Ila Rana(Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.0-opw-16152-ira into
lp:openobject-addons/6.0.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-16152-ira/+merge/69424
Hello,
mrp_repair : Improved tax calculation while invoicing.
Regards,
Rana Ila.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-16152-ira/+merge/69424
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.0-opw-16152-ira.
=== modified file 'mrp_repair/mrp_repair.py'
--- mrp_repair/mrp_repair.py 2011-04-26 09:31:37 +0000
+++ mrp_repair/mrp_repair.py 2011-07-27 10:08:32 +0000
@@ -646,11 +646,16 @@
@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 @@
@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 = {
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
