Merge lp:~unifield-team/unifield-server/us-1563 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/sale_override/sale.py'
--- bin/addons/sale_override/sale.py	2016-07-13 13:27:48 +0000
+++ bin/addons/sale_override/sale.py	2016-08-09 15:06:08 +0000
@@ -2910,7 +2910,7 @@
             self.infolog(cr, uid, "The line id:%s (line number: %s) of the %s id:%s (%s) has been deleted." % ltl)
 
         if lines_to_check:
-            self.check_confirm_order(cr, uid, lines_to_check, run_scheduler=False, context=context)
+            self.check_confirm_order(cr, uid, lines_to_check, run_scheduler=False, context=context, update_lines=False)
 
         return res
 
 
=== modified file 'bin/addons/sourcing/sale_order_line.py'
--- bin/addons/sourcing/sale_order_line.py	2016-06-09 13:56:58 +0000
+++ bin/addons/sourcing/sale_order_line.py	2016-08-09 15:06:08 +0000
@@ -1263,7 +1263,7 @@
 
         return True
 
-    def check_confirm_order(self, cr, uid, ids, run_scheduler=False, context=None):
+    def check_confirm_order(self, cr, uid, ids, run_scheduler=False, context=None, update_lines=True):
         """
         Run the confirmation of the FO/IR if all lines are confirmed
         :param cr: Cursor to the database
@@ -1290,10 +1290,11 @@
             if order_data['state'] != 'validated':
                 continue
             state_to_use = order_proc and 'confirmed' or 'sourced'
-            self.write(cr, uid, [line['id']], {
-                'state': state_to_use,
-                'cf_estimated_delivery_date': line['estimated_delivery_date'],
-            }, context=context)
+            if update_lines:
+                self.write(cr, uid, [line['id']], {
+                    'state': state_to_use,
+                    'cf_estimated_delivery_date': line['estimated_delivery_date'],
+                }, context=context)
             if line['order_id'][0] not in order_to_check:
                 order_to_check.update({line['order_id'][0]: state_to_use})