Merge lp:~jfb-tempo-consulting/unifield-server/us-3440 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/sale_override/sale.py'
--- bin/addons/sale_override/sale.py	2017-08-25 15:37:51 +0000
+++ bin/addons/sale_override/sale.py	2017-09-26 07:31:55 +0000
@@ -3181,6 +3181,8 @@
         '''
         if not default:
             default = {}
+        if context is None:
+            context = {}
         # if the po link is not in default, we set both to False (both values are closely related)
         if 'so_back_update_dest_po_id_sale_order_line' not in default:
             default.update({
@@ -3188,6 +3190,9 @@
                 'so_back_update_dest_pol_id_sale_order_line': False,
             })
 
+        if not context.get('keepDateAndDistrib') and 'source_sync_line_id' not in default:
+            default['source_sync_line_id'] = False
+
         default.update({
             'sync_order_line_db_id': False,
             'manually_corrected': False,