diff --git a/addons/mrp_repair/__terp__.py b/addons/mrp_repair/__terp__.py
index 0cb90558a0c..c6a7a53b6fc 100644
--- a/addons/mrp_repair/__terp__.py
+++ b/addons/mrp_repair/__terp__.py
@@ -39,8 +39,8 @@
         'security/ir.model.access.csv',
         'mrp_repair_sequence.xml',
         'mrp_repair_wizard.xml',
-        'mrp_repair_cancel_view.xml',
-        'mrp_repair_make_invoice_view.xml',
+        'wizard/mrp_repair_cancel_view.xml',
+        'wizard/mrp_repair_make_invoice_view.xml',
         'mrp_repair_view.xml',
         'mrp_repair_workflow.xml',
         'mrp_repair_report.xml',
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index 423be2e27b3..dbc1e0a04c1 100644
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -28,6 +28,18 @@ class repair_cancel(osv.osv_memory):
     _description = 'Cancel Repair'
 
     def cancel_repair(self, cr, uid, ids, context):
+        """ 
+             @summary: Cancels the repair
+        
+             @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('record_id', False) or False
         if record_id:
             repair_obj = self.pool.get('mrp.repair').browse(cr, uid, [record_id])
@@ -43,6 +55,17 @@ class repair_cancel(osv.osv_memory):
         return {}
     
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        """ 
+             @summary: 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.
+        
+        """
         record_id = context and context.get('record_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:
@@ -50,6 +73,8 @@ class repair_cancel(osv.osv_memory):
             if not repair_obj.invoice_id:
                 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>
diff --git a/addons/mrp_repair/wizard/make_invoice.py b/addons/mrp_repair/wizard/make_invoice.py
index 983ebabac25..cc82f0590da 100644
--- a/addons/mrp_repair/wizard/make_invoice.py
+++ b/addons/mrp_repair/wizard/make_invoice.py
@@ -31,6 +31,18 @@ class make_invoice(osv.osv_memory):
     }
 
     def make_invoices(self, cr, uid, ids, context):
+        """ 
+             @summary: Generates invoice(s) of selected records.
+        
+             @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: Loads the view of new invoice(s).
+        
+        """
         inv = self.browse(cr, uid, ids[0])
         order_obj = self.pool.get('mrp.repair')       
         newinv = order_obj.action_invoice_create(cr, uid, context['active_ids'], group=inv.group,context=context)    
diff --git a/addons/mrp_repair/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
similarity index 100%
rename from addons/mrp_repair/mrp_repair_cancel_view.xml
rename to addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
diff --git a/addons/mrp_repair/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
similarity index 100%
rename from addons/mrp_repair/mrp_repair_make_invoice_view.xml
rename to addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml