Merged in production (pull request #144)

Production

13 files changed, 219 insertions, 9 deletions

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 1be6d118..93145fea 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -111,6 +111,8 @@
                     <field name="bill_day_to_due" string="Due Date" widget="remaining_days"/>
                     <field name="is_efaktur_uploaded" optional="hide"/>
                     <field name="is_invoice_uploaded" optional="hide"/>
+                    <field name="invoice_date"/>
+                    <field name="invoice_date_due"/>
                 </field>
 
                 <field name="invoice_date_due" position="attributes">
@@ -131,6 +133,9 @@
                         {'column_invisible': [('parent.move_type', '!=', 'in_invoice')]}
                     </attribute>
                 </field>
+                <field name="invoice_incoterm_id" position="after">
+                    <field name="date_terima_tukar_faktur"/>
+                </field>
             </field>
         </record>
 
@@ -141,6 +146,14 @@
             <field name="state">code</field>
             <field name="code">action = records.open_form_multi_update()</field>
         </record>
+        
+        <record id="account_move_multi_update_bills_ir_actions_server" model="ir.actions.server">
+            <field name="name">Update Terima Faktur Bills</field>
+            <field name="model_id" ref="account.model_account_move"/>
+            <field name="binding_model_id" ref="account.model_account_move"/>
+            <field name="state">code</field>
+            <field name="code">action = records.open_form_multi_update_bills()</field>
+        </record>
 
         <record id="account_move_multi_create_reklas_ir_actions_server" model="ir.actions.server">
             <field name="name">Create Reklas Penjualan</field>
diff --git a/indoteknik_custom/views/account_move_multi_update_bills.xml b/indoteknik_custom/views/account_move_multi_update_bills.xml
new file mode 100644
index 00000000..73f92d16
--- /dev/null
+++ b/indoteknik_custom/views/account_move_multi_update_bills.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="view_account_move_multi_update_form_bills" model="ir.ui.view">
+            <field name="name">Account Move Multi Update Bills</field>
+            <field name="model">account.move.multi_update_bills</field>
+            <field name="arch" type="xml">
+                <form>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="date_terima_tukar_faktur" />
+                            </group>
+                        </group>
+                    </sheet>
+                    <footer>
+                        <button name="save_multi_update_bills" 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_account_move_multi_update_bills" model="ir.actions.act_window">
+            <field name="name">Account Move Multi Update Bills</field>
+            <field name="res_model">account.move.multi_update_bills</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_account_move_multi_update_form_bills"/>
+            <field name="target">new</field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/automatic_purchase.xml b/indoteknik_custom/views/automatic_purchase.xml
index 974fbd17..cdaf6297 100644
--- a/indoteknik_custom/views/automatic_purchase.xml
+++ b/indoteknik_custom/views/automatic_purchase.xml
@@ -44,7 +44,7 @@
         <field name="name">automatic.purchase.sales.match.tree</field>
         <field name="model">automatic.purchase.sales.match</field>
         <field name="arch" type="xml">
-            <tree>
+            <tree editable="bottom">
                 <field name="sale_id" readonly="1"/>
                 <field name="sale_line_id" readonly="1" optional="hide"/>
                 <field name="picking_id" readonly="1" optional="hide"/>
@@ -57,6 +57,7 @@
                 <field name="product_id" readonly="1"/>
                 <field name="qty_so" readonly="1"/>
                 <field name="qty_po" readonly="1"/>
+                <field name="note_procurement"/>
             </tree>
         </field>
     </record>
diff --git a/indoteknik_custom/views/def_cargo_city.xml b/indoteknik_custom/views/def_cargo_city.xml
new file mode 100644
index 00000000..8f8beec5
--- /dev/null
+++ b/indoteknik_custom/views/def_cargo_city.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="def_cargo_city_tree" model="ir.ui.view">
+        <field name="name">def.cargo.city.tree</field>
+        <field name="model">def.cargo.city</field>
+        <field name="arch" type="xml">
+            <tree editable="top">
+                <field name="name"/>
+                <field name="province_id"/>
+            </tree>
+        </field>
+    </record>
+    
+    <record id="def_cargo_city_form" model="ir.ui.view">
+        <field name="name">def.cargo.city.form</field>
+        <field name="model">def.cargo.city</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet string="Def Cargo City">
+                    <group>
+                        <group>
+                            <field name="name" required="1"/>
+                            <field name="province_id"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="def_cargo_city_action" model="ir.actions.act_window">
+        <field name="name">Def Cargo City</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">def.cargo.city</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem name="Def Cargo City" action="def_cargo_city_action"
+        id="menu_def_cargo_city"
+        parent="delivery.menu_delivery" sequence="112"/>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/def_cargo_district.xml b/indoteknik_custom/views/def_cargo_district.xml
new file mode 100644
index 00000000..109fbcba
--- /dev/null
+++ b/indoteknik_custom/views/def_cargo_district.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="def_cargo_district_tree" model="ir.ui.view">
+        <field name="name">def.cargo.district.tree</field>
+        <field name="model">def.cargo.district</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name"/>
+                <field name="city_id"/>
+                <field name="coverage"/>
+                <field name="rate"/>
+                <field name="next_kg"/>
+                <field name="sla"/>
+            </tree>
+        </field>
+    </record>
+    
+    <record id="def_cargo_district_form" model="ir.ui.view">
+        <field name="name">def.cargo.district.form</field>
+        <field name="model">def.cargo.district</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet string="Def Cargo District">
+                    <group>
+                        <group>
+                            <field name="name" required="1"/>
+                            <field name="city_id"/>
+                            <field name="coverage"/>
+                            <field name="rate"/>
+                            <field name="next_kg"/>
+                            <field name="sla"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="def_cargo_district_action" model="ir.actions.act_window">
+        <field name="name">Def Cargo District</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">def.cargo.district</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem name="Def Cargo District" action="def_cargo_district_action"
+        id="menu_def_cargo_district"
+        parent="delivery.menu_delivery" sequence="112"/>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/def_cargo_province.xml b/indoteknik_custom/views/def_cargo_province.xml
new file mode 100644
index 00000000..37dc9162
--- /dev/null
+++ b/indoteknik_custom/views/def_cargo_province.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="def_cargo_province_tree" model="ir.ui.view">
+        <field name="name">def.cargo.province.tree</field>
+        <field name="model">def.cargo.province</field>
+        <field name="arch" type="xml">
+            <tree editable="top">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="def_cargo_province_form" model="ir.ui.view">
+        <field name="name">def.cargo.province.form</field>
+        <field name="model">def.cargo.province</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet string="Def Cargo Province">
+                    <group>
+                        <group>
+                            <field name="name" required="1"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="def_cargo_province_action" model="ir.actions.act_window">
+        <field name="name">Def Cargo Province</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">def.cargo.province</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem name="Def Cargo Province" action="def_cargo_province_action"
+        id="menu_def_cargo_province"
+        parent="delivery.menu_delivery" sequence="112"/>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/dunning_run.xml b/indoteknik_custom/views/dunning_run.xml
index 9994d28d..567d5e8c 100644
--- a/indoteknik_custom/views/dunning_run.xml
+++ b/indoteknik_custom/views/dunning_run.xml
@@ -79,6 +79,10 @@
                             </page>
                         </notebook>
                     </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
             </form>
         </field>
     </record>
diff --git a/indoteknik_custom/views/dunning_run_ged.xml b/indoteknik_custom/views/dunning_run_ged.xml
index ecda228d..90a2950b 100644
--- a/indoteknik_custom/views/dunning_run_ged.xml
+++ b/indoteknik_custom/views/dunning_run_ged.xml
@@ -6,13 +6,6 @@
             <field name="model">dunning.run</field>
             <field name="inherit_id" ref="indoteknik_custom.dunning_run_form"/>
             <field name="arch" type="xml">
-                <field name="is_validated" position="before">
-                    <button name="get_tracking_history_by_awb"
-                            string="Get Tracking"
-                            type="object"
-                            class="oe_highlight oe_edit_only"
-                    />
-                </field>
                 <page id="invoice_tab" position="after">
                     <page string="Tracking">
                         <field name="ged_tracking"/>
@@ -21,6 +14,29 @@
                         <field name="ged_tracking_line"/>
                     </page>
                 </page>
+                <field name="shipper_faktur_id" position="after">
+                    <field name="last_status_awb" readonly="1"/>
+                </field>
+                <field name="notification" position="after">
+                    <button name="get_tracking_history_by_awb"
+                            string="Get Tracking"
+                            type="object"
+                    />
+                    <button name="get_tracking_history_by_awb_log"
+                            string="Logging"
+                            type="object"
+                    />
+                </field>
+            </field>
+        </record>
+        <record id="ged_tracking_tree_inherit" model="ir.ui.view">
+            <field name="name">Dunning Run Tree GED</field>
+            <field name="model">dunning.run</field>
+            <field name="inherit_id" ref="indoteknik_custom.dunning_run_tree"/>
+            <field name="arch" type="xml">
+                <field name="shipper_faktur_id" position="after">
+                    <field name="last_status_awb"/>
+                </field>
             </field>
         </record>
     </data>
diff --git a/indoteknik_custom/views/product_template.xml b/indoteknik_custom/views/product_template.xml
index 309cbcc5..052a1eba 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -12,6 +12,8 @@
                     <field name="x_model_product"/>
                     <field name="kind_of"/>
                     <field name="x_studio_field_tGhJR" widget="many2many_tags"/>
+                    <field name="sni"/>
+                    <field name="tkdn"/>
                 </field>
                 <field name="uom_po_id" position="after">
                     <field name="unpublished" />
diff --git a/indoteknik_custom/views/promotion/promotion_monitoring.xml b/indoteknik_custom/views/promotion/promotion_monitoring.xml
index 88325c52..5f6490ed 100644
--- a/indoteknik_custom/views/promotion/promotion_monitoring.xml
+++ b/indoteknik_custom/views/promotion/promotion_monitoring.xml
@@ -10,6 +10,8 @@
                 <field name="has_promo" />
                 <field name="count_active" />
                 <field name="count_inactive" />
+                <field name="human_last_update" />
+                <field name="promotion_program_line_names"/>
             </tree>
         </field>
     </record>
@@ -28,6 +30,7 @@
                             <field name="has_promo" />
                             <field name="count_active" />
                             <field name="count_inactive" />
+                            <field name="human_last_update" />
                         </group>
                     </group>
                 </sheet>
diff --git a/indoteknik_custom/views/purchasing_job.xml b/indoteknik_custom/views/purchasing_job.xml
index 290955cf..16f1bedd 100644
--- a/indoteknik_custom/views/purchasing_job.xml
+++ b/indoteknik_custom/views/purchasing_job.xml
@@ -14,7 +14,7 @@
                 <field name="onhand"/>
                 <field name="incoming"/>
                 <field name="outgoing"/>
-                <field name="status_apo"/>
+                <field name="status_apo" invisible="1"/>
                 <field name="action"/>
                 <field name="note"/>
             </tree>
diff --git a/indoteknik_custom/views/report_logbook_sj.xml b/indoteknik_custom/views/report_logbook_sj.xml
index 687464f0..147ae393 100644
--- a/indoteknik_custom/views/report_logbook_sj.xml
+++ b/indoteknik_custom/views/report_logbook_sj.xml
@@ -60,6 +60,7 @@
                                 <field name="state" readonly="1"/>
                                 <field name="created_by" readonly="1"/>
                                 <field name="approve_by" readonly="1"/>
+                                <field name="count_line" readonly="1"/>
                             </group>
                         </group>
                         <notebook>
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 59d33f29..fd8c8202 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -11,6 +11,14 @@
                     <field name="counter"/>
                     <field name="reference_number"/>
                 </field>
+                <field name="property_payment_term_id" position="after">
+                    <field name="user_payment_terms_sales" readonly="1"/>
+                    <field name="date_payment_terms_sales" readonly="1"/>
+                </field>
+                <field name="property_supplier_payment_term_id" position="after">
+                    <field name="user_payment_terms_purchase" readonly="1"/>
+                    <field name="date_payment_terms_purchase" readonly="1"/>
+                </field>
                 <field name="industry_id" position="after">
                     <field name="company_type_id"/>
                     <field name="group_partner_id"/>