From 60fffef5ee0c91ba58a056823fc2feff6241a303 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Thu, 22 Sep 2022 13:46:48 +0700
Subject: add calculate margin including delivery fee in purchase order

---
 indoteknik_custom/views/purchase_order.xml | 8 ++++++++
 indoteknik_custom/views/sale_order.xml     | 6 ++++++
 2 files changed, 14 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index f209d18a..7df2ca9f 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -17,6 +17,14 @@
                 <field name="date_order" position="before">
                     <field name="sale_order_id" attrs="{'readonly': [('state', 'not in', ['draft'])]}"/>
                 </field>
+                <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_subtotal']" position="after">
+                    <field name="item_margin"/>
+                    <field name="item_percent_margin"/>
+                </xpath>
+                <field name="amount_total" position="after">
+                    <field name="total_margin"/>
+                    <field name="total_percent_margin"/>
+                </field>
             </field>
         </record>
     </data>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 19182a6b..b2466b0d 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -6,6 +6,12 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
+                <button id="action_confirm" position="after">
+                    <button name="sale_order_approve"
+                            string="Ask Approval"
+                            type="object"
+                    />
+                </button>
                 <field name="payment_term_id" position="after">
                     <field name="approval_status" />
                 </field>
-- 
cgit v1.2.3


From 54ce5a6396f5d5365d8afba0823167dfb5561cc5 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Thu, 22 Sep 2022 17:20:57 +0700
Subject: add approval validation in po confirmation

---
 indoteknik_custom/views/purchase_order.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 7df2ca9f..21ce3c58 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -14,6 +14,12 @@
                             attrs="{'invisible': ['|', ('sale_order_id', '=', False), ('state', 'not in', ['draft'])]}"
                     />
                 </div>
+                <button id="draft_confirm" position="after">
+                    <button name="po_approve"
+                            string="Ask Approval"
+                            type="object"
+                    />
+                </button>
                 <field name="date_order" position="before">
                     <field name="sale_order_id" attrs="{'readonly': [('state', 'not in', ['draft'])]}"/>
                 </field>
-- 
cgit v1.2.3


From f9d6b340a6e75799edc3a6a2a9e5bd6086fc8a3f Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Fri, 23 Sep 2022 09:14:46 +0700
Subject: add volumn approval status and procurement status in rfq and purchase
 order

---
 indoteknik_custom/views/purchase_order.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 21ce3c58..a1e6f08c 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -34,4 +34,28 @@
             </field>
         </record>
     </data>
+    <data>
+        <record id="rfq_order_tree_view_inherit" model="ir.ui.view">
+            <field name="name">Purchase</field>
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase.purchase_order_kpis_tree"/>
+            <field name="arch" type="xml">
+                <field name="create_date" position="after">
+                    <field name="approval_status" />
+                </field>
+            </field>
+        </record>
+    </data>
+    <data>
+        <record id="purchase_order_tree_view_inherit" model="ir.ui.view">
+            <field name="name">Purchase</field>
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase.purchase_order_view_tree"/>
+            <field name="arch" type="xml">
+                <field name="invoice_status" position="after">
+                    <field name="procurement_status" />
+                </field>
+            </field>
+        </record>
+    </data>
 </odoo>
\ No newline at end of file
-- 
cgit v1.2.3


From 62dfd611cac52a2099deabf26149b1779926ee7a Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Fri, 23 Sep 2022 09:31:52 +0700
Subject: override method cancel purchase order and add field approval status
 in form purchase order

---
 indoteknik_custom/views/purchase_order.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index a1e6f08c..ccedd857 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -22,6 +22,7 @@
                 </button>
                 <field name="date_order" position="before">
                     <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"/>
-- 
cgit v1.2.3


From 248fd7cb0c93e60bdfccaf095cdb601a3319b65e Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Sat, 24 Sep 2022 11:11:49 +0700
Subject: add several column in sales order and order line

---
 indoteknik_custom/views/sale_order.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index b2466b0d..c101fe1b 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -13,9 +13,15 @@
                     />
                 </button>
                 <field name="payment_term_id" position="after">
+                    <field name="shipping_cost_covered"/>
+                </field>
+                <field name="partner_shipping_id" position="after">
                     <field name="approval_status" />
                 </field>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_total']" position="after">
+                    <field name="vendor" attrs="{'readonly': [('parent.state', 'not in', ['draft', 'sent', 'sale'])]}"/>
+                    <field name="purchase_price" attrs="{'readonly': [('parent.state', 'not in', ['draft', 'sent', 'sale'])]}"/>
+                    <field name="tax_id" attrs="{'readonly': [('parent.state', 'not in', ['draft', 'sent', 'sale'])]}"/>
                     <field name="item_margin" groups="sales_team.group_sale_manager"/>
                     <field name="item_percent_margin" groups="sales_team.group_sale_manager"/>
                 </xpath>
-- 
cgit v1.2.3


From 01b658ddbb6ed4e5c493da2c9cae92ce80a7e135 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Sat, 24 Sep 2022 11:39:41 +0700
Subject: fix error column sale order

---
 indoteknik_custom/views/sale_order.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index c101fe1b..03a6b45c 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -21,7 +21,7 @@
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_total']" position="after">
                     <field name="vendor" attrs="{'readonly': [('parent.state', 'not in', ['draft', 'sent', 'sale'])]}"/>
                     <field name="purchase_price" attrs="{'readonly': [('parent.state', 'not in', ['draft', 'sent', 'sale'])]}"/>
-                    <field name="tax_id" 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_margin" groups="sales_team.group_sale_manager"/>
                     <field name="item_percent_margin" groups="sales_team.group_sale_manager"/>
                 </xpath>
-- 
cgit v1.2.3


From 18a08e93126100d572a56e4deced21434082bd72 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Mon, 26 Sep 2022 13:29:17 +0700
Subject: Update sale_order.py and sale_order.xml - calculate margin with input
 purchase price

---
 indoteknik_custom/views/sale_order.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 03a6b45c..0e2d2923 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -19,7 +19,7 @@
                     <field name="approval_status" />
                 </field>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_total']" position="after">
-                    <field name="vendor" attrs="{'readonly': [('parent.state', 'not in', ['draft', 'sent', 'sale'])]}"/>
+                    <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_margin" groups="sales_team.group_sale_manager"/>
-- 
cgit v1.2.3


From 7ae5b8b7baafb9ed302c3c3e54f3f44664651c06 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Mon, 26 Sep 2022 18:25:41 +0700
Subject: Update purchase_order.py, purchase_order_line.py, and 2 more files...

---
 indoteknik_custom/views/purchase_order.xml | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index ccedd857..37b9c0cb 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -24,14 +24,6 @@
                     <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="item_percent_margin"/>
-                </xpath>
-                <field name="amount_total" position="after">
-                    <field name="total_margin"/>
-                    <field name="total_percent_margin"/>
-                </field>
             </field>
         </record>
     </data>
-- 
cgit v1.2.3


From 3a8710d164ced77e532b0b96988d84bb08515602 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Tue, 27 Sep 2022 14:42:59 +0700
Subject: Update purchase_order.py, sale_order.py, and sale_order.xml

---
 indoteknik_custom/views/sale_order.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 0e2d2923..2260ddc1 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -14,6 +14,8 @@
                 </button>
                 <field name="payment_term_id" position="after">
                     <field name="shipping_cost_covered"/>
+                    <field name="shipping_paid_by"/>
+                    <field name="delivery_amt"/>
                 </field>
                 <field name="partner_shipping_id" position="after">
                     <field name="approval_status" />
-- 
cgit v1.2.3


From d023b4f2564c7d2fbe3d61a2348250569f182dc4 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Wed, 28 Sep 2022 10:59:19 +0700
Subject: Update sale_order.py and sale_order.xml

---
 indoteknik_custom/views/sale_order.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 2260ddc1..17902aca 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -16,6 +16,7 @@
                     <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" />
@@ -24,7 +25,6 @@
                     <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_margin" groups="sales_team.group_sale_manager"/>
                     <field name="item_percent_margin" groups="sales_team.group_sale_manager"/>
                 </xpath>
                 <field name="amount_total" position="after">
-- 
cgit v1.2.3


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


From 43a8e9a7f2d6ba127de9bcd40925b838b1f5eaeb Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Thu, 29 Sep 2022 08:54:16 +0700
Subject: Update __manifest__.py, __init__.py, and 3 more files...

---
 indoteknik_custom/views/users.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 indoteknik_custom/views/users.xml

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/users.xml b/indoteknik_custom/views/users.xml
new file mode 100644
index 00000000..d75b35fc
--- /dev/null
+++ b/indoteknik_custom/views/users.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="users_form_view_inherit" model="ir.ui.view">
+            <field name="name">User</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form"/>
+            <field name="arch" type="xml">
+                <field name="tz_offset" position="after">
+                    <field name="is_purchasing_manager"/>
+                    <field name="is_sales_manager"/>
+                    <field name="is_leader"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
-- 
cgit v1.2.3


From fca62b9b9a56f92abffd624067ee75c64f1c84fa Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Thu, 29 Sep 2022 11:42:31 +0700
Subject: Update sale_order.py and sale_order.xml

---
 indoteknik_custom/views/sale_order.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 297d0045..0abbae94 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -20,6 +20,7 @@
                 <field name="partner_shipping_id" position="after">
                     <field name="approval_status" />
                     <field name="sales_tax_id" domain="[('type_tax_use','=','sale')]"/>
+                    <field name="carrier_id"/>
                 </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


From 1e40f3b647d6825779503858bb2ed2d0f8a4b184 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Thu, 29 Sep 2022 19:06:49 +0700
Subject: Update purchase_order.py, purchase_order_line.py, and 2 more files...

---
 indoteknik_custom/views/purchase_order.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index e1f6560c..d0bd515f 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -29,6 +29,7 @@
                     <field name="so_item_margin"/>
                     <field name="item_percent_margin"/>
                     <field name="so_item_percent_margin"/>
+                    <field name="delivery_amt_line"/>
                 </xpath>
                 <field name="amount_total" position="after">
                     <field name="total_margin"/>
-- 
cgit v1.2.3


From 70c227cff8a3891b4b15b0e8b97ae81beac6a41a Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Mon, 3 Oct 2022 09:25:46 +0700
Subject: Update purchase_order.xml

---
 indoteknik_custom/views/purchase_order.xml | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index d0bd515f..a8b71d5a 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -24,13 +24,6 @@
                     <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"/>
-                    <field name="delivery_amt_line"/>
-                </xpath>
                 <field name="amount_total" position="after">
                     <field name="total_margin"/>
                     <field name="total_so_margin"/>
-- 
cgit v1.2.3