diff options
| author | Indoteknik . <it@fixcomart.co.id> | 2025-07-05 15:00:30 +0700 |
|---|---|---|
| committer | Indoteknik . <it@fixcomart.co.id> | 2025-07-05 15:00:30 +0700 |
| commit | 2b7d3e4f575c881b73f18b242dbf65e9bbf4c5ab (patch) | |
| tree | fe9d5aca45b030cfedcc8875c02bafcb277d8f3f /indoteknik_custom/views/customer_commision.xml | |
| parent | 20f206f3d9b798fee50a06d4a462cf256a71d58e (diff) | |
| parent | 5b1b45d46e34c6724572b9b3182813e0bfdea0a3 (diff) | |
(andri) fix conflict
Diffstat (limited to 'indoteknik_custom/views/customer_commision.xml')
| -rw-r--r-- | indoteknik_custom/views/customer_commision.xml | 9 |
1 files changed, 5 insertions, 4 deletions
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" |