Merge branch 'production' into feature/calculate_selling_price

# Conflicts:
#	indoteknik_custom/views/website_user_cart.xml

5 files changed, 87 insertions, 4 deletions

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/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index b928b046..bfac1eb3 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"/>
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/website_user_cart.xml b/indoteknik_custom/views/website_user_cart.xml
index 9e88f3d4..11573121 100755
--- a/indoteknik_custom/views/website_user_cart.xml
+++ b/indoteknik_custom/views/website_user_cart.xml
@@ -62,7 +62,6 @@
             <field name="code">model.action_mail_reminder_to_checkout()</field>
             <field name="state">code</field>
             <field name="priority">75</field>
-            <field name="active">False</field>
         </record>
 
         <record id="mail_template_user_cart_reminder_to_checkout" model="mail.template">