[FIX]:mrp_repair: order/tax included error is removed.(case:16152)

bzr revid: ira@tinyerp.com-20110727095000-6xkvqz65dgsay5z0

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 950aee0..14a0647 100644 (file)
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -646,11 +646,16 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
         @return: Dictionary of values.
         """
         res = {}
+        tax_obj = self.pool.get('account.tax')
         cur_obj=self.pool.get('res.currency')
+        if context is None:
+            context = {}
         for line in self.browse(cr, uid, ids, context=context):
-            res[line.id] = line.to_invoice and line.price_unit * line.product_uom_qty or 0
+            price = line.price_unit
+            taxes = tax_obj.compute_all(cr, uid, line.tax_id, price, line.product_uom_qty,\
+                line.repair_id.partner_invoice_id.id, line.product_id, line.repair_id.partner_id)
             cur = line.repair_id.pricelist_id.currency_id
-            res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
+            res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
         return res
 
     _columns = {
@@ -736,11 +741,16 @@ class mrp_repair_fee(osv.osv, ProductChangeMixin):
         @return: Dictionary of values.
         """
         res = {}
+        tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
+        if context is None:
+            context = {}
         for line in self.browse(cr, uid, ids, context=context):
-            res[line.id] = line.to_invoice and line.price_unit * line.product_uom_qty or 0
+            price = line.price_unit
+            taxes = tax_obj.compute_all(cr, uid, line.tax_id, price, line.product_uom_qty,\
+                line.repair_id.partner_invoice_id.id, line.product_id, line.repair_id.partner_id)
             cur = line.repair_id.pricelist_id.currency_id
-            res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
+            res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
         return res
 
     _columns = {