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

[jftempo]

=== modified file 'bin/addons/delivery_mechanism/wizard/enter_reason.py'
--- bin/addons/delivery_mechanism/wizard/enter_reason.py	2017-11-03 10:59:21 +0000
+++ bin/addons/delivery_mechanism/wizard/enter_reason.py	2018-01-17 15:53:13 +0000
@@ -66,6 +66,8 @@
             # set the reason
             obj.write({'change_reason': change_reason}, context=context)
 
+            if context.get('do_resource', False):
+                self.pool.get('stock.move').write(cr, uid, [move.id for move in obj.move_lines], {'has_to_be_resourced': True}, context=context)
             self.pool.get('stock.move').action_cancel(cr, uid, [move.id for move in obj.move_lines], context=context)
 
             # cancel the IN

=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
--- bin/addons/msf_outgoing/msf_outgoing.py	2017-12-14 17:30:55 +0000
+++ bin/addons/msf_outgoing/msf_outgoing.py	2018-01-17 15:53:13 +0000
@@ -5090,26 +5090,6 @@
                     signal = 'cancel_r' if resource else 'cancel'
                     wf_service.trg_validate(uid, 'purchase.order.line', move.purchase_line_id.id, signal, cr)
 
-                not_done_moves = self.pool.get('stock.move').search(cr, uid, [
-                    ('purchase_line_id', '=', move.purchase_line_id.id),
-                    ('state', 'not in', ['cancel', 'cancel_r', 'done']),
-                    ('picking_id.type', '=', 'in'),
-                ], context=context)
-                if (not not_done_moves) or all([x in ids for x in not_done_moves]):
-                    # all in lines processed or will be processed for this po line
-                    wf_service.trg_validate(uid, 'purchase.order.line', move.purchase_line_id.id, 'done', cr)
-
-                if move.purchase_line_id.is_line_split and move.purchase_line_id.original_line_id:
-                    # check if the original PO line can be set to done
-                    not_done_moves = self.pool.get('stock.move').search(cr, uid, [
-                        ('purchase_line_id', '=', move.purchase_line_id.original_line_id.id),
-                        ('state', 'not in', ['cancel', 'cancel_r', 'done']),
-                        ('picking_id.type', '=', 'in'),
-                    ], context=context)
-                    if (not not_done_moves) or all([x in ids for x in not_done_moves]):
-                        # all in lines processed or will be processed for this po line
-                        wf_service.trg_validate(uid, 'purchase.order.line', move.purchase_line_id.original_line_id.id, 'done', cr)
-
                 sol_ids = pol_obj.get_sol_ids_from_pol_ids(cr, uid, [move.purchase_line_id.id], context=context)
                 for sol in sol_obj.browse(cr, uid, sol_ids, context=context):
                     # If the line will be sourced in another way, do not cancel the OUT move
@@ -5133,6 +5113,26 @@
                         if out_move_id:
                             context.setdefault('not_resource_move', []).append(out_move_id)
                             self.action_cancel(cr, uid, [out_move_id], context=context)
+                            
+                not_done_moves = self.pool.get('stock.move').search(cr, uid, [
+                    ('purchase_line_id', '=', move.purchase_line_id.id),
+                    ('state', 'not in', ['cancel', 'cancel_r', 'done']),
+                    ('picking_id.type', '=', 'in'),
+                ], context=context)
+                if (not not_done_moves) or all([x in ids for x in not_done_moves]):
+                    # all in lines processed or will be processed for this po line
+                    wf_service.trg_validate(uid, 'purchase.order.line', move.purchase_line_id.id, 'done', cr)
+
+                if move.purchase_line_id.is_line_split and move.purchase_line_id.original_line_id:
+                    # check if the original PO line can be set to done
+                    not_done_moves = self.pool.get('stock.move').search(cr, uid, [
+                        ('purchase_line_id', '=', move.purchase_line_id.original_line_id.id),
+                        ('state', 'not in', ['cancel', 'cancel_r', 'done']),
+                        ('picking_id.type', '=', 'in'),
+                    ], context=context)
+                    if (not not_done_moves) or all([x in ids for x in not_done_moves]):
+                        # all in lines processed or will be processed for this po line
+                        wf_service.trg_validate(uid, 'purchase.order.line', move.purchase_line_id.original_line_id.id, 'done', cr)
 
                 self.pool.get('purchase.order.line').update_fo_lines(cr, uid, [move.purchase_line_id.id], context=context)
 

=== modified file 'bin/addons/sale/sale_workflow.py'
--- bin/addons/sale/sale_workflow.py	2018-01-08 13:50:26 +0000
+++ bin/addons/sale/sale_workflow.py	2018-01-17 15:53:13 +0000
@@ -374,7 +374,9 @@
             ], context=context)
 
             if out_moves_to_cancel:
+                context.update({'not_resource_move': out_moves_to_cancel})
                 self.pool.get('stock.move').action_cancel(cr, uid, out_moves_to_cancel, context=context)
+                context.pop('not_resource_move')
 
         return True