odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

account: improve amount untax field to show really the amount 

bzr revid: ced-d8f672e164550582f305a7b835b9bf651859113a
This commit is contained in:
ced 2007-07-19 13:36:11 +00:00
parent 65f20bd8a9
commit cc4497fc23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account_tax_include/invoice_tax_incl.py
View File

@ -38,7 +38,7 @@ class account_invoice(osv.osv):
res = {}
for invoice in self.browse(cr,uid,ids):
if invoice.price_type == 'tax_included':
res[invoice.id]= invoice.amount_total - invoice.amount_tax
res[invoice.id] = reduce( lambda x, y: x+y.price_subtotal, invoice.invoice_line,0)
else:
res[invoice.id] = super(account_invoice, self)._amount_untaxed(cr, uid, [invoice.id], name, args, context)[invoice.id]
return res
@ -56,7 +56,7 @@ class account_invoice(osv.osv):
res = {}
for invoice in self.browse(cr,uid,ids):
if invoice.price_type == 'tax_included':
res[invoice.id]= reduce( lambda x, y: x+y.price_subtotal_incl, invoice.invoice_line,0)
res[invoice.id]= invoice.amount_untaxed + invoice.amount_tax
else:
res[invoice.id] = super(account_invoice, self)._amount_total(cr, uid, [invoice.id], name, args, context)[invoice.id]
return res