diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index afcf75c0bcf..16994c3ced6 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -525,7 +525,7 @@ class ProductChangeMixin(object):
                             "You have to change either the product, the quantity or the pricelist.")
                      }
                 else:
-                    result.update({'price_unit': price, 'price_subtotal': price * product_uom_qty})
+                    result.update({'price_unit': price, 'price_subtotal': 0.0})
 
         return {'value': result, 'warning': warning}
 
@@ -643,7 +643,7 @@ class mrp_repair_fee(osv.osv, ProductChangeMixin):
             if line.to_invoice:
                 cur = line.repair_id.pricelist_id.currency_id
                 taxes = tax_obj.compute_all(cr, uid, line.tax_id.ids, line.price_unit, cur.id, line.product_uom_qty, line.product_id.id, line.repair_id.partner_id.id)
-                res[line.id] = taxes['total_included']
+                res[line.id] = taxes['total_excluded']
             else:
                 res[line.id] = 0
         return res