diff options
| author | Azka Nathan <darizkyfaz@gmail.com> | 2024-09-24 09:03:52 +0700 |
|---|---|---|
| committer | Azka Nathan <darizkyfaz@gmail.com> | 2024-09-24 09:03:52 +0700 |
| commit | cc4be72fc2f0d98f8bc2190ea5c404536bb3c56d (patch) | |
| tree | a00f22741ba1ec63b59659834a9c6177b20db343 /indoteknik_custom/views/purchase_order.xml | |
| parent | 1f9d0136758531831ea6c7a90556c9a472ed8d40 (diff) | |
| parent | 649f3037e4357dab42d1a8d799e5f2a2f1fd2e52 (diff) | |
Merge branch 'production' into unreserved_permission
# Conflicts:
# indoteknik_custom/models/sale_order.py
Diffstat (limited to 'indoteknik_custom/views/purchase_order.xml')
| -rwxr-xr-x | indoteknik_custom/views/purchase_order.xml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml index 6bc97bbf..0ef0aa7f 100755 --- a/indoteknik_custom/views/purchase_order.xml +++ b/indoteknik_custom/views/purchase_order.xml @@ -27,19 +27,19 @@ <button name="delete_line" type="object" string="Delete " states="draft"/> </button> <button name="button_unlock" position="after"> - <button name="create_bill_dp" string="Create Bill DP" type="object" class="oe_highlight" context="{'create_bill':True}" attrs="{'invisible': ['|', ('state', 'not in', ('purchase', 'done')), ('invoice_status', 'in', ('no', 'invoiced'))]}"/> + <button name="create_bill_dp" string="Create Bill DP" type="object" class="oe_highlight" attrs="{'invisible': [('state', 'not in', ('purchase', 'done'))]}"/> </button> <field name="date_order" position="before"> <field name="sale_order_id" attrs="{'readonly': [('state', 'not in', ['draft'])]}"/> <field name="sale_order"/> <field name="is_create_uangmuka"/> <field name="approval_status"/> - <field name="amount_total_without_service"/> </field> <field name="approval_status" position="after"> <field name="revisi_po" invisible="1"/> </field> <field name="incoterm_id" position="after"> + <field name="amount_total_without_service"/> <field name="delivery_amt"/> </field> <field name="currency_id" position="after"> @@ -48,7 +48,6 @@ <field name="payment_term_id" readonly="1"/> </field> <field name="amount_total" position="after"> - <field name="grand_total"/> <field name="total_margin"/> <field name="total_so_margin"/> <field name="total_percent_margin"/> @@ -237,6 +236,9 @@ <field name="product_id"/> <field name="qty_so"/> <field name="qty_po"/> + <field name="margin_item" optional="hide"/> + <field name="delivery_amt" optional="hide"/> + <field name="margin_deduct" optional="hide"/> <field name="margin_so"/> </tree> </field> |