Merge branch 'production' into feature/request-by-abl

9 files changed, 32 insertions, 6 deletions

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index f505ef9d..1be6d118 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -50,9 +50,14 @@
                     <field name="date_terima_tukar_faktur"/>
                     <field name="due_extension"/>
                     <field name="counter"/>
+                    <field name="nomor_kwitansi"/>
                 </field>
                 <field name="to_check" position="after">
                     <field name="already_paid"/>
+                    <field name="so_shipping_paid_by"/>
+                    <field name="so_shipping_covered_by"/>
+                    <field name="so_delivery_amt"/>
+                    <field name="flag_delivery_amt"/>
                 </field>
                 <notebook position="inside">
                     <page string="Due Extension" attrs="{'invisible': [('move_type', '!=', 'out_invoice')]}">
diff --git a/indoteknik_custom/views/automatic_purchase.xml b/indoteknik_custom/views/automatic_purchase.xml
index 360fdd16..974fbd17 100644
--- a/indoteknik_custom/views/automatic_purchase.xml
+++ b/indoteknik_custom/views/automatic_purchase.xml
@@ -30,7 +30,7 @@
                 <field name="qty_max"/>
                 <field name="qty_available"/>
                 <field name="qty_purchase"/>
-                <field name="partner_id"/>
+                <field name="partner_id" required="1"/>
                 <field name="last_price"/>
                 <field name="taxes_id"/>
                 <field name="subtotal"/>
@@ -52,6 +52,8 @@
                 <field name="partner_id" readonly="1" optional="hide"/>
                 <field name="partner_invoice_id" readonly="1"/>
                 <field name="salesperson_id" readonly="1"/>
+                <field name="purchase_price" readonly="1"/>
+                <field name="purchase_tax_id" readonly="1"/>
                 <field name="product_id" readonly="1"/>
                 <field name="qty_so" readonly="1"/>
                 <field name="qty_po" readonly="1"/>
diff --git a/indoteknik_custom/views/cust_commision.xml b/indoteknik_custom/views/cust_commision.xml
index be58a68c..f080bc60 100644
--- a/indoteknik_custom/views/cust_commision.xml
+++ b/indoteknik_custom/views/cust_commision.xml
@@ -12,6 +12,7 @@
                 <field name="achieve_1st"/>
                 <field name="achieve_2nd"/>
                 <field name="commision_type"/>
+                <field name="brand_ids"/>
             </tree>
         </field>
     </record>
@@ -31,6 +32,7 @@
                                 <field name="achieve_1st"/>
                                 <field name="achieve_2nd"/>
                                 <field name="commision_type"/>
+                                <field name="brand_ids"/>
                             </group>
                         </group>
                 </sheet>
diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 600ad192..4b74cd34 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -12,6 +12,7 @@
                 <field name="commision_percent"/>
                 <field name="commision_amt" readonly="1"/>
                 <field name="status" readonly="1"/>
+                <field name="brand_ids" widget="many2many_tags"/>
             </tree>
         </field>
     </record>
@@ -63,6 +64,7 @@
                                 </div>
                                 <field name="date_to"/>
                                 <field name="commision_type"/>
+                                <field name="brand_ids" widget="many2many_tags"/>
                                 <field name="notification" readonly="1"/>
                                 <field name="status" readonly="1"/>
                                 <field name="total_dpp"/>
diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index d52f55ca..af07ba38 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -90,6 +90,15 @@
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
         </record>
-
+        
+        <record id="sequence_nomor_kwitansi" model="ir.sequence">
+            <field name="name">Nomor Kwitansi</field>
+            <field name="code">nomor.kwitansi</field>
+            <field name="active">TRUE</field>
+            <field name="prefix">KWT/%(year)s/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/logbook_sj.xml b/indoteknik_custom/views/logbook_sj.xml
index 9eb9aa12..0fa65be5 100644
--- a/indoteknik_custom/views/logbook_sj.xml
+++ b/indoteknik_custom/views/logbook_sj.xml
@@ -22,6 +22,7 @@
                             <field name="carrier_id" readonly="1"/>
                             <field name="tracking_no" readonly="1"/>
                             <field name="partner_id" readonly="1"/>
+                            <field name="note"/>
                         </tree>
                     </field>
                 </sheet>
diff --git a/indoteknik_custom/views/promotion/promotion_program_line.xml b/indoteknik_custom/views/promotion/promotion_program_line.xml
index 025ea35a..7c8e403d 100644
--- a/indoteknik_custom/views/promotion/promotion_program_line.xml
+++ b/indoteknik_custom/views/promotion/promotion_program_line.xml
@@ -73,6 +73,14 @@
         action="promotion_program_line_action"
     />
 
+    <record id="ir_actions_server_promotion_program_line_sync_to_solr" model="ir.actions.server">
+        <field name="name">Sync to Solr</field>
+        <field name="model_id" ref="indoteknik_custom.model_promotion_program_line"/>
+        <field name="binding_model_id" ref="indoteknik_custom.model_promotion_program_line"/>
+        <field name="state">code</field>
+        <field name="code">model.action_sync_to_solr()</field>
+    </record>
+
     <data noupdate="1">
         <record id="cron_program_line_solr_flag_solr" model="ir.cron">
             <field name="name">Program Line: Solr Flag to Queue</field>
diff --git a/indoteknik_custom/views/report_logbook_sj.xml b/indoteknik_custom/views/report_logbook_sj.xml
index 8221b419..687464f0 100644
--- a/indoteknik_custom/views/report_logbook_sj.xml
+++ b/indoteknik_custom/views/report_logbook_sj.xml
@@ -31,6 +31,7 @@
                 <field name="picking_id"/>
                 <field name="sale_id"/>
                 <field name="not_exist"/>
+                <field name="note"/>
             </tree>
         </field>
     </record>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index c455655b..23905ef7 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -49,7 +49,6 @@
                 </field>
                 <field name="user_id" position="after">
                     <field name="helper_by_id" readonly="1"/>
-                    <field name="compute_fullfillment" invisible="1"/>
                 </field>
                 <field name="tag_ids" position="after">
                     <field name="eta_date" readonly="1"/>
@@ -187,9 +186,6 @@
                     <page string="Matches PO" name="page_matches_po" invisible="1">
                         <field name="order_sales_match_line" readonly="1"/>
                     </page>
-                    <page string="Fullfillment" name="page_sale_order_fullfillment">
-                        <field name="fullfillment_line" readonly="1"/>
-                    </page>
                 </page>
             </field>
         </record>