Merge lp:~openerp-dev/openobject-addons/trunk-new-account-tax-design-tpa into lp:openobject-addons

[Turkesh Patel (openERP)]

[lp:~openerp-dev/openobject-addons/trunk-new-account-tax-design-tpa]

9468. By Turkesh Patel (openERP) on 2014-05-29

[IMP] remove old fields which were there temp.

[Nhomar - Vauxoo (nhomar)]

Turkesh.

Can you share the pad that explain changes on this MP?

It should be great to validate reasons and changes.

Good job dudes.... thanks for the great job.

Regards.

[Turkesh Patel (openERP) (turkesh-tinyerp)]

Hello Nhomar,

this is the pad https://pad.odoo.com/p/openerp-project.task-XDGBPBPVQ8

[lp:~openerp-dev/openobject-addons/trunk-new-account-tax-design-tpa]

9469. By Turkesh Patel (openERP) on 2014-05-29

[IMP] improved code to generate tax.lines from tax.line.template

[Nhomar - Vauxoo (nhomar)]

REALLY thanks.

I can't find an important point (and I think it should be done in the core because overwrite taxes is really complex technically speaking).

In Odoo (formelly OpenERP) for historical reasons the VAT is applied on "Invoices" directly to "Income and Outcome Tax." AFAICS it will continue being on this way, but, we have several countries (Mexico, EEUU, Italy AFAICK) where we have 2 stages for every account.tax on invoices:

1.- Tax Invoiced.
2.- Tax effectively paid.

The first one is perfectly managed by the actual behavior even on this merge proposal.

But the second one (which the payment process must to be included) is not possible, then we have in the pad one question not answered yet:

----
Question... (that wait for an answer)
does it make sense to be able to add lines in Journal items ?
----

May be if the answer is "Yes" it can help but I am not sure that it is the correct approach (due to the great simplification done on the configuration process that can be solved in a different way).

We did this approach in a generic way[1] (but so tricky due to technical limitations on this module as it is actually) but We think the concept is clear, we need at least 2 extra accounts on taxes (see the code) on account.tax and account.tax.template models.

It means, if you think this concept of separate "Invoiced" from "Paid" taxes in a configurable way can be included on the core we can document perfectly this module and share all documentation regarding with the "Functional" approach (because honestly I am not ABSOLUTLY SURE if our technical approach was correct, but we are absolutely sure functionally speaking it is a mandatory feature on some countries).

Thanks in advance and again, thanks for this improvements.

[1] http://goo.gl/rj5fDa

[lp:~openerp-dev/openobject-addons/trunk-new-account-tax-design-tpa]

9470. By Turkesh Patel (openERP) on 2014-05-29

[IMP] improved 'configurable account chart template' taxes as per new model design. improved code to generate tax from tax template.

9471. By Turkesh Patel (openERP) on 2014-05-29

[FIX] fixed issue of tax_code_id. use new mapped id of code.

9472. By Turkesh Patel (openERP) on 2014-05-29

[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-new-account-tax-design-tpa-l10n-tpa

9473. By DJ Patel (OpenERP) on 2014-05-30

[FIX] l10n_ma : The value 'none' for the field 'account_tax_template.type' is not in the selection.

9474. By DJ Patel (OpenERP) on 2014-05-30

[FIX] l10n_ma : The value 'all' for the field 'account_tax_template.type' is not in the selection.

9475. By Turkesh Patel (openERP) on 2014-05-30

[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-new-account-tax-design-tpa-l10n-tpa , added account_id in tax templates

9476. By Turkesh Patel (openERP) on 2014-05-30

[IMP] improved code to map accounts in account.tax.lines

9477. By Turkesh Patel (openERP) on 2014-05-30

[FIX] improved code to add tex lines properly

9478. By Turkesh Patel (openERP) on 2014-06-02

[IMP] replace code_sign field by tax_amount

9479. By Turkesh Patel (openERP) on 2014-06-02

[IMP]l10n_br, l10n_cn, l10n_gr, l10n_mx, l10n_tr, l10n_us: replace code_sign bt tax_amount

Unmerged revisions

9479. By Turkesh Patel (openERP) on 2014-06-02

[IMP]l10n_br, l10n_cn, l10n_gr, l10n_mx, l10n_tr, l10n_us: replace code_sign bt tax_amount

9478. By Turkesh Patel (openERP) on 2014-06-02

[IMP] replace code_sign field by tax_amount

9477. By Turkesh Patel (openERP) on 2014-05-30

[FIX] improved code to add tex lines properly

9476. By Turkesh Patel (openERP) on 2014-05-30

[IMP] improved code to map accounts in account.tax.lines

9475. By Turkesh Patel (openERP) on 2014-05-30

[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-new-account-tax-design-tpa-l10n-tpa , added account_id in tax templates

9474. By DJ Patel (OpenERP) on 2014-05-30

[FIX] l10n_ma : The value 'all' for the field 'account_tax_template.type' is not in the selection.

9473. By DJ Patel (OpenERP) on 2014-05-30

[FIX] l10n_ma : The value 'none' for the field 'account_tax_template.type' is not in the selection.

9472. By Turkesh Patel (openERP) on 2014-05-29

[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-new-account-tax-design-tpa-l10n-tpa

9471. By Turkesh Patel (openERP) on 2014-05-29

[FIX] fixed issue of tax_code_id. use new mapped id of code.

9470. By Turkesh Patel (openERP) on 2014-05-29

[IMP] improved 'configurable account chart template' taxes as per new model design. improved code to generate tax from tax template.

=== modified file 'account/__openerp__.py'
--- account/__openerp__.py	2014-04-29 15:41:04 +0000
+++ account/__openerp__.py	2014-06-02 10:31:27 +0000
@@ -162,6 +162,7 @@
         'test/account_period_close.yml',
         'test/account_use_model.yml',
         'test/account_validate_account_move.yml',
+        'test/account_tax_cal.yml',
         'test/test_edi_invoice.yml',
         'test/account_report.yml',
         'test/account_fiscalyear_close.yml', #last test, as it will definitively close the demo fiscalyear

=== modified file 'account/account.py'
--- account/account.py	2014-04-24 13:45:33 +0000
+++ account/account.py	2014-06-02 10:31:27 +0000
@@ -24,6 +24,8 @@
 from dateutil.relativedelta import relativedelta
 from operator import itemgetter
 import time
+from lxml import etree
+from openerp.report import report_sxw
 
 import openerp
 from openerp import SUPERUSER_ID
@@ -87,7 +89,7 @@
             if amt:
                 next_date = (datetime.strptime(date_ref, '%Y-%m-%d') + relativedelta(days=line.days))
                 if line.days2 < 0:
-                    next_first_date = next_date + relativedelta(day=1,months=1) #Getting 1st of next month
+                    next_first_date = next_date + relativedelta(day=1, months=1) #Getting 1st of next month
                     next_date = next_first_date + relativedelta(days=line.days2)
                 if line.days2 > 0:
                     next_date += relativedelta(day=line.days2, months=1)
@@ -120,11 +122,11 @@
         'days': 30,
         'days2': 0,
     }
-    _order = "value desc,days"
+    _order = "value desc, days"
 
     def _check_percent(self, cr, uid, ids, context=None):
         obj = self.browse(cr, uid, ids[0], context=context)
-        if obj.value == 'procent' and ( obj.value_amount < 0.0 or obj.value_amount > 1.0):
+        if obj.value == 'procent' and (obj.value_amount < 0.0 or obj.value_amount > 1.0):
             return False
         return True
 
@@ -239,7 +241,7 @@
                     continue
                 jour = self.pool.get('account.journal').browse(cr, uid, args[pos][2], context=context)
                 if (not (jour.account_control_ids or jour.type_control_ids)) or not args[pos][2]:
-                    args[pos] = ('type','not in',('consolidation','view'))
+                    args[pos] = ('type', 'not in', ('consolidation', 'view'))
                     continue
                 ids3 = map(lambda x: x.id, jour.type_control_ids)
                 ids1 = super(account_account, self).search(cr, uid, [('user_type', 'in', ids3)])
@@ -366,7 +368,7 @@
     def _get_company_currency(self, cr, uid, ids, field_name, arg, context=None):
         result = {}
         for rec in self.browse(cr, uid, ids, context=context):
-            result[rec.id] = (rec.company_id.currency_id.id,rec.company_id.currency_id.symbol)
+            result[rec.id] = (rec.company_id.currency_id.id, rec.company_id.currency_id.symbol)
         return result
 
     def _get_child_ids(self, cr, uid, ids, field_name, arg, context=None):
@@ -427,10 +429,10 @@
         if move_id:
             move = move_obj.browse(cr, uid, move_id[0], context=context)
             move_obj.write(cr, uid, move_id[0], {
-                name: diff+getattr(move,name)
+                name: diff + getattr(move, name)
             }, context=context)
         else:
-            if diff<0.0:
+            if diff < 0.0:
                 raise osv.except_osv(_('Error!'),_("Unable to adapt the initial balance (negative value)."))
             nameinv = (name=='credit' and 'debit') or 'credit'
             move_id = move_obj.create(cr, uid, {
@@ -452,7 +454,7 @@
             ('other', 'Regular'),
             ('receivable', 'Receivable'),
             ('payable', 'Payable'),
-            ('liquidity','Liquidity'),
+            ('liquidity', 'Liquidity'),
             ('consolidation', 'Consolidation'),
             ('closed', 'Closed'),
         ], 'Internal Type', required=True, help="The 'Internal Type' is used for features available on "\
@@ -648,7 +650,7 @@
         return True
 
     def _check_allow_type_change(self, cr, uid, ids, new_type, context=None):
-        restricted_groups = ['consolidation','view']
+        restricted_groups = ['consolidation', 'view']
         line_obj = self.pool.get('account.move.line')
         for account in self.browse(cr, uid, ids, context=context):
             old_type = account.type
@@ -687,7 +689,7 @@
             move_lines = self.pool.get('account.move.line').search(cr, uid, [('account_id', 'in', ids)])
             if move_lines:
                 # Allow the write if the value is the same
-                for i in [i['company_id'][0] for i in self.read(cr,uid,ids,['company_id'])]:
+                for i in [i['company_id'][0] for i in self.read(cr, uid, ids, ['company_id'])]:
                     if vals['company_id']!=i:
                         raise osv.except_osv(_('Warning!'), _('You cannot change the owner company of an account that already contains journal items.'))
         if 'active' in vals and not vals['active']:
@@ -729,7 +731,7 @@
         'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
         'entry_posted': fields.boolean('Autopost Created Moves', help='Check this box to automatically post entries of this journal. Note that legally, some entries may be automatically posted when the source document is validated (Invoices), whatever the status of this field.'),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"),
-        'allow_date':fields.boolean('Check Date in Period', help= 'If checked, the entry won\'t be created if the entry date is not included into the selected period'),
+        'allow_date': fields.boolean('Check Date in Period', help= 'If checked, the entry won\'t be created if the entry date is not included into the selected period'),
         'profit_account_id' : fields.many2one('account.account', 'Profit Account'),
         'loss_account_id' : fields.many2one('account.account', 'Loss Account'),
         'internal_account_id' : fields.many2one('account.account', 'Internal Transfers Account', select=1),
@@ -1130,7 +1132,7 @@
     _inherit = "account.fiscalyear"
     _description = "Fiscal Year"
     _columns = {
-        'end_journal_period_id':fields.many2one('account.journal.period','End of Year Entries Journal', readonly=True),
+        'end_journal_period_id': fields.many2one('account.journal.period','End of Year Entries Journal', readonly=True),
     }
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -1215,7 +1217,6 @@
             else:
                 if cond[1] in ['=like', 'like', 'not like', 'ilike', 'not ilike', 'in', 'not in', 'child_of']:
                     continue
-
             cr.execute("select move_id from account_move_line group by move_id having sum(debit) %s %%s" % (cond[1]),(amount,))
             res_ids = set(id[0] for id in cr.fetchall())
             ids = ids and (ids & res_ids) or res_ids
@@ -1242,7 +1243,7 @@
             }),
         'amount': fields.function(_amount_compute, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
         'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}, select=True),
-        'narration':fields.text('Internal Note'),
+        'narration': fields.text('Internal Note'),
         'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
         'balance': fields.float('balance', digits_compute=dp.get_precision('Account'), help="This is a field only used for internal purpose and shouldn't be displayed"),
     }
@@ -1790,7 +1791,7 @@
         'line_ids': fields.one2many('account.move.line', 'tax_code_id', 'Lines'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'sign': fields.float('Coefficent for parent', required=True, help='You can specify here the coefficient that will be used when consolidating the amount of this case into its parent. For example, set 1/-1 if you want to add/substract it.'),
-        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any tax related to this tax code to appear on invoices"),
+        'notprintable': fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any tax related to this tax code to appear on invoices"),
         'sequence': fields.integer('Sequence', help="Determine the display order in the report 'Accounting \ Reporting \ Generic Reporting \ Taxes \ Taxes Report'"),
     }
 
@@ -1839,6 +1840,7 @@
     ]
     _order = 'code'
 
+TAX_TYPE = [('percent', 'Percentage'), ('fixed', 'Fixed Amount'), ('group', 'Group of Tax'), ('code', 'Python Code'), ('percentage_price_include', 'Percentage based on price included amounts')]
 
 def get_precision_tax():
     def change_digit_tax(cr):
@@ -1850,10 +1852,10 @@
     """
     A tax object.
 
-    Type: percent, fixed, none, code
-        PERCENT: tax = price * amount
+    Type: percent, fixed, group, code
+        PERCENT: tax = price * amount / 100
         FIXED: tax = price + amount
-        NONE: no tax line
+        GROUP: tax = tax + .. + tax
         CODE: execute python code. localcontext = {'price_unit':pu}
             return result in the context
             Ex: result=round(price_unit*0.21,4)
@@ -1871,49 +1873,94 @@
     _columns = {
         'name': fields.char('Tax Name', size=64, required=True, translate=True, help="This name will be displayed on reports"),
         'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the tax lines from the lowest sequences to the higher ones. The order is important if you have a tax with several tax children. In this case, the evaluation order is important."),
-        'amount': fields.float('Amount', required=True, digits_compute=get_precision_tax(), help="For taxes of type percentage, enter % ratio between 0-1."),
+        'amount': fields.float('Tax Rate', required=True, digits_compute=get_precision_tax(), help="For taxes of type percentage, enter % between 0-100."),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the tax without removing it."),
-        'type': fields.selection( [('percent','Percentage'), ('fixed','Fixed Amount'), ('none','None'), ('code','Python Code'), ('balance','Balance')], 'Tax Type', required=True,
+        'type': fields.selection(TAX_TYPE, 'Type of Tax', required=True,
             help="The computation method for the tax amount."),
         'applicable_type': fields.selection( [('true','Always'), ('code','Given by Python Code')], 'Applicability', required=True,
             help="If not applicable (computed through a Python code), the tax won't appear on the invoice."),
-        'domain':fields.char('Domain', size=32, help="This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."),
-        'account_collected_id':fields.many2one('account.account', 'Invoice Tax Account', help="Set the account that will be set by default on invoice tax lines for invoices. Leave empty to use the expense account."),
-        'account_paid_id':fields.many2one('account.account', 'Refund Tax Account', help="Set the account that will be set by default on invoice tax lines for refunds. Leave empty to use the expense account."),
-        'account_analytic_collected_id':fields.many2one('account.analytic.account', 'Invoice Tax Analytic Account', help="Set the analytic account that will be used by default on the invoice tax lines for invoices. Leave empty if you don't want to use an analytic account on the invoice tax lines by default."),
-        'account_analytic_paid_id':fields.many2one('account.analytic.account', 'Refund Tax Analytic Account', help="Set the analytic account that will be used by default on the invoice tax lines for refunds. Leave empty if you don't want to use an analytic account on the invoice tax lines by default."),
-        'parent_id':fields.many2one('account.tax', 'Parent Tax Account', select=True),
-        'child_ids':fields.one2many('account.tax', 'parent_id', 'Child Tax Accounts'),
-        'child_depend':fields.boolean('Tax on Children', help="Set if the tax computation is based on the computation of child taxes rather than on the total amount."),
-        'python_compute':fields.text('Python Code'),
-        'python_compute_inv':fields.text('Python Code (reverse)'),
+        'python_compute': fields.text('Python Code (invoices)'),
+        'python_compute_inv': fields.text('Python Code (refunds)'),
         'python_applicable':fields.text('Applicable Code'),
-
-        #
-        # Fields used for the Tax declaration
-        #
-        'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the tax declaration."),
-        'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the tax declaration."),
-        'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1.", digits_compute=get_precision_tax()),
-        'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1.", digits_compute=get_precision_tax()),
-
-        # Same fields for refund invoices
-
-        'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the tax declaration."),
-        'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the tax declaration."),
-        'ref_base_sign': fields.float('Refund Base Code Sign', help="Usually 1 or -1.", digits_compute=get_precision_tax()),
-        'ref_tax_sign': fields.float('Refund Tax Code Sign', help="Usually 1 or -1.", digits_compute=get_precision_tax()),
         'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"),
         'company_id': fields.many2one('res.company', 'Company', required=True),
-        'description': fields.char('Tax Code'),
+        'description': fields.char('Display on Reports'),
         'price_include': fields.boolean('Tax Included in Price', help="Check this if the price you use on the product and invoices includes this tax."),
-        'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Application', required=True)
-
+        'type_tax_use': fields.selection([('sale', 'Sale'),('purchase', 'Purchase'),('all', 'All Documents')], 'Tax Application', required=True),
+        'parent_id': fields.many2one('account.tax', 'Parent Tax Account', select=True),
+        'child_ids': fields.one2many('account.tax', 'parent_id', 'Child Tax Accounts'),
+        'tax_invoice_line_ids': fields.one2many('account.tax.line', 'tax_id', 'Tax Invoice', domain=[('apply_on','=','invoice')]),
+        'tax_refund_line_ids': fields.one2many('account.tax.line', 'tax_id', 'Tax Refund', domain=[('apply_on','=','refund')]),
     }
+
+    def _check_base_line(self, cr, uid, ids, context=None):
+        tax = self.browse(cr, uid, ids[0], context=context)
+        base_count = 0
+        for tax_line in tax.tax_invoice_line_ids:
+            if tax_line.code_type == 'base':
+                base_count += 1
+                if base_count > 1: return False
+        return True
+
+    _constraints = [
+        (_check_base_line, "Code Type 'Base' should be used only once for tax lines.", ['tax_invoice_line_ids']),
+    ]
+
     _sql_constraints = [
         ('name_company_uniq', 'unique(name, company_id)', 'Tax Name must be unique per company!'),
     ]
 
+    def _compute_tax_amount_line(self, base_amount, tax_amount, tax_type, python_compute=None, product=None, partner=None):
+        if tax_type == 'percent':
+            tax_amount = base_amount * tax_amount / 100
+        elif tax_type == 'code':
+            localdict = {'price_unit': base_amount, 'product': product, 'partner': partner}
+            exec python_compute in localdict
+            if localdict.get('result', False):
+                tax_amount = localdict['result']
+        elif tax_type == 'fixed':
+            tax_amount = tax_amount
+        return base_amount, tax_amount
+
+    def onchange_tax_id(self, cr, uid, ids, tax_type, tax_amount, type_tax_use, python_compute=None, price_include=False, context=None):
+        if tax_type in ['group']:
+            return {}
+        base_amount, tax_amount = self._compute_tax_amount_line(100, tax_amount, tax_type, python_compute=python_compute)
+        if tax_type == 'percentage_price_include':
+            price_include = True
+        if tax_type in ('code','group'):
+            price_include = False
+        if price_include:
+            base_amount -= tax_amount
+        tax_invoice_line_ids = [{'code_type': 'base', 'apply_on': 'invoice', 'amount': 100, 'tax_amount': 100},
+                                {'code_type': 'tax', 'apply_on': 'invoice', 'amount': tax_amount, 'base_amount': base_amount, 'tax_amount': tax_amount}]
+        tax_refund_line_ids = [{'code_type': 'base', 'apply_on': 'refund', 'amount': 100, 'tax_amount': -100},
+                                {'code_type': 'tax', 'apply_on': 'refund', 'amount': tax_amount, 'base_amount': base_amount, 'tax_amount': -tax_amount}]
+        return {'value': {'price_include': price_include, 'tax_invoice_line_ids': tax_invoice_line_ids, 'tax_refund_line_ids': tax_refund_line_ids}}
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
+        if context is None:
+            context = {}
+        res = super(account_tax, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        rml_parser = report_sxw.rml_parse(cr, uid, 'tax_form_parser', context=context)
+        amount_str = rml_parser.formatLang(100, currency_obj=user.company_id.currency_id)
+        doc = etree.XML(res['arch'])
+        for node in doc.xpath("//label[@name='sale_excluded']"):
+            node.set('string', _('Journal Items for a %s sale (taxes excluded)') % (amount_str))
+        for node in doc.xpath("//label[@name='sale_included']"):
+            node.set('string', _('Journal Items for a %s sale (taxes included)') % (amount_str))
+        for node in doc.xpath("//label[@name='purchase_excluded']"):
+            node.set('string', _('Journal Items for a %s purchase (taxes excluded)') % (amount_str))
+        for node in doc.xpath("//label[@name='purchase_included']"):
+            node.set('string', _('Journal Items for a %s purchase (taxes included)') % (amount_str))
+        for node in doc.xpath("//label[@name='refund_excluded']"):
+            node.set('string', _('Journal Items for a %s refund (taxes excluded)') % (amount_str))
+        for node in doc.xpath("//label[@name='refund_included']"):
+            node.set('string', _('Journal Items for a %s refund (taxes included)') % (amount_str))
+        res['arch'] = etree.tostring(doc)
+        return res
+
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
         """
         Returns a list of tupples containing id, name, as internally it is called {def name_get}
@@ -1938,9 +1985,16 @@
         ids = self.search(cr, user, expression.AND([domain, args]), limit=limit, context=context)
         return self.name_get(cr, user, ids, context=context)
 
+    def create(self, cr, uid, vals, context=None):
+        if vals.get('type', False) and vals['type'] == 'percentage_price_include':
+            vals.update({'price_include': True})
+        return super(account_tax, self).create(cr, uid, vals, context=context)
+
     def write(self, cr, uid, ids, vals, context=None):
         if vals.get('type', False) and vals['type'] in ('none', 'code'):
             vals.update({'amount': 0.0})
+        if vals.get('type', False) and vals['type'] == 'percentage_price_include':
+            vals.update({'price_include': True})
         return super(account_tax, self).write(cr, uid, ids, vals, context=context)
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
@@ -1957,8 +2011,7 @@
         if context.get('journal_id'):
             journal = journal_pool.browse(cr, uid, context.get('journal_id'))
             if journal.type in ('sale', 'purchase'):
-                args += [('type_tax_use','in',[journal.type,'all'])]
-
+                args += [('type_tax_use', 'in', [journal.type, 'all'])]
         return super(account_tax, self).search(cr, uid, args, offset, limit, order, context, count)
 
     def name_get(self, cr, uid, ids, context=None):
@@ -1978,18 +2031,14 @@
 
     _defaults = {
         'python_compute': '''# price_unit\n# or False\n# product: product.product object or None\n# partner: res.partner object or None\n\nresult = price_unit * 0.10''',
-        'python_compute_inv': '''# price_unit\n# product: product.product object or False\n\nresult = price_unit * 0.10''',
         'applicable_type': 'true',
+        'python_applicable': '''# price_unit\n# product: product.product object or None\n# partner: res.partner object or None\n\nif price_unit >= 1000:\n    result = True''',
         'type': 'percent',
         'amount': 0,
         'price_include': 0,
         'active': 1,
         'type_tax_use': 'all',
         'sequence': 1,
-        'ref_tax_sign': 1,
-        'ref_base_sign': 1,
-        'tax_sign': 1,
-        'base_sign': 1,
         'include_base_amount': False,
         'company_id': _default_company,
     }
@@ -1998,7 +2047,7 @@
     def _applicable(self, cr, uid, taxes, price_unit, product=None, partner=None):
         res = []
         for tax in taxes:
-            if tax.applicable_type=='code':
+            if tax.applicable_type == 'code':
                 localdict = {'price_unit':price_unit, 'product':product, 'partner':partner}
                 exec tax.python_applicable in localdict
                 if localdict.get('result', False):
@@ -2007,73 +2056,49 @@
                 res.append(tax)
         return res
 
-    def _unit_compute(self, cr, uid, taxes, price_unit, product=None, partner=None, quantity=0):
+    def _unit_compute(self, cr, uid, taxes, price_unit, product=None, partner=None, date=None, apply_on='invoice'):
+        #apply_on: invoice or refund
         taxes = self._applicable(cr, uid, taxes, price_unit ,product, partner)
         res = []
-        cur_price_unit=price_unit
+        cur_price_unit = price_unit
         for tax in taxes:
-            # we compute the amount for the current tax object and append it to the result
-            data = {'id':tax.id,
-                    'name':tax.description and tax.description + " - " + tax.name or tax.name,
-                    'account_collected_id':tax.account_collected_id.id,
-                    'account_paid_id':tax.account_paid_id.id,
-                    'account_analytic_collected_id': tax.account_analytic_collected_id.id,
-                    'account_analytic_paid_id': tax.account_analytic_paid_id.id,
-                    'base_code_id': tax.base_code_id.id,
-                    'ref_base_code_id': tax.ref_base_code_id.id,
-                    'sequence': tax.sequence,
-                    'base_sign': tax.base_sign,
-                    'tax_sign': tax.tax_sign,
-                    'ref_base_sign': tax.ref_base_sign,
-                    'ref_tax_sign': tax.ref_tax_sign,
-                    'price_unit': cur_price_unit,
-                    'tax_code_id': tax.tax_code_id.id,
-                    'ref_tax_code_id': tax.ref_tax_code_id.id,
-            }
-            res.append(data)
-            if tax.type=='percent':
-                amount = cur_price_unit * tax.amount
-                data['amount'] = amount
-
-            elif tax.type=='fixed':
-                data['amount'] = tax.amount
-                data['tax_amount']=quantity
-               # data['amount'] = quantity
-            elif tax.type=='code':
-                localdict = {'price_unit':cur_price_unit, 'product':product, 'partner':partner}
-                exec tax.python_compute in localdict
-                amount = localdict['result']
-                data['amount'] = amount
-            elif tax.type=='balance':
-                data['amount'] = cur_price_unit - reduce(lambda x,y: y.get('amount',0.0)+x, res, 0.0)
-                data['balance'] = cur_price_unit
-
-            amount2 = data.get('amount', 0.0)
-            if tax.child_ids:
-                if tax.child_depend:
-                    latest = res.pop()
-                amount = amount2
-                child_tax = self._unit_compute(cr, uid, tax.child_ids, amount, product, partner, quantity)
-                res.extend(child_tax)
-                if tax.child_depend:
-                    for r in res:
-                        for name in ('base','ref_base'):
-                            if latest[name+'_code_id'] and latest[name+'_sign'] and not r[name+'_code_id']:
-                                r[name+'_code_id'] = latest[name+'_code_id']
-                                r[name+'_sign'] = latest[name+'_sign']
-                                r['price_unit'] = latest['price_unit']
-                                latest[name+'_code_id'] = False
-                        for name in ('tax','ref_tax'):
-                            if latest[name+'_code_id'] and latest[name+'_sign'] and not r[name+'_code_id']:
-                                r[name+'_code_id'] = latest[name+'_code_id']
-                                r[name+'_sign'] = latest[name+'_sign']
-                                r['amount'] = data['amount']
-                                latest[name+'_code_id'] = False
-            if tax.include_base_amount:
-                cur_price_unit+=amount2
+            tax_lines = []
+            if apply_on == 'invoice':
+                tax_lines = tax.tax_invoice_line_ids
+            if apply_on == 'refund':
+                tax_lines = tax.tax_refund_line_ids
+            if tax.type == 'group':
+                for child in tax.child_ids: #get child order by sequence
+                    child_tax = self._unit_compute(cr, uid, [child], cur_price_unit, product=product, partner=partner, date=date, apply_on=apply_on)
+                    for rec in child_tax:
+                        if rec.get('code_type') == 'tax' and child.include_base_amount:
+                            cur_price_unit += rec.get('amount', 0.0)
+                        if rec.get('code_type') == 'tax' and child.price_include:
+                            cur_price_unit -= rec.get('amount', 0.0)
+                            rec['price_include_in_group'] = True
+                    res.extend(child_tax)
+            elif tax_lines:
+                amt = 0
+                for tax_line in tax_lines:
+                    if tax_line.code_type == 'base' and (tax_line.tax_id.type == 'percent' or tax_line.tax_id.type == 'fixed' or tax_line.tax_id.type == 'percentage_price_include') and tax_line.tax_id.price_include:
+                        amt = tax_line.amount
+                    data = tax_line.compute(price_unit, amt, date=date)
+                    data[0]['todo'] = 0
+                    if tax.price_include:
+                        data[0]['todo'] = 1
+                    res.extend(data)
+            else:
+                raise osv.except_osv(_('No Tax lines !'),_("You must define Tax lines !"))
+        total = 0.0
+        for r in res:
+            if r['todo'] and r['code_type'] == 'tax':
+                total += r['amount']
+                r['todo'] = 0
+        for r in res:
+            r['price_unit'] -= total
         return res
 
-    def compute_all(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, force_excluded=False):
+    def compute_all(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, precision=None, date=None, apply_on='invoice', force_excluded=False):
         """
         :param force_excluded: boolean used to say that we don't want to consider the value of field price_include of
             tax. It's used in encoding by line where you don't matter if you encoded a tax with that boolean to True or
@@ -2084,7 +2109,6 @@
                 'taxes': []                  # List of taxes, see compute for the format
             }
         """
-
         # By default, for each tax, tax amount will first be computed
         # and rounded at the 'Account' decimal precision for each
         # PO/SO/invoice line and then these rounded amounts will be
@@ -2106,144 +2130,114 @@
                 tex.append(tax)
             else:
                 tin.append(tax)
-        tin = self.compute_inv(cr, uid, tin, price_unit, quantity, product=product, partner=partner, precision=tax_compute_precision)
+        tin = self._compute(cr, uid, tin, price_unit, quantity, product=product, \
+                               partner=partner, precision=tax_compute_precision, date=date, apply_on=apply_on)
         for r in tin:
-            totalex -= r.get('amount', 0.0)
+            if r.get('code_type') == 'tax':
+                totalex -= r.get('amount', 0.0)
         totlex_qty = 0.0
         try:
             totlex_qty = totalex/quantity
         except:
             pass
-        tex = self._compute(cr, uid, tex, totlex_qty, quantity, product=product, partner=partner, precision=tax_compute_precision)
+        tex = self._compute(cr, uid, tex, totlex_qty, quantity, product=product, \
+                            partner=partner, precision=tax_compute_precision, date=date, apply_on=apply_on)
         for r in tex:
-            totalin += r.get('amount', 0.0)
+            if r.get('code_type') == 'tax':
+                totalin += r.get('amount', 0.0)
+            #special case of group tax which will have child tax with include price option
+            if r.get('code_type') == 'tax' and r.get('price_include_in_group', False):
+                totalex -= r.get('amount', 0.0)
         return {
             'total': totalex,
             'total_included': totalin,
             'taxes': tin + tex
         }
 
-    def compute(self, cr, uid, taxes, price_unit, quantity,  product=None, partner=None):
+    def compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, date=None, apply_on='invoice', context=None):
         _logger.warning("Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included.")
-        return self._compute(cr, uid, taxes, price_unit, quantity, product, partner)
+        return self._compute(cr, uid, taxes, price_unit, quantity, product, partner, date=date, apply_on=apply_on, context=context)
 
-    def _compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, precision=None):
+    def _compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, precision=None, date=None, apply_on='invoice', context=None):
         """
         Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
 
         RETURN:
             [ tax ]
-            tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
+            tax = {'name':'', 'amount':0.0}
             one tax for each tax id in IDS and their children
         """
         if not precision:
             precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
-        res = self._unit_compute(cr, uid, taxes, price_unit, product, partner, quantity)
+        taxes = self._unit_compute(cr, uid, taxes, price_unit, product=product, partner=partner, date=date, apply_on=apply_on)
         total = 0.0
-        for r in res:
+        for r in taxes:
             if r.get('balance',False):
                 r['amount'] = round(r.get('balance', 0.0) * quantity, precision) - total
             else:
                 r['amount'] = round(r.get('amount', 0.0) * quantity, precision)
                 total += r['amount']
-        return res
-
-    def _unit_compute_inv(self, cr, uid, taxes, price_unit, product=None, partner=None):
-        taxes = self._applicable(cr, uid, taxes, price_unit,  product, partner)
-        res = []
-        taxes.reverse()
-        cur_price_unit = price_unit
-
-        tax_parent_tot = 0.0
-        for tax in taxes:
-            if (tax.type=='percent') and not tax.include_base_amount:
-                tax_parent_tot += tax.amount
-
-        for tax in taxes:
-            if (tax.type=='fixed') and not tax.include_base_amount:
-                cur_price_unit -= tax.amount
-
-        for tax in taxes:
-            if tax.type=='percent':
-                if tax.include_base_amount:
-                    amount = cur_price_unit - (cur_price_unit / (1 + tax.amount))
-                else:
-                    amount = (cur_price_unit / (1 + tax_parent_tot)) * tax.amount
-
-            elif tax.type=='fixed':
-                amount = tax.amount
-
-            elif tax.type=='code':
-                localdict = {'price_unit':cur_price_unit, 'product':product, 'partner':partner}
-                exec tax.python_compute_inv in localdict
-                amount = localdict['result']
-            elif tax.type=='balance':
-                amount = cur_price_unit - reduce(lambda x,y: y.get('amount',0.0)+x, res, 0.0)
-
-            if tax.include_base_amount:
-                cur_price_unit -= amount
-                todo = 0
-            else:
-                todo = 1
-            res.append({
-                'id': tax.id,
-                'todo': todo,
-                'name': tax.name,
-                'amount': amount,
-                'account_collected_id': tax.account_collected_id.id,
-                'account_paid_id': tax.account_paid_id.id,
-                'account_analytic_collected_id': tax.account_analytic_collected_id.id,
-                'account_analytic_paid_id': tax.account_analytic_paid_id.id,
-                'base_code_id': tax.base_code_id.id,
-                'ref_base_code_id': tax.ref_base_code_id.id,
-                'sequence': tax.sequence,
-                'base_sign': tax.base_sign,
-                'tax_sign': tax.tax_sign,
-                'ref_base_sign': tax.ref_base_sign,
-                'ref_tax_sign': tax.ref_tax_sign,
-                'price_unit': cur_price_unit,
-                'tax_code_id': tax.tax_code_id.id,
-                'ref_tax_code_id': tax.ref_tax_code_id.id,
-            })
-            if tax.child_ids:
-                if tax.child_depend:
-                    del res[-1]
-                    amount = price_unit
-
-            parent_tax = self._unit_compute_inv(cr, uid, tax.child_ids, amount, product, partner)
-            res.extend(parent_tax)
-
-        total = 0.0
-        for r in res:
-            if r['todo']:
-                total += r['amount']
-        for r in res:
-            r['price_unit'] -= total
-            r['todo'] = 0
-        return res
-
-    def compute_inv(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, precision=None):
-        """
-        Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
-        Price Unit is a Tax included price
-
-        RETURN:
-            [ tax ]
-            tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
-            one tax for each tax id in IDS and their children
-        """
-        if not precision:
-            precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
-        res = self._unit_compute_inv(cr, uid, taxes, price_unit, product, partner=None)
-        total = 0.0
-        for r in res:
-            if r.get('balance',False):
-                r['amount'] = round(r['balance'] * quantity, precision) - total
-            else:
-                r['amount'] = round(r['amount'] * quantity, precision)
-                total += r['amount']
-        return res
-
+        return taxes
+
+class AccountTaxLine(osv.Model):
+    _name = 'account.tax.line'
+
+    def compute(self, cr, uid, ids, price_unit, amt, date=None, context=None):
+        if date is None:
+            date = fields.date.context_today(self, cr, uid, context=context)
+        taxes = []
+        for tax_line in self.browse(cr, uid, ids, context=context):
+            if tax_line.code_type == 'tax' and tax_line.tax_id.type == 'fixed':
+                amount = tax_line.amount
+                price_unit = tax_line.tax_id.price_include and amt == tax_line.base_amount and tax_line.base_amount or price_unit
+            elif amt and amt == tax_line.base_amount:
+                amount = (tax_line.amount / 100) * price_unit
+            elif tax_line.code_type == 'base':
+                amount = (tax_line.amount / 100) * price_unit
+            else:
+                amount = (tax_line.tax_id.price_include or amt != tax_line.base_amount) and (tax_line.amount / 100) * price_unit * (tax_line.base_amount / 100) or (tax_line.amount / 100) * price_unit
+            taxes.append({
+                        'name': tax_line.description and tax_line.description + " - " + tax_line.tax_id.name or tax_line.tax_id.name,
+                        'sequence': tax_line.sequence,
+                        'tax_id': tax_line.tax_id.id,
+                        'code_id': tax_line.code_id and tax_line.code_id.id or False,
+                        'account_id': tax_line.account_id and tax_line.account_id.id or False,
+                        'analytic_account_id': tax_line.analytic_account_id and tax_line.analytic_account_id.id or False,
+                        'price_unit': price_unit,
+                        'code_type': tax_line.code_type,
+                        'tax_amount': tax_line.tax_amount,
+                        'amount': amount or 0.0,
+                        'base_amount': tax_line.base_amount or False,
+                        })
+        return taxes
+
+    _columns = {
+        'code_type': fields.selection([('base','Base'),('tax','Tax')], "Code Type"),
+        'tax_amount': fields.float('Amount to report in the Tax Statement', help="Amount to report in the Tax Statement."),
+        'apply_on': fields.selection([('invoice','Invoice'),('refund','Refund')], "Apply On", required=True),
+        'code_id': fields.many2one('account.tax.code', 'Section in the Tax Statement', help="Use this code for the tax declaration."),
+        'account_id': fields.many2one('account.account', 'Tax Account', help="Set the account that will be set by default on invoice tax lines for invoices or refund. Leave empty to use the expense account."),
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Tax Analytic Account', help="Set the analytic account that will be used by default on the invoice tax lines for invoices or Refunds. Leave empty if you don't want to use an analytic account on the invoice tax lines by default."),
+        'amount': fields.float('Tax/Base Amount', required=True, digits_compute=dp.get_precision('Account')),
+        'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the tax lines from the lowest sequences to the higher ones. The order is important if you have a tax with several tax children. In this case, the evaluation order is important."),
+        'tax_id': fields.many2one('account.tax','Tax', ondelete="cascade"),
+        'company_id': fields.related('tax_id','company_id', type='many2one', relation='res.company', string='Company'),
+        'description': fields.char('Display'),
+        'base_amount': fields.float('Base for Computation', help="Use this to define different base amount for current tax line"),
+        #will remove after conformation.
+        'code_sign': fields.float('Amount to report in the Tax Statement', help="Amount to report in the Tax Statement."),
+    }
+    _defaults = {
+        'sequence': 1,
+        'code_type': 'base',
+        'tax_amount': 1,
+        'apply_on': 'invoice',
+        'base_amount': 100.0,
+    }
+    _order = 'sequence'
+
+    def onchange_amount(self, cr, uid, ids, amount=False, context=None):
+        return {'value': {'tax_amount': context and 'default_apply_on' in context and context['default_apply_on'] == 'refund' and -amount or amount}}
 
 # ---------------------------------------------------------
 # Account Entries Models
@@ -2516,7 +2510,7 @@
         'shortcut': fields.char('Shortcut', size=12),
         'note': fields.text('Note'),
         'parent_id': fields.many2one('account.account.template', 'Parent Account Template', ondelete='cascade', domain=[('type','=','view')]),
-        'child_parent_ids':fields.one2many('account.account.template', 'parent_id', 'Children'),
+        'child_parent_ids': fields.one2many('account.account.template', 'parent_id', 'Children'),
         'tax_ids': fields.many2many('account.tax.template', 'account_account_template_tax_rel', 'account_id', 'tax_id', 'Default Taxes'),
         'nocreate': fields.boolean('Optional create', help="If checked, the new chart of accounts will not contain this by default."),
         'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', help="This optional field allow you to link an account template to a specific chart template that may differ from the one its root parent belongs to. This allow you to define chart templates that extend another and complete it with few new accounts (You don't need to define the whole structure that is common to both several times)."),
@@ -2634,7 +2628,7 @@
         return res and res[0] or False
 
     _columns = {
-        'cparent_id':fields.many2one('account.account', 'Parent target', help="Creates an account with the selected template under this existing parent.", required=True),
+        'cparent_id': fields.many2one('account.account', 'Parent target', help="Creates an account with the selected template under this existing parent.", required=True),
     }
     _defaults = {
         'cparent_id': _get_def_cparent,
@@ -2680,7 +2674,7 @@
         'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True),
         'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Child Codes'),
         'sign': fields.float('Sign For Parent', required=True),
-        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any tax related to this tax Code to appear on invoices."),
+        'notprintable': fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any tax related to this tax Code to appear on invoices."),
     }
 
     _defaults = {
@@ -2770,48 +2764,117 @@
         'complete_tax_set': True,
     }
 
+class AccountTaxLineTemplate(osv.Model):
+    _name = 'account.tax.line.template'
+    _order = 'sequence'
+
+    _columns = {
+        'code_type': fields.selection([('base','Base'),('tax','Tax')], "Code Type"),
+        'tax_amount': fields.float('Amount to report in the Tax Statement', help="Amount to report in the Tax Statement."),
+        'apply_on': fields.selection([('invoice','Invoice'),('refund','Refund')], "Apply On", required=True),
+        'code_id': fields.many2one('account.tax.code.template', 'Section in the Tax Statement', help="Use this code for the tax declaration."),
+        'account_id': fields.many2one('account.account.template', 'Tax Account', help="Set the account that will be set by default on invoice tax lines for invoices or refund. Leave empty to use the expense account."),
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Tax Analytic Account', help="Set the analytic account that will be used by default on the invoice tax lines for invoices or Refunds. Leave empty if you don't want to use an analytic account on the invoice tax lines by default."),
+        'amount': fields.float('Tax/Base Amount', required=True, digits_compute=dp.get_precision('Account')),
+        'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the tax lines from the lowest sequences to the higher ones. The order is important if you have a tax with several tax children. In this case, the evaluation order is important."),
+        'tax_id': fields.many2one('account.tax.template','Tax', ondelete="cascade"),
+        'description': fields.char('Display'),
+        'base_amount': fields.float('Base for Computation', help="Use this to define different base amount for current tax line"),
+        #will remove after confirmation.
+        'code_sign': fields.float('Amount to report in the Tax Statement', help="Amount to report in the Tax Statement."),
+    }
+    _defaults = {
+        'sequence': 1,
+        'code_type': 'base',
+        'tax_amount': 1,
+        'apply_on': 'invoice',
+        'base_amount': 100.0,
+    }
+
+    def onchange_amount(self, cr, uid, ids, amount=False, context=None):
+        return {'value': {'tax_amount': context and 'default_apply_on' in context and context['default_apply_on'] == 'refund' and -amount or amount}}
+
+    def generate_tax_line(self, cr, uid, line_ids, tax_code_template_ref, context=None):
+        """
+        This method for generating lines from templates.
+        """
+        if context is None:
+            context = {}
+        tax_lines, line_accounts = [], {}
+        obj_tax_line = self.pool.get('account.tax.line')
+        for tax_line in line_ids:
+            vals = {
+                'code_type': tax_line.code_type,
+                'tax_amount': tax_line.tax_amount,
+                'amount': tax_line.amount,
+                'apply_on': tax_line.apply_on,
+                'code_id': tax_line.code_id and ((tax_line.code_id.id in tax_code_template_ref) and tax_code_template_ref[tax_line.code_id.id]) or False,
+                'analytic_account_id': tax_line.analytic_account_id.id,
+                'sequence': tax_line.sequence,
+                'description': tax_line.description,
+                'base_amount': tax_line.base_amount,
+            }
+            new_line = obj_tax_line.create(cr, uid, vals, context=context)
+            line_accounts[new_line] = tax_line.account_id and tax_line.account_id.id or False
+            tax_lines.append(new_line)
+        return { 'tax_lines' : tax_lines, 'line_accounts': line_accounts}
 
 class account_tax_template(osv.osv):
-
     _name = 'account.tax.template'
     _description = 'Templates for Taxes'
 
     _columns = {
-        'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
-        'name': fields.char('Tax Name', size=64, required=True),
-        'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the taxes lines from lower sequences to higher ones. The order is important if you have a tax that has several tax children. In this case, the evaluation order is important."),
-        'amount': fields.float('Amount', required=True, digits_compute=get_precision_tax(), help="For Tax Type percent enter % ratio between 0-1."),
-        'type': fields.selection( [('percent','Percent'), ('fixed','Fixed'), ('none','None'), ('code','Python Code'), ('balance','Balance')], 'Tax Type', required=True),
-        'applicable_type': fields.selection( [('true','True'), ('code','Python Code')], 'Applicable Type', required=True, help="If not applicable (computed through a Python code), the tax won't appear on the invoice."),
-        'domain':fields.char('Domain', size=32, help="This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."),
-        'account_collected_id':fields.many2one('account.account.template', 'Invoice Tax Account'),
-        'account_paid_id':fields.many2one('account.account.template', 'Refund Tax Account'),
-        'parent_id':fields.many2one('account.tax.template', 'Parent Tax Account', select=True),
-        'child_depend':fields.boolean('Tax on Children', help="Set if the tax computation is based on the computation of child taxes rather than on the total amount."),
-        'python_compute':fields.text('Python Code'),
-        'python_compute_inv':fields.text('Python Code (reverse)'),
+        'name': fields.char('Tax Name', size=64, required=True, translate=True, help="This name will be displayed on reports"),
+        'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the tax lines from the lowest sequences to the higher ones. The order is important if you have a tax with several tax children. In this case, the evaluation order is important."),
+        'amount': fields.float('Tax Rate', required=True, digits_compute=get_precision_tax(), help="For taxes of type percentage, enter % between 0-100."),
+        'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the tax without removing it."),
+        'type': fields.selection(TAX_TYPE, 'Type of Tax', required=True,
+            help="The computation method for the tax amount."),
+        'applicable_type': fields.selection( [('true','Always'), ('code','Given by Python Code')], 'Applicability', required=True,
+            help="If not applicable (computed through a Python code), the tax won't appear on the invoice."),
+        'python_compute': fields.text('Python Code (invoices)'),
+        'python_compute_inv': fields.text('Python Code (refunds)'),
         'python_applicable':fields.text('Applicable Code'),
-
-        #
-        # Fields used for the Tax declaration
-        #
-        'base_code_id': fields.many2one('account.tax.code.template', 'Base Code', help="Use this code for the tax declaration."),
-        'tax_code_id': fields.many2one('account.tax.code.template', 'Tax Code', help="Use this code for the tax declaration."),
-        'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
-        'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
-
-        # Same fields for refund invoices
-
-        'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the tax declaration."),
-        'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the tax declaration."),
-        'ref_base_sign': fields.float('Refund Base Code Sign', help="Usually 1 or -1."),
-        'ref_tax_sign': fields.float('Refund Tax Code Sign', help="Usually 1 or -1."),
-        'include_base_amount': fields.boolean('Include in Base Amount', help="Set if the amount of tax must be included in the base amount before computing the next taxes."),
-        'description': fields.char('Internal Name'),
-        'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Use In', required=True,),
+        'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"),
+        'description': fields.char('Display on Reports'),
         'price_include': fields.boolean('Tax Included in Price', help="Check this if the price you use on the product and invoices includes this tax."),
+        'type_tax_use': fields.selection([('sale', 'Sale'),('purchase', 'Purchase'),('all', 'All Documents')], 'Tax Application', required=True),
+        'parent_id': fields.many2one('account.tax.template', 'Parent Tax Account', select=True),
+        'child_ids': fields.one2many('account.tax.template', 'parent_id', 'Child Tax Accounts'),
+        'tax_invoice_line_ids': fields.one2many('account.tax.line.template', 'tax_id', 'Tax Invoice', domain=[('apply_on','=','invoice')]),
+        'tax_refund_line_ids': fields.one2many('account.tax.line.template', 'tax_id', 'Tax Refund', domain=[('apply_on','=','refund')]),
+        'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
     }
 
+    def _compute_tax_amount_line(self, base_amount, tax_amount, tax_type, python_compute=None, product=None, partner=None):
+        if tax_type == 'percent':
+            tax_amount = base_amount * tax_amount / 100
+        elif tax_type == 'code':
+            localdict = {'price_unit': base_amount, 'product': product, 'partner': partner}
+            exec python_compute in localdict
+            if localdict.get('result', False):
+                tax_amount = localdict['result']
+        elif tax_type == 'fixed':
+            tax_amount = tax_amount
+        return base_amount, tax_amount
+
+    def onchange_tax_id(self, cr, uid, ids, tax_type, tax_amount, type_tax_use, python_compute=None, price_include=False, context=None):
+        if tax_type in ['group']:
+            return {}
+        base_amount, tax_amount = self._compute_tax_amount_line(100, tax_amount, tax_type, python_compute=python_compute)
+        if tax_type == 'percentage_price_include':
+            price_include = True
+        if tax_type in ('code','group'):
+            price_include = False
+        if price_include:
+            base_amount -= tax_amount
+        tax_invoice_line_ids = [{'code_type': 'base', 'apply_on': 'invoice', 'amount': 100, 'tax_amount': 100},
+                                {'code_type': 'tax', 'apply_on': 'invoice', 'amount': tax_amount, 'base_amount': base_amount, 'tax_amount': tax_amount}]
+        tax_refund_line_ids = [{'code_type': 'base', 'apply_on': 'refund', 'amount': 100, 'tax_amount': -100},
+                                {'code_type': 'tax', 'apply_on': 'refund', 'amount': tax_amount, 'base_amount': base_amount, 'tax_amount': -tax_amount}]
+        return {'value': {'price_include': price_include, 'tax_invoice_line_ids': tax_invoice_line_ids, 'tax_refund_line_ids': tax_refund_line_ids}}
+
+
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []
@@ -2829,19 +2892,17 @@
 
     _defaults = {
         'python_compute': lambda *a: '''# price_unit\n# product: product.product object or None\n# partner: res.partner object or None\n\nresult = price_unit * 0.10''',
-        'python_compute_inv': lambda *a: '''# price_unit\n# product: product.product object or False\n\nresult = price_unit * 0.10''',
         'applicable_type': 'true',
+        'python_applicable': '''# price_unit\n# product: product.product object or None\n# partner: res.partner object or None\n\nif price_unit >= 1000:\n    result = True''',
         'type': 'percent',
         'amount': 0,
         'sequence': 1,
-        'ref_tax_sign': 1,
-        'ref_base_sign': 1,
-        'tax_sign': 1,
-        'base_sign': 1,
         'include_base_amount': False,
         'type_tax_use': 'all',
         'price_include': 0,
+        'active': True,
     }
+
     _order = 'sequence'
 
     def _generate_tax(self, cr, uid, tax_templates, tax_code_template_ref, company_id, context=None):
@@ -2862,44 +2923,35 @@
         res = {}
         todo_dict = {}
         tax_template_to_tax = {}
+        tax_obj = self.pool.get('account.tax')
+        obj_tax_line_temp = self.pool.get('account.tax.line.template')
         for tax in tax_templates:
+            #Generate tax lines
+            tax_invoice_lines = obj_tax_line_temp.generate_tax_line(cr, uid, tax.tax_invoice_line_ids, tax_code_template_ref, context=context)
+            todo_dict.update(tax_invoice_lines['line_accounts'])
+            tax_refund_lines = obj_tax_line_temp.generate_tax_line(cr, uid, tax.tax_refund_line_ids, tax_code_template_ref, context=context)
+            todo_dict.update(tax_refund_lines['line_accounts'])
             vals_tax = {
-                'name':tax.name,
+                'name': tax.name,
                 'sequence': tax.sequence,
                 'amount': tax.amount,
                 'type': tax.type,
                 'applicable_type': tax.applicable_type,
-                'domain': tax.domain,
                 'parent_id': tax.parent_id and ((tax.parent_id.id in tax_template_to_tax) and tax_template_to_tax[tax.parent_id.id]) or False,
-                'child_depend': tax.child_depend,
                 'python_compute': tax.python_compute,
-                'python_compute_inv': tax.python_compute_inv,
                 'python_applicable': tax.python_applicable,
-                'base_code_id': tax.base_code_id and ((tax.base_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.base_code_id.id]) or False,
-                'tax_code_id': tax.tax_code_id and ((tax.tax_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.tax_code_id.id]) or False,
-                'base_sign': tax.base_sign,
-                'tax_sign': tax.tax_sign,
-                'ref_base_code_id': tax.ref_base_code_id and ((tax.ref_base_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.ref_base_code_id.id]) or False,
-                'ref_tax_code_id': tax.ref_tax_code_id and ((tax.ref_tax_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.ref_tax_code_id.id]) or False,
-                'ref_base_sign': tax.ref_base_sign,
-                'ref_tax_sign': tax.ref_tax_sign,
                 'include_base_amount': tax.include_base_amount,
                 'description': tax.description,
-                'company_id': company_id,
                 'type_tax_use': tax.type_tax_use,
-                'price_include': tax.price_include
+                'price_include': tax.price_include,
+                'tax_invoice_line_ids': [(4, line) for line in tax_invoice_lines['tax_lines']],
+                'tax_refund_line_ids': [(4, line) for line in tax_refund_lines['tax_lines']],
             }
-            new_tax = self.pool.get('account.tax').create(cr, uid, vals_tax)
+            new_tax = tax_obj.create(cr, uid, vals_tax)
             tax_template_to_tax[tax.id] = new_tax
-            #as the accounts have not been created yet, we have to wait before filling these fields
-            todo_dict[new_tax] = {
-                'account_collected_id': tax.account_collected_id and tax.account_collected_id.id or False,
-                'account_paid_id': tax.account_paid_id and tax.account_paid_id.id or False,
-            }
         res.update({'tax_template_to_tax': tax_template_to_tax, 'account_dict': todo_dict})
         return res
 
-
 # Fiscal Position Templates
 
 class account_fiscal_position_template(osv.osv):
@@ -2991,12 +3043,12 @@
     _inherit = 'res.config'
 
     _columns = {
-        'company_id':fields.many2one('res.company', 'Company', required=True),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
         'currency_id': fields.many2one('res.currency', 'Currency', help="Currency as per company's country."),
         'only_one_chart_template': fields.boolean('Only One Chart Template Available'),
         'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
         'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Cash and Banks', required=True),
-        'code_digits':fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"),
+        'code_digits': fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"),
         "sale_tax": fields.many2one("account.tax.template", "Default Sale Tax"),
         "purchase_tax": fields.many2one("account.tax.template", "Default Purchase Tax"),
         'sale_tax_rate': fields.float('Sales Tax(%)'),
@@ -3322,12 +3374,14 @@
         account_ref.update(account_template_ref)
 
         # writing account values on tax after creation of accounts
-        for key,value in generated_tax_res['account_dict'].items():
-            if value['account_collected_id'] or value['account_paid_id']:
-                obj_acc_tax.write(cr, uid, [key], {
-                    'account_collected_id': account_ref.get(value['account_collected_id'], False),
-                    'account_paid_id': account_ref.get(value['account_paid_id'], False),
-                })
+        for key,value in generated_tax_res['tax_template_to_tax'].items():
+            tax = obj_acc_tax.browse(cr, uid, value)
+            for invoice_tax_line in tax.tax_invoice_line_ids:
+                if invoice_tax_line.code_type == 'tax':
+                    invoice_tax_line.write({'account_id': account_ref.get(generated_tax_res['account_dict'][invoice_tax_line.id], False)})
+            for refund_tax_line in tax.tax_refund_line_ids:
+                if refund_tax_line.code_type == 'tax':
+                    refund_tax_line.write({'account_id': account_ref.get(generated_tax_res['account_dict'][refund_tax_line.id], False)})
 
         # Create Journals
         self.generate_journals(cr, uid, template_id, account_ref, company_id, context=context)
@@ -3423,7 +3477,6 @@
         '''
         obj_data = self.pool.get('ir.model.data')
         obj_journal = self.pool.get('account.journal')
-        
 
         # we need to loop again to find next number for journal code
         # because we can't rely on the value current_num as,
@@ -3450,7 +3503,6 @@
         }
         if line['currency_id']:
             vals['currency'] = line['currency_id']
-        
         return vals
 
     def _prepare_bank_account(self, cr, uid, line, new_code, acc_template_ref, ref_acc_bank, company_id, context=None):

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2014-05-07 17:01:12 +0000
+++ account/account_invoice.py	2014-06-02 10:31:27 +0000
@@ -306,7 +306,7 @@
             }, help="It indicates that the invoice has been paid and the journal entry of the invoice has been reconciled with one or several journal entries of payment."),
         'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',
             help='Bank Account Number to which the invoice will be paid. A Company bank account if this is a Customer Invoice or Supplier Refund, otherwise a Partner bank account number.', readonly=True, states={'draft':[('readonly',False)]}),
-        'move_lines':fields.function(_get_lines, type='many2many', relation='account.move.line', string='Entry Lines'),
+        'move_lines': fields.function(_get_lines, type='many2many', relation='account.move.line', string='Entry Lines'),
         'residual': fields.function(_amount_residual, digits_compute=dp.get_precision('Account'), string='Balance',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line','move_id'], 50),
@@ -1382,8 +1382,13 @@
         tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
         for line in self.browse(cr, uid, ids):
+            apply_on = 'refund'
+            if line.invoice_id.type in ['out_invoice','in_invoice']:
+                apply_on = 'invoice'
             price = line.price_unit * (1-(line.discount or 0.0)/100.0)
-            taxes = tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, price, line.quantity, product=line.product_id, partner=line.invoice_id.partner_id)
+            taxes = tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, price, line.quantity, \
+                                        product=line.product_id, partner=line.invoice_id.partner_id, \
+                                        date=line.invoice_id.date_invoice, apply_on=apply_on)
             res[line.id] = taxes['total']
             if line.invoice_id:
                 cur = line.invoice_id.currency_id
@@ -1403,7 +1408,7 @@
                     taxes = l[2].get('invoice_line_tax_id')
                     if len(taxes[0]) >= 3 and taxes[0][2]:
                         taxes = tax_obj.browse(cr, uid, list(taxes[0][2]))
-                        for tax in tax_obj.compute_all(cr, uid, taxes, p,l[2].get('quantity'), l[2].get('product_id', False), context.get('partner_id', False))['taxes']:
+                        for tax in tax_obj.compute_all(cr, uid, taxes, p, l[2].get('quantity'), l[2].get('product_id', False), context.get('partner_id', False))['taxes']:
                             t = t - tax['amount']
             return t
         return 0
@@ -1568,7 +1573,11 @@
         if context is None:
             context = {}
         inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
-        company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id
+        company_currency = inv.company_id.currency_id.id
+
+        apply_on = 'refund'
+        if inv.type in ('out_invoice', 'in_invoice'):
+            apply_on = 'invoice'
         for line in inv.invoice_line:
             mres = self.move_line_get_item(cr, uid, line, context)
             if not mres:
@@ -1577,28 +1586,20 @@
             tax_code_found= False
             for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id,
                     (line.price_unit * (1.0 - (line['discount'] or 0.0) / 100.0)),
-                    line.quantity, line.product_id,
-                    inv.partner_id)['taxes']:
-
-                if inv.type in ('out_invoice', 'in_invoice'):
-                    tax_code_id = tax['base_code_id']
-                    tax_amount = line.price_subtotal * tax['base_sign']
-                else:
-                    tax_code_id = tax['ref_base_code_id']
-                    tax_amount = line.price_subtotal * tax['ref_base_sign']
-
-                if tax_code_found:
-                    if not tax_code_id:
-                        continue
-                    res.append(self.move_line_get_item(cr, uid, line, context))
-                    res[-1]['price'] = 0.0
-                    res[-1]['account_analytic_id'] = False
-                elif not tax_code_id:
-                    continue
-                tax_code_found = True
-
-                res[-1]['tax_code_id'] = tax_code_id
-                res[-1]['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, tax_amount, context={'date': inv.date_invoice})
+                    line.quantity, 
+                    line.product_id,
+                    inv.partner_id, date=inv.date_invoice, apply_on=apply_on)['taxes']:
+                if tax['code_type'] == 'base':
+                    if not tax_code_found and tax['code_id']:
+                        res[-1]['tax_code_id'] = tax['code_id']
+                        res[-1]['tax_amount'] = tax['code_id'] and (tax['tax_amount'] >= 0 and tax['price_unit'] * line.quantity or -tax['price_unit'] * line.quantity) or 0.0
+                    elif tax_code_found and tax['code_id']:
+                        res.append(self.move_line_get_item(cr, uid, line, context))
+                        res[-1]['price'] = 0.0
+                        res[-1]['account_analytic_id'] = False
+                        res[-1]['tax_code_id'] = tax['code_id']
+                        res[-1]['tax_amount'] = tax['tax_amount'] >= 0 and tax['price_unit'] * line.quantity or -tax['price_unit'] * line.quantity
+                    tax_code_found = True
         return res
 
     def move_line_get_item(self, cr, uid, line, context=None):
@@ -1671,7 +1672,8 @@
         'tax_amount': fields.float('Tax Code Amount', digits_compute=dp.get_precision('Account')),
         'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
         'factor_base': fields.function(_count_factor, string='Multipication factor for Base code', type='float', multi="all"),
-        'factor_tax': fields.function(_count_factor, string='Multipication factor Tax code', type='float', multi="all")
+        'factor_tax': fields.function(_count_factor, string='Multipication factor Tax code', type='float', multi="all"),
+        'tax_id': fields.many2one('account.tax', 'Tax', ondelete='cascade'),
     }
 
     def base_change(self, cr, uid, ids, base, currency_id=False, company_id=False, date_invoice=False):
@@ -1706,38 +1708,36 @@
         'base_amount': 0.0,
         'tax_amount': 0.0,
     }
+
     def compute(self, cr, uid, invoice_id, context=None):
         tax_grouped = {}
         tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
         inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
         cur = inv.currency_id
-        company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id
+        company_currency = inv.company_id.currency_id.id
+        apply_on = 'refund'
+        if inv.type in ['out_invoice','in_invoice']:
+            apply_on = 'invoice'
         for line in inv.invoice_line:
-            for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, line.product_id, inv.partner_id)['taxes']:
-                val={}
-                val['invoice_id'] = inv.id
-                val['name'] = tax['name']
-                val['amount'] = tax['amount']
-                val['manual'] = False
-                val['sequence'] = tax['sequence']
-                val['base'] = cur_obj.round(cr, uid, cur, 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['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
-                    val['account_analytic_id'] = tax['account_analytic_collected_id']
-                else:
-                    val['base_code_id'] = tax['ref_base_code_id']
-                    val['tax_code_id'] = tax['ref_tax_code_id']
-                    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
-                    val['account_analytic_id'] = tax['account_analytic_paid_id']
-
+            for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit * (1-(line.discount or 0.0)/100.0)), \
+                                           line.quantity, line.product_id, inv.partner_id, date=inv.date_invoice, apply_on=apply_on)['taxes']:
+                val={'invoice_id': inv.id,
+                    'name': tax['name'],
+                    'sequence': tax['sequence'],
+                    'amount': tax['amount'],
+                    'manual': False,
+                    'base': tax['price_unit'] * line['quantity'],
+                    'base_code_id': tax['code_type'] and tax['code_type'] == 'base' and tax['code_id'] or False,
+                    'tax_code_id': tax['code_type'] and tax['code_type'] == 'tax' and tax['code_id'] or False,
+                    'base_amount': 0,
+                    'tax_amount': 0,
+                    'account_id': tax['account_id'] or line.account_id.id,
+                    'account_analytic_id': tax['analytic_account_id']}
+                val['base_amount'] = tax['tax_amount'] >= 0 and val['base'] or -val['base']
+                val['tax_amount'] = tax['tax_amount'] >= 0 and val['amount'] or -val['amount']
+                if tax['code_type'] == 'base':
+                    continue
                 key = (val['tax_code_id'], val['base_code_id'], val['account_id'], val['account_analytic_id'])
                 if not key in tax_grouped:
                     tax_grouped[key] = val
@@ -1746,7 +1746,6 @@
                     tax_grouped[key]['base'] += val['base']
                     tax_grouped[key]['base_amount'] += val['base_amount']
                     tax_grouped[key]['tax_amount'] += val['tax_amount']
-
         for t in tax_grouped.values():
             t['base'] = cur_obj.round(cr, uid, cur, t['base'])
             t['amount'] = cur_obj.round(cr, uid, cur, t['amount'])

=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2014-05-07 17:01:12 +0000
+++ account/account_move_line.py	2014-06-02 10:31:27 +0000
@@ -489,7 +489,7 @@
                     "this field will contain the basic amount(without tax)."),
         'invoice': fields.function(_invoice, string='Invoice',
             type='many2one', relation='account.invoice', fnct_search=_invoice_search),
-        'account_tax_id':fields.many2one('account.tax', 'Tax'),
+        'account_tax_id': fields.many2one('account.tax', 'Tax'),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'),
         'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', 
                             string='Company', store=True, readonly=True)
@@ -1231,27 +1231,17 @@
         if vals.get('account_tax_id', False):
             tax_id = tax_obj.browse(cr, uid, vals['account_tax_id'])
             total = vals['debit'] - vals['credit']
-            if journal.type in ('purchase_refund', 'sale_refund'):
-                base_code = 'ref_base_code_id'
-                tax_code = 'ref_tax_code_id'
-                account_id = 'account_paid_id'
-                base_sign = 'ref_base_sign'
-                tax_sign = 'ref_tax_sign'
-            else:
-                base_code = 'base_code_id'
-                tax_code = 'tax_code_id'
-                account_id = 'account_collected_id'
-                base_sign = 'base_sign'
-                tax_sign = 'tax_sign'
             tmp_cnt = 0
             for tax in tax_obj.compute_all(cr, uid, [tax_id], total, 1.00, force_excluded=True).get('taxes'):
+                if tax['code_type'] == 'base':
+                    continue
                 #create the base movement
                 if tmp_cnt == 0:
-                    if tax[base_code]:
+                    if tax['account_id']:
                         tmp_cnt += 1
                         self.write(cr, uid,[result], {
-                            'tax_code_id': tax[base_code],
-                            'tax_amount': tax[base_sign] * abs(total)
+                            'tax_code_id': tax['code_id'],
+                            'tax_amount': tax['tax_amount'] >= 0 and abs(total) or -abs(total)
                         })
                 else:
                     data = {
@@ -1261,8 +1251,8 @@
                         'partner_id': vals.get('partner_id',False),
                         'ref': vals.get('ref',False),
                         'account_tax_id': False,
-                        'tax_code_id': tax[base_code],
-                        'tax_amount': tax[base_sign] * abs(total),
+                        'tax_code_id': tax['code_id'],
+                        'tax_amount':  tax['tax_amount'] >= 0 and abs(total) or -abs(total),
                         'account_id': vals['account_id'],
                         'credit': 0.0,
                         'debit': 0.0,
@@ -1277,9 +1267,9 @@
                     'partner_id': vals.get('partner_id',False),
                     'ref': vals.get('ref',False),
                     'account_tax_id': False,
-                    'tax_code_id': tax[tax_code],
-                    'tax_amount': tax[tax_sign] * abs(tax['amount']),
-                    'account_id': tax[account_id] or vals['account_id'],
+                    'tax_code_id': tax['code_id'],
+                    'tax_amount':  tax['tax_amount'] >= 0 and abs(total) or -abs(total),
+                    'account_id': tax['account_id'] or vals['account_id'],
                     'credit': tax['amount']<0 and -tax['amount'] or 0.0,
                     'debit': tax['amount']>0 and tax['amount'] or 0.0,
                 }

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2014-05-02 13:07:53 +0000
+++ account/account_view.xml	2014-06-02 10:31:27 +0000
@@ -893,11 +893,9 @@
                 <search string="Search Taxes">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <filter string="Sale" domain="[('type_tax_use','=','sale')]" />
-                    <filter string="Purchase" domain="[('type_tax_use','=','purchase')]" />
                     <group string="Group By...">
-                        <filter string="Company" domain="[]" context="{'group_by':'company_id'}"/>
-                        <filter string="Tax Application" domain="[]" context="{'group_by':'type_tax_use'}"/>
+                        <filter string="Parent" context="{'group_by':'parent_id'}"/>
+                        <filter string="Company" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     </group>
                 </search>
             </field>
@@ -910,83 +908,88 @@
                     <group>
                         <group>
                             <field name="name"/>
-                            <field name="description"/>
+                            <field name="description" attrs="{'invisible': [('type','in',('group'))]}"/>
+                            <field name="type" on_change="onchange_tax_id(type, amount, type_tax_use, python_compute, price_include, context)"/>
+                            <field name="price_include" attrs="{'invisible':[('type','in',('group','code'))], 'readonly':[('type','in',('percentage_price_include'))]}" on_change="onchange_tax_id(type, amount, type_tax_use, python_compute, price_include, context)"/>
+                            <field name="active" groups="base.group_no_one"/>
                         </group>
                         <group>
-                            <field name="type_tax_use"/>
+                            <field name="type_tax_use" string="Domain" on_change="onchange_tax_id(type, amount, type_tax_use, python_compute, price_include, context)"/>
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                            <field name="active"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="Tax Definition">
-                        <group>
-                            <group string="Tax Computation">
-                                <label for="type"/>
-                                <div>
-                                    <field name="type"/>
-                                    <field name="amount" attrs="{'invisible':[('type','in',('none', 'code', 'balance'))]}"/>
-                                </div>
-                                <field name="python_compute" attrs="{'invisible':[('type','!=','code')],'required':[('type','=','code')]}"/>
-                                <field name="python_compute_inv" attrs="{'invisible':[('type','!=','code')],'required':[('type','=','code')]}"/>
-                                <field name="price_include"/>
-                            </group>
-                            <group string="Misc">
-                                <field name="sequence"/>
+                            <label for="amount" attrs="{'invisible': [('type','in',('group','code'))]}"/>
+                            <div attrs="{'invisible': [('type','in',('group','code'))]}">
+                                <field name="amount" string="Tax Rate" class="oe_inline" nolabel="1"
+                                on_change="onchange_tax_id(type, amount, type_tax_use, python_compute, price_include, context)"/>
+                                    <span attrs="{'invisible': [('type','not in',('percent','percentage_price_include'))]}">%%</span>
+                            </div>
+                            <label for="include_base_amount"/>
+                            <div>
                                 <field name="include_base_amount"/>
-                                <field name="child_depend"/>
-                            </group>
-                            <group string="Invoices">
-                                  <field name="account_collected_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                                  <field name="account_analytic_collected_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id)]" groups="analytic.group_analytic_accounting"/>
-
-                                  <field name="base_code_id"/>
-                                  <field name="base_sign"/>
-                                  <field name="tax_code_id"/>
-                                  <field name="tax_sign"/>
-
-                            </group>
-                            <group string="Refunds">
-                                  <field name="account_paid_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                                  <field name="account_analytic_paid_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id)]" groups="analytic.group_analytic_accounting"/>
-
-                                  <field name="ref_base_code_id"/>
-                                  <field name="ref_base_sign"/>
-                                  <field name="ref_tax_code_id"/>
-                                  <field name="ref_tax_sign"/>
-                            </group>
-                            <group string="Children/Sub Taxes" colspan="2">
-                                <field name="child_depend" class="oe_inline"/>
-                                <field name="child_ids" nolabel="1" colspan="2">
-                                      <tree string="Account Tax">
-                                          <field name="sequence"/>
-                                          <field name="name"/>
-                                          <field name="price_include"/>
-                                          <field name="description"/>
-                                     </tree>
-                                </field>
-                            </group>
-                        </group>
-                        </page>
-                        <page string="Special Computation">
-                            <group col="4">
-                                <separator colspan="4" string="Applicability Options"/>
-                                <field name="applicable_type"/>
-                                <field name="domain"/>
-                                <separator colspan="4" string="Applicable Code (if type=code)"/>
-                                <field colspan="4" name="python_applicable" nolabel="1" attrs="{'readonly':[('applicable_type','=','true')], 'required':[('applicable_type','=','code')]}"/>
-                            </group>
-                        </page>
-                    </notebook>
+                            </div>
+                            <field name="parent_id" attrs="{'invisible': [('parent_id','=',False)]}" domain="[('type','=','group')]"/>
+                        </group>
+                        <group string="Misc" groups="base.group_no_one" attrs="{'invisible': [('type','=','group')]}">
+                            <field name="sequence"/>
+                            <field name="applicable_type" groups="base.group_no_one"/>
+                            <separator colspan="4" string="Applicable Code" attrs="{'invisible': [('applicable_type','!=','code')]}" groups="base.group_no_one"/>
+                            <field colspan="4" name="python_applicable" nolabel="1" attrs="{'invisible': [('applicable_type','!=','code')], 'required':[('applicable_type','=','code')]}" groups="base.group_no_one"/>
+                        </group>
+                        <group string="Tax Computation By Python Code" attrs="{'invisible': [('type','!=','code')]}">
+                            <field name="python_compute" attrs="{'required':[('type','=','code')]}" on_change="onchange_tax_id(type, amount, type_tax_use, python_compute, price_include, context)"/>
+                        </group>
+                    </group>
+                    <group name="child" attrs="{'invisible': [('type','!=','group')]}" string="Child Tax Account">
+                          <field name="child_ids" nolabel="1" widget="many2many_tags"/>
+                    </group>
+                    <div attrs="{'invisible': [('type','=','group')]}">
+                        <h2><label name="sale_excluded" string="Journal Items for a 100euros sale (taxes excluded)" attrs="{'invisible':['|', ('price_include','=',True), ('type_tax_use','in','purchase')]}"/></h2>
+                        <h2><label name="sale_included" string="Journal Items for a 100euros sale (taxes included)" attrs="{'invisible':['|', ('price_include','=',False), ('type_tax_use','in','purchase')]}"/></h2>
+                        <h2><label name="purchase_excluded" string="Journal Items for a 100euros purchase (taxes excluded)" attrs="{'invisible':['|', ('price_include','=',True), ('type_tax_use','not in','purchase')]}"/></h2>
+                        <h2><label name="purchase_included" string="Journal Items for a 100euros purchase (taxes included)" attrs="{'invisible':['|', ('price_include','=',False), ('type_tax_use','not in','purchase')]}"/></h2>
+                        <group colspan="7" name="invoice">
+                            <field name="tax_invoice_line_ids" context= "{'default_apply_on':'invoice'}" nolabel="1">
+                                <tree string="Tax Invoice Line" editable="bottom">
+                                    <field name="sequence" widget="handle"/>
+                                    <field name="code_type"/>
+                                    <field name="description"/>
+                                    <field name="account_id" domain="[('type', '!=', 'view')]"/>
+                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('type','in',('normal','contract'))]"/>
+                                    <field name="apply_on" invisible="1"/>
+                                    <field name="base_amount" attrs="{'invisible': [('code_type', '=', 'base')]}"/>
+                                    <field name="amount" on_change="onchange_amount(amount, context)"/>
+                                    <field name="tax_amount"/>
+                                    <field name="code_id"/>
+                                </tree>
+                            </field>
+                        </group>
+                        <h2><label name="refund_excluded" string="Journal Items for a 100euros refund (taxes excluded)" attrs="{'invisible':[('price_include','=',True)]}"/></h2>
+                        <h2><label name="refund_included" string="Journal Items for a 100euros refund (taxes included)" attrs="{'invisible':[('price_include','=',False)]}"/></h2>
+                        <group colspan="7" name="refund">
+                            <field name="tax_refund_line_ids" context= "{'default_apply_on':'refund'}" nolabel="1">
+                                <tree string="Tax Refund Line" editable="bottom">
+                                    <field name="sequence" widget="handle"/>
+                                    <field name="code_type"/>
+                                    <field name="description"/>
+                                    <field name="account_id" domain="[('type', '!=', 'view')]"/>
+                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('type','in',('normal','contract'))]"/>
+                                    <field name="apply_on" invisible="1"/>
+                                    <field name="base_amount" attrs="{'invisible': [('code_type', '=', 'base')]}"/>
+                                    <field name="amount" on_change="onchange_amount(amount, context)"/>
+                                    <field name="tax_amount"/>
+                                    <field name="code_id"/>
+                                </tree>
+                            </field>
+                        </group>
+                    </div>
                 </form>
-              </field>
+            </field>
         </record>
+
         <record id="action_tax_form" model="ir.actions.act_window">
             <field name="name">Taxes</field>
             <field name="res_model">account.tax</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_tax_tree"/>
-            <field name="domain">[('parent_id','=',False)]</field>
         </record>
         <menuitem action="action_tax_form" id="menu_action_tax_form" parent="next_id_27"/>
 
@@ -1604,7 +1607,7 @@
                     <group>
                         <group string="Amount Computation">
 	                        <field name="value"/>
-	                        <label for="value_amount" string="Amount To Pay"  attrs="{'invisible':[('value','=','balance')]}"/>
+	                        <label for="value_amount" string="Amount To Pay" attrs="{'invisible': [('value','=','balance')]}"/>
 	                        <div attrs="{'invisible':[('value','=','balance')]}">
 	                            <field name="value_amount" class="oe_inline"/>
 	                        </div>
@@ -1976,57 +1979,86 @@
             <field name="model">account.tax.template</field>
             <field name="arch" type="xml">
                 <form string="Account Tax Template" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="description"/>
-                        <field name="chart_template_id"/>
-                        <field name="type"/>
-                        <field name="type_tax_use"/>
-                        <field name="price_include"/>
-                    </group>
-                    <notebook>
-                        <page string="Tax Definition">
-                            <group col="4">
-                                <field name="applicable_type"/>
-                                <field name="amount" attrs="{'readonly':[('type','=','none'),('type','=','code')]}"/>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="chart_template_id"/>
+                            <field name="description" attrs="{'invisible': [('type','in',('group'))]}"/>
+                            <field name="type" on_change="onchange_tax_id(type, amount, type_tax_use, python_compute, price_include, context)"/>
+                            <field name="price_include" attrs="{'invisible':[('type','in',('group','code'))], 'readonly':[('type','in',('percentage_price_include'))]}" on_change="onchange_tax_id(type, amount, type_tax_use, python_compute, price_include, context)"/>
+                            <field name="active" groups="base.group_no_one"/>
+                        </group>
+                        <group>
+                            <field name="type_tax_use" string="Domain" on_change="onchange_tax_id(type, amount, type_tax_use, python_compute, price_include, context)"/>
+                            <label for="amount" attrs="{'invisible': [('type','in',('group','code'))]}"/>
+                            <div attrs="{'invisible': [('type','in',('group','code'))]}">
+                                <field name="amount" string="Tax Rate" class="oe_inline" nolabel="1"
+                                on_change="onchange_tax_id(type, amount, type_tax_use, python_compute, price_include, context)"/>
+                                    <span attrs="{'invisible': [('type','not in',('percent','percentage_price_include'))]}">%%</span>
+                            </div>
+                            <label for="include_base_amount"/>
+                            <div>
                                 <field name="include_base_amount"/>
-                                <field name="domain"/>
-                                <newline/>
-                                <field name="account_collected_id"/>
-                                <label colspan="2" string="Keep empty to use the income account"/>
-                                <field name="account_paid_id"/>
-                                <label colspan="2" string="Keep empty to use the expense account"/>
-                                <field name="child_depend"/>
-                                <field name="sequence"/>
-                            </group>
-                        </page>
-                        <page string="Tax Declaration">
-                            <group col="4">
-                                <separator colspan="4" string="Invoices"/>
-                                <field name="base_code_id"/>
-                                <field name="base_sign"/>
-                                <field name="tax_code_id"/>
-                                <field name="tax_sign"/>
-
-                                <separator colspan="4" string="Credit Notes"/>
-                                <field name="ref_base_code_id"/>
-                                <field name="ref_base_sign"/>
-                                <field name="ref_tax_code_id"/>
-                                <field name="ref_tax_sign"/>
-                            </group>
-                        </page>
-                        <page string="Special Computation">
-                            <separator string="Compute Code (if type=code)"/>
-                            <field name="python_compute" attrs="{'readonly':[('type','!=','code')]}"/>
-                            <separator string="Compute Code for Taxes Included Prices"/>
-                            <field name="python_compute_inv"/>
-                            <separator string="Applicable Code (if type=code)"/>
-                            <field name="python_applicable" attrs="{'readonly':[('applicable_type','=','true')]}"/>
-                        </page>
-                    </notebook>
+                            </div>
+                            <field name="parent_id" attrs="{'invisible': [('parent_id','=',False)]}" domain="[('type','=','group')]"/>
+                        </group>
+                        <group string="Misc" groups="base.group_no_one" attrs="{'invisible': [('type','=','group')]}">
+                            <field name="sequence"/>
+                            <field name="applicable_type" groups="base.group_no_one"/>
+                            <separator colspan="4" string="Applicable Code" attrs="{'invisible': [('applicable_type','!=','code')]}" groups="base.group_no_one"/>
+                            <field colspan="4" name="python_applicable" nolabel="1" attrs="{'invisible': [('applicable_type','!=','code')], 'required':[('applicable_type','=','code')]}" groups="base.group_no_one"/>
+                        </group>
+                        <group string="Tax Computation By Python Code" attrs="{'invisible': [('type','!=','code')]}">
+                            <field name="python_compute" attrs="{'required':[('type','=','code')]}" on_change="onchange_tax_id(type, amount, type_tax_use, python_compute, price_include, context)"/>
+                        </group>
+                    </group>
+                    <group name="child" attrs="{'invisible': [('type','!=','group')]}" string="Child Tax Account">
+                          <field name="child_ids" nolabel="1" widget="many2many_tags"/>
+                    </group>
+                    <div attrs="{'invisible': [('type','=','group')]}">
+                        <h2><label name="sale_excluded" string="Journal Items for a 100euros sale (taxes excluded)" attrs="{'invisible':['|', ('price_include','=',True), ('type_tax_use','in','purchase')]}"/></h2>
+                        <h2><label name="sale_included" string="Journal Items for a 100euros sale (taxes included)" attrs="{'invisible':['|', ('price_include','=',False), ('type_tax_use','in','purchase')]}"/></h2>
+                        <h2><label name="purchase_excluded" string="Journal Items for a 100euros purchase (taxes excluded)" attrs="{'invisible':['|', ('price_include','=',True), ('type_tax_use','not in','purchase')]}"/></h2>
+                        <h2><label name="purchase_included" string="Journal Items for a 100euros purchase (taxes included)" attrs="{'invisible':['|', ('price_include','=',False), ('type_tax_use','not in','purchase')]}"/></h2>
+                        <group colspan="7" name="invoice">
+                            <field name="tax_invoice_line_ids" context= "{'default_apply_on':'invoice'}" nolabel="1">
+                                <tree string="Tax Invoice Line" editable="bottom">
+                                    <field name="sequence" widget="handle"/>
+                                    <field name="code_type"/>
+                                    <field name="description"/>
+                                    <field name="account_id" domain="[('type', '!=', 'view')]"/>
+                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('type','in',('normal','contract'))]"/>
+                                    <field name="apply_on" invisible="1"/>
+                                    <field name="base_amount" attrs="{'invisible': [('code_type', '=', 'base')]}"/>
+                                    <field name="amount" on_change="onchange_amount(amount, context)"/>
+                                    <field name="tax_amount"/>
+                                    <field name="code_id"/>
+                                </tree>
+                            </field>
+                        </group>
+                        <h2><label name="refund_excluded" string="Journal Items for a 100euros refund (taxes excluded)" attrs="{'invisible':[('price_include','=',True)]}"/></h2>
+                        <h2><label name="refund_included" string="Journal Items for a 100euros refund (taxes included)" attrs="{'invisible':[('price_include','=',False)]}"/></h2>
+                        <group colspan="7" name="refund">
+                            <field name="tax_refund_line_ids" context= "{'default_apply_on':'refund'}" nolabel="1">
+                                <tree string="Tax Refund Line" editable="bottom">
+                                    <field name="sequence" widget="handle"/>
+                                    <field name="code_type"/>
+                                    <field name="description"/>
+                                    <field name="account_id" domain="[('type', '!=', 'view')]"/>
+                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('type','in',('normal','contract'))]"/>
+                                    <field name="apply_on" invisible="1"/>
+                                    <field name="base_amount" attrs="{'invisible': [('code_type', '=', 'base')]}"/>
+                                    <field name="amount" on_change="onchange_amount(amount, context)"/>
+                                    <field name="tax_amount"/>
+                                    <field name="code_id"/>
+                                </tree>
+                            </field>
+                        </group>
+                    </div>
                 </form>
             </field>
         </record>
+        
         <record id="view_account_tax_template_tree" model="ir.ui.view">
             <field name="name">account.tax.template.tree</field>
             <field name="model">account.tax.template</field>

=== modified file 'account/data/configurable_account_chart.xml'
--- account/data/configurable_account_chart.xml	2012-11-29 22:26:45 +0000
+++ account/data/configurable_account_chart.xml	2014-06-02 10:31:27 +0000
@@ -390,118 +390,372 @@
         <record id="otaxs" model="account.tax.template">
             <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="name">OTAX S</field>
-            <field eval="0.15" name="amount"/>
+            <field eval="15" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="conf_ova"/>
-            <field name="account_paid_id" ref="conf_ova"/>
-            <field name="base_code_id" ref="tax_code_purch_S"/>
-            <field name="tax_code_id" ref="tax_code_output_S"/>
-            <field name="ref_base_code_id" ref="tax_code_purch_S"/>
-            <field name="ref_tax_code_id" ref="tax_code_output_S"/>
             <field name="type_tax_use">purchase</field>
         </record>
 
+        <record id="otaxs_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_purch_S"/>
+            <field name="tax_id" ref="otaxs"/>
+        </record>
+
+        <record id="otaxs_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">15</field>
+            <field name="amount">15</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_output_S"/>
+            <field name="account_id" ref="conf_ova"/>
+            <field name="tax_id" ref="otaxs"/>
+        </record>
+
+        <record id="otaxs_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_purch_S"/>
+            <field name="tax_id" ref="otaxs"/>
+        </record>
+
+        <record id="otaxs_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">15</field>
+            <field name="amount">15</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_output_S"/>
+            <field name="account_id" ref="conf_ova"/>
+            <field name="tax_id" ref="otaxs"/>
+        </record>
+
         <record id="otaxr" model="account.tax.template">
             <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="name">OTAX R</field>
-            <field eval="0.05" name="amount"/>
+            <field eval="5" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="conf_ova"/>
-            <field name="account_paid_id" ref="conf_ova"/>
-            <field name="base_code_id" ref="tax_code_purch_R"/>
-            <field name="tax_code_id" ref="tax_code_output_R"/>
-            <field name="ref_base_code_id" ref="tax_code_purch_R"/>
-            <field name="ref_tax_code_id" ref="tax_code_output_R"/>
             <field name="type_tax_use">purchase</field>
         </record>
 
+        <record id="otaxr_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_purch_R"/>
+            <field name="tax_id" ref="otaxr"/>
+        </record>
+
+        <record id="otaxr_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">5</field>
+            <field name="amount">5</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_output_R"/>
+            <field name="account_id" ref="conf_ova"/>
+            <field name="tax_id" ref="otaxr"/>
+        </record>
+
+        <record id="otaxr_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_purch_R"/>
+            <field name="tax_id" ref="otaxr"/>
+        </record>
+
+        <record id="otaxr_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">5</field>
+            <field name="amount">5</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_output_R"/>
+            <field name="account_id" ref="conf_ova"/>
+            <field name="tax_id" ref="otaxr"/>
+        </record>
+
         <record id="otaxx" model="account.tax.template">
             <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="name">OTAX X</field>
-            <field eval="0.0" name="amount"/>
+            <field eval="0" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="conf_ova"/>
-            <field name="account_paid_id" ref="conf_ova"/>
-            <field name="base_code_id" ref="tax_code_purch_X"/>
-            <field name="tax_code_id" ref="tax_code_output_X"/>
-            <field name="ref_base_code_id" ref="tax_code_purch_X"/>
-            <field name="ref_tax_code_id" ref="tax_code_output_X"/>
             <field name="type_tax_use">purchase</field>
         </record>
 
+        <record id="otaxx_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_purch_X"/>
+            <field name="tax_id" ref="otaxx"/>
+        </record>
+
+        <record id="otaxx_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">0</field>
+            <field name="amount">0</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_output_X"/>
+            <field name="account_id" ref="conf_ova"/>
+            <field name="tax_id" ref="otaxx"/>
+        </record>
+
+        <record id="otaxx_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_purch_X"/>
+            <field name="tax_id" ref="otaxx"/>
+        </record>
+
+        <record id="otaxx_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">0</field>
+            <field name="amount">0</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_output_X"/>
+            <field name="account_id" ref="conf_ova"/>
+            <field name="tax_id" ref="otaxx"/>
+        </record>
+
         <record id="otaxo" model="account.tax.template">
             <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="name">OTAX O</field>
-            <field eval="0.0" name="amount"/>
+            <field eval="0" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="conf_ova"/>
-            <field name="account_paid_id" ref="conf_ova"/>
-            <field name="base_code_id" ref="tax_code_purch_O"/>
-            <field name="tax_code_id" ref="tax_code_output_O"/>
-            <field name="ref_base_code_id" ref="tax_code_purch_O"/>
-            <field name="ref_tax_code_id" ref="tax_code_output_O"/>
             <field name="type_tax_use">purchase</field>
         </record>
 
+        <record id="otaxo_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_purch_O"/>
+            <field name="tax_id" ref="otaxo"/>
+        </record>
+
+        <record id="otaxo_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">0</field>
+            <field name="amount">0</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_output_O"/>
+            <field name="account_id" ref="conf_ova"/>
+            <field name="tax_id" ref="otaxo"/>
+        </record>
+
+        <record id="otaxo_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_purch_O"/>
+            <field name="tax_id" ref="otaxo"/>
+        </record>
+
+        <record id="otaxo_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">0</field>
+            <field name="amount">0</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_output_O"/>
+            <field name="account_id" ref="conf_ova"/>
+            <field name="tax_id" ref="otaxo"/>
+        </record>
+
         <!-- Sales + Input VAT -->
 
         <record id="itaxs" model="account.tax.template">
             <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="name">ITAX S</field>
-            <field eval="0.15" name="amount"/>
+            <field eval="15" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="conf_iva"/>
-            <field name="account_paid_id" ref="conf_iva"/>
-            <field name="base_code_id" ref="tax_code_sales_S"/>
-            <field name="tax_code_id" ref="tax_code_input_S"/>
-            <field name="ref_base_code_id" ref="tax_code_sales_S"/>
-            <field name="ref_tax_code_id" ref="tax_code_input_S"/>
             <field name="type_tax_use">sale</field>
         </record>
 
+        <record id="itaxs_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_sales_S"/>
+            <field name="tax_id" ref="itaxs"/>
+        </record>
+
+        <record id="itaxs_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">15</field>
+            <field name="amount">15</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_input_S"/>
+            <field name="account_id" ref="conf_iva"/>
+            <field name="tax_id" ref="itaxs"/>
+        </record>
+
+        <record id="itaxs_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_sales_S"/>
+            <field name="tax_id" ref="itaxs"/>
+        </record>
+
+        <record id="itaxs_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">15</field>
+            <field name="amount">15</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_input_S"/>
+            <field name="account_id" ref="conf_iva"/>
+            <field name="tax_id" ref="itaxs"/>
+        </record>
+
         <record id="itaxr" model="account.tax.template">
             <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="name">ITAX R</field>
-            <field eval="0.05" name="amount"/>
+            <field eval="5" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="conf_iva"/>
-            <field name="account_paid_id" ref="conf_iva"/>
-            <field name="base_code_id" ref="tax_code_sales_R"/>
-            <field name="tax_code_id" ref="tax_code_input_R"/>
-            <field name="ref_base_code_id" ref="tax_code_sales_R"/>
-            <field name="ref_tax_code_id" ref="tax_code_input_R"/>
             <field name="type_tax_use">sale</field>
         </record>
 
+        <record id="itaxr_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_sales_R"/>
+            <field name="tax_id" ref="itaxr"/>
+        </record>
+
+        <record id="itaxr_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">5</field>
+            <field name="amount">5</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_input_R"/>
+            <field name="account_id" ref="conf_iva"/>
+            <field name="tax_id" ref="itaxr"/>
+        </record>
+
+        <record id="itaxr_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_sales_R"/>
+            <field name="tax_id" ref="itaxr"/>
+        </record>
+
+        <record id="itaxr_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">5</field>
+            <field name="amount">5</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_input_R"/>
+            <field name="account_id" ref="conf_iva"/>
+            <field name="tax_id" ref="itaxr"/>
+        </record>
+
         <record id="itaxx" model="account.tax.template">
             <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="name">ITAX X</field>
             <field eval="0.0" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="conf_iva"/>
-            <field name="account_paid_id" ref="conf_iva"/>
-            <field name="base_code_id" ref="tax_code_sales_X"/>
-            <field name="tax_code_id" ref="tax_code_input_X"/>
-            <field name="ref_base_code_id" ref="tax_code_sales_X"/>
-            <field name="ref_tax_code_id" ref="tax_code_input_X"/>
             <field name="type_tax_use">sale</field>
         </record>
 
+        <record id="itaxx_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_sales_X"/>
+            <field name="tax_id" ref="itaxx"/>
+        </record>
+
+        <record id="itaxx_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">0</field>
+            <field name="amount">0</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_input_X"/>
+            <field name="account_id" ref="conf_iva"/>
+            <field name="tax_id" ref="itaxx"/>
+        </record>
+
+        <record id="itaxx_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_sales_X"/>
+            <field name="tax_id" ref="itaxx"/>
+        </record>
+
+        <record id="itaxx_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">0</field>
+            <field name="amount">0</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_input_X"/>
+            <field name="account_id" ref="conf_iva"/>
+            <field name="tax_id" ref="itaxx"/>
+        </record>
+
         <record id="itaxo" model="account.tax.template">
             <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="name">ITAX O</field>
             <field eval="0.0" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="conf_iva"/>
-            <field name="account_paid_id" ref="conf_iva"/>
-            <field name="base_code_id" ref="tax_code_sales_O"/>
-            <field name="tax_code_id" ref="tax_code_input_O"/>
-            <field name="ref_base_code_id" ref="tax_code_sales_O"/>
-            <field name="ref_tax_code_id" ref="tax_code_input_O"/>
             <field name="type_tax_use">sale</field>
         </record>
 
-
+        <record id="itaxo_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_sales_O"/>
+            <field name="tax_id" ref="itaxo"/>
+        </record>
+
+        <record id="itaxo_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">0</field>
+            <field name="amount">0</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_input_O"/>
+            <field name="account_id" ref="conf_iva"/>
+            <field name="tax_id" ref="itaxo"/>
+        </record>
+
+        <record id="itaxo_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_sales_O"/>
+            <field name="tax_id" ref="itaxo"/>
+        </record>
+
+        <record id="itaxo_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">0</field>
+            <field name="amount">0</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_input_O"/>
+            <field name="account_id" ref="conf_iva"/>
+            <field name="tax_id" ref="itaxo"/>
+        </record>
 
         <!-- = = = = = = = = = = = = = = = -->
          <!-- Fiscal Mapping Templates     -->

=== modified file 'account/product.py'
--- account/product.py	2013-11-29 16:56:44 +0000
+++ account/product.py	2014-06-02 10:31:27 +0000
@@ -45,7 +45,7 @@
     _columns = {
         'taxes_id': fields.many2many('account.tax', 'product_taxes_rel',
             'prod_id', 'tax_id', 'Customer Taxes',
-            domain=[('parent_id','=',False),('type_tax_use','in',['sale','all'])]),
+             domain=[('parent_id','=',False),('type_tax_use','in',['sale','all'])]),
         'supplier_taxes_id': fields.many2many('account.tax',
             'product_supplier_taxes_rel', 'prod_id', 'tax_id',
             'Supplier Taxes', domain=[('parent_id', '=', False),('type_tax_use','in',['purchase','all'])]),

=== modified file 'account/security/ir.model.access.csv'
--- account/security/ir.model.access.csv	2013-10-27 12:31:04 +0000
+++ account/security/ir.model.access.csv	2014-06-02 10:31:27 +0000
@@ -4,12 +4,14 @@
 access_account_payment_term_line,account.payment.term.line,model_account_payment_term_line,account.group_account_user,1,0,0,0
 access_account_account_type,account.account.type,model_account_account_type,account.group_account_user,1,0,0,0
 access_account_tax_internal_user,account.tax internal user,model_account_tax,base.group_user,1,0,0,0
+access_account_tax_line_internal_user,account.tax.line internal user,model_account_tax_line,base.group_user,1,0,0,0
 access_account_account,account.account,model_account_account,account.group_account_user,1,0,0,0
 access_account_account_user,account.account user,model_account_account,base.group_user,1,0,0,0
 access_account_account_partner_manager,account.account partner manager,model_account_account,base.group_partner_manager,1,0,0,0
 access_account_journal_period_manager,account.journal.period manager,model_account_journal_period,account.group_account_manager,1,0,0,0
 access_account_tax_code,account.tax.code,model_account_tax_code,account.group_account_invoice,1,0,0,0
 access_account_tax,account.tax,model_account_tax,account.group_account_invoice,1,0,0,0
+access_account_tax_line_internal_user,account.tax.line,model_account_tax_line,account.group_account_invoice,1,0,0,0
 access_account_model,account.model,model_account_model,account.group_account_user,1,1,1,1
 access_account_model_line,account.model.line,model_account_model_line,account.group_account_user,1,1,1,1
 access_account_subscription,account.subscription,model_account_subscription,account.group_account_user,1,1,1,1
@@ -36,6 +38,7 @@
 access_account_payment_term_manager,account.payment.term,model_account_payment_term,account.group_account_manager,1,1,1,1
 access_account_payment_term_line_manager,account.payment.term.line,model_account_payment_term_line,account.group_account_manager,1,1,1,1
 access_account_tax_manager,account.tax,model_account_tax,account.group_account_manager,1,1,1,1
+access_account_tax_line_manager,account.tax.line,model_account_tax_line,account.group_account_manager,1,1,1,1
 access_account_journal_manager,account.journal,model_account_journal,account.group_account_manager,1,1,1,1
 access_account_journal_invoice,account.journal invoice,model_account_journal,account.group_account_invoice,1,0,0,0
 access_account_period_manager,account.period,model_account_period,account.group_account_manager,1,1,1,1
@@ -91,6 +94,7 @@
 access_report_account_receivable_invoice,report.account.receivable.invoice,model_report_account_receivable,account.group_account_invoice,1,1,1,1
 access_account_sequence_fiscal_year_invoice,account.sequence.fiscalyear invoice,model_account_sequence_fiscalyear,account.group_account_invoice,1,1,1,1
 access_account_tax_sale_manager,account.tax sale manager,model_account_tax,base.group_sale_salesman,1,0,0,0
+access_account_tax_line_sale_manager,account.tax.line sale manager,model_account_tax_line,base.group_sale_salesman,1,0,0,0
 access_account_journal_sale_manager,account.journal sale manager,model_account_journal,base.group_sale_salesman,1,0,0,0
 access_account_invoice_tax_sale_manager,account.invoice.tax  sale manager,model_account_invoice_tax,base.group_sale_salesman,1,0,0,0
 access_account_sequence_fiscal_year_sale_user,account.sequence.fiscalyear.sale.user,model_account_sequence_fiscalyear,base.group_sale_salesman,1,1,1,0

=== modified file 'account/test/account_customer_invoice.yml'
--- account/test/account_customer_invoice.yml	2013-10-27 12:31:04 +0000
+++ account/test/account_customer_invoice.yml	2014-06-02 10:31:27 +0000
@@ -33,6 +33,11 @@
       - product_id: product.product_product_5
         quantity: 10.0
 -
+  compute
+-
+  !python {model: account.invoice}: |
+    self.button_compute(cr, uid, [ref('account_invoice_customer0')])
+-
   I manually assign tax on invoice
 -
   !python {model: account.invoice.tax}: |

=== modified file 'account/test/account_supplier_invoice.yml'
--- account/test/account_supplier_invoice.yml	2013-10-27 12:31:04 +0000
+++ account/test/account_supplier_invoice.yml	2014-06-02 10:31:27 +0000
@@ -22,7 +22,13 @@
     sequence: 1
     company_id: base.main_company
     type_tax_use: all
-    tax_code_id: tax_case
+    tax_invoice_line_ids: 
+      - code_type: base
+        amount: 100
+      - code_type: tax
+        amount: 10
+        code_id: tax_case
+        account_id: account.ova
 -
   I create a supplier invoice
 -
@@ -45,6 +51,11 @@
     reference_type: none
     type: in_invoice
 -
+  I compute a supplier Invoice
+-
+  !python {model: account.invoice}: |
+    self.button_compute(cr, uid, [ref('account_invoice_supplier0')])
+-
   I check that Initially supplier invoice state is "Draft"
 -
   !assert {model: account.invoice, id: account_invoice_supplier0}:

=== added file 'account/test/account_tax_cal.yml'
--- account/test/account_tax_cal.yml	1970-01-01 00:00:00 +0000
+++ account/test/account_tax_cal.yml	2014-06-02 10:31:27 +0000
@@ -0,0 +1,247 @@
+-
+  In order to test account tax I create a new base line and tax lines
+-
+  I create a Tax
+-
+  !record {model: account.tax, id: vat_12}:
+    name: VAT-12%
+    amount: 12
+    type: percent
+    tax_invoice_line_ids:
+      - code_type: base
+        amount: 100
+      - code_type: tax #vat
+        amount: 12
+        account_id: account.ova
+      - code_type: tax #cess2
+        amount: 0.24
+        account_id: account.ova
+      - code_type: tax #high education cess1
+        amount: 0.12
+        account_id: account.ova
+-
+  I compute a tax
+-
+  !python {model: account.tax}: |
+    taxes = self.browse(cr, uid, [ref('vat_12')])
+    res = self.compute_all(cr, uid, taxes, 1000, 3)
+    taxes = res['taxes']
+
+    assert res['total'] == 3000, 'Incorrect amount on which tax applied.'
+    assert res['total_included'] == 3370.7999999999997, 'Incorrect total amount(with Tax amount).'
+
+    assert taxes[0]['price_unit'] == 1000, 'Incorrect unit Price.'
+    assert taxes[0]['amount'] == 3000, 'Incorrect base amount.'
+    assert taxes[0]['code_type'] == 'base', 'Incorrect code type.'
+
+    assert taxes[1]['price_unit'] == 1000.0, 'Incorrect unit Price.'
+    assert taxes[1]['amount'] == 360.0, 'Incorrect calculated tax amount.'
+    assert taxes[1]['code_type'] == 'tax', 'Incorrect code type.'
+
+    assert taxes[2]['price_unit'] == 1000.0, 'Incorrect unit Price.'
+    assert taxes[2]['amount'] == 7.2, 'Incorrect calculated amount for cess2 tax.'
+    assert taxes[2]['code_type'] == 'tax', 'Incorrect code type.'
+
+    assert taxes[3]['price_unit'] == 1000.0, 'Incorrect unit Price.'
+    assert taxes[3]['amount'] == 3.6, 'Incorrect calculated amount for high education cess1 tax.'
+    assert taxes[3]['code_type'] == 'tax', 'Incorrect code type.'
+-
+  In order to test account tax with Price Include I create a new base line and tax line
+-
+  I create a Tax with price include
+-
+  !record {model: account.tax, id: priceinclude}:
+    name: Price Include
+    amount: 10
+    type: percent
+    price_include: 1
+-
+  I compute a tax.
+-
+  !python {model: account.tax}: |
+    taxes = self.browse(cr, uid, [ref('priceinclude')])
+    res = self.compute_all(cr, uid, taxes, 1000, 1)
+    taxes = res['taxes']
+
+    assert res['total'] == 910, 'Incorrect amount on which tax applied.'
+    assert res['total_included'] == 1000, 'Incorrect total amount(with Tax amount).'
+
+    assert taxes[0]['price_unit'] == 910, 'Incorrect unit Price.'
+    assert taxes[0]['amount'] == 1000, 'Incorrect base amount.'
+    assert taxes[0]['code_type'] == 'base', 'Incorrect code type.'
+
+    assert taxes[1]['price_unit'] == 910, 'Incorrect unit Price.'
+    assert taxes[1]['amount'] == 90, 'Incorrect tax amount.'
+    assert taxes[1]['code_type'] == 'tax', 'Incorrect code type.'
+-
+  In order to test account tax with Include Base I create a new base line and tax lines
+-
+  I create a Tax with include base
+-
+   !record {model: account.tax, id: vat_4_group}:
+     name: vat 4 group
+     type: group
+-
+  !record {model: account.tax, id: vat12}:
+    name: vat 12
+    amount: 12
+    type: percent
+    parent_id: vat_4_group
+-
+  !record {model: account.tax, id: vat_4_cess_2}:
+    name: Education cess
+    amount: 2
+    type: percent
+    include_base_amount: 1
+    parent_id: vat_4_group
+-
+  !record {model: account.tax, id: vat_4_cess_1}:
+    name: Higher Education cess
+    amount: 1
+    type: percent
+    include_base_amount: 1
+    parent_id: vat_4_group
+-
+  I compute a tax
+-
+  !python {model: account.tax}: |
+    taxes = self.browse(cr, uid, [ref('vat_4_group')])
+    res = self.compute_all(cr, uid, taxes, 1000, 3)
+    taxes = res['taxes']
+
+    assert res['total'] == 3000, 'Incorrect amount on which tax applied.'
+    assert res['total_included'] == 3450.6, 'Incorrect total amount(with Tax amount).'
+
+    assert taxes[0]['price_unit'] == 1000, 'Incorrect unit Price for vat 12.'
+    assert taxes[0]['amount'] == 3000, 'Incorrect base amount for vat 12.'
+    assert taxes[0]['code_type'] == 'base', 'Incorrect code type for vat 12.'
+    
+    assert taxes[1]['price_unit'] == 1000, 'Incorrect unit Price for vat 12.'
+    assert taxes[1]['amount'] == 360, 'Incorrect tax amount for vat 12.'
+    assert taxes[1]['code_type'] == 'tax', 'Incorrect code type for vat 12.'
+
+    assert taxes[2]['price_unit'] == 1000, 'Incorrect unit Price for Education cess tax.'
+    assert taxes[2]['amount'] == 3000, 'Incorrect base amount for Education cess tax.'
+    assert taxes[2]['code_type'] == 'base', 'Incorrect code type for Education cess tax.'
+
+    assert taxes[3]['price_unit'] == 1000, 'Incorrect unit Price for Education cess tax.'
+    assert taxes[3]['amount'] == 60, 'Incorrect tax amount for Education cess tax.'
+    assert taxes[3]['code_type'] == 'tax', 'Incorrect code type for Education cess tax.'
+
+    assert taxes[4]['price_unit'] == 1020, 'Incorrect unit Price for Higher Education cess tax.'
+    assert taxes[4]['amount'] == 3060, 'Incorrect base amount for Higher Education cess tax.'
+    assert taxes[4]['code_type'] == 'base', 'Incorrect code type for Higher Education cess tax.'
+
+    assert taxes[5]['price_unit'] == 1020, 'Incorrect unit Price for Higher Education cess tax.'
+    assert taxes[5]['amount'] == 30.6, 'Incorrect tax amount for Higher Education cess tax.'
+    assert taxes[5]['code_type'] == 'tax', 'Incorrect code type for Higher Education cess tax.'
+
+-
+  In order to test account tax with Python Code I create a new base line and tax line
+-
+  I create a Tax
+-
+  !record {model: account.tax, id: code_tax}:
+    name: Code Tax
+    type: code
+    python_compute: '100 * 0.10'
+    tax_invoice_line_ids:
+      - code_type: base
+        amount: 100
+      - code_type: tax 
+        amount: 10
+-
+  I compute a tax
+-
+  !python {model: account.tax}: |
+    taxes = self.browse(cr, uid, [ref('code_tax')])
+    res = self.compute_all(cr, uid, taxes, 1000, 1)
+    taxes = res['taxes']
+
+    assert res['total'] == 1000, 'Incorrect amount on which tax applied.'
+    assert res['total_included'] == 1100, 'Incorrect total amount(with Tax amount).'
+
+    assert taxes[0]['price_unit'] == 1000, 'Incorrect unit Price.'
+    assert taxes[0]['amount'] == 1000, 'Incorrect base amount.'
+    assert taxes[0]['code_type'] == 'base', 'Incorrect code type.'
+
+    assert taxes[1]['price_unit'] == 1000, 'Incorrect unit Price.'
+    assert taxes[1]['amount'] == 100, 'Incorrect tax amount.'
+    assert taxes[1]['code_type'] == 'tax', 'Incorrect code type.'
+
+-
+  In order to test account invoice I create a new supplier invoice
+-
+  I create a Tax with Base code and Tax code
+-
+  !record {model: account.tax.code, id: tax_10_base_code}:
+    name: Tax 10 Base Code
+-
+  !record {model: account.tax.code, id: tax_10_tax_code}:
+    name: TAX 10 Tax Code
+-
+  !record {model: account.tax, id: invtax}:
+    name: Tax10.0
+    amount: 10.0
+    type: percent
+    type_tax_use: all
+    tax_invoice_line_ids:
+      - code_type: base
+        amount: 100.0
+        code_id: tax_10_base_code
+      - code_type: tax
+        amount: 10.0
+        code_id: tax_10_tax_code
+-
+  I create a supplier invoice
+-
+  !record {model: account.invoice, id: account_invoice_supplier1, view: invoice_supplier_form}:
+    account_id: account.a_pay
+    check_total: 3300.0
+    currency_id: base.EUR
+    invoice_line:
+      - account_id: account.a_expense
+        name: '[PCSC234] PC Assemble SC234'
+        price_unit: 300.0
+        product_id: product.product_product_3
+        quantity: 10.0
+        uos_id: product.product_uom_unit
+        invoice_line_tax_id:
+                  - invtax
+    journal_id: account.expenses_journal
+    partner_id: base.res_partner_12
+    reference_type: none
+    type: in_invoice
+-
+  I compute a supplier Invoice
+-
+  !python {model: account.invoice}: |
+    self.button_compute(cr, uid, [ref('account_invoice_supplier1')])
+-
+  I check that account invoice tax line
+- 
+  !python {model: account.invoice}: |
+    inv = self.browse(cr, uid, ref('account_invoice_supplier1'))
+    taxline = inv.tax_line
+    assert taxline[0].amount == 300, "Tax amount is wrong"
+    assert taxline[0].base == 3000, "Base amount is wrong"
+- 
+  I Validate the invoice and make state of invoice to open
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_supplier1}
+-
+  I check that the invoice state is now "Open"
+-
+  !assert {model: account.invoice, id: account_invoice_supplier1}:
+    - state == 'open'
+-
+  I check that account move lines
+-
+  !python {model: account.invoice}: |
+    inv = self.browse(cr, uid, ref('account_invoice_supplier1'))
+    move_line = inv.move_id.line_id
+    assert (move_line[0].debit == 3300.0 and move_line[0].credit == 0.0 and move_line[0].tax_amount == 0.0), "Incorrect Debit, Credit or Amount"
+    assert (move_line[1].debit == 0.0 and move_line[1].credit == 300.0 and move_line[1].tax_amount == 300.0), "Incorrect Debit, Credit or Amount"
+    assert (move_line[1].tax_code_id.id == ref('tax_10_tax_code')), "Incorrect Tax Account"
+    assert (move_line[2].debit == 0.0 and move_line[2].credit == 3000.0 and move_line[2].tax_amount == 3000.0), "Incorrect Debit, Credit or Amount"
+    assert (move_line[2].tax_code_id.id == ref('tax_10_base_code')), "Incorrect Tax Account"

=== modified file 'account/test/account_validate_account_move.yml'
--- account/test/account_validate_account_move.yml	2013-10-27 12:31:04 +0000
+++ account/test/account_validate_account_move.yml	2014-06-02 10:31:27 +0000
@@ -36,15 +36,14 @@
   !python {model: account.move.line}: |
     import time
     date = self._get_date(cr, uid, {
-      'journal_id': 1, 
-      'period_id': 6,}) 
+      'journal_id': ref('account.bank_journal'), 
+      'period_id': ref('account.period_6'),}) 
     partner = self.onchange_partner_id(cr, uid, [], False, ref('base.res_partner_12'), ref('account.cash'), debit=0, credit=2000, date=date, journal=False)
     account = self.onchange_account_id(cr, uid, [], account_id=ref('account.a_recv'), partner_id= ref('base.res_partner_12'))
     vals = {
         'journal_id': ref('account.bank_journal'),
         'period_id': ref('account.period_6'),
         'ref': '2011010',
-        'tax_code_id': ref('account_tax_code_0'),
         'tax_amount': 0.0,
         'account_id': ref('account.a_recv'),
         'amount_currency': 0.0,

=== modified file 'account/test/test_edi_invoice.yml'
--- account/test/test_edi_invoice.yml	2012-11-29 22:26:45 +0000
+++ account/test/test_edi_invoice.yml	2014-06-02 10:31:27 +0000
@@ -4,7 +4,7 @@
   First I create a draft customer invoice
 -
   !record {model: account.invoice, id: invoice_edi_1}:
-    journal_id: 1
+    journal_id: account.bank_journal
     partner_id: base.res_partner_2
     currency_id: base.EUR
     company_id: 1
@@ -32,6 +32,11 @@
         manual: True
         amount: 1000.00
 -
+  I compute a customer Invoice
+-
+  !python {model: account.invoice}: |
+    self.button_compute(cr, uid, [ref('invoice_edi_1')])
+-
   I confirm and open the invoice
 -
   !workflow {model: account.invoice, ref: invoice_edi_1, action: invoice_open}

=== modified file 'account/tests/test_tax.py'
--- account/tests/test_tax.py	2012-11-01 20:39:35 +0000
+++ account/tests/test_tax.py	2014-06-02 10:31:27 +0000
@@ -18,13 +18,15 @@
                 name="Programmatic tax",
                 type='code',
                 python_compute='result = 12.0',
+                python_applicable='result = 12.0',
                 python_compute_inv='result = 11.0',
+                tax_invoice_line_ids= [(0, 0, dict(code_type = 'base', amount= 100, apply_on = 'invoice')), \
+                                       (0, 0, dict(code_type = 'tax', amount = 24, apply_on = 'invoice'))]
                 ))
 
         tax_records = self.tax_model.browse(cr, uid, [tax_id])
         res = self.tax_model.compute_all(cr, uid, tax_records, 50.0, 2)
-
-        tax_detail = res['taxes'][0]
+        tax_detail = res['taxes'][1]
         self.assertEquals(tax_detail['amount'], 24.0)
         self.assertEquals(res['total_included'], 124.0)
 
@@ -34,16 +36,15 @@
         tax_id = self.tax_model.create(cr, uid, dict(
                 name="Percent tax",
                 type='percent',
-                amount='0.1',
+                amount='10',
+                tax_invoice_line_ids= [(0, 0, dict(code_type = 'base', amount= 100, apply_on = 'invoice')), \
+                                       (0, 0, dict(code_type = 'tax', amount = 10, apply_on = 'invoice'))]
                 ))
 
         tax_records = self.tax_model.browse(cr, uid, [tax_id])
         res = self.tax_model.compute_all(cr, uid, tax_records, 50.0, 2)
 
-        tax_detail = res['taxes'][0]
+        tax_detail = res['taxes'][1]
         self.assertEquals(tax_detail['amount'], 10.0)
         self.assertEquals(res['total_included'], 110.0)
 
-        # now the inverse computation
-        res = self.tax_model.compute_inv(cr, uid, tax_records, 55.0, 2)
-        self.assertEquals(res[0]['amount'], 10.0)

=== modified file 'account/wizard/account_change_currency.py'
--- account/wizard/account_change_currency.py	2013-10-27 12:31:04 +0000
+++ account/wizard/account_change_currency.py	2014-06-02 10:31:27 +0000
@@ -71,6 +71,8 @@
                 new_price = (line.price_unit / old_rate ) * rate
             obj_inv_line.write(cr, uid, [line.id], {'price_unit': new_price})
         obj_inv.write(cr, uid, [invoice.id], {'currency_id': new_currency}, context=context)
+        #apply computation of tax with new currency
+        obj_inv.button_reset_taxes(cr, uid, [invoice.id], context=context)
         return {'type': 'ir.actions.act_window_close'}
 
 

=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py	2014-05-02 13:03:52 +0000
+++ account_voucher/account_voucher.py	2014-06-02 10:31:27 +0000
@@ -440,7 +440,8 @@
             if not tax[0].price_include:
                 for line in voucher.line_ids:
                     for tax_line in tax_pool.compute_all(cr, uid, tax, line.amount, 1).get('taxes', []):
-                        total_tax += tax_line.get('amount', 0.0)
+                        if tax_line['code_type'] == 'tax':
+                            total_tax += tax_line.get('amount', 0.0)
                 total += total_tax
             else:
                 for line in voucher.line_ids:
@@ -448,8 +449,9 @@
                     line_tax = 0.0
 
                     for tax_line in tax_pool.compute_all(cr, uid, tax, line.untax_amount or line.amount, 1).get('taxes', []):
-                        line_tax += tax_line.get('amount', 0.0)
-                        line_total += tax_line.get('price_unit')
+                        if tax_line['code_type'] == 'tax':
+                            line_tax += tax_line.get('amount', 0.0)
+                            line_total += tax_line.get('price_unit')
                     total_tax += line_tax
                     untax_amount = line.untax_amount or line.amount
                     voucher_line_pool.write(cr, uid, [line.id], {'amount':line_total, 'untax_amount':untax_amount})
@@ -487,7 +489,8 @@
 
                 if not tax[0].price_include:
                     for tax_line in tax_pool.compute_all(cr, uid, tax, line_amount, 1).get('taxes', []):
-                        total_tax += tax_line.get('amount')
+                        if tax_line['code_type'] == 'tax':
+                            total_tax += tax_line.get('amount')
 
             voucher_total += line_amount
         total = voucher_total + total_tax
@@ -1240,8 +1243,9 @@
 
             if move_line.get('account_tax_id', False):
                 tax_data = tax_obj.browse(cr, uid, [move_line['account_tax_id']], context=context)[0]
-                if not (tax_data.base_code_id and tax_data.tax_code_id):
-                    raise osv.except_osv(_('No Account Base Code and Account Tax Code!'),_("You have to configure account base code and account tax code on the '%s' tax!") % (tax_data.name))
+                for tax_invoice_line_id in tax_data.tax_invoice_line_ids:
+                    if not tax_invoice_line_id.code_id:
+                        raise osv.except_osv(_('No Tax Grid!'),_("You have to configure Tax Grid on the '%s' tax!") % (tax_data.name))
 
             # compute the amount in foreign currency
             foreign_currency_diff = 0.0

=== modified file 'account_voucher/test/case1_usd_usd.yml'
--- account_voucher/test/case1_usd_usd.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case1_usd_usd.yml	2014-06-02 10:31:27 +0000
@@ -83,6 +83,7 @@
         quantity: 1.0
         product_id: product.product_product_3
         uos_id: product.product_uom_unit
+        invoice_line_tax_id: []
     journal_id: account.sales_journal
     partner_id: base.res_partner_19
     reference_type: none
@@ -116,6 +117,7 @@
         quantity: 1.0
         product_id: product.product_product_3
         uos_id: product.product_uom_unit
+        invoice_line_tax_id: []
     journal_id: account.sales_journal
     partner_id: base.res_partner_19
     reference_type: none

=== modified file 'account_voucher/test/case2_usd_eur_debtor_in_eur.yml'
--- account_voucher/test/case2_usd_eur_debtor_in_eur.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case2_usd_eur_debtor_in_eur.yml	2014-06-02 10:31:27 +0000
@@ -88,6 +88,7 @@
         quantity: 1.0
         product_id: product.product_product_3
         uos_id: product.product_uom_unit
+        invoice_line_tax_id: []
     journal_id: account.sales_journal
     partner_id: base.res_partner_19
     reference_type: none
@@ -121,6 +122,7 @@
         quantity: 1.0
         product_id: product.product_product_3
         uos_id: product.product_uom_unit
+        invoice_line_tax_id: []
     journal_id: account.sales_journal
     partner_id: base.res_partner_19
     reference_type: none

=== modified file 'account_voucher/test/case2_usd_eur_debtor_in_usd.yml'
--- account_voucher/test/case2_usd_eur_debtor_in_usd.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case2_usd_eur_debtor_in_usd.yml	2014-06-02 10:31:27 +0000
@@ -88,6 +88,7 @@
         quantity: 1.0
         product_id: product.product_product_3
         uos_id: product.product_uom_unit
+        invoice_line_tax_id: []
     journal_id: account.sales_journal
     partner_id: base.res_partner_19
     reference_type: none
@@ -121,6 +122,7 @@
         quantity: 1.0
         product_id: product.product_product_3
         uos_id: product.product_uom_unit
+        invoice_line_tax_id: []
     journal_id: account.sales_journal
     partner_id: base.res_partner_19
     reference_type: none

=== modified file 'account_voucher/test/case3_eur_eur.yml'
--- account_voucher/test/case3_eur_eur.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case3_eur_eur.yml	2014-06-02 10:31:27 +0000
@@ -43,6 +43,7 @@
         quantity: 1.0
         product_id: product.product_product_3
         uos_id: product.product_uom_unit
+        invoice_line_tax_id: []
     journal_id: account.sales_journal
     partner_id: base.res_partner_19
     reference_type: none
@@ -76,6 +77,7 @@
         quantity: 1.0
         product_id: product.product_product_3
         uos_id: product.product_uom_unit
+        invoice_line_tax_id: []
     journal_id: account.sales_journal
     partner_id: base.res_partner_19
     reference_type: none

=== modified file 'account_voucher/test/case4_cad_chf.yml'
--- account_voucher/test/case4_cad_chf.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case4_cad_chf.yml	2014-06-02 10:31:27 +0000
@@ -77,6 +77,7 @@
         quantity: 1.0
         product_id: product.product_product_3
         uos_id: product.product_uom_unit
+        invoice_line_tax_id: []
     journal_id: account.sales_journal
     partner_id: base.res_partner_19
     reference_type: none

=== modified file 'account_voucher/test/case5_suppl_usd_usd.yml'
--- account_voucher/test/case5_suppl_usd_usd.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case5_suppl_usd_usd.yml	2014-06-02 10:31:27 +0000
@@ -80,6 +80,7 @@
         quantity: 1.0
         product_id: product.product_product_3
         uos_id: product.product_uom_unit
+        invoice_line_tax_id: []
     journal_id: account.sales_journal
     partner_id: base.res_partner_19
     reference_type: none

=== modified file 'account_voucher/test/case_eur_usd.yml'
--- account_voucher/test/case_eur_usd.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case_eur_usd.yml	2014-06-02 10:31:27 +0000
@@ -61,6 +61,7 @@
         quantity: 1.0
         product_id: product.product_product_3
         uos_id: product.product_uom_unit
+        invoice_line_tax_id: []
     journal_id: account.sales_journal
     partner_id: base.res_partner_19
 -

=== modified file 'account_voucher/test/sales_payment.yml'
--- account_voucher/test/sales_payment.yml	2014-04-24 12:35:38 +0000
+++ account_voucher/test/sales_payment.yml	2014-06-02 10:31:27 +0000
@@ -17,6 +17,7 @@
         quantity: 1.0
         product_id: product.product_product_3
         uos_id: product.product_uom_unit
+        invoice_line_tax_id: []
     journal_id: account.sales_journal
     partner_id: base.res_partner_19
 

=== modified file 'account_voucher/voucher_sales_purchase_view.xml'
--- account_voucher/voucher_sales_purchase_view.xml	2014-02-12 18:23:15 +0000
+++ account_voucher/voucher_sales_purchase_view.xml	2014-06-02 10:31:27 +0000
@@ -101,24 +101,23 @@
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
-			                <group>
+                            <group>
                                 <field name="narration" placeholder="Internal Notes" nolabel="1"/>
                                 <group class="oe_subtotal_footer oe_right">
                                     <field name="tax_id" 
-                                        on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
-                                        widget="selection" nolabel="1"
-					placeholder="Tax"
-                                        domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
+                                        on_change="onchange_price(line_cr_ids, tax_id, partner_id)" 
+                                        widget="selection" nolabel="1" 
+                                        placeholder="Tax" domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
                                     <field name="tax_amount" nolabel="1"/>
                                     <div class="oe_subtotal_footer_separator">
                                         <label for="amount"/>
                                         <button type="object" class="oe_link oe_edit_only"
                                             name="compute_tax" string="(update)"
                                             attrs="{'invisible': [('state','!=','draft')]}"/>
-			                        </div>
+                                    </div>
                                     <field name="amount" class="oe_subtotal_footer_separator" nolabel="1"/>
                                 </group>                                    
-			                </group>
+			    </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
                             <group col="4">
@@ -269,17 +268,14 @@
                                     <field name="tax_id" 
                                         on_change="onchange_price(line_dr_ids, tax_id, partner_id)"
                                         widget="selection" nolabel="1"
-					placeholder="Tax"
-
-                                        domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"
-                                        />
+                                        placeholder="Tax" domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"/>
                                     <field name="tax_amount" nolabel="1"/>
                                     <div class="oe_subtotal_footer_separator">
                                         <label for="amount"/>
                                         <button type="object" class="oe_link oe_edit_only"
                                             name="compute_tax" string="(update)"
                                             attrs="{'invisible': [('state','!=','draft')]}"/>
-			            </div>
+                                    </div>
                                     <field name="amount" class="oe_subtotal_footer_separator" nolabel="1"/>
                                 </group>
                             </group>

=== modified file 'hr_expense/hr_expense.py'
--- hr_expense/hr_expense.py	2014-03-10 14:36:00 +0000
+++ hr_expense/hr_expense.py	2014-06-02 10:31:27 +0000
@@ -311,8 +311,10 @@
                     line.unit_amount ,
                     line.unit_quantity, line.product_id,
                     exp.user_id.partner_id)['taxes']:
-                tax_code_id = tax['base_code_id']
-                tax_amount = line.total_amount * tax['base_sign']
+                if tax['code_type'] == 'base':
+                    continue
+                tax_code_id = tax['code_id']
+                tax_amount = line.total_amount * tax['code_sign']
                 if tax_code_found:
                     if not tax_code_id:
                         continue
@@ -328,16 +330,16 @@
                 is_price_include = tax_obj.read(cr,uid,tax['id'],['price_include'],context)['price_include']
                 if is_price_include:
                     ## We need to deduce the price for the tax
-                    res[-1]['price'] = res[-1]['price']  - (tax['amount'] * tax['base_sign'] or 0.0)
+                    res[-1]['price'] = res[-1]['price']  - (tax['amount'] * tax['code_sign'] or 0.0)
                 assoc_tax = {
                              'type':'tax',
                              'name':tax['name'],
                              'price_unit': tax['price_unit'],
                              'quantity': 1,
-                             'price':  tax['amount'] * tax['base_sign'] or 0.0,
-                             'account_id': tax['account_collected_id'] or mres['account_id'],
-                             'tax_code_id': tax['tax_code_id'],
-                             'tax_amount': tax['amount'] * tax['base_sign'],
+                             'price':  tax['amount'] * tax['code_sign'] or 0.0,
+                             'account_id': tax['account_id'] or mres['account_id'],
+                             'tax_code_id': tax['code_id'],
+                             'tax_amount': tax['amount'] * tax['code_sign'],
                              }
                 res.append(assoc_tax)
         return res

=== modified file 'hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml'
--- hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml	2013-10-27 12:31:04 +0000
+++ hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml	2014-06-02 10:31:27 +0000
@@ -48,7 +48,12 @@
     sequence: 1
     company_id: base.main_company
     type_tax_use: all
-    tax_code_id: tax_case
+    tax_invoice_line_ids:
+      - code_type: base
+        amount: 100
+      - code_type: tax
+        amount: 10
+        code_id: tax_case
 -
   I create an Account with the tax
 -

=== modified file 'hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml'
--- hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml	2013-10-27 12:31:04 +0000
+++ hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml	2014-06-02 10:31:27 +0000
@@ -47,7 +47,12 @@
     sequence: 1
     company_id: base.main_company
     type_tax_use: all
-    tax_code_id: tax_case
+    tax_invoice_line_ids: 
+      - code_type: base
+        amount: 100
+      - code_type: tax
+        amount: 8
+        code_id: tax_case
 -
   I create an Account with the tax
 -
@@ -106,7 +111,6 @@
       product = invoice.product_id.id
 
     product_exp = data['product'][0]
-
     assert product == product_exp
     assert aline.invoice_id, "Invoice created, but analytic line wasn't updated."
     assert aline.invoice_id == invoice_id, "Invoice doesn't match the one at analytic line"

=== modified file 'l10n_br/account.py'
--- l10n_br/account.py	2013-10-27 12:31:04 +0000
+++ l10n_br/account.py	2014-06-02 10:31:27 +0000
@@ -19,6 +19,7 @@
 
 import openerp
 from openerp.osv import fields, osv
+from openerp.addons.account import account
 
 TAX_CODE_COLUMNS = {
                     'domain':fields.char('Domain', size=32, 
@@ -162,7 +163,6 @@
         return result
 
 
-
 class account_tax(osv.osv):
     """ Add fields used to define some brazilian taxes """
     _inherit = 'account.tax'
@@ -176,12 +176,7 @@
                'amount_mva': fields.float('MVA Percent', required=True, 
                                           digits_compute=get_precision_tax(), 
                                           help="Um percentual decimal em % entre 0-1."),
-               'type': fields.selection([('percent','Percentage'), 
-                                         ('fixed','Fixed Amount'), 
-                                         ('none','None'), 
-                                         ('code','Python Code'), 
-                                         ('balance','Balance'), 
-                                         ('quantity','Quantity')], 'Tax Type', required=True,
+               'type': fields.selection(account.TAX_TYPE + [('quantity', 'Quantity')], 'Tax Type', required=True,
                                         help="The computation method for the tax amount."),
                }
     _defaults = TAX_DEFAULTS

=== modified file 'l10n_br/account_view.xml'
--- l10n_br/account_view.xml	2012-10-29 18:16:57 +0000
+++ l10n_br/account_view.xml	2014-06-02 10:31:27 +0000
@@ -36,9 +36,6 @@
 				<field position="after" name="price_include">
 					<field groups="base.group_extended" name="tax_discount"/>
 			    </field>
-	    		<field name="tax_code_id" position="replace" >
-					<field name="tax_code_id" on_change="onchange_tax_code_id(tax_code_id)" />
-			    </field>
    				<field position="after" name="amount">
 					<field groups="base.group_extended" name="base_reduction"/>
 					<field groups="base.group_extended" name="amount_mva"/>
@@ -54,9 +51,6 @@
 				<field position="after" name="price_include">
 					<field groups="base.group_extended" name="tax_discount"/>
 			    </field>
-   				<field name="tax_code_id" position="replace" >
-					<field name="tax_code_id" on_change="onchange_tax_code_id(tax_code_id)" />
-			    </field>
 			    <field position="after" name="amount">
 					<field groups="base.group_extended" name="base_reduction"/>
 					<field groups="base.group_extended" name="amount_mva"/>

=== modified file 'l10n_br/data/account_tax_template.xml'
--- l10n_br/data/account_tax_template.xml	2013-10-27 12:31:04 +0000
+++ l10n_br/data/account_tax_template.xml	2014-06-02 10:31:27 +0000
@@ -1,1343 +1,3893 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data noupdate="0">
-
-		<record id="tax_template_out_ipi" model="account.tax.template">
-			<field name="description">IPI </field>
-			<field name="name">IPI Saída</field>
-			<field name="amount">0.00</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_ipi2" model="account.tax.template">
-			<field name="description">IPI 2%</field>
-			<field name="name">IPI Saída 2%</field>
-			<field name="amount">0.02</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_ipi3" model="account.tax.template">
-			<field name="description">IPI 3%</field>
-			<field name="name">IPI Saída 3%</field>
-			<field name="amount">0.03</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_ipi4" model="account.tax.template">
-			<field name="description">IPI 4%</field>
-			<field name="name">IPI Saída 4%</field>
-			<field name="amount">0.04</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_ipi5" model="account.tax.template">
-			<field name="description">IPI 5%</field>
-			<field name="name">IPI Saída 5%</field>
-			<field name="amount">0.05</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_ipi7" model="account.tax.template">
-			<field name="description">IPI 7%</field>
-			<field name="name">IPI Saída 7%</field>
-			<field name="amount">0.07</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_out_ipi8" model="account.tax.template">
-			<field name="description">IPI 8%</field>
-			<field name="name">IPI Saída 8%</field>
-			<field name="amount">0.08</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_ipi10" model="account.tax.template">
-			<field name="description">IPI 10%</field>
-			<field name="name">IPI Saída 10%</field>
-			<field name="amount">0.10</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_ipi12" model="account.tax.template">
-			<field name="description">IPI 12%</field>
-			<field name="name">IPI Saída 12%</field>
-			<field name="amount">0.12</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_ipi13" model="account.tax.template">
-			<field name="description">IPI 13%</field>
-			<field name="name">IPI Saída 13%</field>
-			<field name="amount">0.13</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_ipi15" model="account.tax.template">
-			<field name="description">IPI 15%</field>
-			<field name="name">IPI Saída 15%</field>
-			<field name="amount">0.15</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_ipi16" model="account.tax.template">
-			<field name="description">IPI 16%</field>
-			<field name="name">IPI Saída 16%</field>
-			<field name="amount">0.16</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_ipi18" model="account.tax.template">
-			<field name="description">IPI 18%</field>
-			<field name="name">IPI Saída 18%</field>
-			<field name="amount">0.18</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_ipi20" model="account.tax.template">
-			<field name="description">IPI 20%</field>
-			<field name="name">IPI Saída 20%</field>
-			<field name="amount">0.20</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_out_ipi22" model="account.tax.template">
-			<field name="description">IPI 22%</field>
-			<field name="name">IPI Saída 22%</field>
-			<field name="amount">0.22</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_ipi24" model="account.tax.template">
-			<field name="description">IPI 24%</field>
-			<field name="name">IPI Saída 24%</field>
-			<field name="amount">0.24</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_ipi25" model="account.tax.template">
-			<field name="description">IPI 25%</field>
-			<field name="name">IPI Saída 25%</field>
-			<field name="amount">0.25</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_ipi27" model="account.tax.template">
-			<field name="description">IPI 27%</field>
-			<field name="name">IPI Saída 27%</field>
-			<field name="amount">0.27</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_ipi30" model="account.tax.template">
-			<field name="description">IPI 30%</field>
-			<field name="name">IPI Saída 30%</field>
-			<field name="amount">0.30</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_ipi35" model="account.tax.template">
-			<field name="description">IPI 35%</field>
-			<field name="name">IPI Saída 35%</field>
-			<field name="amount">0.35</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_out_ipi40" model="account.tax.template">
-			<field name="description">IPI 40%</field>
-			<field name="name">IPI Saída 40%</field>
-			<field name="amount">0.40</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_ipi42" model="account.tax.template">
-			<field name="description">IPI 42%</field>
-			<field name="name">IPI Saída 42%</field>
-			<field name="amount">0.42</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_ipi45" model="account.tax.template">
-			<field name="description">IPI 45%</field>
-			<field name="name">IPI Saída 45%</field>
-			<field name="amount">0.45</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_ipi50" model="account.tax.template">
-			<field name="description">IPI 50%</field>
-			<field name="name">IPI Saída 50%</field>
-			<field name="amount">0.50</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_ipi60" model="account.tax.template">
-			<field name="description">IPI 60%</field>
-			<field name="name">IPI Saída 60%</field>
-			<field name="amount">0.60</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-	<record id="tax_template_out_ipi300" model="account.tax.template">
-			<field name="description">IPI 300%</field>
-			<field name="name">IPI Saída 300%</field>
-			<field name="amount">3.00</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_ipi330" model="account.tax.template">
-			<field name="description">IPI 330%</field>
-			<field name="name">IPI Saída 330%</field>
-			<field name="amount">3.30</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010301" name="account_collected_id"/>
-			<field ref="account_template_101050502" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-       	
-       	<record id="tax_template_in_ipi" model="account.tax.template">
-			<field name="description">IPI</field>
-			<field name="name">IPI Entrada</field>
-			<field name="amount">0.00</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi2" model="account.tax.template">
-			<field name="description">IPI 2%</field>
-			<field name="name">IPI Entrada 2%</field>
-			<field name="amount">0.02</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi3" model="account.tax.template">
-			<field name="description">IPI 3%</field>
-			<field name="name">IPI Entrada 3%</field>
-			<field name="amount">0.03</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi4" model="account.tax.template">
-			<field name="description">IPI 4%</field>
-			<field name="name">IPI Entrada 4%</field>
-			<field name="amount">0.04</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi5" model="account.tax.template">
-			<field name="description">IPI 5%</field>
-			<field name="name">IPI Entrada 5%</field>
-			<field name="amount">0.05</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi7" model="account.tax.template">
-			<field name="description">IPI 7%</field>
-			<field name="name">IPI Entrada 7%</field>
-			<field name="amount">0.07</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_in_ipi8" model="account.tax.template">
-			<field name="description">IPI 8%</field>
-			<field name="name">IPI Entrada 8%</field>
-			<field name="amount">0.08</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi10" model="account.tax.template">
-			<field name="description">IPI 10%</field>
-			<field name="name">IPI Entrada 10%</field>
-			<field name="amount">0.10</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi12" model="account.tax.template">
-			<field name="description">IPI 12%</field>
-			<field name="name">IPI Entrada 12%</field>
-			<field name="amount">0.12</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi13" model="account.tax.template">
-			<field name="description">IPI 13%</field>
-			<field name="name">IPI Entrada 13%</field>
-			<field name="amount">0.13</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi15" model="account.tax.template">
-			<field name="description">IPI 15%</field>
-			<field name="name">IPI Entrada 15%</field>
-			<field name="amount">0.15</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi16" model="account.tax.template">
-			<field name="description">IPI 16%</field>
-			<field name="name">IPI Entrada 16%</field>
-			<field name="amount">0.16</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi18" model="account.tax.template">
-			<field name="description">IPI 18%</field>
-			<field name="name">IPI Entrada 18%</field>
-			<field name="amount">0.18</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi20" model="account.tax.template">
-			<field name="description">IPI 20%</field>
-			<field name="name">IPI Entrada 20%</field>
-			<field name="amount">0.20</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_in_ipi22" model="account.tax.template">
-			<field name="description">IPI 22%</field>
-			<field name="name">IPI Entrada 22%</field>
-			<field name="amount">0.22</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi24" model="account.tax.template">
-			<field name="description">IPI 24%</field>
-			<field name="name">IPI Entrada 24%</field>
-			<field name="amount">0.24</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi25" model="account.tax.template">
-			<field name="description">IPI 25%</field>
-			<field name="name">IPI Entrada 25%</field>
-			<field name="amount">0.25</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi27" model="account.tax.template">
-			<field name="description">IPI 27%</field>
-			<field name="name">IPI Entrada 27%</field>
-			<field name="amount">0.27</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi30" model="account.tax.template">
-			<field name="description">IPI 30%</field>
-			<field name="name">IPI Entrada 30%</field>
-			<field name="amount">0.30</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi35" model="account.tax.template">
-			<field name="description">IPI 35%</field>
-			<field name="name">IPI Entrada 35%</field>
-			<field name="amount">0.35</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-        	</record>
-
-		<record id="tax_template_in_ipi40" model="account.tax.template">
-			<field name="description">IPI 40%</field>
-			<field name="name">IPI Entrada 40%</field>
-			<field name="amount">0.40</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi42" model="account.tax.template">
-			<field name="description">IPI 42%</field>
-			<field name="name">IPI Entrada 42%</field>
-			<field name="amount">0.42</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi45" model="account.tax.template">
-			<field name="description">IPI 45%</field>
-			<field name="name">IPI Entrada 45%</field>
-			<field name="amount">0.45</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi50" model="account.tax.template">
-			<field name="description">IPI 50%</field>
-			<field name="name">IPI Entrada 50%</field>
-			<field name="amount">0.50</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi60" model="account.tax.template">
-			<field name="description">IPI 60%</field>
-			<field name="name">IPI Entrada 60%</field>
-			<field name="amount">0.60</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi300" model="account.tax.template">
-			<field name="description">IPI 300%</field>
-			<field name="name">IPI Entrada 300%</field>
-			<field name="amount">3.00</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_ipi330" model="account.tax.template">
-			<field name="description">IPI 330%</field>
-			<field name="name">IPI Entrada 330%</field>
-			<field name="amount">3.30</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050502" name="account_collected_id"/>
-			<field ref="account_template_201010301" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_ipi" name="base_code_id"/>
-			<field ref="tax_code_template_ipi" name="tax_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_base_code_id"/>
-			<field ref="tax_code_template_ipi" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_icms_interno" model="account.tax.template">
-			<field name="description">ICMS Interno</field>
-			<field name="name">ICMS Saida Interno</field>
-			<field name="amount">0.00</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010302" name="account_collected_id"/>
-			<field ref="account_template_101050505" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="1" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_icms" name="base_code_id"/>
-			<field ref="tax_code_template_icms" name="tax_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_base_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_icms_externo" model="account.tax.template">
-			<field name="description">ICMS Externo</field>
-			<field name="name">ICMS Saida Externo</field>
-			<field name="amount">0.00</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010302" name="account_collected_id"/>
-			<field ref="account_template_101050505" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="1" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_icms" name="base_code_id"/>
-			<field ref="tax_code_template_icms" name="tax_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_base_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_icms_subist" model="account.tax.template">
-			<field name="description">ICMS Subist</field>
-			<field name="name">ICMS Saida Subist</field>
-			<field name="amount">0.00</field>
-			<field name="type_tax_use">sale</field>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_icmsst" name="base_code_id"/>
-			<field ref="tax_code_template_icmsst" name="tax_code_id"/>
-			<field ref="tax_code_template_icmsst" name="ref_base_code_id"/>
-			<field ref="tax_code_template_icmsst" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_icms_externo7" model="account.tax.template">
-			<field name="description">ICMS Externo 7%</field>
-			<field name="name">ICMS Saida Externo 7%</field>
-			<field name="amount">0.07</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010302" name="account_collected_id"/>
-			<field ref="account_template_101050505" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="1" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_icms" name="base_code_id"/>
-			<field ref="tax_code_template_icms" name="tax_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_base_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_icms_externo12" model="account.tax.template">
-			<field name="description">ICMS Externo 12%</field>
-			<field name="name">ICMS Saida Externo 12%</field>
-			<field name="amount">0.12</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010302" name="account_collected_id"/>
-			<field ref="account_template_101050505" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="1" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_icms" name="base_code_id"/>
-			<field ref="tax_code_template_icms" name="tax_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_base_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_icms_interno19" model="account.tax.template">
-			<field name="description">ICMS Interno 19%</field>
-			<field name="name">ICMS Saida Interno 19%</field>
-			<field name="amount">0.19</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010302" name="account_collected_id"/>
-			<field ref="account_template_101050505" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="1" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_icms" name="base_code_id"/>
-			<field ref="tax_code_template_icms" name="tax_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_base_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_icms_interno26" model="account.tax.template">
-			<field name="description">ICMS Interno 26%</field>
-			<field name="name">ICMS Saida Interno 26%</field>
-			<field name="amount">0.26</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010302" name="account_collected_id"/>
-			<field ref="account_template_101050505" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="1" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_icms" name="base_code_id"/>
-			<field ref="tax_code_template_icms" name="tax_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_base_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_tax_code_id"/>
-       	</record>
-       	
-       	<record id="tax_template_in_icms_interno" model="account.tax.template">
-			<field name="description">ICMS Interno</field>
-			<field name="name">ICMS Entrada Interno</field>
-			<field name="amount">0.00</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050505" name="account_collected_id"/>
-			<field ref="account_template_201010302" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="1" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_icms" name="base_code_id"/>
-			<field ref="tax_code_template_icms" name="tax_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_base_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_icms_externo" model="account.tax.template">
-			<field name="description">ICMS Externo</field>
-			<field name="name">ICMS Entrada Externo</field>
-			<field name="amount">0.00</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050505" name="account_collected_id"/>
-			<field ref="account_template_201010302" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="1" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_icms" name="base_code_id"/>
-			<field ref="tax_code_template_icms" name="tax_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_base_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_icms_subist" model="account.tax.template">
-			<field name="description">ICMS Subist</field>
-			<field name="name">ICMS Entrada Subist</field>
-			<field name="amount">0.00</field>
-			<field name="type_tax_use">purchase</field>
-			<field eval="0" name="price_include"/>
-			<field eval="0" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_icmsst" name="base_code_id"/>
-			<field ref="tax_code_template_icmsst" name="tax_code_id"/>
-			<field ref="tax_code_template_icmsst" name="ref_base_code_id"/>
-			<field ref="tax_code_template_icmsst" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_icms_externo7" model="account.tax.template">
-			<field name="description">ICMS Externo 7%</field>
-			<field name="name">ICMS Entrada Externo 7%</field>
-			<field name="amount">0.07</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050505" name="account_collected_id"/>
-			<field ref="account_template_201010302" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="1" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_icms" name="base_code_id"/>
-			<field ref="tax_code_template_icms" name="tax_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_base_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_icms_externo12" model="account.tax.template">
-			<field name="description">ICMS Externo 12%</field>
-			<field name="name">ICMS Entrada Externo 12%</field>
-			<field name="amount">0.12</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050505" name="account_collected_id"/>
-			<field ref="account_template_201010302" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="1" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_icms" name="base_code_id"/>
-			<field ref="tax_code_template_icms" name="tax_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_base_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_icms_interno19" model="account.tax.template">
-			<field name="description">ICMS Interno 19%</field>
-			<field name="name">ICMS Entrada Interno 19%</field>
-			<field name="amount">0.19</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050505" name="account_collected_id"/>
-			<field ref="account_template_201010302" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="1" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_icms" name="base_code_id"/>
-			<field ref="tax_code_template_icms" name="tax_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_base_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_icms_interno26" model="account.tax.template">
-			<field name="description">ICMS Interno 26%</field>
-			<field name="name">ICMS Entrada Interno 26%</field>
-			<field name="amount">0.26</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050505" name="account_collected_id"/>
-			<field ref="account_template_201010302" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="1" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_icms" name="base_code_id"/>
-			<field ref="tax_code_template_icms" name="tax_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_base_code_id"/>
-			<field ref="tax_code_template_icms" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_pis" model="account.tax.template">
-			<field name="description">PIS</field>
-			<field name="name">PIS Saida</field>
-			<field name="amount">0.00</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010500" name="account_collected_id"/>
-			<field ref="account_template_101050503" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="1" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_pis" name="base_code_id"/>
-			<field ref="tax_code_template_pis" name="tax_code_id"/>
-			<field ref="tax_code_template_pis" name="ref_base_code_id"/>
-			<field ref="tax_code_template_pis" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_pis065" model="account.tax.template">
-			<field name="description">PIS 0,65%</field>
-			<field name="name">PIS Saida 0,65%</field>
-			<field name="amount">0.0065</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010500" name="account_collected_id"/>
-			<field ref="account_template_101050503" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="1" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_pis" name="base_code_id"/>
-			<field ref="tax_code_template_pis" name="tax_code_id"/>
-			<field ref="tax_code_template_pis" name="ref_base_code_id"/>
-			<field ref="tax_code_template_pis" name="ref_tax_code_id"/>
-       	</record>
-       	
-       	<record id="tax_template_in_pis" model="account.tax.template">
-			<field name="description">PIS</field>
-			<field name="name">PIS Entrada</field>
-			<field name="amount">0.00</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050503" name="account_collected_id"/>
-			<field ref="account_template_201010500" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="1" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_pis" name="base_code_id"/>
-			<field ref="tax_code_template_pis" name="tax_code_id"/>
-			<field ref="tax_code_template_pis" name="ref_base_code_id"/>
-			<field ref="tax_code_template_pis" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_in_pis065" model="account.tax.template">
-			<field name="description">PIS 0,65%</field>
-			<field name="name">PIS Entrada 0,65%</field>
-			<field name="amount">0.0065</field>
-			<field name="type_tax_use">purchase</field>
-			<field ref="account_template_101050503" name="account_collected_id"/>
-			<field ref="account_template_201010500" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="1" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_pis" name="base_code_id"/>
-			<field ref="tax_code_template_pis" name="tax_code_id"/>
-			<field ref="tax_code_template_pis" name="ref_base_code_id"/>
-			<field ref="tax_code_template_pis" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_cofins" model="account.tax.template">
-			<field name="description">COFINS</field>
-			<field name="name">COFINS Saida</field>
-			<field name="amount">0.00</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010500" name="account_collected_id"/>
-			<field ref="account_template_101050503" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="1" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_cofins" name="base_code_id"/>
-			<field ref="tax_code_template_cofins" name="tax_code_id"/>
-			<field ref="tax_code_template_cofins" name="ref_base_code_id"/>
-			<field ref="tax_code_template_cofins" name="ref_tax_code_id"/>
-       	</record>
-
-		<record id="tax_template_out_cofins3" model="account.tax.template">
-			<field name="description">COFINS 3%</field>
-			<field name="name">COFINS Saida 3%</field>
-			<field name="amount">0.03</field>
-			<field name="type_tax_use">sale</field>
-			<field ref="account_template_201010500" name="account_collected_id"/>
-			<field ref="account_template_101050503" name="account_paid_id"/>
-			<field eval="0" name="price_include"/>
-			<field eval="1" name="tax_discount"/>
-			<field ref="l10n_br_account_chart_template" name="chart_template_id"/>
-			<field ref="tax_code_template_cofins" name="base_code_id"/>
-			<field ref="tax_code_template_cofins" name="tax_code_id"/>
-			<field ref="tax_code_template_cofins" name="ref_base_code_id"/>
-			<field ref="tax_code_template_cofins" name="ref_tax_code_id"/>
+    <data noupdate="0">
+
+        <record id="tax_template_out_ipi" model="account.tax.template">
+            <field name="description">IPI </field>
+            <field name="name">IPI Saída</field>
+            <field name="amount">0.00</field>
+            <field name="type_tax_use">sale</field>
+            <field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+        </record>
+
+        <record id="tax_template_out_ipi_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi"/>
+        </record>
+
+        <record id="tax_template_out_ipi_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">0</field>
+            <field name="amount">0</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_201010301"/>
+            <field name="tax_id" ref="tax_template_out_ipi"/>
+        </record>
+
+        <record id="tax_template_out_ipi_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi"/>
+        </record>
+
+        <record id="tax_template_out_ipi_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">0</field>
+            <field name="amount">0</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_101050502"/>
+            <field name="tax_id" ref="tax_template_out_ipi"/>
+        </record>
+
+        <record id="tax_template_out_ipi2" model="account.tax.template">
+            <field name="description">IPI 2%</field>
+            <field name="name">IPI Saída 2%</field>
+            <field name="amount">2</field>
+            <field name="type_tax_use">sale</field>
+            <field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+        </record>
+
+        <record id="tax_template_out_ipi2_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi2"/>
+        </record>
+
+        <record id="tax_template_out_ipi2_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">2</field>
+            <field name="amount">2</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_201010301"/>
+            <field name="tax_id" ref="tax_template_out_ipi2"/>
+        </record>
+
+        <record id="tax_template_out_ipi2_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi2"/>
+        </record>
+
+        <record id="tax_template_out_ipi2_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">2</field>
+            <field name="amount">2</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_101050502"/>
+            <field name="tax_id" ref="tax_template_out_ipi2"/>
+        </record>
+
+        <record id="tax_template_out_ipi3" model="account.tax.template">
+            <field name="description">IPI 3%</field>
+            <field name="name">IPI Saída 3%</field>
+            <field name="amount">3</field>
+            <field name="type_tax_use">sale</field>
+            <field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+        </record>
+
+        <record id="tax_template_out_ipi3_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi3"/>
+        </record>
+
+        <record id="tax_template_out_ipi3_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">3</field>
+            <field name="amount">3</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_201010301"/>
+            <field name="tax_id" ref="tax_template_out_ipi3"/>
+        </record>
+
+        <record id="tax_template_out_ipi3_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi3"/>
+        </record>
+
+        <record id="tax_template_out_ipi3_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">3</field>
+            <field name="amount">3</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_101050502"/>
+            <field name="tax_id" ref="tax_template_out_ipi3"/>
+        </record>
+
+        <record id="tax_template_out_ipi4" model="account.tax.template">
+            <field name="description">IPI 4%</field>
+            <field name="name">IPI Saída 4%</field>
+            <field name="amount">4</field>
+            <field name="type_tax_use">sale</field>
+            <field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+        </record>
+
+        <record id="tax_template_out_ipi4_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi4"/>
+        </record>
+
+        <record id="tax_template_out_ipi4_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">4</field>
+            <field name="amount">4</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_201010301"/>
+            <field name="tax_id" ref="tax_template_out_ipi4"/>
+        </record>
+
+        <record id="tax_template_out_ipi4_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi4"/>
+        </record>
+
+        <record id="tax_template_out_ipi4_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">4</field>
+            <field name="amount">4</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_101050502"/>
+            <field name="tax_id" ref="tax_template_out_ipi4"/>
+        </record>
+
+        <record id="tax_template_out_ipi5" model="account.tax.template">
+            <field name="description">IPI 5%</field>
+            <field name="name">IPI Saída 5%</field>
+            <field name="amount">5</field>
+            <field name="type_tax_use">sale</field>
+            <field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+        </record>
+
+        <record id="tax_template_out_ipi5_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi5"/>
+        </record>
+
+        <record id="tax_template_out_ipi5_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">5</field>
+            <field name="amount">5</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_201010301"/>
+            <field name="tax_id" ref="tax_template_out_ipi5"/>
+        </record>
+
+        <record id="tax_template_out_ipi5_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi5"/>
+        </record>
+
+        <record id="tax_template_out_ipi5_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">5</field>
+            <field name="amount">5</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_101050502"/>
+            <field name="tax_id" ref="tax_template_out_ipi5"/>
+        </record>
+
+        <record id="tax_template_out_ipi7" model="account.tax.template">
+            <field name="description">IPI 7%</field>
+            <field name="name">IPI Saída 7%</field>
+            <field name="amount">7</field>
+            <field name="type_tax_use">sale</field>
+            <field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+        </record>
+
+        <record id="tax_template_out_ipi7_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi7"/>
+        </record>
+
+        <record id="tax_template_out_ipi7_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">7</field>
+            <field name="amount">7</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_201010301"/>
+            <field name="tax_id" ref="tax_template_out_ipi7"/>
+        </record>
+
+        <record id="tax_template_out_ipi7_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi7"/>
+        </record>
+
+        <record id="tax_template_out_ipi7_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">7</field>
+            <field name="amount">7</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_101050502"/>
+            <field name="tax_id" ref="tax_template_out_ipi7"/>
+        </record>
+
+        <record id="tax_template_out_ipi8" model="account.tax.template">
+            <field name="description">IPI 8%</field>
+            <field name="name">IPI Saída 8%</field>
+            <field name="amount">8</field>
+            <field name="type_tax_use">sale</field>
+            <field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+        </record>
+
+        <record id="tax_template_out_ipi8_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi8"/>
+        </record>
+
+        <record id="tax_template_out_ipi8_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">8</field>
+            <field name="amount">8</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_201010301"/>
+            <field name="tax_id" ref="tax_template_out_ipi8"/>
+        </record>
+
+        <record id="tax_template_out_ipi8_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi8"/>
+        </record>
+
+        <record id="tax_template_out_ipi8_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">8</field>
+            <field name="amount">8</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_101050502"/>
+            <field name="tax_id" ref="tax_template_out_ipi8"/>
+        </record>
+
+        <record id="tax_template_out_ipi10" model="account.tax.template">
+            <field name="description">IPI 10%</field>
+            <field name="name">IPI Saída 10%</field>
+            <field name="amount">10</field>
+            <field name="type_tax_use">sale</field>
+            <field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+        </record>
+
+        <record id="tax_template_out_ipi10_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi10"/>
+        </record>
+
+        <record id="tax_template_out_ipi10_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">10</field>
+            <field name="amount">10</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_201010301"/>
+            <field name="tax_id" ref="tax_template_out_ipi10"/>
+        </record>
+
+        <record id="tax_template_out_ipi10_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi10"/>
+        </record>
+
+        <record id="tax_template_out_ipi10_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">10</field>
+            <field name="amount">10</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_101050502"/>
+            <field name="tax_id" ref="tax_template_out_ipi10"/>
+        </record>
+
+        <record id="tax_template_out_ipi12" model="account.tax.template">
+            <field name="description">IPI 12%</field>
+            <field name="name">IPI Saída 12%</field>
+            <field name="amount">12</field>
+            <field name="type_tax_use">sale</field>
+            <field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+        </record>
+
+        <record id="tax_template_out_ipi12_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi12"/>
+        </record>
+
+        <record id="tax_template_out_ipi12_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">12</field>
+            <field name="amount">12</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_201010301"/>
+            <field name="tax_id" ref="tax_template_out_ipi12"/>
+        </record>
+
+        <record id="tax_template_out_ipi12_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi12"/>
+        </record>
+
+        <record id="tax_template_out_ipi12_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">12</field>
+            <field name="amount">12</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_101050502"/>
+            <field name="tax_id" ref="tax_template_out_ipi12"/>
+        </record>
+
+        <record id="tax_template_out_ipi13" model="account.tax.template">
+            <field name="description">IPI 13%</field>
+            <field name="name">IPI Saída 13%</field>
+            <field name="amount">13</field>
+            <field name="type_tax_use">sale</field>
+            <field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+        </record>
+
+        <record id="tax_template_out_ipi13_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi13"/>
+        </record>
+
+        <record id="tax_template_out_ipi13_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">13</field>
+            <field name="amount">13</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_201010301"/>
+            <field name="tax_id" ref="tax_template_out_ipi13"/>
+        </record>
+
+        <record id="tax_template_out_ipi13_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi13"/>
+        </record>
+
+        <record id="tax_template_out_ipi13_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">13</field>
+            <field name="amount">13</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_101050502"/>
+            <field name="tax_id" ref="tax_template_out_ipi13"/>
+        </record>
+
+        <record id="tax_template_out_ipi15" model="account.tax.template">
+            <field name="description">IPI 15%</field>
+            <field name="name">IPI Saída 15%</field>
+            <field name="amount">15</field>
+            <field name="type_tax_use">sale</field>
+            <field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+        </record>
+
+        <record id="tax_template_out_ipi15_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi15"/>
+        </record>
+
+        <record id="tax_template_out_ipi15_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">15</field>
+            <field name="amount">15</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_201010301"/>
+            <field name="tax_id" ref="tax_template_out_ipi15"/>
+        </record>
+
+        <record id="tax_template_out_ipi15_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi15"/>
+        </record>
+
+        <record id="tax_template_out_ipi15_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">15</field>
+            <field name="amount">15</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_101050502"/>
+            <field name="tax_id" ref="tax_template_out_ipi15"/>
+        </record>
+
+        <record id="tax_template_out_ipi16" model="account.tax.template">
+            <field name="description">IPI 16%</field>
+            <field name="name">IPI Saída 16%</field>
+            <field name="amount">16</field>
+            <field name="type_tax_use">sale</field>
+            <field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+        </record>
+
+        <record id="tax_template_out_ipi16_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi16"/>
+        </record>
+
+        <record id="tax_template_out_ipi16_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">16</field>
+            <field name="amount">16</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_201010301"/>
+            <field name="tax_id" ref="tax_template_out_ipi16"/>
+        </record>
+
+        <record id="tax_template_out_ipi16_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi16"/>
+        </record>
+
+        <record id="tax_template_out_ipi16_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">16</field>
+            <field name="amount">16</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_101050502"/>
+            <field name="tax_id" ref="tax_template_out_ipi16"/>
+        </record>
+
+        <record id="tax_template_out_ipi18" model="account.tax.template">
+            <field name="description">IPI 18%</field>
+            <field name="name">IPI Saída 18%</field>
+            <field name="amount">18</field>
+            <field name="type_tax_use">sale</field>
+            <field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+        </record>
+
+        <record id="tax_template_out_ipi18_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi18"/>
+        </record>
+
+        <record id="tax_template_out_ipi18_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">18</field>
+            <field name="amount">18</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_201010301"/>
+            <field name="tax_id" ref="tax_template_out_ipi18"/>
+        </record>
+
+        <record id="tax_template_out_ipi18_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi18"/>
+        </record>
+
+        <record id="tax_template_out_ipi18_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">18</field>
+            <field name="amount">18</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_101050502"/>
+            <field name="tax_id" ref="tax_template_out_ipi18"/>
+        </record>
+
+        <record id="tax_template_out_ipi20" model="account.tax.template">
+            <field name="description">IPI 20%</field>
+            <field name="name">IPI Saída 20%</field>
+            <field name="amount">20</field>
+            <field name="type_tax_use">sale</field>
+            <field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+        </record>
+
+        <record id="tax_template_out_ipi20_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi20"/>
+        </record>
+
+        <record id="tax_template_out_ipi20_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">20</field>
+            <field name="amount">20</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_201010301"/>
+            <field name="tax_id" ref="tax_template_out_ipi20"/>
+        </record>
+
+        <record id="tax_template_out_ipi20_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi20"/>
+        </record>
+
+        <record id="tax_template_out_ipi20_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">20</field>
+            <field name="amount">20</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_101050502"/>
+            <field name="tax_id" ref="tax_template_out_ipi20"/>
+        </record>
+
+        <record id="tax_template_out_ipi22" model="account.tax.template">
+            <field name="description">IPI 22%</field>
+            <field name="name">IPI Saída 22%</field>
+            <field name="amount">22</field>
+            <field name="type_tax_use">sale</field>
+            <field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+        </record>
+
+        <record id="tax_template_out_ipi22_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi22"/>
+        </record>
+
+        <record id="tax_template_out_ipi22_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">22</field>
+            <field name="amount">22</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_201010301"/>
+            <field name="tax_id" ref="tax_template_out_ipi22"/>
+        </record>
+
+        <record id="tax_template_out_ipi22_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi22"/>
+        </record>
+
+        <record id="tax_template_out_ipi22_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">22</field>
+            <field name="amount">22</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_101050502"/>
+            <field name="tax_id" ref="tax_template_out_ipi22"/>
+        </record>
+
+        <record id="tax_template_out_ipi24" model="account.tax.template">
+            <field name="description">IPI 24%</field>
+            <field name="name">IPI Saída 24%</field>
+            <field name="amount">24</field>
+            <field name="type_tax_use">sale</field>
+            <field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+        </record>
+
+        <record id="tax_template_out_ipi24_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi24"/>
+        </record>
+
+        <record id="tax_template_out_ipi24_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">24</field>
+            <field name="amount">24</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_201010301"/>
+            <field name="tax_id" ref="tax_template_out_ipi24"/>
+        </record>
+
+        <record id="tax_template_out_ipi24_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi24"/>
+        </record>
+
+        <record id="tax_template_out_ipi24_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">24</field>
+            <field name="amount">24</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_101050502"/>
+            <field name="tax_id" ref="tax_template_out_ipi24"/>
+        </record>
+
+        <record id="tax_template_out_ipi25" model="account.tax.template">
+            <field name="description">IPI 25%</field>
+            <field name="name">IPI Saída 25%</field>
+            <field name="amount">25</field>
+            <field name="type_tax_use">sale</field>
+            <field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+        </record>
+
+        <record id="tax_template_out_ipi25_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi25"/>
+        </record>
+
+        <record id="tax_template_out_ipi25_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">25</field>
+            <field name="amount">25</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_201010301"/>
+            <field name="tax_id" ref="tax_template_out_ipi25"/>
+        </record>
+
+        <record id="tax_template_out_ipi25_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi25"/>
+        </record>
+
+        <record id="tax_template_out_ipi25_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">25</field>
+            <field name="amount">25</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_101050502"/>
+            <field name="tax_id" ref="tax_template_out_ipi25"/>
+        </record>
+
+        <record id="tax_template_out_ipi27" model="account.tax.template">
+            <field name="description">IPI 27%</field>
+            <field name="name">IPI Saída 27%</field>
+            <field name="amount">27</field>
+            <field name="type_tax_use">sale</field>
+            <field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+        </record>
+
+        <record id="tax_template_out_ipi27_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi27"/>
+        </record>
+
+        <record id="tax_template_out_ipi27_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">27</field>
+            <field name="amount">27</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_201010301"/>
+            <field name="tax_id" ref="tax_template_out_ipi27"/>
+        </record>
+
+        <record id="tax_template_out_ipi27_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi27"/>
+        </record>
+
+        <record id="tax_template_out_ipi27_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">27</field>
+            <field name="amount">27</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_101050502"/>
+            <field name="tax_id" ref="tax_template_out_ipi27"/>
+        </record>
+
+        <record id="tax_template_out_ipi30" model="account.tax.template">
+            <field name="description">IPI 30%</field>
+            <field name="name">IPI Saída 30%</field>
+            <field name="amount">30</field>
+            <field name="type_tax_use">sale</field>
+            <field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+        </record>
+
+        <record id="tax_template_out_ipi30_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi30"/>
+        </record>
+
+        <record id="tax_template_out_ipi30_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">30</field>
+            <field name="amount">30</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_201010301"/>
+            <field name="tax_id" ref="tax_template_out_ipi30"/>
+        </record>
+
+        <record id="tax_template_out_ipi30_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi30"/>
+        </record>
+
+        <record id="tax_template_out_ipi30_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">30</field>
+            <field name="amount">30</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_101050502"/>
+            <field name="tax_id" ref="tax_template_out_ipi30"/>
+        </record>
+
+        <record id="tax_template_out_ipi35" model="account.tax.template">
+            <field name="description">IPI 35%</field>
+            <field name="name">IPI Saída 35%</field>
+            <field name="amount">35</field>
+            <field name="type_tax_use">sale</field>
+            <field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+        </record>
+
+        <record id="tax_template_out_ipi35_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi35"/>
+        </record>
+
+        <record id="tax_template_out_ipi35_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">35</field>
+            <field name="amount">35</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_201010301"/>
+            <field name="tax_id" ref="tax_template_out_ipi"/>
+        </record>
+
+        <record id="tax_template_out_ipi35_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi35"/>
+        </record>
+
+        <record id="tax_template_out_ipi35_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">35</field>
+            <field name="amount">35</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_101050502"/>
+            <field name="tax_id" ref="tax_template_out_ipi35"/>
+        </record>
+
+        <record id="tax_template_out_ipi40" model="account.tax.template">
+            <field name="description">IPI 40%</field>
+            <field name="name">IPI Saída 40%</field>
+            <field name="amount">40</field>
+            <field name="type_tax_use">sale</field>
+            <field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+        </record>
+
+        <record id="tax_template_out_ipi40_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi40"/>
+        </record>
+
+        <record id="tax_template_out_ipi40_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">40</field>
+            <field name="amount">40</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_201010301"/>
+            <field name="tax_id" ref="tax_template_out_ipi40"/>
+        </record>
+
+        <record id="tax_template_out_ipi40_refund_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi40"/>
+        </record>
+
+        <record id="tax_template_out_ipi40_refund_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">40</field>
+            <field name="amount">40</field>
+            <field name="apply_on">refund</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_101050502"/>
+            <field name="tax_id" ref="tax_template_out_ipi40"/>
+        </record>
+
+        <record id="tax_template_out_ipi42" model="account.tax.template">
+            <field name="description">IPI 42%</field>
+            <field name="name">IPI Saída 42%</field>
+            <field name="amount">42</field>
+            <field name="type_tax_use">sale</field>
+            <field ref="l10n_br_account_chart_template" name="chart_template_id"/>
+        </record>
+
+        <record id="tax_template_out_ipi42_invoice_base_line" model="account.tax.line.template">
+            <field name="code_type">base</field>
+            <field name="tax_amount">100</field>
+            <field name="amount">100</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="tax_id" ref="tax_template_out_ipi42"/>
+        </record>
+
+        <record id="tax_template_out_ipi42_invoice_tax_line" model="account.tax.line.template">
+            <field name="code_type">tax</field>
+            <field name="tax_amount">42</field>
+            <field name="amount">42</field>
+            <field name="apply_on">invoice</field>
+            <field name="code_id" ref="tax_code_template_ipi"/>
+            <field name="account_id" ref="account_template_201010301"/>
+            <field name="tax_id" ref="tax_template_out_ipi42"/>
+        </record>
+
+        <record id="tax_template_out_ipi42_refund_base_line" model="account.tax.line.template">