Merge branch 'production' into CR/quotation-noPo

# Conflicts:
#	indoteknik_custom/models/user_company_request.py

11 files changed, 233 insertions, 33 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/form_vendor_approval_multi_approve.xml b/indoteknik_custom/views/form_vendor_approval_multi_approve.xml
new file mode 100644
index 00000000..d9be107e
--- /dev/null
+++ b/indoteknik_custom/views/form_vendor_approval_multi_approve.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="view_va_multi_approve_form" model="ir.ui.view">
+            <field name="name">VA Multi Approve</field>
+            <field name="model">va.multi.approve</field>
+            <field name="arch" type="xml">
+                <form>
+                    <sheet>
+                        <group>
+                           <span>Apakah Anda Yakin Ingin Approve Vendor Approval?</span> 
+                        </group>
+                    </sheet>
+                    <footer>
+                        <button name="save_multi_approve_va" string="Update" type="object" default_focus="1" class="oe_highlight"/>
+                        <button string="Cancel" class="btn btn-secondary" special="cancel" />
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_va_multi_approve" model="ir.actions.act_window">
+            <field name="name">VA Multi Approve</field>
+            <field name="res_model">va.multi.approve</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_va_multi_approve_form"/>
+            <field name="target">new</field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/form_vendor_approval_multi_reject.xml b/indoteknik_custom/views/form_vendor_approval_multi_reject.xml
new file mode 100644
index 00000000..666de261
--- /dev/null
+++ b/indoteknik_custom/views/form_vendor_approval_multi_reject.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="view_va_multi_reject_form" model="ir.ui.view">
+            <field name="name">VA Multi Reject</field>
+            <field name="model">va.multi.reject</field>
+            <field name="arch" type="xml">
+                <form>
+                    <sheet>
+                        <group>
+                           <span>Apakah Anda Yakin Ingin Reject Vendor Approval?</span> 
+                        </group>
+                    </sheet>
+                    <footer>
+                        <button name="save_multi_reject_va" string="Update" type="object" default_focus="1" class="oe_highlight"/>
+                        <button string="Cancel" class="btn btn-secondary" special="cancel" />
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_va_multi_reject" model="ir.actions.act_window">
+            <field name="name">VA Multi Reject</field>
+            <field name="res_model">va.multi.reject</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_va_multi_reject_form"/>
+            <field name="target">new</field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/partner_payment_term.xml b/indoteknik_custom/views/partner_payment_term.xml
index 433cac3e..e0f2fe39 100644
--- a/indoteknik_custom/views/partner_payment_term.xml
+++ b/indoteknik_custom/views/partner_payment_term.xml
@@ -24,6 +24,9 @@
                             <field name="name"/>
                             <field name="parent_id" readonly="1"/>
                             <field name="property_payment_term_id"/>
+                            <field name="active_limit"/>
+                            <field name="warning_stage"/>
+                            <field name="blocking_stage"/>
                         </group>
                     </group>
                 </sheet>
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/product_template.xml b/indoteknik_custom/views/product_template.xml
index 5a509ebd..b6599137 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -24,6 +24,12 @@
                 <field name="public_categ_ids" position="attributes">
                     <attribute name="required">0</attribute>
                 </field>
+                <div name="options" position="inside">
+                    <div>
+                        <field name="merchandise_ok"/>
+                        <label for="merchandise_ok"/>
+                    </div>
+                </div>
                 <field name="public_categ_ids" position="attributes">
                     <attribute name="options">{'no_create': True}</attribute>
                 </field>
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/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 6d02a86b..1b164161 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -6,6 +6,15 @@
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
+                <field name="active_limit" position="attributes">
+                    <attribute name="readonly">1</attribute>
+                </field>
+                <field name="warning_stage" position="attributes">
+                    <attribute name="readonly">1</attribute>
+                </field>
+                <field name="blocking_stage" position="attributes">
+                    <attribute name="readonly">1</attribute>
+                </field>
                 <field name="npwp" position="after">
                     <field name="sppkp"/>
                     <field name="counter"/>
@@ -22,7 +31,7 @@
                 <field name="industry_id" position="after">
                     <field name="company_type_id"/>
                     <field name="group_partner_id"/>
-                    <field name="is_potential"/>
+                    <field name="is_not_potential"/>
                     <field name="pareto_status"/>
                     <field name="digital_invoice_tax"/>
                 </field>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 98001589..e12130de 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -82,7 +82,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="vendor_approval_id" readonly="1" widget="many2many_tags"/>
                     <field name="source_id" domain="[('id', 'in', [32, 59, 60, 61])]" required="1"/>
                     <button name="override_allow_create_invoice"
                             string="Override Create Invoice"
@@ -118,8 +118,47 @@
                         }
                     </attribute>
                 </xpath>
+                <div name="invoice_lines" position="before">
+                    <div name="vendor_id" groups="base.group_no_one" attrs="{'invisible': [('display_type', '!=', False)]}">
+                        <label for="vendor_id"/>
+                        <div name="vendor_id">
+                            <field name="vendor_id" 
+                                   attrs="{'readonly': [('parent.approval_status', '=', 'approved')]}" 
+                                   domain="[('parent_id', '=', False)]" 
+                                   options="{'no_create': True}" class="oe_inline" />
+                        </div>
+                    </div>
+                </div>
+                
+                <div name="invoice_lines" position="before">
+                    <div name="purchase_price" groups="base.group_no_one" attrs="{'invisible': [('display_type', '!=', False)]}">
+                        <label for="purchase_price"/>
+                        <field name="purchase_price"/>
+                    </div>
+                </div>
+                <div name="invoice_lines" position="before">
+                    <div name="purchase_tax_id" groups="base.group_no_one" attrs="{'invisible': [('display_type', '!=', False)]}">
+                        <label for="purchase_tax_id"/>
+                        <div name="purchase_tax_id">
+                            <field name="purchase_tax_id"/>
+                        </div>
+                    </div>
+                </div>
+                <div name="invoice_lines" position="before">
+                    <div name="item_percent_margin" groups="base.group_no_one" attrs="{'invisible': [('display_type', '!=', False)]}">
+                        <label for="item_percent_margin"/>
+                        <field name="item_percent_margin"/>
+                    </div>
+                </div>
+                <div name="invoice_lines" position="before">
+                    <div name="price_subtotal" groups="base.group_no_one" attrs="{'invisible': [('display_type', '!=', False)]}">
+                        <label for="price_subtotal"/>
+                        <field name="price_subtotal"/>
+                    </div>
+                </div>
                 <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="qty_free_bu" optional="hide"/>
+                    <field name="vendor_id" attrs="{'readonly': [('parent.approval_status', '=', 'approved')], 'invisible': [('display_type', '!=', False)]}" domain="[('parent_id', '=', False)]" options="{'no_create':True}"/>
                     <field name="vendor_md_id" optional="hide"/>
                     <field name="purchase_price" attrs="
                         {
@@ -227,6 +266,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 +384,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>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index c230bc7b..1893fcaf 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -129,6 +129,7 @@
                     <page string="Delivery" name="delivery_order">
                         <group>
                             <group>
+                                <field name="notee"/>
                                 <field name="note_logistic"/>
                                 <field name="responsible" />
                                 <field name="carrier_id"/>
diff --git a/indoteknik_custom/views/vendor_approval.xml b/indoteknik_custom/views/vendor_approval.xml
index 605edfbf..359c67d4 100644
--- a/indoteknik_custom/views/vendor_approval.xml
+++ b/indoteknik_custom/views/vendor_approval.xml
@@ -5,33 +5,24 @@
             <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">
+                <tree default_order="create_date desc" create="0" editable="bottom">
                     <field name="number"/>
                     <field name="create_date_so"/>
                     <field name="order_id"/>
                     <field name="partner_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="state" readonly="1" widget="badge" decoration-danger="state == 'cancel'" decoration-success="state == 'done'"/>
                     <field name="product_id"/>
-                    <field name="sales_price"/>
-                    <field name="product_uom_qty"/>
-                    <field name="sales_tax_id"/>
-                    <field name="margin_after"/>
+                    <field name="sales_price" optional="hide"/>
+                    <field name="product_uom_qty" optional="hide"/>
+                    <field name="sales_tax_id" optional="hide"/>
+                    <field name="margin_after" optional="hide"/>
                     <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"/>
+                    <field name="purchase_price" optional="hide"/>
+                    <field name="purchase_price_md" optional="hide"/>
+                    <field name="margin_before" optional="hide"/>
+                    <field name="purchase_tax_id" optional="hide"/>
+                    <field name="percent_margin_difference" optional="hide"/>
                 </tree>
             </field>
         </record>
@@ -60,13 +51,22 @@
                                 <field name="order_id" readonly="1"/>
                                 <field name="state" readonly="1"/>
                                 <field name="create_date_so" readonly="1"/>
+                                <field name="product_id"/>
+                                <field name="sales_price"/>
+                                <field name="product_uom_qty"/>
+                                <field name="sales_tax_id"/>
+                            </group>
+                            <group>
+                                <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"/>
                             </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"/>
@@ -77,7 +77,7 @@
         </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="name">vendor.approval.search.view</field>
             <field name="model">vendor.approval</field>
             <field name="arch" type="xml">
                 <search string="Search Vendor Approval">
@@ -102,5 +102,19 @@
             sequence="4"
             action="vendor_approval_action"
         />
+        <record id="vendor_approval_multi_approve_ir_actions_server" model="ir.actions.server">
+            <field name="name">Approve</field>
+            <field name="model_id" ref="model_vendor_approval"/>
+            <field name="binding_model_id" ref="model_vendor_approval"/>
+            <field name="state">code</field>
+            <field name="code">action = records.open_form_multi_approve()</field>
+        </record>
+        <record id="vendor_approval_multi_reject_ir_actions_server" model="ir.actions.server">
+            <field name="name">Reject</field>
+            <field name="model_id" ref="model_vendor_approval"/>
+            <field name="binding_model_id" ref="model_vendor_approval"/>
+            <field name="state">code</field>
+            <field name="code">action = records.open_form_multi_reject()</field>
+        </record>
     </data>    
 </odoo>