diff options
| author | trisusilo48 <tri.susilo@altama.co.id> | 2025-03-19 10:23:27 +0700 |
|---|---|---|
| committer | trisusilo48 <tri.susilo@altama.co.id> | 2025-03-19 10:23:27 +0700 |
| commit | e0ba42d70cda5ab419badac0775b550e63645b3b (patch) | |
| tree | d58923caf57b341a3c3c97f1fa08278e641788a8 /indoteknik_custom/views | |
| parent | fc5defa647bcdd317dc2d4069432c2dcc1141344 (diff) | |
| parent | 9e293f201e3c43662c3866fa06eaa36805d69cc5 (diff) | |
Merge branch 'odoo-backup' into feature/feedback_bitehisp
# Conflicts:
# indoteknik_custom/models/sale_order.py
Diffstat (limited to 'indoteknik_custom/views')
| -rw-r--r-- | indoteknik_custom/views/customer_commision.xml | 4 | ||||
| -rwxr-xr-x | indoteknik_custom/views/sale_order.xml | 1 | ||||
| -rw-r--r-- | indoteknik_custom/views/stock_picking.xml | 16 |
3 files changed, 20 insertions, 1 deletions
diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml index 51172b1c..bb1628bc 100644 --- a/indoteknik_custom/views/customer_commision.xml +++ b/indoteknik_custom/views/customer_commision.xml @@ -17,6 +17,8 @@ decoration-danger="payment_status == 'pending'" widget="badge"/> <field name="brand_ids" widget="many2many_tags"/> + <field name="grouped_so_number" readonly="1"/> + <field name="grouped_invoice_number" readonly="1"/> </tree> </field> </record> @@ -62,6 +64,8 @@ <field name="description"/> <field name="commision_percent"/> <field name="commision_amt"/> + <field name="grouped_so_number" readonly="1"/> + <field name="grouped_invoice_number" readonly="1"/> </group> <group> <div> diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml index ebee64b1..0d190f37 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -100,6 +100,7 @@ <field name="sales_tax_id" domain="[('type_tax_use','=','sale'), ('active', '=', True)]" required="1"/> <field name="carrier_id" required="1"/> <field name="delivery_service_type" readonly="1"/> + <field name="shipping_option_id"/> </field> <field name="medium_id" position="after"> <field name="date_doc_kirim" readonly="1"/> diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml index dadd5021..ce07888a 100644 --- a/indoteknik_custom/views/stock_picking.xml +++ b/indoteknik_custom/views/stock_picking.xml @@ -19,7 +19,8 @@ <field name="note" optional="hide"/> <field name="date_reserved" optional="hide"/> <field name="state_reserve" optional="hide"/> - <field name="final_seq"/> + <field name="final_seq"/> +<!-- <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'" decoration-warning="state_approve_md == 'pending'" />--> <!-- <field name="countdown_hours" optional="hide"/> <field name="countdown_ready_to_ship" /> --> </field> @@ -70,6 +71,17 @@ type="object" attrs="{'invisible': [('carrier_id', '!=', 9)]}" /> +<!-- <button name="button_state_approve_md"--> +<!-- string="Approve MD Gudang Selisih"--> +<!-- type="object"--> +<!-- attrs="{'invisible': [('state_approve_md', 'not in', ['waiting', 'pending'])]}"--> +<!-- />--> + +<!-- <button name="button_state_pending_md"--> +<!-- string="Pending MD Gudang Selisih"--> +<!-- type="object"--> +<!-- attrs="{'invisible': [('state_approve_md', 'not in', ['waiting'])]}"--> +<!-- />--> </button> <field name="backorder_id" position="after"> <field name="summary_qty_detail"/> @@ -97,6 +109,8 @@ <field name="arrival_time"/> </field> <field name="origin" position="after"> +<!-- <field name="show_state_approve_md" invisible="1" optional="hide"/>--> +<!-- <field name="state_approve_md" widget="badge" attrs="{'invisible': [('show_state_approve_md', '=', False)]}"/>--> <field name="purchase_id"/> <field name="sale_order"/> <field name="invoice_status"/> |