Merge commit '24649f8e939484759ef34e5e68f251d951f63c02'

Conflicts:
	indoteknik_custom/__manifest__.py
	indoteknik_custom/security/ir.model.access.csv

7 files changed, 159 insertions, 22 deletions

diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index 6a6f474d..9af85408 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -30,5 +30,15 @@
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
         </record>
+
+        <record id="sequence_requisition" model="ir.sequence">
+            <field name="name">Requisition</field>
+            <field name="code">requisition</field>
+            <field name="active">TRUE</field>
+            <field name="prefix">RPO/%(year)s/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/landedcost.xml b/indoteknik_custom/views/landedcost.xml
new file mode 100644
index 00000000..4736941a
--- /dev/null
+++ b/indoteknik_custom/views/landedcost.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="landed_cost_form_inherit" model="ir.ui.view">
+            <field name="name">Landed Cost</field>
+            <field name="model">stock.landed.cost</field>
+            <field name="inherit_id" ref="stock_landed_costs.view_stock_landed_cost_form"/>
+            <field name="arch" type="xml">
+                <field name="vendor_bill_id" position="replace">
+                    <field name="vendor_bill_id" required="1"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/requisition.xml b/indoteknik_custom/views/requisition.xml
new file mode 100644
index 00000000..6e61ce1e
--- /dev/null
+++ b/indoteknik_custom/views/requisition.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="requisition_tree" model="ir.ui.view">
+        <field name="name">requisition.tree</field>
+        <field name="model">requisition</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="date_doc"/>
+                <field name="number"/>
+                <field name="description"/>
+                <field name="notification" readonly="1"/>
+                <field name="is_po" readonly="1"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="requisition_line_tree" model="ir.ui.view">
+        <field name="name">requisition.line.tree</field>
+        <field name="model">requisition.line</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="brand_id"/>
+                <field name="product_id"/>
+                <field name="partner_id"/>
+                <field name="qty_purchase"/>
+                <field name="price_unit"/>
+                <field name="tax_id"/>
+                <field name="subtotal"/>
+                <field name="source"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="requisition_purchase_match_tree" model="ir.ui.view">
+        <field name="name">requisition.purchase.match.tree</field>
+        <field name="model">requisition.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>
+
+    <record id="requisition_form" model="ir.ui.view">
+        <field name="name">requisition.form</field>
+        <field name="model">requisition</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet string="Requisition">
+                        <div class="oe_button_box" name="button_box"/>
+                        <group>
+                            <group>
+                                <field name="number"/>
+                                <field name="date_doc"/>
+                                <field name="sale_order_id"/>
+                                <field name="description"/>
+                                <field name="notification" readonly="1"/>
+                            </group>
+                            <group>
+                                <div>
+                                <button name="create_requisition_from_sales"
+                                    string="Create Line"
+                                    type="object"
+                                    class="mr-2 oe_highlight"
+                                />
+                                <button name="create_po_from_requisition"
+                                    string="Create PO"
+                                    type="object"
+                                    class="mr-2 oe_highlight"
+                                />
+                                </div>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Lines">
+                                <field name="requisition_lines"/>
+                            </page>
+                            <page string="Matches">
+                                <field name="requisition_match"/>
+                            </page>
+                        </notebook>
+                    </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="requisition_action" model="ir.actions.act_window">
+        <field name="name">Requisition</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">requisition</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem id="menu_requisition"
+        name="Requisition"
+        action="requisition_action"
+        parent="menu_monitoring_in_purchase"
+        sequence="300"/>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/sale_monitoring.xml b/indoteknik_custom/views/sale_monitoring.xml
index b3b186e9..956e4a24 100755
--- a/indoteknik_custom/views/sale_monitoring.xml
+++ b/indoteknik_custom/views/sale_monitoring.xml
@@ -13,16 +13,17 @@
                 <field name="partner_id"/>
                 <field name="user_id"/>
                 <field name="qty_so"/>
+                <field name="qty_reserved"/>
                 <field name="qty_po"/>
                 <field name="qty_po_received"/>
                 <field name="qty_so_delivered"/>
                 <field name="qty_so_invoiced"/>
                 <field name="status"
                        widget="badge"
-                       decoration-danger="status == 'Belum PO sama sekali' or status == 'Belum PO full'"
-                       decoration-warning="status == 'Belum Received sama sekali' or status == 'Belum Received full'"
-                       decoration-success="status == 'SIAP KIRIM' or status == 'KIRIM SISANYA'"
-                       decoration-info="status == 'Belum Invoiced'"
+                       decoration-danger="status == 'Belum/Kurang PO'"
+                        decoration-warning="status == 'Belum terima' or status == 'Terima sebagian'"
+                        decoration-success="status == 'Siap kirim'"
+                        decoration-info="status == 'Delivered' or status == 'Invoiced'"
                 />
             </tree>
         </field>
@@ -41,15 +42,16 @@
                             <field name="user_id"/>
                             <field name="status"
                                    widget="badge"
-                                   decoration-danger="status == 'Belum PO sama sekali' or status == 'Belum PO full'"
-                                   decoration-warning="status == 'Belum Received sama sekali' or status == 'Belum Received full'"
-                                   decoration-success="status == 'SIAP KIRIM' or status == 'KIRIM SISANYA'"
-                                   decoration-info="status == 'Belum Invoiced'"
+                                   decoration-danger="status == 'Belum/Kurang PO'"
+                                   decoration-warning="status == 'Belum terima' or status == 'Terima sebagian'"
+                                   decoration-success="status == 'Siap kirim'"
+                                   decoration-info="status == 'Delivered' or status == 'Invoiced'"
                             />
                             <field name="po_number"/>
                         </group>
                         <group>
                             <field name="qty_so"/>
+                            <field name="qty_reserved"/>
                             <field name="qty_po"/>
                             <field name="qty_po_received"/>
                             <field name="qty_so_delivered"/>
diff --git a/indoteknik_custom/views/sale_monitoring_detail.xml b/indoteknik_custom/views/sale_monitoring_detail.xml
index b9602abd..736920b3 100755
--- a/indoteknik_custom/views/sale_monitoring_detail.xml
+++ b/indoteknik_custom/views/sale_monitoring_detail.xml
@@ -11,16 +11,17 @@
                 <field name="user_id"/>
                 <field name="product_id"/>
                 <field name="qty_so"/>
+                <field name="qty_reserved"/>
                 <field name="qty_po"/>
                 <field name="qty_po_received"/>
                 <field name="qty_so_delivered"/>
                 <field name="qty_so_invoiced"/>
                 <field name="status"
                        widget="badge"
-                       decoration-danger="status == 'Belum PO sama sekali' or status == 'Belum PO full'"
-                       decoration-warning="status == 'Belum Received sama sekali' or status == 'Belum Received full'"
-                       decoration-success="status == 'SIAP KIRIM' or status == 'KIRIM SISANYA'"
-                       decoration-info="status == 'Belum Invoiced' or status == 'Done'"
+                       decoration-danger="status == 'Belum/Kurang PO'"
+                       decoration-warning="status == 'Belum terima' or status == 'Terima sebagian'"
+                       decoration-success="status == 'Siap kirim'"
+                       decoration-info="status == 'Delivered' or status == 'Invoiced'"
                 />
             </tree>
         </field>
@@ -40,14 +41,15 @@
                             <field name="product_id"/>
                             <field name="status"
                                    widget="badge"
-                                   decoration-danger="status == 'Belum PO sama sekali' or status == 'Belum PO full'"
-                                   decoration-warning="status == 'Belum Received sama sekali' or status == 'Belum Received full'"
-                                   decoration-success="status == 'SIAP KIRIM' or status == 'KIRIM SISANYA'"
-                                   decoration-info="status == 'Belum Invoiced'"
+                                   decoration-danger="status == 'Belum/Kurang PO'"
+                                   decoration-warning="status == 'Belum terima' or status == 'Terima sebagian'"
+                                   decoration-success="status == 'Siap kirim'"
+                                   decoration-info="status == 'Delivered' or status == 'Invoiced'"
                             />
                         </group>
                         <group>
                             <field name="qty_so"/>
+                            <field name="qty_reserved"/>
                             <field name="qty_po"/>
                             <field name="qty_po_received"/>
                             <field name="qty_so_delivered"/>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index c66201a9..ea13c954 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -19,8 +19,8 @@
                         type="action" attrs="{'invisible': [('approval_status', '!=', 'approved')]}"/>
                 </button>
                 <field name="payment_term_id" position="after">
-                    <field name="shipping_cost_covered"/>
-                    <field name="shipping_paid_by"/>
+                    <field name="shipping_cost_covered" required="1"/>
+                    <field name="shipping_paid_by" required="1"/>
                     <field name="delivery_amt"/>
                     <field name="fee_third_party"/>
                     <field name="total_percent_margin"/>
@@ -82,6 +82,11 @@
                                 <field name="partner_purchase_order_file" readonly="True"/>
                             </group>
                             <group>
+                                <button name="generate_payment_link_midtrans_sales_order"
+                                        string="Create Payment Link"
+                                        type="object"
+                                />
+                                <field name="payment_link_midtrans" readonly="True" widget="url"/>
                                 <field name="gross_amount" readonly="True"/>
                                 <field name="payment_type" readonly="True"/>
                                 <field name="payment_status" readonly="True"/>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index e4e9f722..4bbdc7b8 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -7,10 +7,11 @@
             <field name="inherit_id" ref="stock.vpicktree"/>
             <field name="arch" type="xml">
                 <field name="json_popover" position="after">
-                    <field name="date_done"/>
-                    <field name="date_doc_kirim"/>
-                    <field name="driver_departure_date"/>
-                    <field name="driver_arrival_date"/>
+                    <field name="date_done" optional="hide"/>
+                    <field name="date_doc_kirim" optional="hide"/>
+                    <field name="driver_departure_date" optional="hide"/>
+                    <field name="driver_arrival_date" optional="hide"/>
+                    <field name="note_logistic" optional="hide"/>
                 </field>
             </field>
         </record>
@@ -80,6 +81,7 @@
                     <page string="Delivery" name="delivery_order">
                         <group>
                             <group>
+                                <field name="note_logistic"/>
                                 <field name="driver_departure_date"/>
                                 <field name="driver_arrival_date"/>
                                 <field name="delivery_tracking_no"/>