<iman> Merge branch 'production' of https://bitbucket.org/altafixco/indoteknik-addons into feature/tracking-order

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

9 files changed, 226 insertions, 6 deletions

diff --git a/indoteknik_custom/views/airway_bill.xml b/indoteknik_custom/views/airway_bill.xml
index 015f20f2..626a6763 100644
--- a/indoteknik_custom/views/airway_bill.xml
+++ b/indoteknik_custom/views/airway_bill.xml
@@ -94,7 +94,7 @@
         <field name="code">model._fetch()</field>
         <field name="state">code</field>
         <field name="priority">75</field>
-        <field name="active">True</field>
+        <field name="active">False</field>
     </record>
 
     <menuitem id="menu_airway_bill"
diff --git a/indoteknik_custom/views/approval_date_doc.xml b/indoteknik_custom/views/approval_date_doc.xml
new file mode 100644
index 00000000..d6a70763
--- /dev/null
+++ b/indoteknik_custom/views/approval_date_doc.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="approval_date_doc_tree" model="ir.ui.view">
+        <field name="name">approval.date.doc.tree</field>
+        <field name="model">approval.date.doc</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="number"/>
+                <field name="picking_id"/>
+                <field name="sale_id"/>
+                <field name="driver_departure_date"/>
+                <field name="state"/>
+                <field name="approve_date"/>
+                <field name="approve_by"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="approval_date_doc_form" model="ir.ui.view">
+        <field name="name">approval.date.doc.form</field>
+        <field name="model">approval.date.doc</field>
+        <field name="arch" type="xml">
+            <form>
+                <header>
+                    <button name="button_approve"
+                    string="Approve"
+                    type="object"
+                    attrs="{'invisible': [('state', '=', 'done')]}"
+                />
+                </header>
+                <sheet string="Approval Date Doc">
+                    <group>
+                        <group>
+                            <field name="number"/>
+                            <field name="picking_id"/>
+                            <field name="sale_id"/>
+                            <field name="driver_departure_date"/>
+                            <field name="approve_date"/>
+                            <field name="approve_by"/>
+                            <field name="state" readonly="1"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="approval_date_doc_action" model="ir.actions.act_window">
+        <field name="name">Approval Date Doc</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">approval.date.doc</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem id="menu_approval_date_doc" name="Approval Date Doc"
+        parent="account.menu_finance_receivables"
+        action="approval_date_doc_action" 
+        sequence="100"
+    />
+
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index b4fb5c0c..b2768c71 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -11,6 +11,16 @@
             <field name="number_increment">1</field>
         </record>
         
+        <record id="sequence_date_doc" model="ir.sequence">
+            <field name="name">Approval Date Doc</field>
+            <field name="code">approval.date.doc</field>
+            <field name="active">TRUE</field>
+            <field name="prefix">ADD/%(year)s/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+        </record>
+
         <record id="sequence_logbook_sj" model="ir.sequence">
             <field name="name">Logbook SJ</field>
             <field name="code">report.logbook.sj</field>
diff --git a/indoteknik_custom/views/partner_payment_term.xml b/indoteknik_custom/views/partner_payment_term.xml
new file mode 100644
index 00000000..433cac3e
--- /dev/null
+++ b/indoteknik_custom/views/partner_payment_term.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="partner_payment_term_tree" model="ir.ui.view">
+        <field name="name">partner.payment.term.tree</field>
+        <field name="model">res.partner</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="display_name"/>
+                <field name="name"/>
+                <field name="parent_id"/>
+                <field name="property_payment_term_id"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="partner_payment_term_form" model="ir.ui.view">
+        <field name="name">partner.payment.term.form</field>
+        <field name="model">res.partner</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="parent_id" readonly="1"/>
+                            <field name="property_payment_term_id"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_partner_payment_term_filter" model="ir.ui.view">
+        <field name="name">partner.payment.term.list.select</field>
+        <field name="model">res.partner</field>
+        <field name="priority" eval="15"/>
+        <field name="arch" type="xml">
+            <search string="Name">
+                <field name="display_name"/>
+                <field name="name"/>
+                <field name="parent_id"/>
+           </search>
+        </field>
+    </record>
+
+    <record id="partner_payment_term_action" model="ir.actions.act_window">
+        <field name="name">Partner Payment Term</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">res.partner</field>
+        <field name="search_view_id" ref="view_partner_payment_term_filter"/>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="partner_payment_term_tree"/>
+        <field name="view_ids" eval="[(5, 0, 0), (0, 0, {'view_mode': 'tree', 'view_id': ref('partner_payment_term_tree')}), (0, 0, {'view_mode': 'form', 'view_id': ref('partner_payment_term_form')})]"/>
+    </record>
+
+    <menuitem id="menu_partner_payment_term_acct"
+                name="Partner Payment Term"
+                action="partner_payment_term_action"
+                parent="account.menu_finance_entries"
+                sequence="115"
+    />
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/product_sla.xml b/indoteknik_custom/views/product_sla.xml
index d0d3f84a..8b0e874b 100644
--- a/indoteknik_custom/views/product_sla.xml
+++ b/indoteknik_custom/views/product_sla.xml
@@ -48,7 +48,7 @@
         <field name="code">model.generate_product_variant_id_sla(limit=150)</field>
         <field name="state">code</field>
         <field name="priority">100</field>
-        <field name="active">True</field>
+        <field name="active">False</field>
     </record>
 
     <menuitem id="menu_product_sla"
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index b928b046..d77e09b8 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -26,8 +26,17 @@
                     <field name="pareto_status"/>
                     <field name="digital_invoice_tax"/>
                 </field>
+                <field name="nama_wajib_pajak" position="attributes">
+                    <attribute name="required">1</attribute>
+                </field>
+                <field name="npwp" position="attributes">
+                    <attribute name="required">1</attribute>
+                </field>
+                <field name="alamat_lengkap_text" position="attributes">
+                    <attribute name="required">1</attribute>
+                </field>
                 <field name="npwp" position="before">
-                    <field name="customer_type"/>
+                    <field name="customer_type" required="1"/>
                 </field>
                 <field name="is_berikat" position="after">
                     <field name="pakta_integritas"/>
@@ -47,6 +56,12 @@
                     <field name="main_parent_id" invisible="1" />
                     <field name="site_id" attrs="{'readonly': [('parent_id', '=', False)]}" domain="[('partner_id', '=', main_parent_id)]" context="{'default_partner_id': active_id}" />
                 </xpath>
+                <xpath expr="//field[@name='property_payment_term_id']" position="attributes">
+                    <attribute name="readonly">1</attribute>
+                </xpath>
+                <xpath expr="//field[@name='property_supplier_payment_term_id']" position="attributes">
+                    <attribute name="readonly">1</attribute>
+                </xpath>
             </field>
         </record>
     </data>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 04f21d83..1257ff85 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -43,6 +43,10 @@
                             attrs="{'invisible': ['|', ('applied_voucher_id', '=', False), ('state', 'not in', ['draft','sent'])]}"
                         />
                     </div>
+                    <button name="calculate_selling_price"
+                            string="Calculate Selling Price"
+                            type="object"
+                    />
                 </field>
                 <field name="source_id" position="attributes">
                     <attribute name="invisible">1</attribute>
@@ -96,7 +100,7 @@
                     </attribute>
                 </xpath>
                 <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')]}"/>
+                    <field name="vendor_id" attrs="{'readonly': [('parent.approval_status', '=', 'approved')]}" domain="[('parent_id', '=', False)]"/>
                     <field name="purchase_price" attrs="
                         {
                             'readonly': [
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 7567dda2..899d29eb 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -68,10 +68,14 @@
                 <field name="partner_id" position="after">
                     <field name="real_shipping_id"/>
                 </field>
+                <field name="date_done" position="after">
+                    <field name="arrival_time"/>
+                </field>
                 <field name="origin" position="after">
                     <field name="purchase_id"/>
                     <field name="sale_order"/>
-                    <field name="date_doc_kirim"/>
+                    <field name="invoice_status"/>
+                    <field name="date_doc_kirim" attrs="{'readonly':[('invoice_status', '=', 'invoiced')]}"/>
                     <field name="summary_qty_operation"/>
                     <field name="count_line_operation"/>
                     <field name="account_id"
@@ -118,7 +122,7 @@
                         <group>
                             <group>
                                 <field name="note_logistic"/>
-                                <field name="driver_departure_date"/>
+                                <field name="driver_departure_date" attrs="{'readonly':[('invoice_status', '=', 'invoiced')]}"/>
                                 <field name="driver_arrival_date"/>
                                 <field name="delivery_tracking_no"/>
                                 <field name="driver_id"/>
diff --git a/indoteknik_custom/views/vendor_payment_term.xml b/indoteknik_custom/views/vendor_payment_term.xml
new file mode 100644
index 00000000..e0e96388
--- /dev/null
+++ b/indoteknik_custom/views/vendor_payment_term.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="vendor_payment_term_tree" model="ir.ui.view">
+        <field name="name">vendor.payment.term.tree</field>
+        <field name="model">res.partner</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="display_name"/>
+                <field name="name"/>
+                <field name="parent_id"/>
+                <field name="property_supplier_payment_term_id"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="vendor_payment_term_form" model="ir.ui.view">
+        <field name="name">vendor.payment.term.form</field>
+        <field name="model">res.partner</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="parent_id" readonly="1"/>
+                            <field name="property_supplier_payment_term_id"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_vendor_payment_term_filter" model="ir.ui.view">
+        <field name="name">vendor.payment.term.list.select</field>
+        <field name="model">res.partner</field>
+        <field name="priority" eval="15"/>
+        <field name="arch" type="xml">
+            <search string="Name">
+                <field name="display_name"/>
+                <field name="name"/>
+                <field name="parent_id"/>
+           </search>
+        </field>
+    </record>
+
+    <record id="vendor_payment_term_action" model="ir.actions.act_window">
+        <field name="name">Vendor Payment Term</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">res.partner</field>
+        <field name="search_view_id" ref="view_vendor_payment_term_filter"/>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="vendor_payment_term_tree"/>
+        <field name="view_ids" eval="[(5, 0, 0), (0, 0, {'view_mode': 'tree', 'view_id': ref('vendor_payment_term_tree')}), (0, 0, {'view_mode': 'form', 'view_id': ref('vendor_payment_term_form')})]"/>
+    </record>
+
+    <menuitem id="menu_vendor_payment_term_acct"
+                name="Vendor Payment Term"
+                action="vendor_payment_term_action"
+                parent="purchase.menu_purchase_products"
+                sequence="7"
+    />
+</odoo>
\ No newline at end of file