Merge lp:~openerp-dev/openobject-addons/6.0-bug-767208-vro into lp:openobject-addons/6.0

[Valencia Rodrigues (OpenERP)]

Hello,

There was a problem of product lot being overwritten in Manufacturing Orders as reported in LP bug 767208.

This fixes the issue.

Thanks.

[Jay Vora (Serpent Consulting Services) (jayvora)]

Valencia,

Thanks for the very good fix, of the bug generated by me (due to wrong commit of https://bugs.launchpad.net/openobject-addons/+bug/763437).

You should opt to write the author name = bruno bottacini while doing the commit.

Moreover, you should improve the line 9 as move.product_id.id == move.move_dest_id.product_id.id.

Thanks to both of you.

review: Approve

[Valencia Rodrigues (OpenERP) (vro-openerp)]

Hello Sir,

I have made the recommended changes.

Bruno Bottacini has been credited for his work too.

Thanks.

=== modified file 'stock/stock.py'
--- stock/stock.py	2011-07-06 12:17:09 +0000
+++ stock/stock.py	2011-07-19 06:50:44 +0000
@@ -2133,7 +2133,7 @@
                 self.write(cr, uid, [move.id], {'move_history_ids': [(4, move.move_dest_id.id)]})
                 #cr.execute('insert into stock_move_history_ids (parent_id,child_id) values (%s,%s)', (move.id, move.move_dest_id.id))
                 if move.move_dest_id.state in ('waiting', 'confirmed'):
-                    if move.prodlot_id.id:
+                    if move.prodlot_id.id and move.product_id.id == move.move_dest_id.product_id.id:
                         self.write(cr, uid, [move.move_dest_id.id], {'prodlot_id':move.prodlot_id.id})
                     self.force_assign(cr, uid, [move.move_dest_id.id], context=context)
                     if move.move_dest_id.picking_id: