[FIX] delivery: more UX form view grid fixes

- Get Shipping Weight/Computed weight back onto 1 line (package)
- Unsquish delivery.price.rule table (Shipping Method)

closes odoo/odoo#104067

X-original-commit: 6e8cebfa7659140392621fff710115c0709dae13
Related: odoo/enterprise#33173
Signed-off-by: Steve Van Essche <svs@odoo.com>
Signed-off-by: Tiffany Chang <tic@odoo.com>
This commit is contained in:
Tiffany Chang (tic)
2022-10-25 16:12:05 +02:00
parent ec63d36a77
commit 7958080940
+3 -3
View File
@@ -118,7 +118,7 @@
</group>
</group>
<group name="general" attrs="{'invisible':[('delivery_type', '!=', 'base_on_rule')]}">
<field name="price_rule_ids" nolabel="1"/>
<field name="price_rule_ids" nolabel="1" colspan="2"/>
</group>
</page>
<page string="Destination Availability" name="destination">
@@ -298,9 +298,9 @@
<field name="company_id" position="before">
<label for="shipping_weight"/>
<div class="o_row" name="Shipping Weight">
<field name="shipping_weight"/>
<field name="shipping_weight" class="oe_inline"/>
<span><field name="weight_uom_name"/></span>
<span class="text-muted">(computed: <field name="weight" nolabel="1"/></span><span class="text-muted"><field name="weight_uom_name" nolabel="1"/>)</span>
<span class="text-muted">(computed: <field name="weight" class="oe_inline" nolabel="1"/></span><span class="text-muted"><field name="weight_uom_name" nolabel="1" class="oe_inline"/>)</span>
</div>
</field>
</field>