=== modified file 'account/invoice.py'
--- account/invoice.py	2010-05-18 09:45:30 +0000
+++ account/invoice.py	2010-06-14 11:44:29 +0000
@@ -1243,17 +1243,20 @@
                 val['amount'] = tax['amount']
                 val['manual'] = False
                 val['sequence'] = tax['sequence']
-                val['base'] = tax['price_unit'] * line['quantity']
 
                 if inv.type in ('out_invoice','in_invoice'):
                     val['base_code_id'] = tax['base_code_id']
                     val['tax_code_id'] = tax['tax_code_id']
+                    val['amount'] = cur_obj.round(cr, uid, cur, tax['amount'])
+                    val['base'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, tax['price_unit'] * line['quantity'] , context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')})
                     val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
                     val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
                     val['account_id'] = tax['account_collected_id'] or line.account_id.id
                 else:
                     val['base_code_id'] = tax['ref_base_code_id']
                     val['tax_code_id'] = tax['ref_tax_code_id']
+                    val['amount'] = cur_obj.round(cr, uid, cur, tax['amount'])
+                    val['base'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, tax['price_unit'] * line['quantity'] , context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')})
                     val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
                     val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
                     val['account_id'] = tax['account_paid_id'] or line.account_id.id
@@ -1269,6 +1272,7 @@
 
         for t in tax_grouped.values():
             t['amount'] = cur_obj.round(cr, uid, cur, t['amount'])
+            t['base'] = cur_obj.round(cr, uid, cur, t['base'])
             t['base_amount'] = cur_obj.round(cr, uid, cur, t['base_amount'])
             t['tax_amount'] = cur_obj.round(cr, uid, cur, t['tax_amount'])
         return tax_grouped