Merge lp:~mileo/openerp.pt-br-localiz/openerp.pt-br-localiz-fix-saldo into lp:openerp.pt-br-localiz/6.1

[Luis Felipe Miléo - http://www.kmee.com.br]

Unmerged revisions

348. By Luis Felipe Miléo - http://www.kmee.com.br on 2013-02-21

[FIX] Calculo ICMS com RED que causava valores incorretos no saldo/account.move.line/duplicata-nfe

=== modified file 'l10n_br_account/account.py'
--- l10n_br_account/account.py	2012-08-27 02:11:28 +0000
+++ l10n_br_account/account.py	2013-02-21 02:24:24 +0000
@@ -43,10 +43,11 @@
             if tax.get('type') == 'quantity':
                 tax['amount'] = round(product_qty * tax['percent'], precision)
 
+            tax['amount'] = round(tax['amount'] * (1 - tax['base_reduction']), precision)
+
             if tax.get('tax_discount', False):
                 result['tax_discount'] += tax['amount']
 
-            tax['amount'] = round(tax['amount'] * (1 - tax['base_reduction']), precision)
             if tax['percent']:
                 tax['total_base'] = round(total_line * (1 - tax['base_reduction']), precision)
                 tax['total_base_other'] = round(total_line - tax['total_base'], precision)