Merge lp:~mallorymarcot/unifield-server/us-4902 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_order_date/order_dates.py'
--- bin/addons/msf_order_date/order_dates.py	2017-11-28 15:39:55 +0000
+++ bin/addons/msf_order_date/order_dates.py	2018-10-05 09:12:39 +0000
@@ -800,8 +800,6 @@
         if not context.get('keepDateAndDistrib'):
             if 'confirmed_delivery_date' not in default:
                 default['confirmed_delivery_date'] = False
-            if 'date_planned' not in default:
-                default['date_planned'] = (datetime.now() + relativedelta(days=+2)).strftime('%Y-%m-%d')
         return super(sale_order_line, self).copy_data(cr, uid, id, default=default, context=context)
 
     def dates_change(self, cr, uid, ids, requested_date, confirmed_date, context=None):

=== modified file 'bin/addons/sale/sale_workflow.py'
--- bin/addons/sale/sale_workflow.py	2018-09-27 16:07:05 +0000
+++ bin/addons/sale/sale_workflow.py	2018-10-05 09:12:39 +0000
@@ -164,13 +164,14 @@
         new_sol_id = False
         for sol in self.browse(cr, uid, ids, context=context):
             if self.has_to_create_resourced_line(cr, uid, sol.id, context=context):
-                new_sol_id = self.copy(cr, uid, sol.id, {
+                sol_vals = {
                     'resourced_original_line': sol.id,
                     'resourced_original_remote_line': sol.sync_linked_pol,
                     'resourced_at_state': sol.state,
                     'is_line_split': False,
                     'analytic_distribution_id': sol.analytic_distribution_id.id or False,
-                }, context=context)
+                }
+                new_sol_id = self.copy(cr, uid, sol.id, sol_vals, context=context)
                 wf_service.trg_validate(uid, 'sale.order.line', new_sol_id, 'validated', cr)
 
         return new_sol_id