Merge branch 'production' into iman/pengajuan-tempo

# Conflicts:
#	indoteknik_custom/models/res_partner.py

4 files changed, 54 insertions, 2 deletions

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/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index cc6b2357..6ce340f3 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 b8f2d08d..3a3b1c81 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -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="
                         {
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"/>