pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] delivery: delivery_message must also be reset when changing carrier

Browse Source
This commit is contained in:
Richard Mathot
2017-09-29 14:30:17 +02:00
parent dd684e08b4
commit 34a7d9a1fb
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/delivery/models/sale_order.py
+1
View File
@@ -40,6 +40,7 @@ class SaleOrder(models.Model):
if self.state in ('draft', 'sent'):
self.delivery_price = 0.0
self.delivery_rating_success = False
self.delivery_message = False
@api.onchange('partner_id')
def onchange_partner_id_carrier_id(self):
addons/delivery/views/delivery_view.xml
+3 -3
View File
@@ -281,13 +281,13 @@
<field name="carrier_id" context="{'order_id': id}" class="oe_inline" options="{'no_create': True, 'no_open': True}" attrs="{'readonly':[('state','not in',('draft','sent'))]}"/> <i class="fa fa-check text-success" aria-hidden="true" attrs="{'invisible':['|','|',('carrier_id','=',False),('state','not in',('draft','sent')),('delivery_rating_success','=',False)]}"></i>
</div>
<div>
<field name='delivery_price' widget='monetary' class="oe_inline" options="{'currency_field': 'currency_id'}" nolabel="1" attrs="{'invisible': [('carrier_id','=', False)]}"/>
<field name='delivery_price' widget='monetary' class="oe_inline" options="{'currency_field': 'currency_id'}" nolabel="1" attrs="{'invisible': [('carrier_id','=', False)]}" force_save="1"/>
<button name="get_delivery_price" string="Check price" type="object" class="oe_inline fa fa-arrow-right oe_link" attrs="{'invisible':['|',('carrier_id','=',False),('state','not in',('draft','sent'))]}"/>
<button name="set_delivery_line" string="Set price" type="object" class="oe_inline fa fa-arrow-right oe_link" attrs="{'invisible':['|','|',('carrier_id','=',False),('state','not in',('draft','sent')),('delivery_rating_success','=',False)]}"/>
<field name='delivery_rating_success' invisible="1"/>
<field name='delivery_rating_success' invisible="1" force_save="1"/>
</div>
<div class="alert alert-info" role="alert" attrs="{'invisible': ['|',('carrier_id','=', False),('delivery_message','=',False)]}">
<field name='delivery_message'/>
<field name='delivery_message' force_save="1"/>
</div>
</div>
</xpath>