From 34a7d9a1fb00cf369cebdddfa7ffe217d603542f Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@odoo.com>
Date: Fri, 29 Sep 2017 14:18:00 +0200
Subject: [PATCH] [FIX] delivery: delivery_message must also be reset when
 changing carrier

---
 addons/delivery/models/sale_order.py    | 1 +
 addons/delivery/views/delivery_view.xml | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/delivery/models/sale_order.py b/addons/delivery/models/sale_order.py
index 8514a5db7e1..184374020af 100644
--- a/addons/delivery/models/sale_order.py
+++ b/addons/delivery/models/sale_order.py
@@ -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):
diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml
index 2e82a1e28c3..fc12008fd49 100644
--- a/addons/delivery/views/delivery_view.xml
+++ b/addons/delivery/views/delivery_view.xml
@@ -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>