From cc4497fc23a2d2c602c4e0b443270236d31f2de4 Mon Sep 17 00:00:00 2001
From: ced <>
Date: Thu, 19 Jul 2007 13:36:11 +0000
Subject: [PATCH] account: improve amount untax field to show really the amount

bzr revid: ced-d8f672e164550582f305a7b835b9bf651859113a
---
 addons/account_tax_include/invoice_tax_incl.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_tax_include/invoice_tax_incl.py b/addons/account_tax_include/invoice_tax_incl.py
index 15d6f3a8244..5f09062b505 100644
--- a/addons/account_tax_include/invoice_tax_incl.py
+++ b/addons/account_tax_include/invoice_tax_incl.py
@@ -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