diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 245be945b5a..b0e6411a481 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -346,7 +346,10 @@ class mrp_repair(osv.osv):
         """
         mrp_line_obj = self.pool.get('mrp.repair.line')
         for repair in self.browse(cr, uid, ids, context=context):
-            mrp_line_obj.write(cr, uid, [l.id for l in repair.operations], {'state': 'cancel'}, context=context)
+            if repair.invoiced or repair.invoice_method == 'none':
+                mrp_line_obj.write(cr, uid, [l.id for l in repair.operations], {'state': 'cancel'}, context=context)           
+            else:
+                raise osv.except_osv(_('Warning!'),_('Repair order is not invoiced.'))
         self.write(cr,uid,ids,{'state':'cancel'})
         self.set_cancel_send_note(cr, uid, ids, context)
         return True
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 75ac018b054..a3b6a8583e5 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -37,10 +37,10 @@
                    <button name="action_invoice_create" states="2binvoiced" string="Make Invoice"/>
                    <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
                    <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected"/>
-                   <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action" attrs="{'invisible':['|',('invoice_method','!=','none')]}"/>
-                   <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action" attrs="{'invisible':['|',('invoice_method','!=','none')]}"/>
+                   <button name="action_cancel" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="object" attrs="{'invisible':['|',('invoice_method','!=','none')]}"/>
+                   <button name="action_cancel" states="invoice_except" string="Cancel Repair" type="object" attrs="{'invisible':['|',('invoice_method','!=','none')]}"/>
                    <button name="cancel" states="draft" string="Cancel Repair"/>
-                   <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" />
+                   <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done"/>
                </header>
                <sheet string="Repairs order">
                     <label for="product_id" class="oe_edit_only"/>