diff --git a/addons/account/models/account_tax.py b/addons/account/models/account_tax.py
index 29fc18354a0..05de92965bb 100644
--- a/addons/account/models/account_tax.py
+++ b/addons/account/models/account_tax.py
@@ -168,14 +168,14 @@ class AccountTax(models.Model):
if 'refund_repartition_line_ids' in fields_list:
rslt['refund_repartition_line_ids'] = [
- (0, 0, {'repartition_type': 'base', 'factor_percent': 100.0, 'tag_ids': [], 'company_id': company_id}),
- (0, 0, {'repartition_type': 'tax', 'factor_percent': 100.0, 'tag_ids': [], 'company_id': company_id}),
+ (0, 0, {'repartition_type': 'base', 'tag_ids': [], 'company_id': company_id}),
+ (0, 0, {'repartition_type': 'tax', 'tag_ids': [], 'company_id': company_id}),
]
if 'invoice_repartition_line_ids' in fields_list:
rslt['invoice_repartition_line_ids'] = [
- (0, 0, {'repartition_type': 'base', 'factor_percent': 100.0, 'tag_ids': [], 'company_id': company_id}),
- (0, 0, {'repartition_type': 'tax', 'factor_percent': 100.0, 'tag_ids': [], 'company_id': company_id}),
+ (0, 0, {'repartition_type': 'base', 'tag_ids': [], 'company_id': company_id}),
+ (0, 0, {'repartition_type': 'tax', 'tag_ids': [], 'company_id': company_id}),
]
return rslt
@@ -1209,7 +1209,12 @@ class AccountTaxRepartitionLine(models.Model):
_order = 'sequence, repartition_type, id'
_check_company_auto = True
- factor_percent = fields.Float(string="%", required=True, help="Factor to apply on the account move lines generated from this distribution line, in percents")
+ factor_percent = fields.Float(
+ string="%",
+ default=100,
+ required=True,
+ help="Factor to apply on the account move lines generated from this distribution line, in percents",
+ )
factor = fields.Float(string="Factor Ratio", compute="_compute_factor", help="Factor to apply on the account move lines generated from this distribution line")
repartition_type = fields.Selection(string="Based On", selection=[('base', 'Base'), ('tax', 'of tax')], required=True, default='tax', help="Base on which the factor will be applied.")
account_id = fields.Many2one(string="Account",
diff --git a/addons/account/models/chart_template.py b/addons/account/models/chart_template.py
index 69e96e93a0f..03a4f7bfe0d 100644
--- a/addons/account/models/chart_template.py
+++ b/addons/account/models/chart_template.py
@@ -1227,7 +1227,12 @@ class AccountTaxRepartitionLineTemplate(models.Model):
_name = "account.tax.repartition.line.template"
_description = "Tax Repartition Line Template"
- factor_percent = fields.Float(string="%", required=True, help="Factor to apply on the account move lines generated from this distribution line, in percents")
+ factor_percent = fields.Float(
+ string="%",
+ required=True,
+ default=100,
+ help="Factor to apply on the account move lines generated from this distribution line, in percents",
+ )
repartition_type = fields.Selection(string="Based On", selection=[('base', 'Base'), ('tax', 'of tax')], required=True, default='tax', help="Base on which the factor will be applied.")
account_id = fields.Many2one(string="Account", comodel_name='account.account.template', help="Account on which to post the tax amount")
invoice_tax_id = fields.Many2one(comodel_name='account.tax.template', help="The tax set to apply this distribution on invoices. Mutually exclusive with refund_tax_id")
diff --git a/addons/account/tests/common.py b/addons/account/tests/common.py
index ac55e4ff818..d15eded4b3a 100644
--- a/addons/account/tests/common.py
+++ b/addons/account/tests/common.py
@@ -314,7 +314,6 @@ class AccountTestInvoicingCommon(TransactionCase):
'tax_exigibility': 'on_invoice',
'invoice_repartition_line_ids': [
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'base',
}),
(0, 0, {
@@ -330,7 +329,6 @@ class AccountTestInvoicingCommon(TransactionCase):
],
'refund_repartition_line_ids': [
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'base',
}),
(0, 0, {
@@ -354,23 +352,19 @@ class AccountTestInvoicingCommon(TransactionCase):
'cash_basis_transition_account_id': cls.safe_copy(company_data['default_account_tax_sale']).id,
'invoice_repartition_line_ids': [
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'base',
}),
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'tax',
'account_id': company_data['default_account_tax_sale'].id,
}),
],
'refund_repartition_line_ids': [
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'base',
}),
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'tax',
'account_id': company_data['default_account_tax_sale'].id,
}),
@@ -640,24 +634,20 @@ class TestAccountReconciliationCommon(AccountTestInvoicingCommon):
'cash_basis_transition_account_id': cls.tax_waiting_account.id,
'invoice_repartition_line_ids': [
(0,0, {
- 'factor_percent': 100,
'repartition_type': 'base',
}),
(0,0, {
- 'factor_percent': 100,
'repartition_type': 'tax',
'account_id': cls.tax_final_account.id,
}),
],
'refund_repartition_line_ids': [
(0,0, {
- 'factor_percent': 100,
'repartition_type': 'base',
}),
(0,0, {
- 'factor_percent': 100,
'repartition_type': 'tax',
'account_id': cls.tax_final_account.id,
}),
diff --git a/addons/account/tests/test_account_move_entry.py b/addons/account/tests/test_account_move_entry.py
index acf56b81426..46e708eae32 100644
--- a/addons/account/tests/test_account_move_entry.py
+++ b/addons/account/tests/test_account_move_entry.py
@@ -666,12 +666,10 @@ class TestAccountMove(AccountTestInvoicingCommon):
'cash_basis_transition_account_id': tax_waiting_account.id,
'invoice_repartition_line_ids': [
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'base',
'tag_ids': [(6, 0, tax_tags['invoice']['base'].ids)],
}),
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'tax',
'account_id': tax_final_account.id,
'tag_ids': [(6, 0, tax_tags['invoice']['tax'].ids)],
@@ -679,12 +677,10 @@ class TestAccountMove(AccountTestInvoicingCommon):
],
'refund_repartition_line_ids': [
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'base',
'tag_ids': [(6, 0, tax_tags['refund']['base'].ids)],
}),
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'tax',
'account_id': tax_final_account.id,
'tag_ids': [(6, 0, tax_tags['refund']['tax'].ids)],
diff --git a/addons/account/tests/test_account_move_in_invoice.py b/addons/account/tests/test_account_move_in_invoice.py
index 25549b192e8..e0159af9f1c 100644
--- a/addons/account/tests/test_account_move_in_invoice.py
+++ b/addons/account/tests/test_account_move_in_invoice.py
@@ -1868,12 +1868,10 @@ class TestAccountMoveInInvoiceOnchanges(AccountTestInvoicingCommon):
'cash_basis_transition_account_id': tax_waiting_account.id,
'invoice_repartition_line_ids': [
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'base',
'tag_ids': [(6, 0, tax_tags['invoice']['base'].ids)],
}),
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'tax',
'account_id': tax_final_account.id,
'tag_ids': [(6, 0, tax_tags['invoice']['tax'].ids)],
@@ -1881,12 +1879,10 @@ class TestAccountMoveInInvoiceOnchanges(AccountTestInvoicingCommon):
],
'refund_repartition_line_ids': [
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'base',
'tag_ids': [(6, 0, tax_tags['refund']['base'].ids)],
}),
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'tax',
'account_id': tax_final_account.id,
'tag_ids': [(6, 0, tax_tags['refund']['tax'].ids)],
diff --git a/addons/account/tests/test_account_move_in_refund.py b/addons/account/tests/test_account_move_in_refund.py
index 7fbcdff7680..7416bf4dc89 100644
--- a/addons/account/tests/test_account_move_in_refund.py
+++ b/addons/account/tests/test_account_move_in_refund.py
@@ -1041,12 +1041,10 @@ class TestAccountMoveInRefundOnchanges(AccountTestInvoicingCommon):
'cash_basis_transition_account_id': tax_waiting_account.id,
'invoice_repartition_line_ids': [
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'base',
'tag_ids': [(6, 0, tax_tags['invoice']['base'].ids)],
}),
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'tax',
'account_id': tax_final_account.id,
'tag_ids': [(6, 0, tax_tags['invoice']['tax'].ids)],
@@ -1054,12 +1052,10 @@ class TestAccountMoveInRefundOnchanges(AccountTestInvoicingCommon):
],
'refund_repartition_line_ids': [
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'base',
'tag_ids': [(6, 0, tax_tags['refund']['base'].ids)],
}),
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'tax',
'account_id': tax_final_account.id,
'tag_ids': [(6, 0, tax_tags['refund']['tax'].ids)],
diff --git a/addons/account/tests/test_account_move_out_invoice.py b/addons/account/tests/test_account_move_out_invoice.py
index 6b75ab57332..55447b1ef3c 100644
--- a/addons/account/tests/test_account_move_out_invoice.py
+++ b/addons/account/tests/test_account_move_out_invoice.py
@@ -2579,24 +2579,20 @@ class TestAccountMoveOutInvoiceOnchanges(AccountTestInvoicingCommon):
'include_base_amount': include_base_amount,
'invoice_repartition_line_ids': [
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'base',
'tag_ids': [(6, 0, tags[(i * 4)].ids)],
}),
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'tax',
'tag_ids': [(6, 0, tags[(i * 4) + 1].ids)],
}),
],
'refund_repartition_line_ids': [
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'base',
'tag_ids': [(6, 0, tags[(i * 4) + 2].ids)],
}),
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'tax',
'tag_ids': [(6, 0, tags[(i * 4) + 3].ids)],
}),
@@ -3190,12 +3186,10 @@ class TestAccountMoveOutInvoiceOnchanges(AccountTestInvoicingCommon):
'cash_basis_transition_account_id': tax_waiting_account.id,
'invoice_repartition_line_ids': [
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'base',
'tag_ids': [(6, 0, tax_tags['invoice']['base'].ids)],
}),
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'tax',
'account_id': tax_final_account.id,
'tag_ids': [(6, 0, tax_tags['invoice']['tax'].ids)],
@@ -3203,12 +3197,10 @@ class TestAccountMoveOutInvoiceOnchanges(AccountTestInvoicingCommon):
],
'refund_repartition_line_ids': [
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'base',
'tag_ids': [(6, 0, tax_tags['refund']['base'].ids)],
}),
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'tax',
'account_id': tax_final_account.id,
'tag_ids': [(6, 0, tax_tags['refund']['tax'].ids)],
diff --git a/addons/account/tests/test_account_move_out_refund.py b/addons/account/tests/test_account_move_out_refund.py
index ce7d15d7e8e..47f6b713bae 100644
--- a/addons/account/tests/test_account_move_out_refund.py
+++ b/addons/account/tests/test_account_move_out_refund.py
@@ -997,12 +997,10 @@ class TestAccountMoveOutRefundOnchanges(AccountTestInvoicingCommon):
'cash_basis_transition_account_id': tax_waiting_account.id,
'invoice_repartition_line_ids': [
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'base',
'tag_ids': [(6, 0, tax_tags['invoice']['base'].ids)],
}),
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'tax',
'account_id': tax_final_account.id,
'tag_ids': [(6, 0, tax_tags['invoice']['tax'].ids)],
@@ -1010,12 +1008,10 @@ class TestAccountMoveOutRefundOnchanges(AccountTestInvoicingCommon):
],
'refund_repartition_line_ids': [
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'base',
'tag_ids': [(6, 0, tax_tags['refund']['base'].ids)],
}),
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'tax',
'account_id': tax_final_account.id,
'tag_ids': [(6, 0, tax_tags['refund']['tax'].ids)],
diff --git a/addons/account/tests/test_account_move_reconcile.py b/addons/account/tests/test_account_move_reconcile.py
index 314970d65cf..2003feb20bc 100644
--- a/addons/account/tests/test_account_move_reconcile.py
+++ b/addons/account/tests/test_account_move_reconcile.py
@@ -84,13 +84,11 @@ class TestAccountMoveReconcile(AccountTestInvoicingCommon):
'tax_exigibility': 'on_payment',
'invoice_repartition_line_ids': [
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'base',
'tag_ids': [(6, 0, cls.tax_tags[0].ids)],
}),
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'tax',
'account_id': cls.tax_account_1.id,
'tag_ids': [(6, 0, cls.tax_tags[1].ids)],
@@ -98,13 +96,11 @@ class TestAccountMoveReconcile(AccountTestInvoicingCommon):
],
'refund_repartition_line_ids': [
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'base',
'tag_ids': [(6, 0, cls.tax_tags[2].ids)],
}),
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'tax',
'account_id': cls.tax_account_1.id,
'tag_ids': [(6, 0, cls.tax_tags[3].ids)],
@@ -120,13 +116,11 @@ class TestAccountMoveReconcile(AccountTestInvoicingCommon):
'tax_exigibility': 'on_payment',
'invoice_repartition_line_ids': [
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'base',
'tag_ids': [(6, 0, cls.tax_tags[4].ids)],
}),
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'tax',
'account_id': cls.tax_account_2.id,
'tag_ids': [(6, 0, cls.tax_tags[5].ids)],
@@ -134,13 +128,11 @@ class TestAccountMoveReconcile(AccountTestInvoicingCommon):
],
'refund_repartition_line_ids': [
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'base',
'tag_ids': [(6, 0, cls.tax_tags[6].ids)],
}),
(0, 0, {
- 'factor_percent': 100,
'repartition_type': 'tax',
'account_id': cls.tax_account_2.id,
'tag_ids': [(6, 0, cls.tax_tags[7].ids)],
@@ -3508,25 +3500,17 @@ class TestAccountMoveReconcile(AccountTestInvoicingCommon):
'amount': 20,
'tax_exigibility': 'on_invoice',
'invoice_repartition_line_ids': [
- (0,0, {
- 'factor_percent': 100,
- 'repartition_type': 'base',
- }),
+ (0,0, {'repartition_type': 'base'}),
(0,0, {
- 'factor_percent': 100,
'repartition_type': 'tax',
'account_id': self.tax_account_1.id,
}),
],
'refund_repartition_line_ids': [
- (0,0, {
- 'factor_percent': 100,
- 'repartition_type': 'base',
- }),
+ (0,0, {'repartition_type': 'base'}),
(0,0, {
- 'factor_percent': 100,
'repartition_type': 'tax',
'account_id': self.tax_account_1.id,
}),
@@ -3749,26 +3733,14 @@ class TestAccountMoveReconcile(AccountTestInvoicingCommon):
'tax_exigibility': 'on_payment',
'country_id': test_country.id,
'invoice_repartition_line_ids': [
- (0, 0, {
- 'factor_percent': 100,
- 'repartition_type': 'base',
- }),
+ (0, 0, {'repartition_type': 'base'}),
- (0, 0, {
- 'factor_percent': 100,
- 'repartition_type': 'tax',
- }),
+ (0, 0, {'repartition_type': 'tax'}),
],
'refund_repartition_line_ids': [
- (0, 0, {
- 'factor_percent': 100,
- 'repartition_type': 'base',
- }),
+ (0, 0, {'repartition_type': 'base'}),
- (0, 0, {
- 'factor_percent': 100,
- 'repartition_type': 'tax',
- }),
+ (0, 0, {'repartition_type': 'tax'}),
],
})
diff --git a/addons/account/tests/test_invoice_taxes.py b/addons/account/tests/test_invoice_taxes.py
index 09340fabeed..4c13e5fa709 100644
--- a/addons/account/tests/test_invoice_taxes.py
+++ b/addons/account/tests/test_invoice_taxes.py
@@ -215,7 +215,6 @@ class TestInvoiceTaxes(AccountTestInvoicingCommon):
'amount': 42,
'invoice_repartition_line_ids': [
(0,0, {
- 'factor_percent': 100,
'repartition_type': 'base',
'tag_ids': [(4, inv_base_tag.id, 0)],
}),
@@ -236,7 +235,6 @@ class TestInvoiceTaxes(AccountTestInvoicingCommon):
],
'refund_repartition_line_ids': [
(0,0, {
- 'factor_percent': 100,
'repartition_type': 'base',
'tag_ids': [(4, ref_base_tag.id, 0)],
}),
@@ -334,24 +332,20 @@ class TestInvoiceTaxes(AccountTestInvoicingCommon):
'invoice_repartition_line_ids': [
(0, 0, {
'repartition_type': 'base',
- 'factor_percent': 100.0,
'tag_ids': [(6, 0, self.base_tag_pos.ids)],
}),
(0, 0, {
'repartition_type': 'tax',
- 'factor_percent': 100.0,
'tag_ids': [(6, 0, self.tax_tag_pos.ids)],
}),
],
'refund_repartition_line_ids': [
(0, 0, {
'repartition_type': 'base',
- 'factor_percent': 100.0,
'tag_ids': [(6, 0, self.base_tag_neg.ids)],
}),
(0, 0, {
'repartition_type': 'tax',
- 'factor_percent': 100.0,
'tag_ids': [(6, 0, self.tax_tag_neg.ids)],
}),
],
@@ -424,24 +418,20 @@ class TestInvoiceTaxes(AccountTestInvoicingCommon):
'invoice_repartition_line_ids': [
(0, 0, {
'repartition_type': 'base',
- 'factor_percent': 100.0,
'tag_ids': [(6, 0, self.base_tag_pos.ids)],
}),
(0, 0, {
'repartition_type': 'tax',
- 'factor_percent': 100.0,
'tag_ids': [(6, 0, self.tax_tag_pos.ids)],
}),
],
'refund_repartition_line_ids': [
(0, 0, {
'repartition_type': 'base',
- 'factor_percent': 100.0,
'tag_ids': [(6, 0, self.base_tag_neg.ids)],
}),
(0, 0, {
'repartition_type': 'tax',
- 'factor_percent': 100.0,
'tag_ids': [(6, 0, self.tax_tag_neg.ids)],
}),
],
@@ -519,24 +509,16 @@ class TestInvoiceTaxes(AccountTestInvoicingCommon):
'invoice_repartition_line_ids': [
(0, 0, {
'repartition_type': 'base',
- 'factor_percent': 100.0,
'tag_ids': [(6, 0, self.base_tag_pos.ids)],
}),
(0, 0, {
'repartition_type': 'tax',
- 'factor_percent': 100.0,
'tag_ids': [(6, 0, self.tax_tag_pos.ids)],
}),
],
'refund_repartition_line_ids': [
- (0, 0, {
- 'repartition_type': 'base',
- 'factor_percent': 100.0,
- }),
- (0, 0, {
- 'repartition_type': 'tax',
- 'factor_percent': 100.0,
- }),
+ (0, 0, {'repartition_type': 'base'}),
+ (0, 0, {'repartition_type': 'tax'}),
],
})
child2_sale_tax = self.env['account.tax'].create({
@@ -546,24 +528,16 @@ class TestInvoiceTaxes(AccountTestInvoicingCommon):
'amount_type': 'percent',
'amount': 10,
'invoice_repartition_line_ids': [
- (0, 0, {
- 'repartition_type': 'base',
- 'factor_percent': 100.0,
- }),
- (0, 0, {
- 'repartition_type': 'tax',
- 'factor_percent': 100.0,
- }),
+ (0, 0, {'repartition_type': 'base'}),
+ (0, 0, {'repartition_type': 'tax'}),
],
'refund_repartition_line_ids': [
(0, 0, {
'repartition_type': 'base',
- 'factor_percent': 100.0,
'tag_ids': [(6, 0, self.base_tag_neg.ids)],
}),
(0, 0, {
'repartition_type': 'tax',
- 'factor_percent': 100.0,
'tag_ids': [(6, 0, self.tax_tag_neg.ids)],
}),
],
diff --git a/addons/account/tests/test_tax.py b/addons/account/tests/test_tax.py
index e9b769c0ffe..79b8a885694 100644
--- a/addons/account/tests/test_tax.py
+++ b/addons/account/tests/test_tax.py
@@ -99,25 +99,15 @@ class TestTaxCommon(AccountTestInvoicingCommon):
'amount': 0,
'sequence': 8,
'invoice_repartition_line_ids': [
- (0,0, {
- 'factor_percent': 100,
- 'repartition_type': 'base',
- }),
-
- (0,0, {
- 'factor_percent': 100,
+ (0, 0, {'repartition_type': 'base'}),
+ (0, 0, {
'repartition_type': 'tax',
'account_id': some_account.id,
}),
],
'refund_repartition_line_ids': [
- (0,0, {
- 'factor_percent': 100,
- 'repartition_type': 'base',
- }),
-
- (0,0, {
- 'factor_percent': 100,
+ (0, 0, {'repartition_type': 'base'}),
+ (0, 0, {
'repartition_type': 'tax',
'account_id': some_account.id,
}),
@@ -1121,15 +1111,9 @@ class TestTax(TestTaxCommon):
'amount': 42,
'price_include': True,
'invoice_repartition_line_ids': [
- (0, 0, {
- 'factor_percent': 100,
- 'repartition_type': 'base',
- }),
+ (0, 0, {'repartition_type': 'base'}),
- (0, 0, {
- 'factor_percent': 100,
- 'repartition_type': 'tax',
- }),
+ (0, 0, {'repartition_type': 'tax'}),
(0, 0, {
'factor_percent': -100,
@@ -1137,15 +1121,9 @@ class TestTax(TestTaxCommon):
}),
],
'refund_repartition_line_ids': [
- (0, 0, {
- 'factor_percent': 100,
- 'repartition_type': 'base',
- }),
+ (0, 0, {'repartition_type': 'base'}),
- (0, 0, {
- 'factor_percent': 100,
- 'repartition_type': 'tax',
- }),
+ (0, 0, {'repartition_type': 'tax'}),
(0, 0, {
'factor_percent': -100,
diff --git a/addons/l10n_ae/data/account_tax_template_data.xml b/addons/l10n_ae/data/account_tax_template_data.xml
index d750385d7f5..52dc999b581 100644
--- a/addons/l10n_ae/data/account_tax_template_data.xml
+++ b/addons/l10n_ae/data/account_tax_template_data.xml
@@ -10,12 +10,10 @@
@@ -286,25 +250,17 @@
@@ -315,24 +271,12 @@
Export Tax
@@ -344,12 +288,10 @@
@@ -765,24 +661,12 @@
@@ -794,12 +678,10 @@
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
fixed
percent
percent
percent
percent
percent
percent
percent
percent
percent
percent
percent
percent
fixed
percent
fixed
fixed
percent
percent
percent
group
percent
percent
percent
percent
-47.0
@@ -168,25 +144,17 @@
@@ -201,25 +169,17 @@
@@ -234,12 +194,10 @@
@@ -692,25 +604,17 @@
@@ -726,24 +630,20 @@
@@ -817,25 +709,17 @@
@@ -851,24 +735,20 @@
@@ -271,25 +239,17 @@
@@ -304,25 +264,17 @@
@@ -337,25 +289,17 @@
@@ -370,25 +314,17 @@
@@ -403,25 +339,17 @@
@@ -436,25 +364,17 @@
@@ -469,12 +389,10 @@
@@ -617,12 +517,10 @@
@@ -925,26 +789,18 @@
@@ -960,12 +816,10 @@
@@ -1111,12 +947,10 @@
@@ -1293,12 +1109,10 @@
@@ -1475,12 +1271,10 @@
@@ -1656,7 +1432,6 @@
@@ -1887,12 +1641,10 @@
@@ -2216,12 +1938,10 @@
@@ -2300,12 +2010,10 @@
@@ -2432,12 +2126,10 @@
@@ -2614,12 +2288,10 @@
@@ -2796,12 +2450,10 @@
diff --git a/addons/l10n_bo/data/account_tax_data.xml b/addons/l10n_bo/data/account_tax_data.xml
index 9c23fd629b2..9cc1d4773ba 100644
--- a/addons/l10n_bo/data/account_tax_data.xml
+++ b/addons/l10n_bo/data/account_tax_data.xml
@@ -10,12 +10,10 @@
@@ -187,25 +163,17 @@
@@ -219,25 +187,17 @@
@@ -251,25 +211,17 @@
@@ -283,25 +235,17 @@
@@ -315,25 +259,17 @@
@@ -347,12 +283,10 @@
@@ -521,25 +433,17 @@
@@ -553,12 +457,10 @@
@@ -657,25 +545,17 @@
@@ -689,25 +569,17 @@
@@ -721,12 +593,10 @@
@@ -789,12 +649,10 @@
@@ -857,12 +705,10 @@
@@ -925,12 +761,10 @@
@@ -993,25 +817,17 @@
@@ -1025,12 +841,10 @@
@@ -1129,25 +929,17 @@
@@ -1161,25 +953,17 @@
@@ -1193,25 +977,17 @@
@@ -1225,25 +1001,17 @@
diff --git a/addons/l10n_ca/data/account_tax_data.xml b/addons/l10n_ca/data/account_tax_data.xml
index aba57083436..8ab5f35be89 100644
--- a/addons/l10n_ca/data/account_tax_data.xml
+++ b/addons/l10n_ca/data/account_tax_data.xml
@@ -14,23 +14,15 @@
2
2
1
2
2
percent
percent
percent
2
2
1
2
2
percent
percent
percent
purchase
purchase
purchase
purchase
purchase
purchase
purchase
purchase
purchase
purchase
purchase
@@ -665,27 +545,19 @@
@@ -707,26 +579,18 @@
purchase
purchase
@@ -897,27 +733,19 @@
diff --git a/addons/l10n_cl/data/account_tax_data.xml b/addons/l10n_cl/data/account_tax_data.xml
index ff9ccb649bc..858aeffed4d 100644
--- a/addons/l10n_cl/data/account_tax_data.xml
+++ b/addons/l10n_cl/data/account_tax_data.xml
@@ -12,12 +12,10 @@
@@ -131,24 +95,12 @@
@@ -160,24 +112,12 @@
@@ -189,24 +129,12 @@
@@ -218,24 +146,12 @@
@@ -247,23 +163,15 @@
@@ -338,24 +226,12 @@
@@ -367,23 +243,15 @@
@@ -1357,23 +973,15 @@
diff --git a/addons/l10n_cr/data/account_tax_template_data.xml b/addons/l10n_cr/data/account_tax_template_data.xml
index fbd4909e73a..d802e9e951f 100644
--- a/addons/l10n_cr/data/account_tax_template_data.xml
+++ b/addons/l10n_cr/data/account_tax_template_data.xml
@@ -11,23 +11,15 @@
sale
percent
sale
@@ -105,23 +79,15 @@
purchase
purchase
percent
sale
@@ -198,12 +144,8 @@
percent
purchase
True
True
purchase
@@ -166,7 +150,6 @@
purchase
@@ -216,7 +192,6 @@
True
True
@@ -306,29 +270,21 @@
True
@@ -344,27 +300,19 @@
True
@@ -380,27 +328,19 @@
True
@@ -413,13 +353,9 @@
19
purchase
7
purchase
True
@@ -548,27 +464,19 @@
True
@@ -585,13 +493,11 @@
True
True
False
True
@@ -700,13 +588,11 @@
True
True
True
True
True
True
@@ -932,26 +792,18 @@
False
True
False
True
False
True
@@ -1042,26 +874,18 @@
purchase
True
purchase
True
False
True
False
True
True
True
True
True
True
True
True
True
True
@@ -1540,27 +1300,19 @@
True
@@ -1576,27 +1328,19 @@
True
@@ -1612,27 +1356,19 @@
True
@@ -1648,27 +1384,19 @@
True
@@ -1684,27 +1412,19 @@
True
@@ -1720,13 +1440,11 @@
True
True
True
True
True
False
True
True
True
False
True
False
True
True
True
purchase
@@ -166,7 +150,6 @@
purchase
@@ -216,7 +192,6 @@
True
True
@@ -306,29 +270,21 @@
True
@@ -344,27 +300,19 @@
True
@@ -380,27 +328,19 @@
True
@@ -413,13 +353,9 @@
19
purchase
7
purchase
True
@@ -548,27 +464,19 @@
True
@@ -585,13 +493,11 @@
True
True
False
True
@@ -700,13 +588,11 @@
True
True
True
True
True
True
@@ -932,26 +792,18 @@
False
True
False
True
False
True
@@ -1042,26 +874,18 @@
purchase
True
purchase
True
False
True
False
True
True
True
True
True
True
True
True
True
True
@@ -1540,27 +1300,19 @@
True
@@ -1576,27 +1328,19 @@
True
@@ -1612,27 +1356,19 @@
True
@@ -1648,27 +1384,19 @@
True
@@ -1684,27 +1412,19 @@
True
@@ -1720,13 +1440,11 @@
True
True
True
True
True
False
True
True
True
False
True
False
True
+
@@ -11,24 +11,16 @@
percent
sale
percent
sale
sale
@@ -108,25 +84,17 @@
sale
@@ -139,25 +107,17 @@
sale
@@ -174,24 +134,16 @@
percent
purchase
purchase
percent
purchase
purchase
percent
purchase
percent
purchase
purchase
purchase
purchase
percent
purchase
percent
purchase
purchase
purchase
purchase
percent
purchase
percent
purchase
purchase
@@ -48,26 +40,14 @@
@@ -82,13 +62,11 @@
purchase
sale
purchase
sale
purchase
purchase
purchase
@@ -224,24 +164,12 @@
purchase
@@ -253,24 +181,12 @@
sale
@@ -282,24 +198,12 @@
sale
@@ -311,24 +215,12 @@
purchase
diff --git a/addons/l10n_ec/data/account_tax_template_vat_data.xml b/addons/l10n_ec/data/account_tax_template_vat_data.xml
index 9d0558a163d..e372ac9a273 100644
--- a/addons/l10n_ec/data/account_tax_template_vat_data.xml
+++ b/addons/l10n_ec/data/account_tax_template_vat_data.xml
@@ -18,24 +18,20 @@
@@ -125,23 +113,19 @@
@@ -159,23 +143,19 @@
@@ -193,23 +173,19 @@
@@ -227,23 +203,19 @@
@@ -261,23 +233,19 @@
@@ -295,23 +263,19 @@
@@ -330,24 +294,20 @@
@@ -476,24 +424,20 @@
@@ -620,23 +552,19 @@
@@ -654,23 +582,19 @@
@@ -688,23 +612,19 @@
@@ -722,23 +642,19 @@
@@ -757,24 +673,20 @@
@@ -828,23 +740,19 @@
@@ -862,23 +770,19 @@
@@ -896,23 +800,19 @@
@@ -930,23 +830,19 @@
@@ -964,23 +860,19 @@
@@ -998,23 +890,19 @@
@@ -1033,24 +921,20 @@
@@ -1071,25 +991,17 @@
@@ -1102,25 +1014,17 @@
@@ -1133,25 +1037,17 @@
@@ -1165,12 +1061,10 @@
percent
percent
@@ -1620,12 +1452,10 @@
@@ -1757,24 +1565,12 @@
@@ -1786,24 +1582,12 @@
@@ -1817,12 +1601,10 @@
percent
@@ -1988,24 +1744,12 @@
percent
@@ -2018,24 +1762,12 @@
percent
@@ -2047,23 +1779,15 @@
percent
percent
percent
percent
percent
percent
percent
percent
@@ -2683,25 +2295,17 @@
@@ -2715,12 +2319,10 @@
percent
percent
percent
percent
percent
percent
@@ -3427,12 +2923,10 @@
percent
percent
@@ -77,25 +65,17 @@
@@ -108,25 +88,17 @@
@@ -139,12 +111,10 @@
@@ -310,25 +258,17 @@
@@ -341,25 +281,17 @@
@@ -372,12 +304,10 @@
percent
percent
percent
percent
@@ -144,11 +128,9 @@
percent
percent
percent
percent
percent
percent
percent
percent
percent
percent
percent
percent
percent
@@ -589,23 +521,19 @@
percent
@@ -622,12 +550,10 @@
percent
percent
percent
percent
percent
percent
percent
@@ -923,22 +823,18 @@
percent
percent
@@ -986,11 +878,9 @@
percent
percent
percent
@@ -1102,12 +982,10 @@
percent
percent
percent
percent
@@ -1269,12 +1133,10 @@
percent
percent
@@ -1817,25 +1625,17 @@
@@ -1849,25 +1649,17 @@
@@ -1882,12 +1674,10 @@
sale
purchase
@@ -151,12 +131,10 @@
@@ -255,12 +219,10 @@
@@ -359,25 +307,17 @@
@@ -391,25 +331,17 @@
@@ -423,25 +355,17 @@
@@ -455,25 +379,17 @@
@@ -487,25 +403,17 @@
@@ -518,24 +426,16 @@
@@ -654,24 +534,16 @@
@@ -721,12 +585,10 @@
@@ -825,12 +673,10 @@
@@ -162,25 +142,17 @@
@@ -196,25 +168,17 @@
@@ -230,25 +194,17 @@
@@ -264,25 +220,17 @@
@@ -298,25 +246,17 @@
@@ -332,25 +272,17 @@
@@ -366,25 +298,17 @@
@@ -400,25 +324,17 @@
@@ -436,12 +352,10 @@
@@ -698,25 +582,17 @@
@@ -732,25 +608,17 @@
@@ -766,25 +634,17 @@
@@ -800,25 +660,17 @@
@@ -834,7 +686,6 @@
@@ -1018,7 +850,6 @@
diff --git a/addons/l10n_id/data/account_tax_template_data.xml b/addons/l10n_id/data/account_tax_template_data.xml
index dd1f6f64700..175d897da88 100644
--- a/addons/l10n_id/data/account_tax_template_data.xml
+++ b/addons/l10n_id/data/account_tax_template_data.xml
@@ -14,24 +14,20 @@
11.0
11.0
percent
0
percent
0
percent
0
percent
0
percent
0
@@ -36,23 +24,15 @@
percent
13.5
percent
0
@@ -94,24 +62,12 @@
percent
0
@@ -122,23 +78,15 @@
percent
13.5
percent
0
@@ -180,12 +116,8 @@
percent
17.5
percent
9
percent
0
@@ -278,24 +186,12 @@
percent
0
@@ -306,23 +202,15 @@
percent
23
percent
23
percent
9
percent
4.8
percent
4.8
@@ -421,23 +351,15 @@
@@ -159,25 +139,17 @@ if tax > result:result=tax
@@ -190,25 +162,17 @@ if tax > result:result=tax
@@ -221,25 +185,17 @@ if tax > result:result=tax
@@ -252,12 +208,10 @@ if tax > result:result=tax
@@ -1092,25 +956,17 @@ if tax > result:result=tax
@@ -1123,25 +979,17 @@ if tax > result:result=tax
@@ -1154,12 +1002,10 @@ if tax > result:result=tax
False
@@ -188,24 +152,18 @@
@@ -368,24 +298,18 @@
@@ -547,24 +443,14 @@
@@ -580,24 +466,14 @@
@@ -612,24 +488,14 @@
@@ -646,12 +512,10 @@
True
True
True
True
True
@@ -198,25 +174,17 @@
True
@@ -232,12 +200,10 @@
True
True
True
True
True
@@ -418,25 +362,17 @@
True
diff --git a/addons/l10n_ke/data/account_tax_template_data.xml b/addons/l10n_ke/data/account_tax_template_data.xml
index 0be8e9fb804..4b0dbf86981 100644
--- a/addons/l10n_ke/data/account_tax_template_data.xml
+++ b/addons/l10n_ke/data/account_tax_template_data.xml
@@ -9,23 +9,15 @@
16
8
0
@@ -100,24 +72,12 @@
0
@@ -129,23 +89,15 @@
16
8
0
@@ -220,24 +152,12 @@
0
diff --git a/addons/l10n_lt/data/account_tax_template_data.xml b/addons/l10n_lt/data/account_tax_template_data.xml
index 7fd82a75142..c0d17030a7b 100644
--- a/addons/l10n_lt/data/account_tax_template_data.xml
+++ b/addons/l10n_lt/data/account_tax_template_data.xml
@@ -11,23 +11,15 @@
@@ -41,7 +37,6 @@
@@ -263,7 +239,6 @@
@@ -485,7 +441,6 @@
@@ -707,11 +643,9 @@
@@ -875,7 +791,6 @@
@@ -1099,7 +995,6 @@
@@ -1321,11 +1197,9 @@
@@ -1490,7 +1346,6 @@
@@ -1719,7 +1555,6 @@
@@ -1948,7 +1764,6 @@
@@ -2175,11 +1971,9 @@
@@ -2348,7 +2124,6 @@
@@ -2577,7 +2333,6 @@
@@ -2804,11 +2540,9 @@
@@ -2977,7 +2693,6 @@
@@ -3206,7 +2902,6 @@
@@ -3435,7 +3111,6 @@
@@ -3662,11 +3318,9 @@
@@ -3835,7 +3471,6 @@
@@ -4064,7 +3680,6 @@
@@ -4291,11 +3887,9 @@
@@ -4464,23 +4040,19 @@
@@ -4497,23 +4069,19 @@
@@ -4530,23 +4098,19 @@
@@ -4563,23 +4127,19 @@
@@ -4595,23 +4155,19 @@
@@ -4628,23 +4184,19 @@
@@ -4661,12 +4213,10 @@
@@ -4842,23 +4374,19 @@
@@ -4874,23 +4402,19 @@
@@ -4906,23 +4430,19 @@
@@ -4938,23 +4458,19 @@
@@ -4970,23 +4486,19 @@
@@ -5002,12 +4514,10 @@
@@ -5176,21 +4668,17 @@
@@ -5206,12 +4694,10 @@
+ (0,0, {'repartition_type': 'base'}),
+ (0,0, {'repartition_type': 'tax'}) ]"/>
+ (0,0, {'repartition_type': 'base'}),
+ (0,0, {'repartition_type': 'tax'}) ]"/>
Exonere de TVA ACHATS
@@ -47,24 +35,12 @@
@@ -77,12 +53,10 @@
@@ -119,25 +103,17 @@
@@ -152,25 +128,17 @@
@@ -185,12 +153,10 @@
@@ -921,25 +805,17 @@
@@ -954,12 +830,10 @@
Tasa
Tasa
Tasa
Tasa
Tasa
Tasa
Tasa
Tasa
Tasa
Tasa
@@ -45,12 +37,10 @@
@@ -222,12 +190,10 @@
purchase
purchase
purchase
purchase
purchase
purchase
purchase
purchase
purchase
purchase
purchase
@@ -778,12 +634,10 @@
@@ -1005,25 +837,17 @@
@@ -1037,25 +861,17 @@
@@ -1069,25 +885,17 @@
@@ -1102,7 +910,6 @@
@@ -1280,7 +1068,6 @@
@@ -1505,25 +1269,17 @@
@@ -1538,7 +1294,6 @@
purchase
purchase
@@ -74,12 +54,10 @@
@@ -140,25 +108,17 @@
@@ -170,24 +130,12 @@
sale
@@ -199,24 +147,16 @@
purchase
purchase
purchase
purchase
purchase
purchase
@@ -393,24 +289,12 @@
purchase
@@ -422,24 +306,12 @@
purchase
@@ -452,12 +324,10 @@
@@ -588,25 +440,17 @@
@@ -619,12 +463,10 @@
@@ -790,12 +610,10 @@
@@ -119,12 +103,10 @@
FALSE
@@ -223,24 +187,12 @@
FALSE
@@ -263,23 +215,15 @@
TRUE
sale
purchase
1
1
1
1
1
1
1
1
1
1
sale
sale
sale
sale
sale
sale
@@ -253,23 +225,19 @@
sale
@@ -284,12 +252,10 @@
sale
sale
purchase
purchase
purchase
purchase
purchase
@@ -597,23 +529,19 @@
purchase
@@ -628,12 +556,10 @@
purchase
purchase
sale
purchase
sale
@@ -824,12 +736,10 @@
purchase
sale
@@ -904,12 +808,10 @@
purchase
sale
@@ -982,12 +878,10 @@
purchase
sale
@@ -1062,12 +950,10 @@
purchase
sale
@@ -1140,12 +1020,10 @@
purchase
percent
percent
percent
percent
percent
percent
purchase
purchase
purchase
purchase
purchase
purchase
@@ -907,24 +803,20 @@
@@ -1117,25 +989,17 @@
@@ -1149,25 +1013,17 @@
@@ -1181,25 +1037,17 @@
@@ -1213,25 +1061,17 @@
@@ -1245,25 +1085,17 @@
@@ -1275,25 +1107,17 @@
sale
@@ -1305,25 +1129,17 @@
sale
@@ -1367,24 +1175,20 @@
purchase
purchase
purchase
purchase
purchase
purchase
@@ -409,21 +333,17 @@
@@ -435,12 +355,10 @@
@@ -842,21 +722,17 @@
@@ -868,12 +744,10 @@
+ (0, 0, {'repartition_type': 'tax'})]"/>
diff --git a/addons/l10n_sg/data/account_tax_data.xml b/addons/l10n_sg/data/account_tax_data.xml
index a47d4b8d2ed..0273702805b 100644
--- a/addons/l10n_sg/data/account_tax_data.xml
+++ b/addons/l10n_sg/data/account_tax_data.xml
@@ -13,23 +13,19 @@
@@ -45,12 +41,10 @@
@@ -113,21 +101,17 @@
@@ -143,23 +127,19 @@
@@ -175,12 +155,10 @@
@@ -243,12 +215,10 @@
@@ -522,23 +462,19 @@
@@ -554,21 +490,17 @@
@@ -584,21 +516,17 @@
@@ -614,23 +542,19 @@
@@ -646,12 +570,10 @@
@@ -43,12 +35,10 @@
@@ -147,12 +123,10 @@
sale
sale
percent
sale
@@ -105,23 +77,15 @@
purchase
purchase
percent
sale
@@ -198,12 +142,8 @@
percent
purchase
sale
purchase
sale
@@ -103,24 +75,12 @@
purchase
diff --git a/addons/l10n_th/data/account_tax_template_data.xml b/addons/l10n_th/data/account_tax_template_data.xml
index 7db365d3f73..d2b6fe6b9a0 100644
--- a/addons/l10n_th/data/account_tax_template_data.xml
+++ b/addons/l10n_th/data/account_tax_template_data.xml
@@ -9,12 +9,10 @@
purchase
sale
purchase
sale
purchase
purchase
purchase
purchase
purchase
purchase
purchase
purchase
sale
sale
sale
sale
sale
sale
sale
sale
7
sale
sale
0
sale
@@ -228,24 +172,12 @@
0
sale
@@ -256,24 +188,12 @@
0
sale
@@ -284,23 +204,15 @@
20
purchase
purchase
14
purchase
purchase
7
purchase
purchase
0
purchase
@@ -501,24 +361,12 @@
0
purchase
@@ -529,24 +377,12 @@
0
purchase
@@ -629,23 +465,15 @@
20
sale
sale
14
sale
sale
7
sale
sale
0
sale
@@ -846,24 +622,12 @@
0
sale
@@ -874,24 +638,12 @@
0
sale
@@ -902,23 +654,15 @@
20
purchase
purchase
14
purchase
purchase
7
purchase
purchase
0
purchase
@@ -1119,24 +811,12 @@
0
purchase
@@ -1147,24 +827,12 @@
0
purchase
diff --git a/addons/l10n_uk/data/account_tax_data.xml b/addons/l10n_uk/data/account_tax_data.xml
index b6898ce2673..905163f8cb9 100644
--- a/addons/l10n_uk/data/account_tax_data.xml
+++ b/addons/l10n_uk/data/account_tax_data.xml
@@ -10,25 +10,17 @@
@@ -41,25 +33,17 @@
@@ -72,25 +56,17 @@
@@ -103,25 +79,17 @@
@@ -134,12 +102,10 @@
@@ -282,25 +230,17 @@
@@ -313,12 +253,10 @@
@@ -113,12 +99,10 @@
diff --git a/addons/l10n_ve/data/account_tax_data.xml b/addons/l10n_ve/data/account_tax_data.xml
index c8a07148886..9e9d542e9a7 100644
--- a/addons/l10n_ve/data/account_tax_data.xml
+++ b/addons/l10n_ve/data/account_tax_data.xml
@@ -11,24 +11,12 @@
sale
@@ -40,23 +28,15 @@
sale
sale
sale
purchase
@@ -162,23 +114,15 @@
purchase
purchase
purchase
+
@@ -12,12 +12,10 @@
@@ -114,12 +98,10 @@
diff --git a/addons/l10n_za/data/account_tax_template_data.xml b/addons/l10n_za/data/account_tax_template_data.xml
index f2de8bb1513..8dbe41fb99a 100644
--- a/addons/l10n_za/data/account_tax_template_data.xml
+++ b/addons/l10n_za/data/account_tax_template_data.xml
@@ -10,12 +10,10 @@
@@ -111,25 +95,17 @@
@@ -142,25 +118,17 @@
@@ -173,12 +141,10 @@
15
15
15
15
15
15
15
15