From 597d6458234a14bd20e7fba8a0ceb07168423d2a Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Wed, 28 Sep 2022 16:25:01 +0700
Subject: Update purchase_order.py, purchase_order_line.py, and 3 more files...

---
 indoteknik_custom/views/purchase_order.xml | 12 ++++++++++++
 indoteknik_custom/views/sale_order.xml     |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 37b9c0cb..e1f6560c 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -24,6 +24,18 @@
                     <field name="sale_order_id" attrs="{'readonly': [('state', 'not in', ['draft'])]}"/>
                     <field name="approval_status"/>
                 </field>
+                <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_subtotal']" position="after">
+                    <field name="item_margin"/>
+                    <field name="so_item_margin"/>
+                    <field name="item_percent_margin"/>
+                    <field name="so_item_percent_margin"/>
+                </xpath>
+                <field name="amount_total" position="after">
+                    <field name="total_margin"/>
+                    <field name="total_so_margin"/>
+                    <field name="total_percent_margin"/>
+                    <field name="total_so_percent_margin"/>
+                </field>
             </field>
         </record>
     </data>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 17902aca..297d0045 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -16,10 +16,10 @@
                     <field name="shipping_cost_covered"/>
                     <field name="shipping_paid_by"/>
                     <field name="delivery_amt"/>
-                    <field name="sales_tax_id" domain="[('type_tax_use','=','sale')]"/>
                 </field>
                 <field name="partner_shipping_id" position="after">
                     <field name="approval_status" />
+                    <field name="sales_tax_id" domain="[('type_tax_use','=','sale')]"/>
                 </field>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_total']" position="after">
                     <field name="vendor_id" attrs="{'readonly': [('parent.state', 'not in', ['draft', 'sent', 'sale'])]}"/>
-- 
cgit v1.2.3