diff options
| author | Azka Nathan <darizkyfaz@gmail.com> | 2024-10-07 08:32:15 +0700 |
|---|---|---|
| committer | Azka Nathan <darizkyfaz@gmail.com> | 2024-10-07 08:32:15 +0700 |
| commit | e02a330a586c83ea1a888e9544d3c450e30099fa (patch) | |
| tree | 0ddd3a7215844ee8cb330c050837fa667915ce46 /indoteknik_custom/views/sale_order.xml | |
| parent | e426f214ed7083ca7deb9f106ff8870b50ad43d4 (diff) | |
| parent | 48c220d1c38f435962b8b630c5209ba781ca30df (diff) | |
Merge branch 'vendor_approval' into production
# Conflicts:
# indoteknik_custom/models/sale_order_line.py
# indoteknik_custom/models/website_user_cart.py
Diffstat (limited to 'indoteknik_custom/views/sale_order.xml')
| -rwxr-xr-x | indoteknik_custom/views/sale_order.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml index 1c75c96a..895b242c 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -72,6 +72,7 @@ <field name="flash_sale"/> <field name="margin_after_delivery_purchase"/> <field name="percent_margin_after_delivery_purchase"/> + <field name="total_weight"/> </field> <field name="analytic_account_id" position="after"> <field name="customer_type" required="1"/> @@ -80,6 +81,7 @@ <field name="email" required="1"/> <field name="unreserve_id"/> <field name="due_id" readonly="1"/> + <field name="vendor_approval_id" readonly="1"/> <field name="source_id" domain="[('id', 'in', [32, 59, 60, 61])]" required="1"/> <button name="override_allow_create_invoice" string="Override Create Invoice" @@ -117,6 +119,7 @@ </xpath> <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_total']" position="after"> <field name="vendor_id" attrs="{'readonly': [('parent.approval_status', '=', 'approved')]}" domain="[('parent_id', '=', False)]" options="{'no_create':True}"/> + <field name="vendor_md_id" optional="hide"/> <field name="purchase_price" attrs=" { 'readonly': [ @@ -126,13 +129,15 @@ ] } "/> + <field name="purchase_price_md" optional="hide"/> <field name="purchase_tax_id" attrs="{'readonly': [('parent.approval_status', '!=', False)]}" domain="[('type_tax_use','=','purchase')]" options="{'no_create':True}"/> <field name="item_percent_margin"/> <field name="item_margin" optional="hide"/> + <field name="margin_md" optional="hide"/> <field name="note" optional="hide"/> <field name="note_procurement" optional="hide"/> <field name="vendor_subtotal" optional="hide"/> - <field name="weight" optional="hide"/> + <field name="weight" optional="hide"/> <field name="amount_voucher_disc" string="Voucher" readonly="1" optional="hide"/> <field name="order_promotion_id" string="Promotion" readonly="1" optional="hide"/> <field name="md_vendor_id" string="MD Vendor" readonly="1" optional="hide"/> |