From afda28eb5bcda235c3c0b9479884894f9cd88c8c Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 1 Oct 2024 17:30:48 +0700
Subject: <iman> add inrernal input

---
 indoteknik_custom/views/user_company_request.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/user_company_request.xml b/indoteknik_custom/views/user_company_request.xml
index c9edd3f8..bff06ecd 100644
--- a/indoteknik_custom/views/user_company_request.xml
+++ b/indoteknik_custom/views/user_company_request.xml
@@ -14,6 +14,8 @@
                     decoration-success="is_approve == 'approved'"
                     decoration-danger="is_approve == 'rejected'"
                 />
+                <field name="internal_input"/>
+                <field name="company_type"/>
                 <field name="create_date"/>
             </tree>
         </field>
@@ -36,6 +38,8 @@
                                 decoration-success="is_approve == 'approved'"
                                 decoration-danger="is_approve == 'rejected'"
                             />
+                            <field name="internal_input" />
+                            <field name="company_type" readonly="1"/>
                         </group>
                     </group>
                 </sheet>
-- 
cgit v1.2.3


From ac0f803ab0a68083ca0d1e540b5eb4c204c45245 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Wed, 2 Oct 2024 14:59:44 +0700
Subject: disable create vendor and tax in sale order

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 17faaa95..029c99e9 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -116,7 +116,7 @@
                     </attribute>
                 </xpath>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_total']" position="after">
-                    <field name="vendor_id" attrs="{'readonly': [('parent.approval_status', '=', 'approved')]}" domain="[('parent_id', '=', False)]"/>
+                    <field name="vendor_id" attrs="{'readonly': [('parent.approval_status', '=', 'approved')]}" domain="[('parent_id', '=', False)]" options="{'no_create':True}"/>
                     <field name="purchase_price" attrs="
                         {
                             'readonly': [
@@ -126,7 +126,7 @@
                             ]
                         }
                     "/>
-                    <field name="purchase_tax_id" attrs="{'readonly': [('parent.approval_status', '!=', False)]}" domain="[('type_tax_use','=','purchase')]"/>
+                    <field name="purchase_tax_id" attrs="{'readonly': [('parent.approval_status', '!=', False)]}" domain="[('type_tax_use','=','purchase')]" options="{'no_create':True}"/>
                     <field name="item_percent_margin"/>
                     <field name="item_margin" optional="hide"/>
                     <field name="note" optional="hide"/>
-- 
cgit v1.2.3


From 27a603a8bc4750dcacd295e07144c5ce2621783c Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 2 Oct 2024 15:10:46 +0700
Subject: cr estimated shipping price + cr user company request

---
 indoteknik_custom/views/user_company_request.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/user_company_request.xml b/indoteknik_custom/views/user_company_request.xml
index c9edd3f8..38340081 100644
--- a/indoteknik_custom/views/user_company_request.xml
+++ b/indoteknik_custom/views/user_company_request.xml
@@ -4,7 +4,7 @@
         <field name="name">user.company.request.tree</field>
         <field name="model">user.company.request</field>
         <field name="arch" type="xml">
-            <tree create="0" default_order="create_date desc">
+            <tree create="1" default_order="create_date desc">
                 <field name="user_id"/>
                 <field name="user_company_id"/>
                 <field name="user_input"/>
@@ -28,7 +28,8 @@
                     <group>
                         <group>
                             <field name="user_id" readonly="1"/>
-                            <field name="user_company_id" readonly="1"/>
+                            <field name="similar_company_ids" invisible="1"/>
+                            <field name="user_company_id" domain="[('id', 'in', similar_company_ids)]"/>
                             <field name="user_input" readonly="1"/>
                             <field 
                                 name="is_approve" 
-- 
cgit v1.2.3


From 8b63d79efe0137ce6af535847f33868e73ce8d3c Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 2 Oct 2024 15:31:02 +0700
Subject: add validation data realshippingaddress

---
 indoteknik_custom/views/res_partner.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index d77e09b8..6d02a86b 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -29,6 +29,15 @@
                 <field name="nama_wajib_pajak" position="attributes">
                     <attribute name="required">1</attribute>
                 </field>
+                <field name="kota_id" position="attributes">
+                    <attribute name="required">0</attribute>
+                </field>
+                <field name="kecamatan_id" position="attributes">
+                    <attribute name="required">0</attribute>
+                </field>
+                <field name="kelurahan_id" position="attributes">
+                    <attribute name="required">0</attribute>
+                </field>
                 <field name="npwp" position="attributes">
                     <attribute name="required">1</attribute>
                 </field>
-- 
cgit v1.2.3


From 16ddcb43b85c1deeda29bf6bb5db4ef73b8d20d2 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Wed, 2 Oct 2024 16:21:55 +0700
Subject: add suggested vendor by md, use later

---
 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 029c99e9..1c75c96a 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -135,6 +135,7 @@
                     <field name="weight" optional="hide"/>
                     <field name="amount_voucher_disc" string="Voucher" readonly="1" optional="hide"/>
                     <field name="order_promotion_id" string="Promotion" readonly="1" optional="hide"/>
+                    <field name="md_vendor_id" string="MD Vendor" readonly="1" optional="hide"/>
                 </xpath>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='product_id']" position="before">
                     <field name="line_no" readonly="1" optional="hide"/>
-- 
cgit v1.2.3


From 4a69c71eab2d4ea3504a0cf6e3a9ca241be48594 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 3 Oct 2024 10:12:24 +0700
Subject: push

---
 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 029c99e9..f2a57fc7 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -117,6 +117,7 @@
                 </xpath>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_total']" position="after">
                     <field name="vendor_id" attrs="{'readonly': [('parent.approval_status', '=', 'approved')]}" domain="[('parent_id', '=', False)]" options="{'no_create':True}"/>
+                    <field name="vendor_md_id" readonly="1" options="{'no_create':True}"/>
                     <field name="purchase_price" attrs="
                         {
                             'readonly': [
@@ -126,6 +127,7 @@
                             ]
                         }
                     "/>
+                    <field name="purchase_price_md" readonly="1"/>
                     <field name="purchase_tax_id" attrs="{'readonly': [('parent.approval_status', '!=', False)]}" domain="[('type_tax_use','=','purchase')]" options="{'no_create':True}"/>
                     <field name="item_percent_margin"/>
                     <field name="item_margin" optional="hide"/>
-- 
cgit v1.2.3


From 7059f095dd09649f7c12f74ff29200f644bbc854 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 3 Oct 2024 11:55:16 +0700
Subject: push

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/vendor_approval.xml b/indoteknik_custom/views/vendor_approval.xml
new file mode 100644
index 00000000..c3f5ee77
--- /dev/null
+++ b/indoteknik_custom/views/vendor_approval.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <data>
+        <record id="vendor_approval_tree" model="ir.ui.view">
+            <field name="name">vendor.approval.tree</field>
+            <field name="model">vendor.approval</field>
+            <field name="arch" type="xml">
+                <tree default_order="create_date desc" create="0">
+                    <field name="number"/>
+                    <field name="partner_id"/>
+                    <field name="order_id"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="vendor_approval_line_tree" model="ir.ui.view">
+            <field name="name">vendor.approval.line.tree</field>
+            <field name="model">vendor.approval.line</field>
+            <field name="arch" type="xml">
+                <tree>
+                    <field name="product_id"/>
+                    <field name="product_uom_qty"/>
+                    <field name="vendor_id"/>
+                    <field name="vendor_md_id"/>
+                    <field name="purchase_price"/>
+                    <field name="purchase_price_md"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="vendor_approval_form" model="ir.ui.view">
+            <field name="name">vendor.approval.form</field>
+            <field name="model">vendor.approval</field>
+            <field name="arch" type="xml">
+                <form create="false">
+                    <header>
+                        <button name="action_approve"
+                            string="Approve"
+                            type="object"
+                            attrs="{'invisible': [('state', '=', 'done')]}"
+                        />
+                        <button name="action_reject"
+                                string="Cancel"
+                                type="object"
+                                attrs="{'invisible': [('state', '=', 'cancel')]}"
+                        />
+                    </header>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="partner_id" readonly="1"/>
+                                <field name="order_id" readonly="1"/>
+                                <field name="state" readonly="1"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="SO Line">
+                                <field name="vendor_approval_line" readonly="1"/>    
+                            </page>
+                        </notebook>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
+                </form>
+            </field>
+        </record>
+
+        <record id="vendor_approval_view_search" model="ir.ui.view">
+            <field name="name">vendor.approval.search.view</field> <!-- Made the name more descriptive -->
+            <field name="model">vendor.approval</field>
+            <field name="arch" type="xml">
+                <search string="Search Vendor Approval">
+                    <field name="number"/>
+                    <field name="partner_id"/>
+                    <field name="order_id"/>
+                </search>
+            </field>
+        </record>    
+
+        <record id="vendor_approval_action" model="ir.actions.act_window">
+            <field name="name">Vendor Approval</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">vendor.approval</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem
+            id="menu_vendor_approval"
+            name="Vendor Approval"
+            parent="sale.product_menu_catalog"
+            sequence="4"
+            action="vendor_approval_action"
+        />
+    </data>    
+</odoo>
-- 
cgit v1.2.3


From 48c220d1c38f435962b8b630c5209ba781ca30df Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Fri, 4 Oct 2024 14:23:59 +0700
Subject: push

---
 indoteknik_custom/views/ir_sequence.xml     | 10 ++++++++++
 indoteknik_custom/views/sale_order.xml      |  9 ++++++---
 indoteknik_custom/views/vendor_approval.xml | 16 ++++++++++++----
 3 files changed, 28 insertions(+), 7 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index dd501d8c..dfb56100 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -21,6 +21,16 @@
             <field name="number_increment">1</field>
         </record>
         
+        <record id="sequence_vendor_approval" model="ir.sequence">
+            <field name="name">Vendor Approval</field>
+            <field name="code">vendor.approval</field>
+            <field name="active">TRUE</field>
+            <field name="prefix">VA/%(year)s/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+        </record>
+
         <record id="sequence_approval_unreserve" model="ir.sequence">
             <field name="name">Approval Unreserve</field>
             <field name="code">approval.unreserve</field>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index f2a57fc7..9a637441 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -72,6 +72,7 @@
                     <field name="flash_sale"/>
                     <field name="margin_after_delivery_purchase"/>
                     <field name="percent_margin_after_delivery_purchase"/>
+                    <field name="total_weight"/>
                 </field>
                 <field name="analytic_account_id" position="after">
                     <field name="customer_type" required="1"/>
@@ -80,6 +81,7 @@
                     <field name="email" required="1"/>
                     <field name="unreserve_id"/>
                     <field name="due_id" readonly="1"/>
+                    <field name="vendor_approval_id" readonly="1"/>
                     <field name="source_id" domain="[('id', 'in', [32, 59, 60, 61])]" required="1"/>
                     <button name="override_allow_create_invoice"
                             string="Override Create Invoice"
@@ -117,7 +119,7 @@
                 </xpath>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_total']" position="after">
                     <field name="vendor_id" attrs="{'readonly': [('parent.approval_status', '=', 'approved')]}" domain="[('parent_id', '=', False)]" options="{'no_create':True}"/>
-                    <field name="vendor_md_id" readonly="1" options="{'no_create':True}"/>
+                    <field name="vendor_md_id" optional="hide"/>
                     <field name="purchase_price" attrs="
                         {
                             'readonly': [
@@ -127,14 +129,15 @@
                             ]
                         }
                     "/>
-                    <field name="purchase_price_md" readonly="1"/>
+                    <field name="purchase_price_md" optional="hide"/>
                     <field name="purchase_tax_id" attrs="{'readonly': [('parent.approval_status', '!=', False)]}" domain="[('type_tax_use','=','purchase')]" options="{'no_create':True}"/>
                     <field name="item_percent_margin"/>
                     <field name="item_margin" optional="hide"/>
+                    <field name="margin_md" optional="hide"/>
                     <field name="note" optional="hide"/>
                     <field name="note_procurement" optional="hide"/>
                     <field name="vendor_subtotal" optional="hide"/>
-                    <field name="weight" optional="hide"/>
+                    <field name="weight" optional="hide"/>  
                     <field name="amount_voucher_disc" string="Voucher" readonly="1" optional="hide"/>
                     <field name="order_promotion_id" string="Promotion" readonly="1" optional="hide"/>
                 </xpath>
diff --git a/indoteknik_custom/views/vendor_approval.xml b/indoteknik_custom/views/vendor_approval.xml
index c3f5ee77..605edfbf 100644
--- a/indoteknik_custom/views/vendor_approval.xml
+++ b/indoteknik_custom/views/vendor_approval.xml
@@ -7,8 +7,9 @@
             <field name="arch" type="xml">
                 <tree default_order="create_date desc" create="0">
                     <field name="number"/>
-                    <field name="partner_id"/>
+                    <field name="create_date_so"/>
                     <field name="order_id"/>
+                    <field name="partner_id"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -20,11 +21,17 @@
             <field name="arch" type="xml">
                 <tree>
                     <field name="product_id"/>
+                    <field name="sales_price"/>
                     <field name="product_uom_qty"/>
+                    <field name="sales_tax_id"/>
+                    <field name="margin_after"/>
                     <field name="vendor_id"/>
                     <field name="vendor_md_id"/>
                     <field name="purchase_price"/>
                     <field name="purchase_price_md"/>
+                    <field name="margin_before"/>
+                    <field name="purchase_tax_id"/>
+                    <field name="percent_margin_difference"/>
                 </tree>
             </field>
         </record>
@@ -38,12 +45,12 @@
                         <button name="action_approve"
                             string="Approve"
                             type="object"
-                            attrs="{'invisible': [('state', '=', 'done')]}"
+                            attrs="{'invisible': [('state', 'not in', ['draft'])]}"
                         />
                         <button name="action_reject"
-                                string="Cancel"
+                                string="Reject"
                                 type="object"
-                                attrs="{'invisible': [('state', '=', 'cancel')]}"
+                                attrs="{'invisible': [('state', 'not in', ['draft'])]}"
                         />
                     </header>
                     <sheet>
@@ -52,6 +59,7 @@
                                 <field name="partner_id" readonly="1"/>
                                 <field name="order_id" readonly="1"/>
                                 <field name="state" readonly="1"/>
+                                <field name="create_date_so" readonly="1"/>
                             </group>
                         </group>
                         <notebook>
-- 
cgit v1.2.3


From fe6b304a65fd7e576382d871558b3c404b9dd40a Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Mon, 7 Oct 2024 10:06:40 +0700
Subject: push

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/vit_kota.xml b/indoteknik_custom/views/vit_kota.xml
index 97c7e66c..58c97eb4 100755
--- a/indoteknik_custom/views/vit_kota.xml
+++ b/indoteknik_custom/views/vit_kota.xml
@@ -9,6 +9,7 @@
                 <field name="name"/>
                 <field name="jenis"/>
                 <field name="state_id"/>
+                <field name="is_jabodetabek"/>
             </tree>
         </field>
     </record>
@@ -28,6 +29,7 @@
                         <group>
                             <field name="jenis"/>
                             <field name="state_id"/>
+                            <field name="is_jabodetabek"/>
                         </group>
                         <group/>
                     </group>
-- 
cgit v1.2.3


From 475b927a543890639cfef7731ba8617449a423ec Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 9 Oct 2024 15:01:30 +0700
Subject: add image small

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index f6e5a1a4..0db378f0 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -69,6 +69,9 @@
                     <field name="suggest" readonly="1" widget="badge" decoration-danger="suggest == 'harus beli'" decoration-success="suggest == 'masih cukup'"/>
                     <!-- <field name="suggest" readonly="1"/> -->
                 </field>
+                <field name="product_id" position="before">
+                    <field name="image_small" readonly="1" optional="hide"/>
+                </field>
                 <field name="price_unit" position="after">
                     <field name="price_vendor" attrs="{'readonly': 1}" optional="hide"/>
                 </field>
-- 
cgit v1.2.3


From 48a3d602e65f4aac6a23b356aa89ce8e37a591ff Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 9 Oct 2024 17:13:07 +0700
Subject: cr po

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 0db378f0..4ca3cd84 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -45,7 +45,7 @@
                 <field name="currency_id" position="after">
                     <field name="summary_qty_po"/>
                     <field name="count_line_product"/>
-                    <field name="payment_term_id" readonly="1"/>
+                    <field name="payment_term_id"/>
                 </field>
                 <field name="amount_total" position="after">
                     <field name="total_margin"/>
@@ -67,7 +67,7 @@
                     <field name="qty_available" readonly="1" optional="hide"/>
                     <field name="qty_reserved" readonly="1" optional="hide"/>
                     <field name="suggest" readonly="1" widget="badge" decoration-danger="suggest == 'harus beli'" decoration-success="suggest == 'masih cukup'"/>
-                    <!-- <field name="suggest" readonly="1"/> -->
+                <!-- <field name="suggest" readonly="1"/> -->
                 </field>
                 <field name="product_id" position="before">
                     <field name="image_small" readonly="1" optional="hide"/>
-- 
cgit v1.2.3


From bf80d91dd74549db76edc0c3df3221bb7afc7564 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 10 Oct 2024 09:19:21 +0700
Subject: cr image small po

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 4ca3cd84..f2aec143 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -70,7 +70,7 @@
                 <!-- <field name="suggest" readonly="1"/> -->
                 </field>
                 <field name="product_id" position="before">
-                    <field name="image_small" readonly="1" optional="hide"/>
+                    <field name="image_small" readonly="1" optional="hide" widget="image"/>
                 </field>
                 <field name="price_unit" position="after">
                     <field name="price_vendor" attrs="{'readonly': 1}" optional="hide"/>
-- 
cgit v1.2.3


From cfe3ab19b4c578ceda20f55e86bc901bbd383da5 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 10 Oct 2024 09:33:35 +0700
Subject: cr image small po

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index f2aec143..346100ae 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -70,7 +70,7 @@
                 <!-- <field name="suggest" readonly="1"/> -->
                 </field>
                 <field name="product_id" position="before">
-                    <field name="image_small" readonly="1" optional="hide" widget="image"/>
+                    <field name="image_small" readonly="1" optional="hide" widget="image" height="50"/>
                 </field>
                 <field name="price_unit" position="after">
                     <field name="price_vendor" attrs="{'readonly': 1}" optional="hide"/>
-- 
cgit v1.2.3


From 7153f047a6c9e98a1a016a6e08379f495071c9a1 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 10 Oct 2024 09:45:23 +0700
Subject: add approve_by po

---
 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 346100ae..1702db5d 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -41,6 +41,7 @@
                 <field name="incoterm_id" position="after">
                     <field name="amount_total_without_service"/>
                     <field name="delivery_amt"/>
+                    <field name="approve_by"/>
                 </field>
                 <field name="currency_id" position="after">
                     <field name="summary_qty_po"/>
-- 
cgit v1.2.3


From 884c8725dc941fc5e74d57959c9d486395bffebc Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 10 Oct 2024 10:44:50 +0700
Subject: cr po

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/product_template.xml b/indoteknik_custom/views/product_template.xml
index a77b99de..8fae5038 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -20,6 +20,7 @@
                     <field name="unpublished" />
                     <field name="desc_update_solr" readonly="1" />
                     <field name="last_update_solr" readonly="1" />
+                    <field name="clean_website_description"/>
                 </field>
                 <field name="public_categ_ids" position="attributes">
                     <attribute name="required">0</attribute>
-- 
cgit v1.2.3


From 3990589120359d4407c65924485098e9c1516acc Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 10 Oct 2024 10:46:14 +0700
Subject: fix bug

---
 indoteknik_custom/views/product_template.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/product_template.xml b/indoteknik_custom/views/product_template.xml
index 8fae5038..a77b99de 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -20,7 +20,6 @@
                     <field name="unpublished" />
                     <field name="desc_update_solr" readonly="1" />
                     <field name="last_update_solr" readonly="1" />
-                    <field name="clean_website_description"/>
                 </field>
                 <field name="public_categ_ids" position="attributes">
                     <attribute name="required">0</attribute>
-- 
cgit v1.2.3


From 811d37923e235e12b2032e2acf93fc69c2a350a7 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 10 Oct 2024 10:58:46 +0700
Subject: cr product variant

---
 indoteknik_custom/views/product_template.xml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/product_template.xml b/indoteknik_custom/views/product_template.xml
index a77b99de..5a509ebd 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -39,12 +39,23 @@
                         </group>
                     </page>
                 </page>
-				<field name="supplier_taxes_id" position="after">
+                <field name="supplier_taxes_id" position="after">
                     <field name="supplier_url" widget="url"/>
                 </field>
             </field>
         </record>
-
+        
+        <record id="product_normal_form_view_inherit" model="ir.ui.view">
+            <field name="name">Product Template</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <field name="last_update_solr" position="after">
+                    <field name="clean_website_description" />
+                </field>
+            </field>
+        </record>
+        
         <record id="x_manufactures_group_by" model="ir.ui.view">
             <field name="name">product.template.search.inherit</field>
             <field name="model">product.template</field>
-- 
cgit v1.2.3


From ed9c28ad7062704cb9f124c7ba7b78eebe2695dc Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 10 Oct 2024 11:24:01 +0700
Subject: cr line po

---
 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 1702db5d..3e609f15 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -65,6 +65,7 @@
                     <field name="qty_onhand" readonly="1" optional="hide"/>
                     <field name="qty_incoming" readonly="1" optional="hide"/>
                     <field name="qty_outgoing" readonly="1" optional="hide"/>
+                    <field name="clean_website_description_product" readonly="1" optional="hide"/>
                     <field name="qty_available" readonly="1" optional="hide"/>
                     <field name="qty_reserved" readonly="1" optional="hide"/>
                     <field name="suggest" readonly="1" widget="badge" decoration-danger="suggest == 'harus beli'" decoration-success="suggest == 'masih cukup'"/>
-- 
cgit v1.2.3


From a3667d8e42b891192a3e86a00ebc3cd07da8877d Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 16 Oct 2024 09:33:42 +0700
Subject: remove field md_vendor_id

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 895b242c..9a637441 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -140,7 +140,6 @@
                     <field name="weight" optional="hide"/>  
                     <field name="amount_voucher_disc" string="Voucher" readonly="1" optional="hide"/>
                     <field name="order_promotion_id" string="Promotion" readonly="1" optional="hide"/>
-                    <field name="md_vendor_id" string="MD Vendor" readonly="1" optional="hide"/>
                 </xpath>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='product_id']" position="before">
                     <field name="line_no" readonly="1" optional="hide"/>
-- 
cgit v1.2.3


From 0f11923903736a7ccbfc6df815103f890d55d7e9 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 16 Oct 2024 10:29:16 +0700
Subject: add state reserve on stock.picking

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 899d29eb..af1af563 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -16,6 +16,7 @@
                     <field name="driver_arrival_date" optional="hide"/>
                     <field name="note_logistic" optional="hide"/>
                     <field name="note" optional="hide"/>
+                    <field name="state_reserve" optional="hide"/>
                 </field>
                 <field name="partner_id" position="after">
                     <field name="purchase_representative_id"/>
-- 
cgit v1.2.3


From 39b3e85ebcef9a02b3d6cb881d071c37ef45ac4f Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Wed, 16 Oct 2024 14:05:28 +0700
Subject: add field pareto_status

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 9a637441..98001589 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -73,6 +73,7 @@
                     <field name="margin_after_delivery_purchase"/>
                     <field name="percent_margin_after_delivery_purchase"/>
                     <field name="total_weight"/>
+                    <field name="pareto_status"/>
                 </field>
                 <field name="analytic_account_id" position="after">
                     <field name="customer_type" required="1"/>
@@ -244,6 +245,7 @@
                     <field name="client_order_ref"/>
                     <field name="payment_type" optional="hide"/>
                     <field name="payment_status" optional="hide"/>
+                    <field name="pareto_status" optional="hide"/>
                 </field>
             </field>
         </record>
@@ -262,6 +264,7 @@
                     <field name="date_driver_arrival"/>
                     <field name="payment_type" optional="hide"/>
                     <field name="payment_status" optional="hide"/>
+                    <field name="pareto_status" optional="hide"/>
                 </field>
             </field>
         </record>
-- 
cgit v1.2.3


From dd53080cb1bd9a1e6236a72dc4df09df9cda82a8 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 17 Oct 2024 14:18:03 +0700
Subject: add printed sj retur

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index af1af563..e435fa71 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -92,6 +92,8 @@
                     <field name="status_printed"/>
                     <field name="printed_sj"/>
                     <field name="date_printed_sj"/>
+                    <field name="printed_sj_retur"/>
+                    <field name="date_printed_sj_retur"/>
                     <field name="date_printed_list"/>
                     <field name="is_internal_use"
                            string="Internal Use"
-- 
cgit v1.2.3


From f65c674b06d3fbe22829a599eec36b4b19c27dd2 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Sat, 19 Oct 2024 09:38:37 +0700
Subject: push

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 6d02a86b..b458c44c 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -65,9 +65,9 @@
                     <field name="main_parent_id" invisible="1" />
                     <field name="site_id" attrs="{'readonly': [('parent_id', '=', False)]}" domain="[('partner_id', '=', main_parent_id)]" context="{'default_partner_id': active_id}" />
                 </xpath>
-                <xpath expr="//field[@name='property_payment_term_id']" position="attributes">
+                <!-- <xpath expr="//field[@name='property_payment_term_id']" position="attributes">
                     <attribute name="readonly">1</attribute>
-                </xpath>
+                </xpath> -->
                 <xpath expr="//field[@name='property_supplier_payment_term_id']" position="attributes">
                     <attribute name="readonly">1</attribute>
                 </xpath>
-- 
cgit v1.2.3


From 4146004dfa277d1e5f15ca7ed6af247f543b74bb Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Sat, 19 Oct 2024 09:41:42 +0700
Subject: push

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index b458c44c..6d02a86b 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -65,9 +65,9 @@
                     <field name="main_parent_id" invisible="1" />
                     <field name="site_id" attrs="{'readonly': [('parent_id', '=', False)]}" domain="[('partner_id', '=', main_parent_id)]" context="{'default_partner_id': active_id}" />
                 </xpath>
-                <!-- <xpath expr="//field[@name='property_payment_term_id']" position="attributes">
+                <xpath expr="//field[@name='property_payment_term_id']" position="attributes">
                     <attribute name="readonly">1</attribute>
-                </xpath> -->
+                </xpath>
                 <xpath expr="//field[@name='property_supplier_payment_term_id']" position="attributes">
                     <attribute name="readonly">1</attribute>
                 </xpath>
-- 
cgit v1.2.3


From a4006a9c7f57bbc11ba0c519e69719ded8248ad3 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Sat, 19 Oct 2024 11:25:53 +0700
Subject: add date_reserved on tree stock picking

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index e435fa71..d713edbc 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -16,6 +16,7 @@
                     <field name="driver_arrival_date" optional="hide"/>
                     <field name="note_logistic" optional="hide"/>
                     <field name="note" optional="hide"/>
+                    <field name="date_reserved" optional="hide"/>
                     <field name="state_reserve" optional="hide"/>
                 </field>
                 <field name="partner_id" position="after">
-- 
cgit v1.2.3


From d588e3c431f428e09f1efc1736a2ad947ca5b61e Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Tue, 22 Oct 2024 16:53:04 +0700
Subject: cr due extension and dunning run

---
 indoteknik_custom/views/account_move_views.xml | 1 +
 indoteknik_custom/views/dunning_run.xml        | 1 +
 2 files changed, 2 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/account_move_views.xml b/indoteknik_custom/views/account_move_views.xml
index 4acafb14..f4faf386 100644
--- a/indoteknik_custom/views/account_move_views.xml
+++ b/indoteknik_custom/views/account_move_views.xml
@@ -12,6 +12,7 @@
                     <field name="description"/>
                     <field name="approval_status"/>
                     <field name="is_approve"/>
+                    <field name="create_uid" optional="hide"/>
                 </tree>
             </field>
         </record>
diff --git a/indoteknik_custom/views/dunning_run.xml b/indoteknik_custom/views/dunning_run.xml
index 522be8c9..2117a7bb 100644
--- a/indoteknik_custom/views/dunning_run.xml
+++ b/indoteknik_custom/views/dunning_run.xml
@@ -14,6 +14,7 @@
                 <field name="date_terima_tukar_faktur"/>
                 <field name="shipper_faktur_id"/>
                 <field name="grand_total"/>
+                <field name="create_uid" optional="hide"/>
             </tree>
         </field>
     </record>
-- 
cgit v1.2.3


From bd02dbfcfef14c016eec14811f9f257790e6e321 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Tue, 22 Oct 2024 16:57:56 +0700
Subject: create_date on due extension

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/account_move_views.xml b/indoteknik_custom/views/account_move_views.xml
index f4faf386..f7b753bd 100644
--- a/indoteknik_custom/views/account_move_views.xml
+++ b/indoteknik_custom/views/account_move_views.xml
@@ -13,6 +13,7 @@
                     <field name="approval_status"/>
                     <field name="is_approve"/>
                     <field name="create_uid" optional="hide"/>
+                    <field name="create_date" optional="hide"/>
                 </tree>
             </field>
         </record>
-- 
cgit v1.2.3


From 25645d93db289ea4855486630dba8d578efb2851 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 23 Oct 2024 09:13:53 +0700
Subject: cr due extension

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/account_move_views.xml b/indoteknik_custom/views/account_move_views.xml
index f7b753bd..da25636e 100644
--- a/indoteknik_custom/views/account_move_views.xml
+++ b/indoteknik_custom/views/account_move_views.xml
@@ -12,6 +12,8 @@
                     <field name="description"/>
                     <field name="approval_status"/>
                     <field name="is_approve"/>
+                    <field name="approve_by" optional="hide"/>
+                    <field name="date_approve" optional="hide"/>
                     <field name="create_uid" optional="hide"/>
                     <field name="create_date" optional="hide"/>
                 </tree>
@@ -60,12 +62,14 @@
                             <group>
                                 <field name="partner_id" readonly="1"/>
                                 <field name="day_extension" attrs="{'readonly': [('is_approve', '=', True)]}"/>    
+                                <field name="order_id" readonly="1"/>
                             </group>
                             <group>
                                 <field name="is_approve" readonly="1"/>
-                                <field name="order_id" readonly="1"/>
                                 <field name="counter" readonly="1"/>
                                 <field name="approval_status" readonly="1"/>
+                                <field name="approve_by" readonly="1"/>
+                                <field name="date_approve" readonly="1"/>
                             </group>
                         </group>
                         <group>
-- 
cgit v1.2.3


From 943ee3ca2e3b8469d1f3969fa6ea45710e532fc0 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Wed, 23 Oct 2024 10:21:27 +0700
Subject: fix web find page

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/find_page.xml b/indoteknik_custom/views/find_page.xml
new file mode 100644
index 00000000..c752aa98
--- /dev/null
+++ b/indoteknik_custom/views/find_page.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="web_find_page_tree" model="ir.ui.view">
+        <field name="name">web.find.page.tree</field>
+        <field name="model">web.find.page</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="category_id"/>
+                <field name="brand_id"/>
+                <field name="url"/>
+                <field name="create_uid"/>
+                <field name="write_uid"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="web_find_page_form" model="ir.ui.view">
+        <field name="name">web.find.page.form</field>
+        <field name="model">web.find.page</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet string="Web Find Page">
+                        <div class="oe_button_box" name="button_box"/>
+                        <group>
+                            <group>
+                                <field name="category_id"/>
+                                <field name="brand_id"/>
+                                <field name="url"/>
+                            </group>
+                            <group>
+                                <field name="create_uid"/>
+                                <field name="write_uid"/>
+                            </group>
+                        </group>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_web_find_page_filter" model="ir.ui.view">
+        <field name="name">web.find.page.list.select</field>
+        <field name="model">web.find.page</field>
+        <field name="priority" eval="15"/>
+        <field name="arch" type="xml">
+            <search string="Search Web Find Page">
+                <field name="category_id"/>
+                <field name="brand_id"/>
+                <field name="url"/>
+           </search>
+        </field>
+    </record>
+
+    <record id="web_find_page_action" model="ir.actions.act_window">
+        <field name="name">Web Find Page</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">web.find.page</field>
+        <field name="search_view_id" ref="view_web_find_page_filter"/>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem id="menu_web_find_page"
+        name="Web Find Page"
+        action="web_find_page_action"
+        parent="website_sale.menu_orders"
+        sequence="8"/>
+</odoo>
\ No newline at end of file
-- 
cgit v1.2.3


From 0b740ccb154fc89e04b41f3b6a199dec4657b7de Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 23 Oct 2024 15:55:28 +0700
Subject: cr rpo

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/requisition.xml b/indoteknik_custom/views/requisition.xml
index 652d03d0..b704baaf 100644
--- a/indoteknik_custom/views/requisition.xml
+++ b/indoteknik_custom/views/requisition.xml
@@ -78,6 +78,7 @@
                                         <field name="partner_id" required="1" />
                                         <field name="qty_purchase" required="1" />
                                         <field name="price_unit" required="1" />
+                                        <field name="taxes_id" readonly="1" />
                                         <field name="subtotal" readonly="1" />
                                         <field name="brand_id" />
                                     </tree>
-- 
cgit v1.2.3