Merge commit '1c18f6c7438537a60f181d089df06a0b4ba915f9'

3 files changed, 68 insertions, 3 deletions

diff --git a/indoteknik_custom/views/product_pricelist.xml b/indoteknik_custom/views/product_pricelist.xml
new file mode 100644
index 00000000..18e9835a
--- /dev/null
+++ b/indoteknik_custom/views/product_pricelist.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="product_pricelist_view_inherit" model="ir.ui.view">
+        <field name="name">product.pricelist.view.inherit</field>
+        <field name="model">product.pricelist</field>
+        <field name="inherit_id" ref="product.product_pricelist_view"/>
+        <field name="arch" type="xml">
+            <field name="company_id" position="after">
+                <field name="is_flash_sale"/>
+            </field>
+            <group name="pricelist_settings" position="after">
+                <group name="flash_sale_setting">
+                    <field name="banner" widget="image" attrs="{
+                        'invisible': [('is_flash_sale', '=', False)]
+                    }" />
+                    <field name="start_date" attrs="{
+                        'invisible': [('is_flash_sale', '=', False)],
+                        'required': [('is_flash_sale', '=', True)]
+                    }" />
+                    <field name="end_date" attrs="{
+                        'invisible': [('is_flash_sale', '=', False)],
+                        'required': [('is_flash_sale', '=', True)]
+                    }" />
+                </group>
+            </group>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/product_pricelist_item.xml b/indoteknik_custom/views/product_pricelist_item.xml
new file mode 100755
index 00000000..94ba9e4f
--- /dev/null
+++ b/indoteknik_custom/views/product_pricelist_item.xml
@@ -0,0 +1,37 @@
+<odoo>
+    <data>
+        <record id="product_pricelist_item_action" model="ir.actions.act_window">
+            <field name="name">Product Pricelist Item</field>
+            <field name="res_model">product.pricelist.item</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <record id="product_pricelist_item_form_view_inherit" model="ir.ui.view">
+            <field name="name">product.pricelist.item.form.view.inherit</field>
+            <field name="model">product.pricelist.item</field>
+            <field name="inherit_id" ref="product.product_pricelist_item_form_view" />
+            <field name="arch" type="xml">
+                <field name="applied_on" position="before">
+                    <field name="pricelist_id" />
+                </field>
+            </field>
+        </record>
+
+        <record id="product_pricelist_item_view_search_inherit" model="ir.ui.view">
+            <field name="name">product.pricelist.item.search.inherit</field>
+            <field name="model">product.pricelist.item</field>
+            <field name="inherit_id" ref="product.product_pricelist_item_view_search"/>
+            <field name="arch" type="xml">
+                <field name="pricelist_id" position="before">
+                    <field name="product_id" string="Products"/>
+                </field>
+            </field>
+        </record>
+
+        <menuitem id="product_pricelist_item"
+                  name="Pricelist Items"
+                  parent="sale.product_menu_catalog"
+                  sequence="2"
+                  action="product_pricelist_item_action"/>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 0abbae94..f83b2a6b 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -26,11 +26,11 @@
                     <field name="vendor_id" attrs="{'readonly': [('parent.state', 'not in', ['draft', 'sent', 'sale'])]}"/>
                     <field name="purchase_price" attrs="{'readonly': [('parent.state', 'not in', ['draft', 'sent', 'sale'])]}"/>
                     <field name="purchase_tax_id" attrs="{'readonly': [('parent.state', 'not in', ['draft', 'sent', 'sale'])]}"/>
-                    <field name="item_percent_margin" groups="sales_team.group_sale_manager"/>
+                    <field name="item_percent_margin"/>
                 </xpath>
                 <field name="amount_total" position="after">
-                    <field name="total_margin" groups="sales_team.group_sale_manager"/>
-                    <field name="total_percent_margin" groups="sales_team.group_sale_manager"/>
+                    <field name="total_margin"/>
+                    <field name="total_percent_margin"/>
                 </field>
                 <field name="effective_date" position="after">
                     <field name="carrier_id"/>