diff options
| author | it-fixcomart <it@fixcomart.co.id> | 2025-01-21 13:53:28 +0700 |
|---|---|---|
| committer | it-fixcomart <it@fixcomart.co.id> | 2025-01-21 13:53:28 +0700 |
| commit | 63433ff471ba98e6fc63bca16abd9a585471498b (patch) | |
| tree | 7fe83758b1c40888bab68f5498e4a1c7da4d7891 /indoteknik_custom/views/stock_picking.xml | |
| parent | ff20b62d6932c6be4ffb56f63f3c05be3aa72c06 (diff) | |
| parent | e3521c2153c36cee6629cee9146e1b4b0201da9f (diff) | |
Merge branch 'odoo-production' into CR/form-merchant
# Conflicts:
# indoteknik_api/models/res_partner.py
# indoteknik_api/models/res_users.py
# indoteknik_custom/__manifest__.py
# indoteknik_custom/models/__init__.py
# indoteknik_custom/models/res_partner.py
# indoteknik_custom/security/ir.model.access.csv
# indoteknik_custom/views/res_partner.xml
# indoteknik_custom/views/user_company_request.xml
Diffstat (limited to 'indoteknik_custom/views/stock_picking.xml')
| -rw-r--r-- | indoteknik_custom/views/stock_picking.xml | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml index fab83885..8acba608 100644 --- a/indoteknik_custom/views/stock_picking.xml +++ b/indoteknik_custom/views/stock_picking.xml @@ -61,10 +61,17 @@ type="object" attrs="{'invisible': [('carrier_id', '!=', 151)]}" /> + <button name="action_fetch_lalamove_order" + string="Tracking Lalamove" + type="object" + attrs="{'invisible': [('carrier_id', '!=', 9)]}" + /> </button> <field name="backorder_id" position="after"> <field name="summary_qty_detail"/> <field name="count_line_detail"/> + <field name="dokumen_tanda_terima"/> + <field name="dokumen_pengiriman"/> </field> <field name="weight_uom_name" position="after"> <group> @@ -79,6 +86,9 @@ <field name="partner_id" position="after"> <field name="real_shipping_id"/> </field> + <field name="product_uom_qty" position="attributes"> + <attribute name="attrs">{'readonly': [('parent.picking_type_code', '=', 'incoming')]}</attribute> + </field> <field name="date_done" position="after"> <field name="arrival_time"/> </field> @@ -150,7 +160,7 @@ <field name="sj_documentation" widget="image" /> <field name="paket_documentation" widget="image" /> </group> - <group> + <group attrs="{'invisible': [('carrier_id', '!=', 151)]}"> <field name="envio_id" invisible="1"/> <field name="envio_code"/> <field name="envio_ref_code"/> @@ -168,6 +178,17 @@ <field name="envio_latest_longitude" invisible="1"/> <field name="tracking_by" invisible="1"/> </group> + <group attrs="{'invisible': [('carrier_id', '!=', 9)]}"> + <field name="lalamove_data" invisible="1"/> + <field name="lalamove_order_id"/> + <field name="lalamove_address"/> + <field name="lalamove_name"/> + <field name="lalamove_phone"/> + <field name="lalamove_status"/> + <field name="lalamove_delivered_at"/> + <field name="lalamove_image_url" invisible="1"/> + <field name="lalamove_image_html"/> + </group> </group> </page> <!-- <page string="Check Product" name="check_product"> @@ -182,8 +203,10 @@ <field name="name">check.product.tree</field> <field name="model">check.product</field> <field name="arch" type="xml"> - <tree editable="bottom"> + <tree editable="bottom" decoration-warning="status == 'Pending'" decoration-success="status == 'Done'"> <field name="product_id"/> + <field name="quantity"/> + <field name="status"/> </tree> </field> </record> --> |