From c99bf4c49859450ce4cb081c920edda2077b3b1a Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Tue, 11 Feb 2025 09:48:55 +0700
Subject: push

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 1c6ae8f7..42fa481d 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -72,6 +72,8 @@
                     <field name="count_line_detail"/>
                     <field name="dokumen_tanda_terima"/>
                     <field name="dokumen_pengiriman"/>
+                    <field name="quantity_koli" attrs="{'invisible': [('location_dest_id', '!=', 60)]}"/>
+                    <field name="source_koli_id" attrs="{'invisible': [('picking_type_code', '!=', 'outgoing')]}"/>
                 </field>
                 <field name="weight_uom_name" position="after">
                     <group>
@@ -198,11 +200,37 @@
                     <page string="Barcode Product" name="barcode_product" attrs="{'invisible': [('picking_type_code', '!=', 'incoming')]}">
                         <field name="barcode_product_lines"/>
                     </page>
+                    <page string="Check Koli" name="check_koli" attrs="{'invisible': [('location_dest_id', '!=', 60)]}">
+                        <field name="check_koli_lines"/>
+                    </page>
+                    <page string="Scan Koli" name="scan_koli" attrs="{'invisible': [('picking_type_code', '!=', 'outgoing')]}">
+                        <field name="scan_koli_lines"/>
+                    </page>
                 </page>
                 
             </field>
         </record>
 
+        <record id="scan_koli_tree" model="ir.ui.view">
+            <field name="name">scan.koli.tree</field>
+            <field name="model">scan.koli</field>
+            <field name="arch" type="xml">
+                <tree editable="bottom">
+                    <field name="koli_id"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="check_koli_tree" model="ir.ui.view">
+            <field name="name">check.koli.tree</field>
+            <field name="model">check.koli</field>
+            <field name="arch" type="xml">
+                <tree editable="bottom">
+                    <field name="koli"/>
+                </tree>
+            </field>
+        </record>
+
         <record id="check_product_tree" model="ir.ui.view">
             <field name="name">check.product.tree</field>
             <field name="model">check.product</field>
-- 
cgit v1.2.3


From 99b252edaefc372fcd4ef59e065284d8feeb669c Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 19 Feb 2025 09:38:46 +0700
Subject: push

---
 indoteknik_custom/views/sale_order.xml    | 15 +++++++++++++++
 indoteknik_custom/views/stock_picking.xml |  6 +++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 008a04ed..877208b0 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -280,6 +280,9 @@
                     <page string="Reject Line" name="page_sale_order_reject_line">
                         <field name="reject_line" readonly="1"/>
                     </page>
+                    <page string="Koli" name="page_sales_order_koli_line">
+                        <field name="koli_lines" readonly="1"/>
+                    </page>
                 </page>
             </field>
         </record>
@@ -391,6 +394,18 @@
         </record>
     </data>
 
+    <data>
+        <record id="sales_order_koli_tree" model="ir.ui.view">
+            <field name="name">sales.order.koli.tree</field>
+            <field name="model">sales.order.koli</field>
+            <field name="arch" type="xml">
+                <tree editable="top" create="false" delete="false">
+                    <field name="koli_id" readonly="1"/>
+                </tree>
+            </field>
+        </record>
+    </data>
+
     <data>
 
     </data>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 42fa481d..2a11459c 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -73,7 +73,10 @@
                     <field name="dokumen_tanda_terima"/>
                     <field name="dokumen_pengiriman"/>
                     <field name="quantity_koli" attrs="{'invisible': [('location_dest_id', '!=', 60)]}"/>
-                    <field name="source_koli_id" attrs="{'invisible': [('picking_type_code', '!=', 'outgoing')]}"/>
+                    <!-- <field name="source_koli_id" attrs="{'invisible': [('picking_type_code', '!=', 'outgoing')]}"/> -->
+                    <field name="total_koli_display" readonly="1"/>
+                    <field name="linked_out_picking_id" readonly="1"/>
+                    <field name="backorder_picking_id" readonly="1"/>
                 </field>
                 <field name="weight_uom_name" position="after">
                     <group>
@@ -217,6 +220,7 @@
             <field name="arch" type="xml">
                 <tree editable="bottom">
                     <field name="koli_id"/>
+                    <field name="scan_koli_progress"/>
                 </tree>
             </field>
         </record>
-- 
cgit v1.2.3


From c1810b315d820a184db47d551b39700ce00d1440 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Mon, 24 Feb 2025 09:57:56 +0700
Subject: push wms

---
 indoteknik_custom/views/sale_order.xml    | 2 ++
 indoteknik_custom/views/stock_picking.xml | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 877208b0..4d31b072 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -401,6 +401,8 @@
             <field name="arch" type="xml">
                 <tree editable="top" create="false" delete="false">
                     <field name="koli_id" readonly="1"/>
+                    <field name="picking_id" readonly="1"/>
+                    <field name="state" readonly="1"/>
                 </tree>
             </field>
         </record>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 2a11459c..1b3406ec 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -73,10 +73,8 @@
                     <field name="dokumen_tanda_terima"/>
                     <field name="dokumen_pengiriman"/>
                     <field name="quantity_koli" attrs="{'invisible': [('location_dest_id', '!=', 60)]}"/>
-                    <!-- <field name="source_koli_id" attrs="{'invisible': [('picking_type_code', '!=', 'outgoing')]}"/> -->
                     <field name="total_koli_display" readonly="1"/>
                     <field name="linked_out_picking_id" readonly="1"/>
-                    <field name="backorder_picking_id" readonly="1"/>
                 </field>
                 <field name="weight_uom_name" position="after">
                     <group>
@@ -219,7 +217,7 @@
             <field name="model">scan.koli</field>
             <field name="arch" type="xml">
                 <tree editable="bottom">
-                    <field name="koli_id"/>
+                    <field name="koli_id"  domain="[('state', '=', 'not_delivered')]"/>
                     <field name="scan_koli_progress"/>
                 </tree>
             </field>
@@ -231,6 +229,7 @@
             <field name="arch" type="xml">
                 <tree editable="bottom">
                     <field name="koli"/>
+                    <field name="reserved_id"/>
                 </tree>
             </field>
         </record>
-- 
cgit v1.2.3


From e9836504e2c814652165cd1a7055e91a8b6ea854 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 3 Mar 2025 13:15:17 +0700
Subject: <iman> CR customer commision jasper

---
 indoteknik_custom/views/customer_commision.xml | 50 ++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 3 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 51172b1c..dddefed4 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -11,7 +11,7 @@
                 <field name="partner_ids" widget="many2many_tags"/>
                 <field name="commision_percent"/>
                 <field name="commision_amt" readonly="1"/>
-                <field name="status" readonly="1"/>
+                <field name="status" readonly="1" decoration-success="status == 'approved'" widget="badge" optional="show"/>
                 <field name="payment_status" readonly="1"
                     decoration-success="payment_status == 'payment'"
                     decoration-danger="payment_status == 'pending'"
@@ -28,6 +28,7 @@
             <tree editable="top" create="false">
                 <field name="partner_id" readonly="1"/>
                 <field name="invoice_id" readonly="1"/>
+                <field name="sale_order_id" readonly="1"/>
                 <field name="state" readonly="1"/>
                 <field name="product_id" readonly="1" optional="hide"/>
                 <field name="dpp" readonly="1"/>
@@ -43,14 +44,28 @@
         <field name="model">customer.commision</field>
         <field name="arch" type="xml">
             <form>
+<!--                    attrs="{'invisible': [('status', 'in', ['draft','pengajuan1','pengajuan2','pengajuan3','pengajuan4'])]}"-->
                 <header>
-                    <button name="action_confirm_customer_commision" 
+                    <button name="action_confirm_customer_commision"
                     string="Confirm" type="object"
+                    attrs="{'invisible': [('status', 'in', ['approved','reject'])]}"
                     options="{}"/>
+                    <button name="action_reject"
+                        string="Reject"
+                        attrs="{'invisible': [('status', 'in', ['approved','reject'])]}"
+                        type="object"
+                        class="oe_highlight"/>
+                <button name="button_draft"
+                        string="Reset to Draft"
+                        attrs="{'invisible': [('status', '!=', 'reject')]}"
+                        type="object"/>
                     <button name="action_confirm_customer_payment"
                         string="Konfirmasi Pembayaran" type="object"
                         options="{}"
                         attrs="{'invisible': [('payment_status', '==', 'payment')], 'readonly': [('payment_status', '=', 'payment')]}"/>
+                    <field name="status" widget="statusbar"
+                       statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,pengajuan4,approved"
+                    statusbar_colors='{"reject":"red"}'/>
                 </header>
                 <sheet string="Customer Commision">
                         <div class="oe_button_box" name="button_box"/>
@@ -75,7 +90,7 @@
                                 <field name="commision_type"/>
                                 <field name="brand_ids" widget="many2many_tags"/>
                                 <field name="notification" readonly="1"/>
-                                <field name="status" readonly="1"/>
+<!--                                <field name="status" readonly="1"/>-->
                                 <field name="payment_status" readonly="1" />
                                 <field name="total_dpp"/>
                             </group>
@@ -92,6 +107,11 @@
                                     <field name="note_transfer"/>
                                 </group>
                             </page>
+                            <page string="Finance Notes">
+                                <group>
+                                    <field name="note_finnance"/>
+                                </group>
+                            </page>
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
@@ -102,6 +122,30 @@
         </field>
     </record>
 
+        <!-- Wizard for Reject Reason -->
+    <record id="view_reject_reason_wizard_form" model="ir.ui.view">
+        <field name="name">reject.reason.commision.form</field>
+        <field name="model">reject.reason.commision</field>
+        <field name="arch" type="xml">
+            <form string="Reject Reason">
+                <group>
+                    <field name="reason_reject" widget="text"/>
+                </group>
+                <footer>
+                    <button string="Confirm" type="object" name="confirm_reject" class="btn-primary"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_reject_reason_wizard" model="ir.actions.act_window">
+        <field name="name">Reject Reason</field>
+        <field name="res_model">reject.reason.commision</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+
     <record id="view_customer_commision_filter" model="ir.ui.view">
         <field name="name">customer.commision.list.select</field>
         <field name="model">customer.commision</field>
-- 
cgit v1.2.3


From 20a56a76c519eba82f70ea1443e272ac64797dd9 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Mon, 3 Mar 2025 16:51:05 +0700
Subject: push

---
 indoteknik_custom/views/stock_picking.xml | 49 ++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 10 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 1b3406ec..016fbf17 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -72,9 +72,9 @@
                     <field name="count_line_detail"/>
                     <field name="dokumen_tanda_terima"/>
                     <field name="dokumen_pengiriman"/>
-                    <field name="quantity_koli" attrs="{'invisible': [('location_dest_id', '!=', 60)]}"/>
-                    <field name="total_koli_display" readonly="1"/>
-                    <field name="linked_out_picking_id" readonly="1"/>
+                    <field name="quantity_koli" attrs="{'invisible': [('location_dest_id', '!=', 60)], 'required': [('location_dest_id', '=', 60)]}"/>
+                    <field name="total_koli_display" readonly="1" attrs="{'invisible': [('location_id', '!=', 60)]}"/>
+                    <field name="linked_out_picking_id" readonly="1" attrs="{'invisible': [('location_id', '=', 60)]}"/>
                 </field>
                 <field name="weight_uom_name" position="after">
                     <group>
@@ -147,7 +147,7 @@
                             </group>
                         </group>
                     </page>
-                    <page string="Delivery" name="delivery_order">
+                    <page string="Delivery" name="delivery_order" attrs="{'invisible': [('location_dest_id', '=', 60)]}">
                         <group>
                             <group>
                                 <field name="notee"/>
@@ -195,7 +195,7 @@
                             </group>
                         </group>
                     </page>
-                    <page string="Check Product" name="check_product">
+                    <page string="Check Product" name="check_product" attrs="{'invisible': [('picking_type_code', '=', 'outgoing')]}">
                         <field name="check_product_lines"/>
                     </page>
                     <page string="Barcode Product" name="barcode_product" attrs="{'invisible': [('picking_type_code', '!=', 'incoming')]}">
@@ -217,7 +217,7 @@
             <field name="model">scan.koli</field>
             <field name="arch" type="xml">
                 <tree editable="bottom">
-                    <field name="koli_id"  domain="[('state', '=', 'not_delivered')]"/>
+                    <field name="koli_id" options="{'no_create': True}" required="1"  domain="[('state', '=', 'not_delivered')]"/>
                     <field name="scan_koli_progress"/>
                 </tree>
             </field>
@@ -239,9 +239,9 @@
             <field name="model">check.product</field>
             <field name="arch" type="xml">
                 <tree editable="bottom" decoration-warning="status == 'Pending'" decoration-success="status == 'Done'">
-                    <field name="product_id"/>
-                    <field name="quantity"/>
-                    <field name="status"/>
+                    <field name="product_id" required="1" options="{'no_create': True}"/>
+                    <field name="quantity" readonly="1"/>
+                    <field name="status" readonly="1"/>
                 </tree>
             </field>
         </record>
@@ -278,6 +278,35 @@
                     <field name="purchase_representative_id"/>
                 </field>
             </field>
-        </record>          
+        </record>
+
+        <record id="view_warning_modal_wizard_form" model="ir.ui.view">
+            <field name="name">warning.modal.wizard.form</field>
+            <field name="model">warning.modal.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Peringatan Koli Belum Diperiksa">
+                    <sheet>
+                        <div class="oe_title">
+                            <h2><span>⚠️ Perhatian!</span></h2>
+                        </div>
+                        <group>
+                            <field name="message" readonly="1" nolabel="1" widget="text"/>
+                        </group>
+                    </sheet>
+                    <footer>
+                        <button name="action_continue" type="object" string="Lanjutkan" class="btn-primary"/>
+                        <button string="Tutup" class="btn-secondary" special="cancel"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+        
+        <record id="action_warning_modal_wizard" model="ir.actions.act_window">
+            <field name="name">Peringatan Koli</field>
+            <field name="res_model">warning.modal.wizard</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_warning_modal_wizard_form"/>
+            <field name="target">new</field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
-- 
cgit v1.2.3


From 2b34ec96718d693d7a322939b23bda2fe64d8c80 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Tue, 18 Mar 2025 15:25:34 +0700
Subject: push

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 7cdf3117..1d3f48fc 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -79,8 +79,10 @@
                                 <field name="description"/>
                                 <field name="commision_percent"/>
                                 <field name="commision_amt"/>
+                                <field name="commision_amt_text"/>
                                 <field name="grouped_so_number" readonly="1"/>
                                 <field name="grouped_invoice_number" readonly="1"/>
+                                <field name="approved_by" readonly="1"/>
                             </group>
                             <group>
                                 <div>
-- 
cgit v1.2.3


From beb653de0340d270f2d56dd7b7145c3552e91ab4 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Mon, 24 Mar 2025 09:37:33 +0700
Subject: push

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 144ed820..67593b5b 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -208,7 +208,10 @@
                     <page string="Check Koli" name="check_koli" attrs="{'invisible': [('location_dest_id', '!=', 60)]}">
                         <field name="check_koli_lines"/>
                     </page>
-                    <page string="Scan Koli" name="scan_koli" attrs="{'invisible': [('picking_type_code', '!=', 'outgoing')]}">
+                    <page string="Mapping Koli" name="konfirm_koli" attrs="{'invisible': [('picking_type_code', '!=', 'outgoing')]}">
+                        <field name="konfirm_koli_lines"/>
+                    </page>
+                    <page string="Konfirm Koli" name="scan_koli" attrs="{'invisible': [('picking_type_code', '!=', 'outgoing')]}">
                         <field name="scan_koli_lines"/>
                     </page>
                 </page>
@@ -227,6 +230,16 @@
             </field>
         </record>
 
+        <record id="konfirm_koli_tree" model="ir.ui.view">
+            <field name="name">konfirm.koli.tree</field>
+            <field name="model">konfirm.koli</field>
+            <field name="arch" type="xml">
+                <tree editable="bottom">
+                    <field name="pick_id" options="{'no_create': True}" required="1"  domain="[('picking_type_code', '=', 'internal'), ('group_id', '=', parent.group_id)]"/>
+                </tree>
+            </field>
+        </record>
+
         <record id="check_koli_tree" model="ir.ui.view">
             <field name="name">check.koli.tree</field>
             <field name="model">check.koli</field>
-- 
cgit v1.2.3


From 99626f917b032110fe12b9a0ee86c218c0367be1 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Mon, 24 Mar 2025 15:34:56 +0700
Subject: push

---
 indoteknik_custom/views/mrp_production.xml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/mrp_production.xml b/indoteknik_custom/views/mrp_production.xml
index f81d65e8..a28cdff8 100644
--- a/indoteknik_custom/views/mrp_production.xml
+++ b/indoteknik_custom/views/mrp_production.xml
@@ -5,9 +5,27 @@
         <field name="model">mrp.production</field>
         <field name="inherit_id" ref="mrp.mrp_production_form_view" />
         <field name="arch" type="xml">
+            <button name="button_mark_done" position="after">
+                <button name="action_approve" type="object" string="Approve" attrs="{'invisible': [('status', '!=', 'pending')]}"/>
+            </button>
+            <button name="button_mark_done" position="after">
+                <button name="action_reject" type="object" string="Reject" attrs="{'invisible': [('status', '!=', 'pending')]}"/>
+            </button>
+            <button name="button_mark_done" position="after">
+                <button name="create_po_from_manufacturing" type="object" string="Create PO" class="oe_highlight" attrs="{'invisible': [('status', '!=', 'approved')]}"/>
+            </button>
             <field name="bom_id" position="after">
                 <field name="desc"/>
+                <field name="status"/>
             </field>
+            <xpath expr="//form/sheet/notebook/page/field[@name='move_raw_ids']/tree/field[@name='product_uom_qty']" position="before">
+                <field name="vendor_id"/>
+            </xpath>
+            <xpath expr="//form/sheet/notebook/page[@name='miscellaneous']" position="after">
+                <page string="Purchase Match" name="purchase_order_lines_indent">
+                    <field name="production_purchase_match"/>
+                </page>
+            </xpath>
         </field>
     </record>
 
@@ -21,4 +39,16 @@
             </field>
         </field>
     </record>
+
+    <record id="production_purchase_match_tree" model="ir.ui.view">
+        <field name="name">production.purchase.match.tree</field>
+        <field name="model">production.purchase.match</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="order_id" readonly="1"/>
+                <field name="vendor" readonly="1"/>
+                <field name="total" readonly="1"/>
+            </tree>
+        </field>
+    </record>
 </odoo>
-- 
cgit v1.2.3


From 459790b31fac1a789efcb946f26938b60b123aab Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Tue, 25 Mar 2025 15:15:05 +0700
Subject: add field date_approve and position

---
 indoteknik_custom/views/customer_commision.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 1d3f48fc..a5f0e07f 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -55,8 +55,7 @@
                     <button name="action_reject"
                         string="Reject"
                         attrs="{'invisible': [('status', 'in', ['approved','reject'])]}"
-                        type="object"
-                        class="oe_highlight"/>
+                        type="object"/>
                 <button name="button_draft"
                         string="Reset to Draft"
                         attrs="{'invisible': [('status', '!=', 'reject')]}"
-- 
cgit v1.2.3


From aada0aa508549c9357cdee1a16cd7a23d6a38b22 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 26 Mar 2025 11:33:57 +0700
Subject: push

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index a5f0e07f..5df494f3 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -35,6 +35,7 @@
                 <field name="product_id" readonly="1" optional="hide"/>
                 <field name="dpp" readonly="1"/>
                 <field name="total_percent_margin" readonly="1"/>
+                <field name="total_margin_excl_third_party" readonly="1"/>
                 <field name="tax" readonly="1" optional="hide"/>
                 <field name="total" readonly="1" optional="hide"/>
             </tree>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 0d190f37..db89d121 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -31,7 +31,9 @@
                     <field name="shipping_paid_by" attrs="{'required': ['|', ('create_date', '&gt;', '2023-06-15'), ('create_date', '=', False)]}"/>
                     <field name="delivery_amt"/>
                     <field name="fee_third_party"/>
+                    <field name="biaya_lain_lain"/>
                     <field name="total_percent_margin"/>
+                    <field name="total_margin_excl_third_party"/>
                     <field name="type_promotion"/>
                     <label for="voucher_id"/>
                     <div class="o_row">
-- 
cgit v1.2.3


From cefc6ec6de52f2c79c1760cf88db3375f4956a31 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 26 Mar 2025 13:48:25 +0700
Subject: PUSH

---
 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 db89d121..74730e06 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -33,7 +33,7 @@
                     <field name="fee_third_party"/>
                     <field name="biaya_lain_lain"/>
                     <field name="total_percent_margin"/>
-                    <field name="total_margin_excl_third_party"/>
+                    <field name="total_margin_excl_third_party" readonly="1"/>
                     <field name="type_promotion"/>
                     <label for="voucher_id"/>
                     <div class="o_row">
-- 
cgit v1.2.3


From a9eed02ec4f14c368fc98accd25ae8acdc67323b Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 27 Mar 2025 09:39:53 +0700
Subject: cr cc

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 5df494f3..a78f8a9f 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -93,6 +93,7 @@
                                 />
                                 </div>
                                 <field name="date_to"/>
+                                <field name="sales_id"/>
                                 <field name="commision_type"/>
                                 <field name="brand_ids" widget="many2many_tags"/>
                                 <field name="notification" readonly="1"/>
-- 
cgit v1.2.3


From e926482af5f2b95ff465445215c77161223ee671 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 27 Mar 2025 14:38:57 +0700
Subject: push

---
 indoteknik_custom/views/mrp_production.xml | 9 +--------
 indoteknik_custom/views/purchase_order.xml | 1 +
 indoteknik_custom/views/purchasing_job.xml | 1 +
 3 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/mrp_production.xml b/indoteknik_custom/views/mrp_production.xml
index a28cdff8..e639b988 100644
--- a/indoteknik_custom/views/mrp_production.xml
+++ b/indoteknik_custom/views/mrp_production.xml
@@ -6,17 +6,10 @@
         <field name="inherit_id" ref="mrp.mrp_production_form_view" />
         <field name="arch" type="xml">
             <button name="button_mark_done" position="after">
-                <button name="action_approve" type="object" string="Approve" attrs="{'invisible': [('status', '!=', 'pending')]}"/>
-            </button>
-            <button name="button_mark_done" position="after">
-                <button name="action_reject" type="object" string="Reject" attrs="{'invisible': [('status', '!=', 'pending')]}"/>
-            </button>
-            <button name="button_mark_done" position="after">
-                <button name="create_po_from_manufacturing" type="object" string="Create PO" class="oe_highlight" attrs="{'invisible': [('status', '!=', 'approved')]}"/>
+                <button name="create_po_from_manufacturing" type="object" string="Create PO" class="oe_highlight" attrs="{'invisible': [('state', '!=', 'confirmed')]}"/>
             </button>
             <field name="bom_id" position="after">
                 <field name="desc"/>
-                <field name="status"/>
             </field>
             <xpath expr="//form/sheet/notebook/page/field[@name='move_raw_ids']/tree/field[@name='product_uom_qty']" position="before">
                 <field name="vendor_id"/>
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 36c0db13..d6ad2408 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -65,6 +65,7 @@
                     <field name="payment_term_id"/>
                     <field name="total_cost_service" attrs="{'required': [('partner_id', 'in', [9688, 29712])]}"/>
                     <field name="total_delivery_amt" attrs="{'required': [('partner_id', 'in', [9688, 29712])]}"/>
+                    <field name="product_bom_id"/>
                 </field>
                 <field name="amount_total" position="after">
                     <field name="total_margin"/>
diff --git a/indoteknik_custom/views/purchasing_job.xml b/indoteknik_custom/views/purchasing_job.xml
index 16f1bedd..bb1c7643 100644
--- a/indoteknik_custom/views/purchasing_job.xml
+++ b/indoteknik_custom/views/purchasing_job.xml
@@ -17,6 +17,7 @@
                 <field name="status_apo" invisible="1"/>
                 <field name="action"/>
                 <field name="note"/>
+                <field name="date_po"/>
             </tree>
         </field>
     </record>
-- 
cgit v1.2.3


From b105f669873645f29314be55aac45d95d0556970 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 27 Mar 2025 16:20:05 +0700
Subject: fix bug

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/mrp_production.xml b/indoteknik_custom/views/mrp_production.xml
index ffbc8659..f8278f39 100644
--- a/indoteknik_custom/views/mrp_production.xml
+++ b/indoteknik_custom/views/mrp_production.xml
@@ -6,11 +6,12 @@
         <field name="inherit_id" ref="mrp.mrp_production_form_view" />
         <field name="arch" type="xml">
             <button name="button_mark_done" position="after">
-                <button name="create_po_from_manufacturing" type="object" string="Create PO" class="oe_highlight" attrs="{'invisible': [('state', '!=', 'confirmed')]}"/>
+                <button name="create_po_from_manufacturing" type="object" string="Create PO" class="oe_highlight" attrs="{'invisible': ['|', ('state', '!=', 'confirmed'), ('is_po', '=', True)]}"/>
             </button>
             <field name="bom_id" position="after">
                 <field name="desc"/>
                 <field name="sale_order"/>
+                <field name="is_po"/>
             </field>
             <xpath expr="//form/sheet/notebook/page/field[@name='move_raw_ids']/tree/field[@name='product_uom_qty']" position="before">
                 <field name="vendor_id"/>
-- 
cgit v1.2.3


From 00c69ce93bdb0071cd563be855857d2137115868 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 10 Apr 2025 13:36:30 +0700
Subject: push

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 67593b5b..d6850b2f 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -244,9 +244,10 @@
             <field name="name">check.koli.tree</field>
             <field name="model">check.koli</field>
             <field name="arch" type="xml">
-                <tree editable="bottom">
+                <tree editable="bottom">    
                     <field name="koli"/>
                     <field name="reserved_id"/>
+                    <field name="check_koli_progress"/>
                 </tree>
             </field>
         </record>
-- 
cgit v1.2.3


From 10e3915bccc758ffc2f6e0e1d2e19f590605339e Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 10 Apr 2025 14:37:06 +0700
Subject: add optional hide on commision tree

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index a78f8a9f..9f0e1e8a 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -17,8 +17,8 @@
                     decoration-danger="payment_status == 'pending'"
                     widget="badge"/>
                 <field name="brand_ids" widget="many2many_tags"/>
-                <field name="grouped_so_number" readonly="1"/>
-                <field name="grouped_invoice_number" readonly="1"/>
+                <field name="grouped_so_number" readonly="1" optional="hide"/>
+                <field name="grouped_invoice_number" readonly="1" optional="hide"/>
             </tree>
         </field>
     </record>
-- 
cgit v1.2.3


From 9ca20d51a0aad50ea3df9bd878735c2fb8aadcc3 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Fri, 11 Apr 2025 15:32:39 +0700
Subject: push wms

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 7b4ba2f8..7d1153e0 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -20,7 +20,7 @@
                     <field name="date_reserved" optional="hide"/>
                     <field name="state_reserve" optional="hide"/>
                     <field name="final_seq"/>
-                    <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'" decoration-warning="state_approve_md == 'pending'" />
+                    <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'" decoration-warning="state_approve_md == 'pending'" optional="hide"/>
                     <!-- <field name="countdown_hours" optional="hide"/>
                     <field name="countdown_ready_to_ship" /> -->
                 </field>
@@ -89,6 +89,7 @@
                     <field name="dokumen_tanda_terima"/>
                     <field name="dokumen_pengiriman"/>
                     <field name="quantity_koli" attrs="{'invisible': [('location_dest_id', '!=', 60)], 'required': [('location_dest_id', '=', 60)]}"/>
+                    <field name="total_mapping_koli" attrs="{'invisible': [('location_id', '!=', 60)]}"/>
                     <field name="total_koli_display" readonly="1" attrs="{'invisible': [('location_id', '!=', 60)]}"/>
                     <field name="linked_out_picking_id" readonly="1" attrs="{'invisible': [('location_id', '=', 60)]}"/>
                 </field>
-- 
cgit v1.2.3


From 487772c771e72a77ae4d9e9c865d94d015f1ea5b Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Mon, 14 Apr 2025 10:44:12 +0700
Subject: refactor code state_reserve

---
 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 7d1153e0..5424f3d3 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -84,6 +84,7 @@
                     />
                 </button>
                 <field name="backorder_id" position="after">
+                    <field name="shipping_method_so_id"/>
                     <field name="summary_qty_detail"/>
                     <field name="count_line_detail"/>
                     <field name="dokumen_tanda_terima"/>
-- 
cgit v1.2.3


From a4d19c6b9f026cc247c135b14a6fecf76a9fcd70 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Mon, 14 Apr 2025 15:17:17 +0700
Subject: push

---
 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 5424f3d3..f7b6134d 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -19,6 +19,7 @@
                     <field name="note" optional="hide"/>
                     <field name="date_reserved" optional="hide"/>
                     <field name="state_reserve" optional="hide"/>
+                    <field name="state_packing" widget="badge" decoration-success="state_packing == 'packing_done'" decoration-danger="state_packing == 'not_packing'" optional="hide"/>
                     <field name="final_seq"/>
                     <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'" decoration-warning="state_approve_md == 'pending'" optional="hide"/>
                     <!-- <field name="countdown_hours" optional="hide"/>
@@ -174,6 +175,7 @@
                                 <field name="note_logistic"/>
                                 <field name="responsible" />
                                 <field name="carrier_id"/>
+                                <field name="out_code" attrs="{'invisible': [['out_code', '=', False]]}"/>
                                 <field name="picking_code" attrs="{'invisible': [['picking_code', '=', False]]}"/>
                                 <field name="picking_code" string="Picking code (akan digenerate ketika sudah di-validate)" attrs="{'invisible': [['picking_code', '!=', False]]}"/>
                                 <field name="driver_departure_date" attrs="{'readonly':[('invoice_status', '=', 'invoiced')]}"/>
-- 
cgit v1.2.3


From 3e22bea62b4c57268ce777d34ec6d19aede8b0c1 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Mon, 14 Apr 2025 16:13:00 +0700
Subject: push

---
 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 f7b6134d..4c60a496 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -148,6 +148,7 @@
                     <field name="approval_status"/>
                     <field name="approval_receipt_status"/>
                     <field name="approval_return_status"/>
+                    <field name="so_lama"/>
                 </field>
                 <field name="product_id" position="before">
                     <field name="line_no" attrs="{'readonly': 1}" optional="hide"/>
-- 
cgit v1.2.3