<Miqdad> cr shopify

1 files changed, 12 insertions, 16 deletions

diff --git a/fixco_custom/views/sale_order.xml b/fixco_custom/views/sale_order.xml
index 2d2a923..11ec935 100755
--- a/fixco_custom/views/sale_order.xml
+++ b/fixco_custom/views/sale_order.xml
@@ -7,25 +7,15 @@
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//button[@name='action_view_invoice']" position="before">
-                    <button type="object"
-                        name="action_view_related_payment"
-                        class="oe_stat_button"
-                        icon="fa-pencil-square-o"
-                        attrs="{'invisible': [('count_payment', '=', 0)]}" groups="base.group_user">
+                    <button type="object" name="action_view_related_payment" class="oe_stat_button" icon="fa-pencil-square-o" attrs="{'invisible': [('count_payment', '=', 0)]}" groups="base.group_user">
                         <field name="count_payment" widget="statinfo" string="Payments"/>
                     </button>
-                    <button type="object"
-                        name="action_view_related_journals"
-                        class="oe_stat_button"
-                        icon="fa-book"
-                        attrs="{'invisible': [('count_journals', '=', 0)]}" groups="base.group_user">
+                    <button type="object" name="action_view_related_journals" class="oe_stat_button" icon="fa-book" attrs="{'invisible': [('count_journals', '=', 0)]}" groups="base.group_user">
                         <field name="count_journals" widget="statinfo" string="Journals"/>
                     </button>
                 </xpath>
                 <button id="action_confirm" position="after">
-                    <button name="open_form_uangmuka_penjualan"
-                            string="UangMuka"
-                            type="object" attrs="{'invisible': [('state', '!=', 'sale')]}"/>
+                    <button name="open_form_uangmuka_penjualan" string="UangMuka" type="object" attrs="{'invisible': [('state', '!=', 'sale')]}"/>
                 </button>
                 <field name="tag_ids" position="after">
                     <field name="carrier"/>
@@ -33,8 +23,14 @@
                 <field name="partner_id" position="after">
                     <field name="address"/>
                 </field>
+                <field name="amount_tax" position="before">
+                    <field name="marketplace_tax" attrs="{'invisible': [('partner_id','!=',281)]}"/>
+                </field>
+
                 <field name="amount_tax" position="after">
-                    <field name="total_discount"/>
+                    <field name="delivery_amount" attrs="{'invisible': [('partner_id','!=',281)]}"/>
+                    <field name="total_discount" />
+                    <field name="marketplace_discount" attrs="{'invisible': [('partner_id','!=',281)]}"/>
                 </field>
                 <field name="client_order_ref" position="after">
                     <field name="order_reference" attrs="{'required': [('source', '!=', 'manual')]}"/>
@@ -50,7 +46,7 @@
             </field>
         </record>
     </data>
-    
+
     <data>
         <record id="sale_order_tree_inherit" model="ir.ui.view">
             <field name="name">Sale Order</field>
@@ -68,7 +64,7 @@
             </field>
         </record>
     </data>
-    
+
     <data>
         <record id="sale_order_quotation_tree_inherit" model="ir.ui.view">
             <field name="name">Quotations</field>