diff options
| author | stephanchrst <stephanchrst@gmail.com> | 2023-06-16 16:11:05 +0700 |
|---|---|---|
| committer | stephanchrst <stephanchrst@gmail.com> | 2023-06-16 16:11:05 +0700 |
| commit | 2b55220a09fa15c22fb0a4e405c6495153604f54 (patch) | |
| tree | f10220540680ca1ad25abb9507c82f09041c75f4 /indoteknik_custom/views/sale_order.xml | |
| parent | ab71c4b64074ec7471954e3c8f652887549950b9 (diff) | |
| parent | e2ccd5719de9cf03a422e93fbef9a7f035b854a5 (diff) | |
Merge branch 'release' into nathan-dev
# Conflicts:
# indoteknik_custom/models/purchase_order.py
Diffstat (limited to 'indoteknik_custom/views/sale_order.xml')
| -rwxr-xr-x | indoteknik_custom/views/sale_order.xml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml index ea13c954..b160d9b1 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -19,8 +19,9 @@ type="action" attrs="{'invisible': [('approval_status', '!=', 'approved')]}"/> </button> <field name="payment_term_id" position="after"> - <field name="shipping_cost_covered" required="1"/> - <field name="shipping_paid_by" required="1"/> + <field name="create_date" invisible="1"/> + <field name="shipping_cost_covered" attrs="{'required': ['|', ('create_date', '>', '2023-06-15'), ('create_date', '=', False)]}"/> + <field name="shipping_paid_by" attrs="{'required': ['|', ('create_date', '>', '2023-06-15'), ('create_date', '=', False)]}"/> <field name="delivery_amt"/> <field name="fee_third_party"/> <field name="total_percent_margin"/> @@ -62,7 +63,7 @@ <field name="item_percent_margin"/> </xpath> <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='product_id']" position="before"> - <field name="line_no" readonly="1"/> + <field name="line_no" readonly="1" optional="hide"/> </xpath> <field name="amount_total" position="after"> <field name="grand_total"/> |