Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into refund_system

1 files changed, 2 insertions, 1 deletions

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 23fbe155..2d4488ab 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -302,6 +302,7 @@
                             ]
                         }
                     "/>
+                    <field name="amount_cashback"/>
                     <field name="purchase_price_md" optional="hide"/>
                     <field name="purchase_tax_id"
                            attrs="{'readonly': [('parent.approval_status', '!=', False)]}"
@@ -384,7 +385,7 @@
                         {
                             'readonly': [
                                 '|',
-                                ('approval_status', 'in', ['pengajuan1', 'pengajuan2', 'approved']),
+                                ('approval_status', 'in', ['pengajuan0','pengajuan1', 'pengajuan2', 'approved']),
                                 ('state', 'not in', ['cancel', 'draft'])
                             ]
                         }