Merge branch 'production' into iman/pengajuan-tempo

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

5 files changed, 70 insertions, 5 deletions

diff --git a/indoteknik_custom/views/approval_retur_picking.xml b/indoteknik_custom/views/approval_retur_picking.xml
new file mode 100644
index 00000000..5ce28e20
--- /dev/null
+++ b/indoteknik_custom/views/approval_retur_picking.xml
@@ -0,0 +1,27 @@
+<odoo>
+    <!-- Form View for Stock Return Note Wizard -->
+    <record id="view_stock_return_note_form" model="ir.ui.view">
+        <field name="name">approval.retur.picking.form</field>
+        <field name="model">approval.retur.picking</field>
+        <field name="arch" type="xml">
+            <form string="Add Return Note">
+                <group>
+                    <span>Ask Approval Retur?</span>
+                </group>
+                <footer>
+                    <button name="action_confirm_note_return" string="Confirm" type="object" class="btn-primary"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <!-- Action to Open the Wizard -->
+    <record id="action_stock_return_note_wizard" model="ir.actions.act_window">
+        <field name="name">Add Return Note</field>
+        <field name="res_model">approval.retur.picking</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_stock_return_note_form"/>
+        <field name="target">new</field>
+    </record>
+</odoo>
diff --git a/indoteknik_custom/views/product_product.xml b/indoteknik_custom/views/product_product.xml
index c06cc5f1..71748e44 100644
--- a/indoteknik_custom/views/product_product.xml
+++ b/indoteknik_custom/views/product_product.xml
@@ -11,11 +11,14 @@
                     <field name="incoming_qty"/>
                 </field>
                 <field name="virtual_available" position="after">
+                    <field name="max_qty_reorder" optional="hide"/>
                     <field name="qty_onhand_bandengan" optional="hide"/>
                     <field name="qty_incoming_bandengan" optional="hide"/>
                     <field name="qty_outgoing_bandengan" optional="hide"/>
                     <field name="qty_available_bandengan" optional="hide"/>
                     <field name="qty_free_bandengan" optional="hide"/>
+                    <field name="qty_rpo" optional="hide"/>
+                    <field name="plafon_qty" optional="hide"/>
                 </field>
             </field>
         </record>
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 06c76a82..0e6b6792 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -212,7 +212,6 @@
             <field name="code">model.procure_calculation()</field>
             <field name="state">code</field>
             <field name="priority">75</field>
-            <field name="active">True</field>
         </record>
     </data>
     <data>
diff --git a/indoteknik_custom/views/requisition.xml b/indoteknik_custom/views/requisition.xml
index b704baaf..957113a7 100644
--- a/indoteknik_custom/views/requisition.xml
+++ b/indoteknik_custom/views/requisition.xml
@@ -50,6 +50,13 @@
         <field name="model">requisition</field>
         <field name="arch" type="xml">
             <form>
+                <header>
+                    <button name="button_approve"
+                            string="Approve"
+                            type="object"
+                            class="mr-2 oe_highlight"
+                            />
+                </header>
                 <sheet string="Requisition">
                         <div class="oe_button_box" name="button_box"/>
                         <group>
@@ -62,12 +69,19 @@
                             </group>
                             <group>
                                 <div>
-                                <button name="create_po_from_requisition"
-                                    string="Create PO"
-                                    type="object"
-                                    class="mr-2 oe_highlight"
+                                    <button name="generate_requisition_from_so"
+                                        string="Create Line from SO"
+                                        type="object"
+                                        class="mr-2 oe_highlight"
                                 />
                                 </div>
+                                <div>
+                                    <button name="create_po_from_requisition"
+                                        string="Create PO"
+                                        type="object"
+                                        class="mr-2 oe_highlight"
+                                    />
+                                </div>
                             </group>
                         </group>
                         <notebook>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 98001589..b8f2d08d 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -227,6 +227,9 @@
                     <page string="Fullfillment" name="page_sale_order_fullfillment">
                         <field name="fullfillment_line" readonly="1"/>
                     </page>
+                    <page string="Fulfillment v2" name="page_sale_order_fullfillment2">
+                        <field name="fulfillment_line_v2" readonly="1"/>
+                    </page>
                     <page string="Reject Line" name="page_sale_order_reject_line">
                         <field name="reject_line" readonly="1"/>
                     </page>
@@ -342,6 +345,25 @@
     </data>
 
     <data>
+
+    </data>
+        <record id="sales_order_fulfillment_v2_tree" model="ir.ui.view">
+            <field name="name">sales.order.fulfillment.v2.tree</field>
+            <field name="model">sales.order.fulfillment.v2</field>
+            <field name="arch" type="xml">
+                <tree editable="top" create="false">
+                    <field name="product_id" readonly="1"/>
+                    <field name="so_qty" readonly="1" optional="show"/>
+                    <field name="reserved_stock_qty" readonly="1" optional="show"/>
+                    <field name="delivered_qty" readonly="1" optional="hide"/>
+                    <field name="po_ids" widget="many2many_tags" readonly="1" optional="show"/>
+                    <field name="po_qty" readonly="1" optional="show"/>
+                    <field name="received_qty" readonly="1" optional="show"/>
+                    <field name="purchaser" readonly="1" optional="hide"/>
+                </tree>
+            </field>
+        </record>
+    <data>
         <record id="sales_order_fullfillmet_tree" model="ir.ui.view">
             <field name="name">sales.order.fullfillment.tree</field>
             <field name="model">sales.order.fullfillment</field>