[MERGE] merged the team 1 branch

bzr revid: qdp-launchpad@tinyerp.com-20101018122913-bick4g41tq0zt0x3

addons/mrp/stock.py

@@ -128,7 +128,7 @@ class StockMove(osv.osv):
         wf_service = netsvc.LocalService("workflow")
         for move in self.browse(cr, uid, ids):
             new_moves = super(StockMove, self).action_scrap(cr, uid, [move.id], product_qty, location_id, context=context)
-            self.write(cr, uid, [move.id], {'prodlot_id': False})
+            self.write(cr, uid, [move.id], {'prodlot_id': False, 'tracking_id': False})
             production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
             for prod_id in production_ids:
                 wf_service.trg_validate(uid, 'mrp.production', prod_id, 'button_produce', cr)

addons/stock/stock.py

@@ -2090,7 +2090,7 @@ class stock_move(osv.osv):
                 'state': move.state,
                 'scrapped' : True,
                 'location_dest_id': location_id,
-                'tracking_id':False,
+                'tracking_id': move.tracking_id.id,
                 'prodlot_id': move.prodlot_id.id,
             }
             new_move = self.copy(cr, uid, move.id, default_val)