(andri) fix conflict

7 files changed, 140 insertions, 7 deletions

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 0fc62293..2f52b3d9 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -37,6 +37,8 @@
                 </field>
                 <field name="ref" position="after">
                     <field name="sale_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'entry')]}"/>
+                </field>
+                <field name="reklas_misc_id" position="after">
                     <field name="purchase_order_id" context="{'form_view_ref': 'purchase.purchase_order_form'}" options="{'no_create': True}"/>
                     <field name="bill_id" readonly="1"/>
                 </field>
@@ -60,6 +62,7 @@
                     <field name="due_extension"/>
                     <field name="counter"/>
                     <field name="nomor_kwitansi"/>
+                    <field name="down_payment"/>
                 </field>
                 <field name="to_check" position="after">
                     <field name="already_paid"/>
@@ -67,6 +70,7 @@
                     <field name="so_shipping_covered_by"/>
                     <field name="so_delivery_amt"/>
                     <field name="flag_delivery_amt"/>
+                    <field name="length_of_payment"/>
                 </field>
                 <field name="amount_untaxed" position="after">
                     <field name="other_subtotal" invisible="1"/>
diff --git a/indoteknik_custom/views/approval_payment_term.xml b/indoteknik_custom/views/approval_payment_term.xml
new file mode 100644
index 00000000..87c77385
--- /dev/null
+++ b/indoteknik_custom/views/approval_payment_term.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="approval_payment_term_tree" model="ir.ui.view">
+        <field name="name">approval.payment.term.tree</field>
+        <field name="model">approval.payment.term</field>
+        <field name="arch" type="xml">
+            <tree default_order="create_date desc">
+                <field name="number"/>
+                <field name="partner_id"/>
+                <field name="parent_id"/>
+                <field name="property_payment_term_id"/>
+                <field name="approve_date" optional="hide"/>
+                <field name="approve_sales_manager" optional="hide"/>
+                <field name="approve_finance" optional="hide"/>
+                <field name="approve_leader" optional="hide"/>
+                <field name="create_uid" optional="hide"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="approval_payment_term_form" model="ir.ui.view">
+        <field name="name">approval.payment.term.form</field>
+        <field name="model">approval.payment.term</field>
+        <field name="arch" type="xml">
+            <form>
+                <header>
+                    <button name="button_approve"
+                    string="Approve"
+                    type="object"
+                    attrs="{'invisible': [('approve_leader', '=', True)]}"
+                />
+                </header>
+                <sheet string="Approval Payment Term">
+                    <group>
+                        <group>
+                            <field name="number" readonly="1"/>
+                            <field name="partner_id"/>
+                            <field name="parent_id" readonly="1"/>
+                            <field name="blocking_stage" attrs="{'readonly': [('number', '=', False)]}"/>
+                            <field name="warning_stage" attrs="{'readonly': [('number', '=', False)]}"/>
+                            <field name="property_payment_term_id" attrs="{'readonly': [('number', '=', False)]}"/>
+                            <field name="active_limit" attrs="{'readonly': [('number', '=', False)]}"/>
+                        </group>
+                        <group>
+                            <field name="reason"/>
+                            <field name="approve_date" readonly="1"/>
+                            <field name="approve_sales_manager" readonly="1"/>
+                            <field name="approve_finance" readonly="1"/>
+                            <field name="approve_leader" readonly="1"/>
+                        </group>
+                    </group>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="approval_payment_term_action" model="ir.actions.act_window">
+        <field name="name">Approval Payment Term</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">approval.payment.term</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem id="menu_approval_payment_term" name="Approval Payment Term"
+        parent="account.menu_finance_receivables"
+        action="approval_payment_term_action" 
+        sequence="100"
+    />
+
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 4be0840f..1c17bf63 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -70,7 +70,7 @@
                            statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,pengajuan4,approved"
                            statusbar_colors='{"reject":"red"}'/>
                 </header>
-                <sheet string="Customer Commision">
+                <sheet string="Customer Benefits">
                     <div class="oe_button_box" name="button_box"/>
                     <group>
                         <group>
@@ -83,6 +83,7 @@
                             <field name="commision_amt_text"/>
                             <field name="cashback" attrs="{'invisible': [('commision_type', 'not in', ['cashback'])]}"/>
                             <field name="total_commision" attrs="{'invisible': [('commision_type', 'not in', ['cashback'])]}"/>
+                            <field name="total_cashback_text" attrs="{'invisible': [('commision_type', 'not in', ['cashback'])]}"/>
                             <field name="grouped_so_number" readonly="1"/>
                             <field name="grouped_invoice_number" readonly="1"/>
                             <field name="approved_by" readonly="1"/>
@@ -173,7 +174,7 @@
     </record>
 
     <record id="customer_commision_action" model="ir.actions.act_window">
-        <field name="name">Customer Commision</field>
+        <field name="name">Customer Benefits</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">customer.commision</field>
         <field name="search_view_id" ref="view_customer_commision_filter"/>
@@ -181,14 +182,14 @@
     </record>
 
     <menuitem id="menu_customer_commision_acct"
-              name="Customer Commision"
+              name="Customer Benefits"
               action="customer_commision_action"
               parent="account.menu_finance_entries"
               sequence="113"
     />
 
     <menuitem id="menu_customer_commision_sales"
-              name="Customer Commision"
+              name="Customer Benefits"
               action="customer_commision_action"
               parent="sale.product_menu_catalog"
               sequence="101"
diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index 97bf40bb..a0f5fc6b 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -131,7 +131,7 @@
             <field name="number_increment">1</field>
         </record>
 
-        <record id="sequence_commision_customer" model="ir.sequence">
+        <!-- <record id="sequence_commision_customer" model="ir.sequence">
             <field name="name">Customer Commision</field>
             <field name="code">customer.commision</field>
             <field name="active">TRUE</field>
@@ -139,6 +139,46 @@
             <field name="padding">5</field>
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
+        </record> -->
+
+        <record id="sequence_commision_cashback" model="ir.sequence">
+            <field name="name">Customer Commision Cashback</field>
+            <field name="code">customer.commision.cashback</field>
+            <field name="prefix">CB/%(year)s/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+            <field name="active">True</field>
+        </record>
+        
+        <record id="sequence_approval_payment_term" model="ir.sequence">
+            <field name="name">Approval Payment Term</field>
+            <field name="code">approval.payment.term</field>
+            <field name="prefix">APP/%(year)s/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+            <field name="active">True</field>
+        </record>
+
+        <record id="sequence_commision_fee" model="ir.sequence">
+            <field name="name">Customer Commision Fee</field>
+            <field name="code">customer.commision.fee</field>
+            <field name="prefix">FE/%(year)s/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+            <field name="active">True</field>
+        </record>
+
+        <record id="sequence_commision_rebate" model="ir.sequence">
+            <field name="name">Customer Commision Rebate</field>
+            <field name="code">customer.commision.rebate</field>
+            <field name="prefix">RB/%(year)s/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+            <field name="active">True</field>
         </record>
 
         <record id="sequence_automatic_purchase" model="ir.sequence">
diff --git a/indoteknik_custom/views/mrp_production.xml b/indoteknik_custom/views/mrp_production.xml
index 3de52a08..5057415f 100644
--- a/indoteknik_custom/views/mrp_production.xml
+++ b/indoteknik_custom/views/mrp_production.xml
@@ -11,7 +11,7 @@
             <field name="bom_id" position="after">
                 <field name="desc"/>
                 <field name="sale_order"/>
-                <field name="is_po"/>
+                <field name="is_po" readonly="1"/>
             </field>
             <xpath expr="//form/sheet/notebook/page/field[@name='move_raw_ids']/tree/field[@name='product_uom_qty']" position="before">
                 <field name="vendor_id"/>
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 7b568d07..dae23eed 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -87,7 +87,8 @@
                     <field name="payment_term_id"/>
                     <field name="total_cost_service" attrs="{'required': [('partner_id', 'in', [9688, 29712])]}"/>
                     <field name="total_delivery_amt" attrs="{'required': [('partner_id', 'in', [9688, 29712])]}"/>
-                    <field name="product_bom_id"/>
+                    <field name="product_bom_id" attrs="{'invisible': [('product_bom_id', '=', None)]}"/>
+                    <field name="manufacturing_id" attrs="{'invisible': [('product_bom_id', '=', None)]}"/>
                     <!-- <field name="move_id" domain="[('move_type','=','entry')]" context="{'form_view_ref': 'account.view_move_form'}" options="{'no_create': True}"/> -->
                 </field>
                 <field name="amount_total" position="after">
@@ -332,6 +333,7 @@
                     <field name="delivery_amt" optional="hide"/>
                     <field name="margin_deduct" optional="hide"/>
                     <field name="hold_outgoing_so" optional="hide"/>
+                    <field name="bu_pick" optional="hide"/>
                     <field name="margin_so"/>
                 </tree>
             </field>
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 30b5ca36..ac4d0364 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -108,6 +108,13 @@
                 <xpath expr="//field[@name='property_supplier_payment_term_id']" position="attributes">
                     <attribute name="readonly">1</attribute>
                 </xpath>
+                <xpath expr="//notebook/page[@name='accounting']" position="inside">
+                    <group string="Aging Info">
+                        <field name="avg_aging" readonly="1"/>
+                        <field name="payment_difficulty" attrs="{'readonly': [('parent_id', '!=', False)]}" />
+                        <field name="payment_history_url" readonly="1" />
+                    </group>
+                </xpath>
                 <notebook>
                     <page string="Pengajuan Tempo">
                         <!-- Informasi Usaha Section -->
@@ -181,6 +188,11 @@
                                 <field name="dokumen_pengiriman_input"/>
                                 <field name="dokumen_invoice"/>
                             </group>
+                    		<!-- <group string="Aging Info">
+                                <field name="avg_aging" readonly="1"/>
+                                <field name="payment_difficulty" attrs="{'readonly': [('parent_id', '!=', False)]}" />
+                                <field name="payment_history_url" readonly="1" />
+                            </group> -->
                         </group>
 
                         <!-- Supplier Lines Section -->