Merge branch 'staging' of bitbucket.org:altafixco/indoteknik-addons into staging

6 files changed, 44 insertions, 4 deletions

diff --git a/indoteknik_custom/views/dunning_run.xml b/indoteknik_custom/views/dunning_run.xml
index cae9cc32..ac080fcf 100644
--- a/indoteknik_custom/views/dunning_run.xml
+++ b/indoteknik_custom/views/dunning_run.xml
@@ -91,6 +91,7 @@
             <search string="Search Dunning Run">
                 <field name="number"/>
                 <field name="partner_id"/>
+                <field name="dunning_line" string="Invoice" filter_domain="[('dunning_line.invoice_id', 'ilike', self)]"/>
            </search>
         </field>
     </record>
diff --git a/indoteknik_custom/views/midtrans.xml b/indoteknik_custom/views/midtrans.xml
new file mode 100644
index 00000000..487e7b7e
--- /dev/null
+++ b/indoteknik_custom/views/midtrans.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="cron_midtrans_parsing" model="ir.cron">
+        <field name="name">Midtrans: Parsing Notification</field>
+        <field name="interval_number">17</field>
+        <field name="interval_type">minutes</field>
+        <field name="numbercall">-1</field>
+        <field name="doall" eval="False"/>
+        <field name="model_id" ref="model_midtrans_notification"/>
+        <field name="code">model._parse_notification()</field>
+        <field name="state">code</field>
+        <field name="priority">29</field>
+    </record>
+</odoo>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 1b6f31aa..d6df24a0 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -29,6 +29,9 @@
                     <field name="sales_tax_id" domain="[('type_tax_use','=','sale')]" required="1"/>
                     <field name="carrier_id" required="1"/>
                 </field>
+                <field name="source_id" position="after">
+                    <field name="date_doc_kirim" readonly="1"/>
+                </field>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']" position="attributes">
                     <attribute name="attrs">
                         {
@@ -66,13 +69,18 @@
                 </field>
 
                 <page name="customer_signature" position="after">
-                    <page string="Customer PO" name="customer_purchase_order">
+                    <page string="Website" name="customer_purchase_order">
                         <group>
                             <group>
                                 <field name="partner_purchase_order_name" readonly="True"/>
                                 <field name="partner_purchase_order_description" readonly="True"/>
                                 <field name="partner_purchase_order_file" readonly="True"/>
                             </group>
+                            <group>
+                                <field name="gross_amount" readonly="True"/>
+                                <field name="payment_type" readonly="True"/>
+                                <field name="payment_status" readonly="True"/>
+                            </group>
                         </group>
                     </page>
                 </page>
@@ -101,6 +109,7 @@
                     <field name="approval_status" />
                     <field name="client_order_ref"/>
                     <field name="so_status"/>
+                    <field name="date_doc_kirim" string="Tgl Kirim"/>
                 </field>
             </field>
         </record>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index a189e399..866c1aac 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -8,6 +8,7 @@
             <field name="arch" type="xml">
                 <field name="json_popover" position="after">
                     <field name="date_done"/>
+                    <field name="date_doc_kirim"/>
                     <field name="driver_departure_date"/>
                     <field name="driver_arrival_date"/>
                 </field>
@@ -45,6 +46,7 @@
                     <field name="real_shipping_id"/>
                 </field>
                 <field name="origin" position="after">
+                    <field name="date_doc_kirim"/>
                     <field name="approval_status" attrs="{'invisible': [('is_internal_use', '=', False)]}"/>
                     <field name="approval_return_status" attrs="{'invisible': [('approval_return_status', '=', False)]}"/>
                     <field name="summary_qty_operation"/>
diff --git a/indoteknik_custom/views/wati.xml b/indoteknik_custom/views/wati.xml
new file mode 100644
index 00000000..fd0306be
--- /dev/null
+++ b/indoteknik_custom/views/wati.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="cron_wati_cleanup" model="ir.cron">
+        <field name="name">Wati: Cleansing Notification</field>
+        <field name="interval_number">15</field>
+        <field name="interval_type">days</field>
+        <field name="numbercall">-1</field>
+        <field name="doall" eval="False"/>
+        <field name="model_id" ref="model_wati_notification"/>
+        <field name="code">model._cleanup()</field>
+        <field name="state">code</field>
+        <field name="priority">28</field>
+    </record>
+</odoo>
diff --git a/indoteknik_custom/views/x_manufactures.xml b/indoteknik_custom/views/x_manufactures.xml
index e51cb6a7..ce00c980 100755
--- a/indoteknik_custom/views/x_manufactures.xml
+++ b/indoteknik_custom/views/x_manufactures.xml
@@ -22,8 +22,7 @@
                     <field name="x_manufacture_level"/>
                     <field name="x_manufacture_service_center"/>
                     <field name="cache_reset_status"/>
-                    <field name="show_as_new_product"/>
-                    <field name="sequence"/>
+                    <field name="parent_id"/>
                 </tree>
             </field>
         </record>
@@ -43,7 +42,8 @@
                                 <field name="x_manufacture_level"/>
                                 <field name="x_produk_aksesoris_sparepart"/>
                                 <field name="cache_reset_status"/>
-                                <field name="sequence"/>
+                                <field name="parent_id"/>
+                                <field name="category_ids" widget="many2many_tags"/>
                             </group>
                             <group>
                                 <field name="x_logo_manufacture" widget="image"/>