diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index 10fadb00bc6..a69e8ce4025 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -67,6 +67,7 @@
         'wizard/orderpoint_procurement_view.xml',
         'wizard/mrp_price_view.xml',
         'wizard/mrp_workcenter_load_view.xml',
+#        'wizard/mrp_track_prod_view.xml',
         'mrp_view.xml',
         'wizard/schedulers_all_view.xml',
         'mrp_wizard.xml',
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index 012677a9ca0..045d7f1bd71 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -25,7 +25,7 @@ import mrp_procurement
 import schedulers_all
 import mrp_price
 import mrp_workcenter_load
-import wizard_track_prod
+#import mrp_track_prod
 import change_production_qty
 import make_procurement_product
 
diff --git a/addons/mrp/wizard/mrp_procurement.py b/addons/mrp/wizard/mrp_procurement.py
index 77728c05517..1c3f3dd5c8a 100644
--- a/addons/mrp/wizard/mrp_procurement.py
+++ b/addons/mrp/wizard/mrp_procurement.py
@@ -35,6 +35,13 @@ class procurement_compute(osv.osv_memory):
         return {}
     
     def procure_calculation(self, cr, uid, ids, context):
+        """ 
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param ids: List of IDs selected 
+         @param context: A standard dictionary 
+        """
         threaded_calculation = threading.Thread(target=self._procure_calculation_procure, args=(cr, uid, ids, context))
         threaded_calculation.start()
         return {}
diff --git a/addons/mrp/wizard/mrp_track_prod.py b/addons/mrp/wizard/mrp_track_prod.py
new file mode 100644
index 00000000000..52e5508317a
--- /dev/null
+++ b/addons/mrp/wizard/mrp_track_prod.py
@@ -0,0 +1,126 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import osv, fields
+
+class mrp_track_move(osv.osv_memory):
+    _name = 'mrp.production.track'
+    _description = 'Production Track'
+            
+    def view_init(self, cr, uid, fields_list, context=None):
+        """ 
+         Creates view dynamically and adding fields at runtime.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary 
+         @return: New arch of view with new columns.
+        """
+        res = super(mrp_track_move, self).view_init(cr, uid, fields_list, context=context)
+        record_id = context and context.get('active_id', False) or False
+        if record_id:
+            prod_obj = self.pool.get('mrp.production')
+            try:
+                prod = prod_obj.browse(cr, uid, record_id)
+                for m in [line for line in prod.move_created_ids]:
+                    if 'track%s'%(m.id) not in self._columns:
+                        self._columns['track%s'%(m.id)] = fields.boolean(string=m.product_id.name)
+            except:
+                return res
+        return res
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        """ 
+         Changes the view dynamically
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary 
+         @return: New arch of view.
+        """
+        res = super(mrp_track_move, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+        record_id = context and context.get('active_id', False) or False
+        if record_id:
+            prod_obj = self.pool.get('mrp.production')
+            prod = prod_obj.browse(cr, uid, record_id)
+            try:
+                if prod.state != 'done':
+                    res['arch'] = '''<form string="Track lines">
+                                        <label colspan="4" string="You can not split an unfinished production Output." />
+                                        <group col="2" colspan="4">
+                                            <button icon='gtk-cancel' special="cancel"
+                                                string="Exit" />
+                                        </group>
+                                    </form>
+                                    '''
+                else:
+                    arch_lst = ['<form string="Track lines">', '<label colspan="4" string="The field on each line says whether this lot should be tracked or not." />']
+                    for m in [line for line in prod.move_created_ids]:
+                        quantity = m.product_qty
+                        res['fields']['track%s' %m.id] = {'string' : m.product_id.name, 'type' : 'boolean', 'default' : lambda x,y,z: False}
+                        arch_lst.append('<field name="track%s" />\n<newline />' %m.id)
+                    arch_lst.append('<group col="2" colspan="4">')
+                    arch_lst.append('<button icon=\'gtk-cancel\' special="cancel" string="Cancel" />')
+                    arch_lst.append('<button name="track_lines" string="Track" colspan="1" type="object" icon="gtk-ok" />')
+                    arch_lst.append('</group>')
+                    arch_lst.append('</form>')
+                    res['arch'] = '\n'.join(arch_lst)
+            except Exception,e:
+                return res
+        return res
+    
+    def track_lines(self, cr, uid, ids, context):
+        """
+         Tracks Finished products and splits products to finish lines.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param ids: List of IDs selected 
+         @param context: A standard dictionary 
+         @return: 
+        """
+        record_id = context and context.get('active_id', False) or False
+        assert record_id, 'Active ID not found'
+        data = self.read(cr, uid, ids[0])
+        prod_obj = self.pool.get('mrp.production')
+        prod = prod_obj.browse(cr, uid, record_id)
+        if not prod.move_created_ids and prod.state != 'done':
+            return {}
+        prodlot_obj = self.pool.get('stock.production.lot')
+        move_obj = self.pool.get('stock.move')
+        move_ids = [m.id for m in [line for line in prod.move_created_ids]]
+        for idx, move in enumerate(move_obj.browse(cr, uid, move_ids)):
+            if data['track%s' %move.id]:
+                for idx in range(int(move.product_qty)):
+                    update_val = {'product_qty': 1}
+                    if idx:
+                        current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id})
+                    else:
+                        current_move = move.id
+                    new_prodlot = prodlot_obj.create(cr, uid, {'name': 'PRODUCTION:%d:LOT:%d' % (record_id, idx+1), 'product_id': move.product_id.id})
+                    update_val['prodlot_id'] = new_prodlot
+                    move_obj.write(cr, uid, [current_move], update_val)
+        return {}
+
+mrp_track_move()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp/wizard/mrp_track_prod_view.xml b/addons/mrp/wizard/mrp_track_prod_view.xml
new file mode 100644
index 00000000000..fe2e54026a2
--- /dev/null
+++ b/addons/mrp/wizard/mrp_track_prod_view.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Track Production -->
+
+        <act_window name="Track Production"		    
+		    res_model="mrp.production.track"
+		    src_model="mrp.production"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="act_production_track"/> 
+		
+	</data>
+</openerp>	
diff --git a/addons/mrp/wizard/wizard_track_prod.py b/addons/mrp/wizard/wizard_track_prod.py
deleted file mode 100644
index c94ce47b8d8..00000000000
--- a/addons/mrp/wizard/wizard_track_prod.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-import time
-from osv import osv
-from tools.misc import UpdateableStr
-
-arch = UpdateableStr()
-fields = {}
-
-def _get_moves(self, cr, uid, data, context):
-    prod_obj = pooler.get_pool(cr.dbname).get('mrp.production')
-    prod = prod_obj.browse(cr, uid, [data['id']])[0]
-    res = {}
-    fields.clear()
-    if prod.state != 'done':
-        arch.string = '''<?xml version="1.0"?><form string="Track lines"><label colspan="4" string="You can not split an unfinished production output" /></form>'''
-        res['moves'] = []
-    else:
-        arch_lst = ['<?xml version="1.0"?>', '<form string="Track lines">', '<label colspan="4" string="The field on each line says if this lot should be tracked or not." />']
-        for m in [line for line in prod.move_created_ids]:
-            quantity = m.product_qty
-            arch_lst.append('<field name="track%s" />\n<newline />' % m.id)
-            fields['track%s' % m.id] = {'string' : m.product_id.name, 'type' : 'boolean', 'default' : lambda x,y,z: False}
-            res.setdefault('moves', []).append(m.id)
-        arch_lst.append('</form>')
-        arch.string = '\n'.join(arch_lst)
-    return res
-
-def _track_lines(self, cr, uid, data, context):
-    if not data['form']['moves']:
-        return {}
-    prodlot_obj = pooler.get_pool(cr.dbname).get('stock.production.lot')
-    lot_obj = pooler.get_pool(cr.dbname).get('stock.lot')
-    move_obj = pooler.get_pool(cr.dbname).get('stock.move')
-
-    new_lot = lot_obj.create(cr, uid, {'name': 'PRODUCTION:%d' % data['id']})
-    for idx, move in enumerate(move_obj.browse(cr, uid, data['form']['moves'])):
-        if data['form']['track%s' % move.id]:
-            for idx in range(move.product_qty):
-                update_val = {'product_qty': 1, 'lot_id': new_lot}
-                if idx:
-                    current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id})
-                else:
-                    current_move = move.id
-                new_prodlot = prodlot_obj.create(cr, uid, {'name': 'PRODUCTION:%d:LOT:%d' % (data['id'], idx+1)})
-                update_val['prodlot_id'] = new_prodlot
-                move_obj.write(cr, uid, [current_move], update_val)
-    return {}
-
-class wizard_track_move(wizard.interface):
-    def _next(self, cr, uid, data, context):
-        prod_obj = pooler.get_pool(cr.dbname).get('mrp.production')
-        prod = prod_obj.browse(cr, uid, [data['id']])[0]
-        if prod.state != 'done':
-            return 'notrack'
-        else:
-            return 'track'
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'choice', 'next_state': _next}
-        },
-        'notrack':{
-            'actions':[_get_moves],
-            'result':{'type':'form', 'arch':arch, 'fields':fields, 'state':[('end', 'Cancel')]}
-        },
-        'track':{
-            'actions':[_get_moves],
-            'result': {'type':'form', 'arch':arch, 'fields':fields, 'state':[('end','Cancel'),('split','Track')]}
-        },
-        'split': {
-            'actions': [_track_lines],
-            'result': {'type':'state', 'state':'end'}
-        }
-    }
-
-wizard_track_move('mrp.production.track')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-