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

[jftempo]

[lp:~unifield-team/unifield-server/us-2194]

4137. By Quentin THEURET @Amaris on 2017-01-18

US-2194 [FIX] When a FO line is C&R at Coordo, do not cancel the OUT line atProject

4138. By Quentin THEURET @Amaris on 2017-01-18

US-2194 [FIX] Do not remove the OUT line if the canceled IN line is resourced

4139. By Quentin THEURET @Amaris on 2017-01-18

US-2194 [FIX] Fix bad indent

4140. By Quentin THEURET @Amaris on 2017-01-19

US-2194 [FIX] Fix bad indent

=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
--- bin/addons/msf_outgoing/msf_outgoing.py	2017-01-17 13:31:02 +0000
+++ bin/addons/msf_outgoing/msf_outgoing.py	2017-01-19 09:38:14 +0000
@@ -4772,7 +4772,11 @@
         pick_obj = self.pool.get('stock.picking')
         sol_obj = self.pool.get('sale.order.line')
         uom_obj = self.pool.get('product.uom')
+<<<<<<< TREE
         #solc_obj = self.pool.get('sale.order.line.cancel')
+=======
+        solc_obj = self.pool.get('sale.order.line.cancel')
+>>>>>>> MERGE-SOURCE
 
         if context is None:
             context = {}
@@ -4817,12 +4821,21 @@
                 for sol in sol_obj.browse(cr, uid, sol_ids, context=context):
                     if sol.order_id.procurement_request and pick_cancel:
                         continue
+<<<<<<< TREE
 
                     # If the line will be sourced in another way, do not cancel the OUT move
                     #if solc_obj.search(cr, uid, [('sync_order_line_db_id', '=', sol.sync_order_line_db_id)],
                     #                   limit=1, order='NO_ORDER', context=context):
                     #    continue
 
+=======
+
+                    # If the line will be sourced in another way, do not cancel the OUT move
+                    if solc_obj.search(cr, uid, [('fo_sync_order_line_db_id', '=', sol.sync_order_line_db_id), ('resource_sync_line_db_id', '!=', False)],
+                        limit=1, order='NO_ORDER', context=context):
+                        continue
+
+>>>>>>> MERGE-SOURCE
                     diff_qty = uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, sol.product_uom.id)
                     if move.has_to_be_resourced or move.picking_id.has_to_be_resourced:
                         sol_obj.add_resource_line(cr, uid, sol.id, False, diff_qty, context=context)

=== modified file 'bin/addons/sale_override/sale.py'
--- bin/addons/sale_override/sale.py	2017-01-17 10:55:37 +0000
+++ bin/addons/sale_override/sale.py	2017-01-19 09:38:14 +0000
@@ -3007,12 +3007,13 @@
                 if move['picking_id']:
                     picking_ids.add(move['picking_id'][0])
 
-            if line.order_id.procurement_request and line.order_id.location_requestor_id.usage == 'customer':
-                move_obj.write(cr, uid, move_ids, {'state': 'draft'}, context=context)
-                move_obj.unlink(cr, uid, move_ids, context=context)
-            else:
-                move_obj.write(cr, uid, move_ids, {'state': 'cancel'}, context=context)
-                move_obj.action_cancel(cr, uid, move_ids, context=context)
+            if not context.get('no_cancel_out'):
+                if line.order_id.procurement_request and line.order_id.location_requestor_id.usage == 'customer':
+                    move_obj.write(cr, uid, move_ids, {'state': 'draft'}, context=context)
+                    move_obj.unlink(cr, uid, move_ids, context=context)
+                else:
+                    move_obj.write(cr, uid, move_ids, {'state': 'cancel'}, context=context)
+                    move_obj.action_cancel(cr, uid, move_ids, context=context)
 
             for pick in pick_obj.browse(cr, uid, list(picking_ids), context=context):
                 if not len(pick.move_lines) or (pick.subtype == 'standard' and all(m.state == 'cancel' for m in pick.move_lines)):
@@ -3048,7 +3049,7 @@
             elif line.order_id.procurement_request:
                 # UFTP-82: flagging SO is an IR and its PO is cancelled
                 self.pool.get('sale.order').write(cr, uid, [line.order_id.id], {'is_ir_from_po_cancel': True}, context=context)
-            if proc and context.get('cancel_type'):
+            if proc and context.get('cancel_type') and not context.get('no_cancel_out'):
                 proc_obj.write(cr, uid, [proc], {'product_qty': 0.00}, context=context)
                 proc_obj.action_cancel(cr, uid, [proc])
         else: