diff options
| author | it-fixcomart <it@fixcomart.co.id> | 2025-05-14 09:23:14 +0700 |
|---|---|---|
| committer | it-fixcomart <it@fixcomart.co.id> | 2025-05-14 09:23:14 +0700 |
| commit | f120c760c6a837681ebed26d9eea33a8961cd1aa (patch) | |
| tree | 728ecdd5ffd1530d97d58a9f18b850186b39aa67 /indoteknik_custom/views/shipment_group.xml | |
| parent | a571531bd8626f9bee25e89c62bbd9268ed30597 (diff) | |
| parent | 2469ee37cfe854f0419a8c3fbabed5bc32bcaa6e (diff) | |
Merge branch 'odoo-backup' into CR/form-merchant
# Conflicts:
# indoteknik_custom/models/__init__.py
# indoteknik_custom/security/ir.model.access.csv
Diffstat (limited to 'indoteknik_custom/views/shipment_group.xml')
| -rw-r--r-- | indoteknik_custom/views/shipment_group.xml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indoteknik_custom/views/shipment_group.xml b/indoteknik_custom/views/shipment_group.xml index e9eec41b..d2c661ba 100644 --- a/indoteknik_custom/views/shipment_group.xml +++ b/indoteknik_custom/views/shipment_group.xml @@ -7,6 +7,8 @@ <tree default_order="create_date desc"> <field name="number"/> <field name="partner_id"/> + <field name="carrier_id"/> + <field name="total_colly_line"/> </tree> </field> </record> @@ -16,11 +18,9 @@ <field name="model">shipment.group.line</field> <field name="arch" type="xml"> <tree editable="bottom"> - <field name="picking_id" required="1"/> - <field name="partner_id" readonly="1"/> <field name="sale_id" readonly="1"/> - <field name="shipping_paid_by" readonly="1"/> - <field name="state" readonly="1"/> + <field name="picking_id" required="1"/> + <field name="total_colly" readonly="1"/> </tree> </field> </record> @@ -37,6 +37,8 @@ </group> <group> <field name="partner_id" readonly="1"/> + <field name="carrier_id" readonly="1"/> + <field name="total_colly_line" readonly="1"/> </group> </group> <notebook> |