From 886e84d2709a20c50eec65a751b1cc4d233baa43 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 30 Aug 2010 13:07:18 +0530
Subject: [PATCH] [IMP] stock: Scrap wizard change label of Dest. Location to
 Scrap Location and scrapped line does not copy the pack of the original line

bzr revid: sbh@tinyerp.com-20100830073718-yefydrjk8mpkx1vb
---
 addons/stock/stock.py                   | 4 +++-
 addons/stock/wizard/stock_move_view.xml | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 2861c556382..bb0e19c67b2 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1920,7 +1920,9 @@ class stock_move(osv.osv):
                 'product_uos_qty': uos_qty,
                 'state': move.state,
                 'scraped' : True,
-                'location_dest_id': location_id
+                'location_dest_id': location_id,
+                'tracking_id':False,
+                'prodlot_id':False
             }
             new_move = self.copy(cr, uid, move.id, default_val)
             res += [new_move]
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 980a1b5f402..fe8e82ba4c7 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -73,7 +73,7 @@
                 <form string="Scrap Move">
                     <separator string="Scrap Products" colspan="4"/>
                     <field name="product_id" colspan="4" readonly="1"/>
-                    <field name="location_id" colspan="4" string="Dest. Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]" widget="selection"/>
+                    <field name="location_id" colspan="4" string="Scrap Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]" widget="selection"/>
                     <field name="product_qty" colspan="2"/>
                     <field name="product_uom" nolabel="1" readonly="1"/>
                     <newline/>