diff --git a/addons/mrp/wizard/mrp_track_prod.py b/addons/mrp/wizard/mrp_track_prod.py
index 11e1ec32ec6..43929b47dc7 100644
--- a/addons/mrp/wizard/mrp_track_prod.py
+++ b/addons/mrp/wizard/mrp_track_prod.py
@@ -56,33 +56,35 @@ class mrp_track_move(osv.osv_memory):
         """
         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
+        active_model = context.get('active_model')
+
+        if not record_id or (active_model and active_model != 'mrp.production'):
+            return res
+        
+        prod_obj = self.pool.get('mrp.production')
+        prod = prod_obj.browse(cr, uid, record_id)
+        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)
+        
         return res
     
     def track_lines(self, cr, uid, ids, context):
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index 371b7ba82e3..ecc88ef6aae 100644
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -57,23 +57,24 @@ class repair_cancel(osv.osv_memory):
         @param context: A standard dictionary 
         @return: New arch of view.
         """
-        record_id = context and context.get('active_id', False) or False        
         res = super(repair_cancel, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
-        if record_id:
-            try:
-                repair_order = self.pool.get('mrp.repair').browse(cr, uid, record_id)
-                if not repair_order.invoiced:
-                    res['arch'] = """ <form string="Cancel Repair" colspan="4">
-                                    <group col="2" colspan="2">
-                                        <label string="Do you want to continue?" colspan="4"/>
-                                        <separator colspan="4"/>
-                                        <button icon="gtk-cancel" special="cancel" string="No" readonly="0"/>
-                                        <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok"/>
-                                    </group>
-                                </form>                             
-                            """
-            except:
-                return res
+        record_id = context and context.get('active_id', False) or False        
+        active_model = context.get('active_model')
+        
+        if not record_id or (active_model and active_model != 'mrp.repair'):
+            return res
+        
+        repair_order = self.pool.get('mrp.repair').browse(cr, uid, record_id)
+        if not repair_order.invoiced:
+            res['arch'] = """ <form string="Cancel Repair" colspan="4">
+                            <group col="2" colspan="2">
+                                <label string="Do you want to continue?" colspan="4"/>
+                                <separator colspan="4"/>
+                                <button icon="gtk-cancel" special="cancel" string="No" readonly="0"/>
+                                <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok"/>
+                            </group>
+                        </form>                             
+                    """
         return res
 
 repair_cancel()