[MERGE] Merged Anup's branch for the fix of invoice creation from repairs

bzr revid: jvo@tinyerp.com-20110518151558-04p8u19yzjlb32m1
This commit is contained in:
Jay Vora (OpenERP)
2011-05-18 20:45:58 +05:30
2 changed files with 3 additions and 2 deletions
+2 -2
View File
@@ -69,11 +69,11 @@ class mrp_repair(osv.osv):
cur = repair.pricelist_id.currency_id
for line in repair.operations:
if line.to_invoice:
for c in tax_obj.compute(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty, repair.partner_invoice_id.id, line.product_id, repair.partner_id):
for c in tax_obj.compute_all(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty, repair.partner_invoice_id.id, line.product_id, repair.partner_id)['taxes']:
val += c['amount']
for line in repair.fees_lines:
if line.to_invoice:
for c in tax_obj.compute(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty, repair.partner_invoice_id.id, line.product_id, repair.partner_id):
for c in tax_obj.compute_all(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty, repair.partner_invoice_id.id, line.product_id, repair.partner_id)['taxes']:
val += c['amount']
res[repair.id] = cur_obj.round(cr, uid, cur, val)
return res
+1
View File
@@ -148,6 +148,7 @@
<field name="product_uom_qty" string="Qty"/>
<field name="product_uom" string="UoM"/>
<field name="price_unit"/>
<field name="tax_id"/>
<field name="to_invoice"/>
<field name="price_subtotal"/>
</tree>