Merge lp:~openerp-dev/openobject-addons/6.1-opw-575816-cbi into lp:openobject-addons/6.1

[Chris Biersbach (OpenERP)]

The original branch:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-575816-rha

The issue that was encountered: When cancelling a manufacturing order that had already been partially produced, the remaining good to consume were not returned to the stock

The reason: well, I guess someone forgot to implement this part of cancelling

The fix: I based myself on rha's patch that already creates a picking to return the goods to their previous stock location. However, the customer still complained that the journal entries are not correct. The account moves corresponding to the stock moves in the new picking need to credit the destination accoutn and not the source account, so I did this additional change.

Unmerged revisions

7078. By Chris Biersbach (OpenERP) on 2012-12-12

[FIX] Cancelling a partially produced manufacturing order now correctly returns all the remaining products to consume to their previous stock location.

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2012-10-05 10:44:47 +0000
+++ mrp/mrp.py	2012-12-12 08:17:19 +0000
@@ -615,6 +615,37 @@
                 line['production_id'] = production.id
                 workcenter_line_obj.create(cr, uid, line)
         return len(results)
+    
+    def _reallocate_picking(self, cr, uid, production, context=None):
+        """ Goods remain allocated while cancelling 'ready to produce'
+        production order. It creates new picking to release the goods
+        back to stock.
+        """
+        if context is None:
+            context = {}
+        consumed_info = {}
+        move_obj = self.pool.get('stock.move')
+        picking_obj = self.pool.get('stock.picking')
+        for consumed_move in production.move_lines2:
+            if consumed_move.state == 'done':
+                if not consumed_move.product_id.id in consumed_info:
+                    consumed_info[consumed_move.product_id.id] = consumed_move.product_qty
+                else:
+                    consumed_info[consumed_move.product_id.id] = consumed_info[consumed_move.product_id.id] + consumed_move.product_qty
+        reallocated_picking_id = picking_obj.copy(cr, uid, production.picking_id.id, context=context)
+        ctx = context.copy()
+        ctx['returned_picking'] = True
+        for move in picking_obj.browse(cr, uid, reallocated_picking_id, context=context).move_lines:
+            move_obj.write(cr, uid, move.id, {
+                'type': 'internal',
+                'location_id': move.location_dest_id.id,
+                'location_dest_id': move.location_id.id,
+                'product_qty': move.product_qty - consumed_info.get(move.product_id.id, 0.0)},
+                context=context)
+            move_obj.action_done(cr, uid, [move.id], context=ctx)
+        picking_obj.action_done(cr, uid, reallocated_picking_id, context=context)
+        return reallocated_picking_id
+        
 
     def action_cancel(self, cr, uid, ids, context=None):
         """ Cancels the production order and related stock moves.
@@ -628,6 +659,10 @@
                 raise osv.except_osv(
                     _('Could not cancel manufacturing order !'),
                     _('You must first cancel related internal picking attached to this manufacturing order.'))
+            if production.state in ('ready', 'in_production'):
+                reallocated_picking_id = self._reallocate_picking(cr, uid, production, context=context)
+                self.write(cr, uid, production.id, {'picking_id': reallocated_picking_id}, context=context)
+                
             if production.move_created_ids:
                 move_obj.action_cancel(cr, uid, [x.id for x in production.move_created_ids])
             move_obj.action_cancel(cr, uid, [x.id for x in production.move_lines])
 
=== modified file 'stock/stock.py'
--- stock/stock.py	2012-10-05 07:47:57 +0000
+++ stock/stock.py	2012-12-12 08:17:19 +0000
@@ -2199,7 +2199,9 @@
                      or move.location_id.company_id != move.location_dest_id.company_id):
                 journal_id, acc_src, acc_dest, acc_valuation = self._get_accounting_data_for_valuation(cr, uid, move, dest_company_ctx)
                 reference_amount, reference_currency_id = self._get_reference_accounting_values_for_valuation(cr, uid, move, src_company_ctx)
-                account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_src, acc_valuation, reference_amount, reference_currency_id, context))]
+                # cancelled production: use destination instead of source
+                acc_from = context.get('returned_picking', False) and acc_dest or acc_src
+                account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_from, acc_valuation, reference_amount, reference_currency_id, context))]
 
             move_obj = self.pool.get('account.move')
             for j_id, move_lines in account_moves: