diff options
| -rw-r--r-- | addons/delivery/delivery_view.xml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index 287a1644f46..42900f0d4be 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -321,13 +321,15 @@ <field name="id" invisible="1"/> <label for="carrier_id"/> <div name='carrier_selection'> - <field name="carrier_id" context="{'order_id': id}" class="oe_inline"/> - <button name="delivery_set" string="Set price" type="object" class="fa fa-arrow-right oe_link" attrs="{'invisible':['|',('carrier_id','=',False),('state','not in',('draft','sent'))]}"/> + <div> + <field name="carrier_id" context="{'order_id': id}" class="oe_inline" options="{'no_create': True}" attrs="{'readonly':[('state','not in',('draft','sent'))]}"/> + </div> + <div> + <field name='delivery_price' widget='monetary' class="oe_inline" options="{'currency_field': 'currency_id'}" nolabel="1" attrs="{'invisible': [('carrier_id','=', False)]}"/> + <button name="delivery_set" string="Set price" type="object" class="oe_inline fa fa-arrow-right oe_link" attrs="{'invisible':['|',('carrier_id','=',False),('state','not in',('draft','sent'))]}"/> + </div> </div> </xpath> - <xpath expr="//div[@name='carrier_selection']" position="after"> - <field name='delivery_price' widget='monetary' options="{'currency_field': 'currency_id'}"/> - </xpath> </data> </field> </record> |