Merge lp:~jfb-tempo-consulting/unifield-server/US-6705-US-6706 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
--- bin/addons/msf_outgoing/msf_outgoing.py	2019-10-30 08:44:20 +0000
+++ bin/addons/msf_outgoing/msf_outgoing.py	2019-11-13 14:34:43 +0000
@@ -954,8 +954,8 @@
 
                     context['non_stock_noupdate'] = False
 
-                    # Find the corresponding move in draft in the draft picking ticket
-                    draft_move = move.backmove_id
+                    # Find the corresponding move in draft in the draft picking ticket: use browse to invalidate cache
+                    draft_move = move_obj.browse(cr, uid, move.backmove_id.id, fields_to_fetch=['product_qty', 'qty_processed'], context=context)
                     # Increase the draft move with the move quantity
 
                     draft_initial_qty = draft_move.product_qty + return_qty
@@ -3572,11 +3572,12 @@
 
                     diff_qty = line.product_qty - line.qty_to_process
                     if line.backmove_id:
+                        backmove_line = move_obj.browse(cr, uid, line.backmove_id.id, fields_to_fetch=['qty_processed', 'product_qty'], context=context)
                         if line.backmove_id.product_uom.id != line.product_uom.id:
                             diff_qty = uom_obj._compute_qty(cr, uid, line.product_uom.id, diff_qty, line.backmove_id.product_uom.id)
-                        backorder_qty = max(line.backmove_id.product_qty + diff_qty, 0)
+                        backorder_qty = max(backmove_line.product_qty + diff_qty, 0)
                         if backorder_qty != 0.00:
-                            new_val = {'product_qty': backorder_qty, 'qty_processed': line.backmove_id.qty_processed and line.backmove_id.qty_processed - diff_qty or 0, 'qty_to_process': backorder_qty}
+                            new_val = {'product_qty': backorder_qty, 'qty_processed': backmove_line.qty_processed and backmove_line.qty_processed - diff_qty or 0, 'qty_to_process': backorder_qty}
                             move_obj.write(cr, uid, [line.backmove_id.id], new_val, context=context)
 
                 if line.qty_to_process:
@@ -4068,8 +4069,8 @@
                 context['keepLineNumber'] = True
                 move_obj.copy(cr, uid, line.move_id.id, return_values, context=context)
                 context['keepLineNumber'] = False
-                # Increase the draft move with the returned quantity
-                draft_move = line.move_id.backmove_id
+                # Increase the draft move with the returned quantity : must broswe the record again to invalidate cache
+                draft_move = move_obj.browse(cr, uid, line.move_id.backmove_id.id, fields_to_fetch=['product_qty', 'qty_processed'], context=context)
                 draft_move_qty = draft_move.product_qty + return_qty
                 qty_processed = max(draft_move.qty_processed - return_qty, 0)
                 move_obj.write(cr, uid, [draft_move.id], {'product_qty': draft_move_qty, 'qty_to_process': draft_move_qty, 'qty_processed': qty_processed}, context=context)

=== modified file 'bin/addons/purchase/purchase_workflow.py'
--- bin/addons/purchase/purchase_workflow.py	2019-10-30 16:33:21 +0000
+++ bin/addons/purchase/purchase_workflow.py	2019-11-13 14:34:43 +0000
@@ -213,12 +213,21 @@
                     netsvc.LocalService('workflow').trg_validate(uid, 'sale.order.line', new_sol, 'sourced', cr)
                     linked_out_moves = self.pool.get('stock.move').search(cr, uid, [
                         ('sale_line_id', '=', sol_values['original_line_id']),
-                        ('type', '=', 'out')],
+                        ('type', '=', 'out'),
+                        ('state', 'in', ['assigned', 'confirmed'])],
                         context=context)
                     if len(linked_out_moves) > 1:
+                        # try first confirmed OUT, if not found link assigned OUT
+                        out_to_update = False
                         for out_move in self.pool.get('stock.move').browse(cr, uid, linked_out_moves, context=context):
-                            if out_move.state in ('assigned', 'confirmed') and out_move.product_qty == sol_values['product_uom_qty']:
-                                self.pool.get('stock.move').write(cr, uid, [out_move.id], {'sale_line_id': new_sol}, context=context)
+                            if out_move.product_qty == sol_values['product_uom_qty']:
+                                if out_move.state == 'confirmed':
+                                    out_to_update = out_move.id
+                                    break
+                                elif out_move.state == 'assigned':
+                                    out_to_update = out_move.id
+                        if out_to_update:
+                            self.pool.get('stock.move').write(cr, uid, [out_to_update], {'sale_line_id': new_sol}, context=context)
 
             else:  # update FO line
                 if pol.linked_sol_id and not pol.linked_sol_id.analytic_distribution_id and not pol.linked_sol_id.order_id.analytic_distribution_id and ad_id and not sale_order.procurement_request: