Merged in cust_comm (pull request #342)

Cust comm

2 files changed, 35 insertions, 5 deletions

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 4be0840f..d5fb1d70 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>
@@ -173,7 +173,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 +181,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..bb8848c4 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,36 @@
             <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_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">