diff --git a/addons/account/models/chart_template.py b/addons/account/models/chart_template.py
index fc6fdbf175b25ec29ebb741e478f6dbcd9030005..94f30d68177c8a6672445110b4a60a04d2ae47fd 100644
--- a/addons/account/models/chart_template.py
+++ b/addons/account/models/chart_template.py
@@ -22,27 +22,6 @@ def migrate_set_tags_and_taxes_updatable(cr, registry, module):
if xml_record_ids:
cr.execute("update ir_model_data set noupdate = 'f' where id in %s", (tuple(xml_record_ids),))
-def migrate_tags_on_taxes(cr, registry):
- ''' This is a utility function to help migrate the tags of taxes when the localization has been modified on stable version. If
- called accordingly in a post_init_hooked function, it will reset the tags set on taxes as per their equivalent template.
-
- Note: This unusual decision has been made in order to help the improvement of VAT reports on version 9.0, to have them more flexible
- and working out of the box when people are creating/using new taxes.
- '''
- env = api.Environment(cr, SUPERUSER_ID, {})
- xml_records = env['ir.model.data'].search([
- ('model', '=', 'account.tax.template'),
- ('module', 'like', 'l10n_%')
- ])
- tax_template_ids = [x['res_id'] for x in xml_records.sudo().read(['res_id'])]
- for tax_template in env['account.tax.template'].browse(tax_template_ids):
- tax_id = env['account.tax'].search([
- ('name', '=', tax_template.name),
- ('type_tax_use', '=', tax_template.type_tax_use),
- ('description', '=', tax_template.description)
- ])
- tax_id.sudo().write({'tag_ids': [(6, 0, tax_template.tag_ids.ids)]})
-
def preserve_existing_tags_on_taxes(cr, registry, module):
''' This is a utility function used to preserve existing previous tags during upgrade of the module.'''
env = api.Environment(cr, SUPERUSER_ID, {})
diff --git a/addons/l10n_ae/data/account_tax_template_data.xml b/addons/l10n_ae/data/account_tax_template_data.xml
index 5614c43941f719ab3071fcfc2fcbca28c8c3247e..f95b45efa0ebbfafd3aad92b00d539224868faa4 100644
--- a/addons/l10n_ae/data/account_tax_template_data.xml
+++ b/addons/l10n_ae/data/account_tax_template_data.xml
@@ -262,7 +262,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('uae_account_3785'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -274,7 +273,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('uae_account_3785'),
}),
]"/>
</record>
@@ -295,7 +293,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('uae_account_3785'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -307,7 +304,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('uae_account_3785'),
}),
]"/>
</record>
@@ -402,7 +398,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('uae_account_3726'),
- 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+ 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
}),
(0,0, {
'factor_percent': 100,
@@ -421,7 +417,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('uae_account_3726'),
- 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+ 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
}),
(0,0, {
'factor_percent': 100,
@@ -448,7 +444,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('uae_account_3726'),
- 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+ 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
}),
(0,0, {
'factor_percent': 100,
@@ -467,7 +463,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('uae_account_3726'),
- 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+ 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
}),
(0,0, {
'factor_percent': 100,
@@ -494,7 +490,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('uae_account_3726'),
- 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+ 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
}),
(0,0, {
'factor_percent': 100,
@@ -513,7 +509,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('uae_account_3726'),
- 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+ 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
}),
(0,0, {
'factor_percent': 100,
@@ -540,7 +536,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('uae_account_3726'),
- 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+ 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
}),
(0,0, {
'factor_percent': 100,
@@ -559,7 +555,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('uae_account_3726'),
- 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+ 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
}),
(0,0, {
'factor_percent': 100,
@@ -586,7 +582,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('uae_account_3726'),
- 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+ 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
}),
(0,0, {
'factor_percent': 100,
@@ -605,7 +601,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('uae_account_3726'),
- 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+ 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
}),
(0,0, {
'factor_percent': 100,
@@ -632,7 +628,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('uae_account_3726'),
- 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+ 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
}),
(0,0, {
'factor_percent': 100,
@@ -651,7 +647,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('uae_account_3726'),
- 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
+ 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')],
}),
(0,0, {
'factor_percent': 100,
@@ -747,8 +743,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('uae_account_3726'),
- 'minus_report_line_ids': [ref('tax_report_line_exempt_supplies_vat')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -759,8 +753,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('uae_account_3726'),
- 'plus_report_line_ids': [ref('tax_report_line_exempt_supplies_vat')],
}),
]"/>
</record>
@@ -780,8 +772,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('uae_account_3726'),
- 'minus_report_line_ids': [ref('tax_report_line_zero_rated_supplies_vat')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -792,8 +782,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('uae_account_3726'),
- 'plus_report_line_ids': [ref('tax_report_line_zero_rated_supplies_vat')],
}),
]"/>
</record>
@@ -852,7 +840,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'minus_report_line_ids': [ref('tax_report_line_expense_supplies_reverse_base'),ref('tax_report_line_standard_rated_expense_base')],
+ 'plus_report_line_ids': [ref('tax_report_line_expense_supplies_reverse_base'),ref('tax_report_line_standard_rated_expense_base')],
}),
(0,0, {
'factor_percent': -100,
@@ -864,14 +852,14 @@
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('uae_account_3726'),
- 'minus_report_line_ids': [ref('tax_report_line_standard_rated_expense_vat')],
+ 'plus_report_line_ids': [ref('tax_report_line_standard_rated_expense_vat')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'plus_report_line_ids': [ref('tax_report_line_expense_supplies_reverse_base'),ref('tax_report_line_standard_rated_expense_base')],
+ 'minus_report_line_ids': [ref('tax_report_line_expense_supplies_reverse_base'),ref('tax_report_line_standard_rated_expense_base')],
}),
(0,0, {
'factor_percent': -100,
@@ -883,7 +871,7 @@
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('uae_account_3726'),
- 'plus_report_line_ids': [ref('tax_report_line_standard_rated_expense_vat')],
+ 'minus_report_line_ids': [ref('tax_report_line_standard_rated_expense_vat')],
}),
]"/>
</record>
diff --git a/addons/l10n_ar/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_ar/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index 404cdd185d4fd371aa6283dd21292151a7b3b0fa..0000000000000000000000000000000000000000
--- a/addons/l10n_ar/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
- registry = odoo.registry(cr.dbname)
- from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_at/data/account_tax_data.xml b/addons/l10n_at/data/account_tax_data.xml
index 026c890d9733f6ee432dff94b9cd6c950ddf881c..ee3ce61b8225691958d6587f7c5e28ea78cf528f 100644
--- a/addons/l10n_at/data/account_tax_data.xml
+++ b/addons/l10n_at/data/account_tax_data.xml
@@ -234,6 +234,7 @@
'factor_percent': 100,
'repartition_type': 'base',
'minus_report_line_ids': [ref('tax_report_ust_steuern_innergemeinschaft_steu_bmg_20')],
+ 'plus_report_line_ids': [ref('tax_report_bemess_vorst_rechnungen_20')],
}),
(0,0, {
'factor_percent': 100,
@@ -253,6 +254,7 @@
'factor_percent': 100,
'repartition_type': 'base',
'plus_report_line_ids': [ref('tax_report_ust_steuern_innergemeinschaft_steu_bmg_20')],
+ 'minus_report_line_ids': [ref('tax_report_bemess_vorst_rechnungen_20')],
}),
(0,0, {
'factor_percent': 100,
@@ -406,7 +408,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart3500'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -418,7 +419,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart3500'),
}),
]"/>
</record>
@@ -440,7 +440,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart3500'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -452,7 +451,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart3500'),
}),
]"/>
</record>
diff --git a/addons/l10n_at/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_at/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index 404cdd185d4fd371aa6283dd21292151a7b3b0fa..0000000000000000000000000000000000000000
--- a/addons/l10n_at/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
- registry = odoo.registry(cr.dbname)
- from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_au/data/account_tax_template_data.xml b/addons/l10n_au/data/account_tax_template_data.xml
index 4b604e1a6be20daa8112853546d7b8098c0423c4..b43521d7fdbed3fdf422a35b38af2b75eb48f88e 100644
--- a/addons/l10n_au/data/account_tax_template_data.xml
+++ b/addons/l10n_au/data/account_tax_template_data.xml
@@ -98,7 +98,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('account_tax_report_gstrpt_g1'), ref('account_tax_report_gstrpt_g2')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[
@@ -110,7 +109,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('account_tax_report_gstrpt_g1'), ref('account_tax_report_gstrpt_g2')],
}),
]"/>
</record>
@@ -133,7 +131,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('account_tax_report_gstrpt_g1'), ref('account_tax_report_gstrpt_g3')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[
@@ -145,7 +142,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('account_tax_report_gstrpt_g1'), ref('account_tax_report_gstrpt_g3')],
}),
]"/>
</record>
@@ -168,7 +164,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('account_tax_report_gstrpt_g1'), ref('account_tax_report_gstrpt_g4')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[
@@ -180,7 +175,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('account_tax_report_gstrpt_g1'), ref('account_tax_report_gstrpt_g4')],
}),
]"/>
</record>
@@ -353,7 +347,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[
@@ -365,7 +358,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')],
}),
]"/>
</record>
@@ -388,7 +380,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[
@@ -400,7 +391,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')],
}),
]"/>
</record>
diff --git a/addons/l10n_be/data/account_tax_template_data.xml b/addons/l10n_be/data/account_tax_template_data.xml
index 70c71a446b2e90188a7a9a22964db63e272e006b..67ce4fc506fc31e4cb43a1ce84e4c59665a7b7d4 100644
--- a/addons/l10n_be/data/account_tax_template_data.xml
+++ b/addons/l10n_be/data/account_tax_template_data.xml
@@ -266,7 +266,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a451054'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -279,7 +278,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a451054'),
}),
]"/>
</record>
@@ -304,8 +302,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a451054'),
- 'plus_report_line_ids': [],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -318,8 +314,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a451054'),
- 'plus_report_line_ids': [],
}),
]"/>
</record>
@@ -344,7 +338,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a451054'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -357,7 +350,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a451054'),
}),
]"/>
</record>
@@ -383,7 +375,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a451054'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -396,7 +387,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a451054'),
}),
]"/>
</record>
@@ -421,7 +411,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a451054'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -434,7 +423,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a451054'),
}),
]"/>
</record>
@@ -460,7 +448,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a451054'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -473,7 +460,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a451054'),
}),
]"/>
</record>
@@ -498,7 +484,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a451054'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -511,7 +496,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a451054'),
}),
]"/>
</record>
@@ -659,7 +643,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -673,7 +656,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
</record>
@@ -992,7 +974,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1006,7 +987,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
</record>
@@ -1032,7 +1012,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1046,7 +1025,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
</record>
@@ -1198,7 +1176,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1212,7 +1189,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
</record>
@@ -1396,7 +1372,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1410,7 +1385,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
</record>
@@ -1595,7 +1569,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1609,7 +1582,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
</record>
@@ -1794,7 +1766,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a451056'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1808,7 +1779,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a451056'),
}),
]"/>
</record>
@@ -2048,7 +2018,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2062,7 +2031,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
</record>
@@ -2406,7 +2374,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2420,7 +2387,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
</record>
@@ -2499,7 +2465,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2513,7 +2478,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
</record>
@@ -2645,7 +2609,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2659,7 +2622,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
</record>
@@ -2843,7 +2805,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2857,7 +2818,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
</record>
@@ -3042,7 +3002,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -3056,7 +3015,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
</record>
@@ -3241,7 +3199,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -3255,7 +3212,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('a411059'),
}),
]"/>
</record>
diff --git a/addons/l10n_be/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_be/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index 404cdd185d4fd371aa6283dd21292151a7b3b0fa..0000000000000000000000000000000000000000
--- a/addons/l10n_be/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
- registry = odoo.registry(cr.dbname)
- from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_bo/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_bo/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index 404cdd185d4fd371aa6283dd21292151a7b3b0fa..0000000000000000000000000000000000000000
--- a/addons/l10n_bo/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
- registry = odoo.registry(cr.dbname)
- from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_br/data/account_tax_template_data.xml b/addons/l10n_br/data/account_tax_template_data.xml
index 5515bb686ff7df4b65a069625073e3d9fec0ebef..d5e90d15dfb9260f2ad257df881d52235e024da7 100644
--- a/addons/l10n_br/data/account_tax_template_data.xml
+++ b/addons/l10n_br/data/account_tax_template_data.xml
@@ -41,8 +41,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_201010301'),
- 'plus_report_line_ids': [ref('tax_report_ipi_2')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -54,8 +52,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_101050502'),
- 'minus_report_line_ids': [ref('tax_report_ipi_2')],
}),
]"/>
</record>
@@ -1040,8 +1036,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_101050502'),
- 'minus_report_line_ids': [ref('tax_report_ipi_2')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1053,8 +1047,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_201010301'),
- 'plus_report_line_ids': [ref('tax_report_ipi_2')],
}),
]"/>
</record>
@@ -2039,8 +2031,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_201010302'),
- 'plus_report_line_ids': [ref('tax_report_icms_1')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2052,8 +2042,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_101050505'),
- 'minus_report_line_ids': [ref('tax_report_icms_1')],
}),
]"/>
</record>
@@ -2076,8 +2064,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_201010302'),
- 'plus_report_line_ids': [ref('tax_report_icms_1')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2089,8 +2075,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_101050505'),
- 'minus_report_line_ids': [ref('tax_report_icms_1')],
}),
]"/>
</record>
@@ -2113,7 +2097,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('tax_report_icmsst_1')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2125,7 +2108,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('tax_report_icmsst_1')],
}),
]"/>
</record>
@@ -2296,8 +2278,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_101050505'),
- 'minus_report_line_ids': [ref('tax_report_icms_1')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2309,8 +2289,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_201010302'),
- 'plus_report_line_ids': [ref('tax_report_icms_1')],
}),
]"/>
</record>
@@ -2333,8 +2311,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_101050505'),
- 'minus_report_line_ids': [ref('tax_report_icms_1')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2346,8 +2322,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_201010302'),
- 'plus_report_line_ids': [ref('tax_report_icms_1')],
}),
]"/>
</record>
@@ -2370,7 +2344,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('tax_report_icmsst_1')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2382,7 +2355,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('tax_report_icmsst_1')],
}),
]"/>
</record>
@@ -2553,8 +2525,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_201010500'),
- 'plus_report_line_ids': [ref('tax_report_pis_1')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2566,8 +2536,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_101050503'),
- 'minus_report_line_ids': [ref('tax_report_pis_1')],
}),
]"/>
</record>
@@ -2627,8 +2595,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_101050503'),
- 'minus_report_line_ids': [ref('tax_report_pis_1')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2640,8 +2606,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_201010500'),
- 'plus_report_line_ids': [ref('tax_report_pis_1')],
}),
]"/>
</record>
@@ -2701,8 +2665,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_201010500'),
- 'plus_report_line_ids': [ref('tax_report_cofins_2')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2714,8 +2676,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_101050503'),
- 'minus_report_line_ids': [ref('tax_report_cofins_2')],
}),
]"/>
</record>
@@ -2775,8 +2735,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_101050503'),
- 'minus_report_line_ids': [ref('tax_report_cofins_2')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2788,8 +2746,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_201010500'),
- 'plus_report_line_ids': [ref('tax_report_cofins_2')],
}),
]"/>
</record>
@@ -2849,7 +2805,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('tax_report_irpj_2')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2861,7 +2816,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('tax_report_irpj_2')],
}),
]"/>
</record>
@@ -2884,7 +2838,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('tax_report_ir_2')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2896,7 +2849,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('tax_report_ir_2')],
}),
]"/>
</record>
@@ -2919,7 +2871,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('tax_report_issqn_2')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -2931,7 +2882,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('tax_report_issqn_2')],
}),
]"/>
</record>
@@ -3163,7 +3113,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('tax_report_csll_2')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -3175,7 +3124,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('tax_report_csll_2')],
}),
]"/>
</record>
diff --git a/addons/l10n_br/migrations/9.0.1.0/post-migrate_tags_on_taxes.py b/addons/l10n_br/migrations/9.0.1.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index 404cdd185d4fd371aa6283dd21292151a7b3b0fa..0000000000000000000000000000000000000000
--- a/addons/l10n_br/migrations/9.0.1.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
- registry = odoo.registry(cr.dbname)
- from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_ch/data/account_vat2011_data.xml b/addons/l10n_ch/data/account_vat2011_data.xml
index f846e0e03788cd8ff2eeece282b2ce00ff55c148..9939461933aab42693394debd046a0f2af1114b0 100644
--- a/addons/l10n_ch/data/account_vat2011_data.xml
+++ b/addons/l10n_ch/data/account_vat2011_data.xml
@@ -622,7 +622,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('ch_coa_2200'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -634,7 +633,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('ch_coa_2200'),
}),
]"/>
</record>
@@ -656,7 +654,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('ch_coa_2200'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -668,7 +665,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('ch_coa_2200'),
}),
]"/>
</record>
@@ -701,7 +697,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('ch_coa_1171'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -713,7 +708,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('ch_coa_1171'),
}),
]"/>
</record>
@@ -736,7 +730,7 @@
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('ch_coa_1170'),
- 'plus_report_line_ids': [ref('account_tax_report_line_chtax_382b')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_chtax_382b')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -749,7 +743,7 @@
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('ch_coa_1170'),
- 'minus_report_line_ids': [ref('account_tax_report_line_chtax_382b')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_chtax_382b')],
}),
]"/>
</record>
diff --git a/addons/l10n_ch/migrations/9.0.9.0/post-migrate_tags_on_taxes.py b/addons/l10n_ch/migrations/9.0.9.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index 404cdd185d4fd371aa6283dd21292151a7b3b0fa..0000000000000000000000000000000000000000
--- a/addons/l10n_ch/migrations/9.0.9.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
- registry = odoo.registry(cr.dbname)
- from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_cl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_cl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index 404cdd185d4fd371aa6283dd21292151a7b3b0fa..0000000000000000000000000000000000000000
--- a/addons/l10n_cl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
- registry = odoo.registry(cr.dbname)
- from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_co/data/account_tax_template.xml b/addons/l10n_co/data/account_tax_template.xml
index 388c9998230ef811727789a68ccd07251e302af0..7fe340bfd3af3f6899e87396bf956c660ca8f83a 100644
--- a/addons/l10n_co/data/account_tax_template.xml
+++ b/addons/l10n_co/data/account_tax_template.xml
@@ -116,7 +116,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('co_puc_236505'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -128,7 +127,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('co_puc_236505'),
}),
]"/>
</record>
@@ -1424,7 +1422,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('co_puc_236805'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1436,7 +1433,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('co_puc_236805'),
}),
]"/>
</record>
diff --git a/addons/l10n_de_skr03/data/account_tax_fiscal_position_data.xml b/addons/l10n_de_skr03/data/account_tax_fiscal_position_data.xml
index 2bc8cfc4e6765e8a0b0e57145f788015d6ad8b6c..c95fff75bf5d14e1653d4919ad97ee70be6ac437 100644
--- a/addons/l10n_de_skr03/data/account_tax_fiscal_position_data.xml
+++ b/addons/l10n_de_skr03/data/account_tax_fiscal_position_data.xml
@@ -923,7 +923,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_1770'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -936,7 +935,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_1770'),
}),
]"/>
<field name="tax_group_id" ref="tax_group_x"/>
diff --git a/addons/l10n_de_skr03/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_de_skr03/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index 404cdd185d4fd371aa6283dd21292151a7b3b0fa..0000000000000000000000000000000000000000
--- a/addons/l10n_de_skr03/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
- registry = odoo.registry(cr.dbname)
- from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_de_skr04/data/account_tax_fiscal_position_data.xml b/addons/l10n_de_skr04/data/account_tax_fiscal_position_data.xml
index 3d004e18c5961ff197c6087d06d56594abbe1a6c..79295d820bd19218fddd82ec29d2a75eff2b9c52 100644
--- a/addons/l10n_de_skr04/data/account_tax_fiscal_position_data.xml
+++ b/addons/l10n_de_skr04/data/account_tax_fiscal_position_data.xml
@@ -960,7 +960,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_skr04_3800'),
}),
]"/>
@@ -974,7 +973,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_skr04_3800'),
}),
]"/>
diff --git a/addons/l10n_de_skr04/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_de_skr04/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index 404cdd185d4fd371aa6283dd21292151a7b3b0fa..0000000000000000000000000000000000000000
--- a/addons/l10n_de_skr04/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
- registry = odoo.registry(cr.dbname)
- from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_do/data/account.tax.template.xml b/addons/l10n_do/data/account.tax.template.xml
index dfb8cd06bd12be6e2d6405cb1f89b1736d8a414b..7aaf53e8cee508607b95be042bc2e9d9488ce9df 100644
--- a/addons/l10n_do/data/account.tax.template.xml
+++ b/addons/l10n_do/data/account.tax.template.xml
@@ -1217,36 +1217,6 @@
<field name="tax_group_id" ref="group_ret"/>
</record>
- <record id="tax_group_moral_construction" model="account.tax.template">
- <field name="chart_template_id" ref="do_chart_template"/>
- <field name="sequence">62</field>
- <field name="name">Retención a JurÃdica (Servicios Construcción con Materiales)</field>
- <field name="amount_type">group</field>
- <field eval="0" name="amount"/>
- <field name="type_tax_use">none</field>
- <field name="tax_group_id" ref="group_ret"/>
- <field name="invoice_repartition_line_ids" eval="[(5,0,0),
- (0,0, {
- 'factor_percent': 100,
- 'repartition_type': 'base',
- }),
- (0,0, {
- 'factor_percent': 100,
- 'repartition_type': 'tax',
- }),
- ]"/>
- <field name="refund_repartition_line_ids" eval="[(5,0,0),
- (0,0, {
- 'factor_percent': 100,
- 'repartition_type': 'base',
- }),
- (0,0, {
- 'factor_percent': 100,
- 'repartition_type': 'tax',
- }),
- ]"/>
- </record>
-
<record id="tax_group_person_services" model="account.tax.template">
<field name="chart_template_id" ref="do_chart_template"/>
<field name="sequence">58</field>
diff --git a/addons/l10n_et/data/account_tax_data.xml b/addons/l10n_et/data/account_tax_data.xml
index 85b898caf808072bfd016ca1832e6bdaec2b352a..04a84a9627acf7f1c204102203c587b07fa29f15 100644
--- a/addons/l10n_et/data/account_tax_data.xml
+++ b/addons/l10n_et/data/account_tax_data.xml
@@ -55,7 +55,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_et3007'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -67,7 +66,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_et3007'),
}),
]"/>
</record>
@@ -89,7 +87,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_et3007'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -101,7 +98,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_et3007'),
}),
]"/>
</record>
@@ -123,7 +119,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_et3007'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -135,7 +130,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_et3007'),
}),
]"/>
</record>
@@ -301,7 +295,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_et2212'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -313,7 +306,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_et2212'),
}),
]"/>
</record>
@@ -335,7 +327,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_et2212'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -347,7 +338,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_et2212'),
}),
]"/>
</record>
@@ -369,7 +359,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_et2212'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -381,7 +370,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_et2212'),
}),
]"/>
</record>
diff --git a/addons/l10n_et/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_et/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index 404cdd185d4fd371aa6283dd21292151a7b3b0fa..0000000000000000000000000000000000000000
--- a/addons/l10n_et/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
- registry = odoo.registry(cr.dbname)
- from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_fr/data/account_tax_data.xml b/addons/l10n_fr/data/account_tax_data.xml
index a32488d9c33208eb28bdbef4477ef60529dd8cd3..f8938c2f145c222dc2d195c5e81d6eedd647b31a 100644
--- a/addons/l10n_fr/data/account_tax_data.xml
+++ b/addons/l10n_fr/data/account_tax_data.xml
@@ -985,13 +985,13 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'minus_report_line_ids': [ref('l10n_fr.tax_report_base_coll_5_5')],
+ 'plus_report_line_ids': [ref('l10n_fr.tax_report_base_acq_5_5')],
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_coll_5_5')],
+ 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_acq_5_5')],
'account_id': ref('pcg_44566'),
}),
]"/>
@@ -999,13 +999,13 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'plus_report_line_ids': [ref('l10n_fr.tax_report_base_coll_5_5')],
+ 'minus_report_line_ids': [ref('l10n_fr.tax_report_base_acq_5_5')],
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_coll_5_5')],
+ 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_acq_5_5')],
'account_id': ref('pcg_44566'),
}),
]"/>
@@ -1270,7 +1270,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_20')],
+ 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_20')],
'account_id': ref('pcg_445201'),
}),
]"/>
@@ -1284,7 +1284,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_20')],
+ 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_20')],
'account_id': ref('pcg_445201'),
}),
]"/>
@@ -1309,7 +1309,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_8_5')],
+ 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_8_5')],
'account_id': ref('pcg_445203'),
}),
]"/>
@@ -1323,7 +1323,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_8_5')],
+ 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_8_5')],
'account_id': ref('pcg_445203'),
}),
]"/>
@@ -1348,7 +1348,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_10')],
+ 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_10')],
'account_id': ref('pcg_445202'),
}),
]"/>
@@ -1362,7 +1362,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_10')],
+ 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_10')],
'account_id': ref('pcg_445202'),
}),
]"/>
@@ -1387,7 +1387,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_5_5')],
+ 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_5_5')],
'account_id': ref('pcg_445203'),
}),
]"/>
@@ -1401,7 +1401,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_5_5')],
+ 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_5_5')],
'account_id': ref('pcg_445203'),
}),
]"/>
@@ -1426,7 +1426,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_2_1')],
+ 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_2_1')],
'account_id': ref('pcg_445203'),
}),
]"/>
@@ -1440,7 +1440,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_2_1')],
+ 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_2_1')],
'account_id': ref('pcg_445203'),
}),
]"/>
@@ -1734,7 +1734,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_445201'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1747,7 +1746,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_445201'),
}),
]"/>
</record>
@@ -1771,7 +1769,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_445663'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1784,7 +1781,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_445663'),
}),
]"/>
</record>
diff --git a/addons/l10n_fr/data/tax_report_data.xml b/addons/l10n_fr/data/tax_report_data.xml
index 71363f0b6cb22c87efc22a386299dc327225412a..bf10b7c3a2f9d6a3cce6c1f8340817ef000b113d 100644
--- a/addons/l10n_fr/data/tax_report_data.xml
+++ b/addons/l10n_fr/data/tax_report_data.xml
@@ -569,8 +569,8 @@
</record>
<record id="tax_report_base_ded_intra_20" model="account.tax.report.line">
- <field name="name">Base H.T. 20%</field>
- <field name="tag_name">Base déductible intracom. 20%</field>
+ <field name="name">Base H.T. 20.0%</field>
+ <field name="tag_name">Base déductible intracom. 20.0%</field>
<field name="country_id" ref="base.fr"/>
<field name="parent_id" ref="tax_report_base_ded_intra"/>
<field name="sequence">1</field>
diff --git a/addons/l10n_fr/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_fr/migrations/2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index 44367687c8fd7b805db8d9f3ca97f685bff971f5..0000000000000000000000000000000000000000
--- a/addons/l10n_fr/migrations/2.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- coding: utf-8 -*-
-from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
-
-def migrate(cr, version):
- migrate_tags_on_taxes(cr, None)
diff --git a/addons/l10n_fr/migrations/9.0.1.1/post-migrate_tags_on_taxes.py b/addons/l10n_fr/migrations/9.0.1.1/post-migrate_tags_on_taxes.py
deleted file mode 100644
index 6f933404f1d3cfc39a5e1fc3c9068ce46a4af075..0000000000000000000000000000000000000000
--- a/addons/l10n_fr/migrations/9.0.1.1/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from openerp.modules.registry import RegistryManager
-
-def migrate(cr, version):
- registry = RegistryManager.get(cr.dbname)
- from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
-
diff --git a/addons/l10n_gr/data/account_tax_data.xml b/addons/l10n_gr/data/account_tax_data.xml
index 5b85ffadada6cda8675a60371d788e6aa10bd03a..9598ccf3452a9b731f23d3fb9b5a787eefeae13d 100644
--- a/addons/l10n_gr/data/account_tax_data.xml
+++ b/addons/l10n_gr/data/account_tax_data.xml
@@ -226,11 +226,13 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
+ 'plus_report_line_ids': [ref('account_tax_report_line_357')],
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('chartgr_54_00'),
+ 'plus_report_line_ids': [ref('account_tax_report_line_377')]
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -259,11 +261,13 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
+ 'plus_report_line_ids': [ref('account_tax_report_line_357')],
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('chartgr_54_00'),
+ 'plus_report_line_ids': [ref('account_tax_report_line_377')]
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -292,11 +296,13 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
+ 'plus_report_line_ids': [ref('account_tax_report_line_357')]
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('chartgr_54_00'),
+ 'plus_report_line_ids': [ref('account_tax_report_line_377')]
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
diff --git a/addons/l10n_gr/migrations/9.0.1.0/post-migrate_tags_on_taxes.py b/addons/l10n_gr/migrations/9.0.1.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index 404cdd185d4fd371aa6283dd21292151a7b3b0fa..0000000000000000000000000000000000000000
--- a/addons/l10n_gr/migrations/9.0.1.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
- registry = odoo.registry(cr.dbname)
- from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_hr/data/account_tax_report_data.xml b/addons/l10n_hr/data/account_tax_report_data.xml
index 7d79e11fee63fc6b80cb78e49f00b9ff4eb97ab2..282f7003b38cc7ce88526b9addf64e0e0e2251c3 100644
--- a/addons/l10n_hr/data/account_tax_report_data.xml
+++ b/addons/l10n_hr/data/account_tax_report_data.xml
@@ -121,7 +121,7 @@
<record id="account_tax_report_line_izdani_10" model="account.tax.report.line">
<field name="name">II.1 Izdani raÄuni po stopi 10%</field>
- <field name="tag_name">II.1 Izdani raÄuni po stopi 10%</field>
+ <field name="tag_name">II.1 Izdani raÄuni po stopi 10% (osnovica)</field>
<field name="code">izdani_10</field>
<field name="sequence" eval="1"/>
<field name="parent_id" ref="account_tax_report_line_oporezive"/>
@@ -137,7 +137,7 @@
<record id="account_tax_report_line_izdani_25" model="account.tax.report.line">
<field name="name">II.3 Izdani raÄuni po stopi 25%</field>
- <field name="tag_name">II.3 Izdani raÄuni po stopi 25%</field>
+ <field name="tag_name">II.3 Izdani raÄuni po stopi 25% (osnovica)</field>
<field name="code">izdani_25</field>
<field name="sequence" eval="3"/>
<field name="parent_id" ref="account_tax_report_line_oporezive"/>
@@ -168,7 +168,7 @@
<record id="account_tax_report_line_pretporez_10" model="account.tax.report.line">
<field name="name">III.1. Pretporez 10%</field>
- <field name="tag_name">III.1. Pretporez 10%</field>
+ <field name="tag_name">III.1. Pretporez 10% (osnovica)</field>
<field name="code">pretporez_10</field>
<field name="sequence" eval="1"/>
<field name="parent_id" ref="account_tax_report_line_obracunani"/>
@@ -211,7 +211,7 @@
<record id="account_tax_report_line_placeni_uvozu" model="account.tax.report.line">
<field name="name">III.4. Plaćeni PP pri uvozu</field>
- <field name="tag_name">III.4. Plaćeni PP pri uvozu</field>
+ <field name="tag_name">III.4. Plaćeni PP pri uvozu (osnovica)</field>
<field name="code">placeni_uvozu</field>
<field name="sequence" eval="4"/>
<field name="parent_id" ref="account_tax_report_line_obracunani"/>
@@ -220,7 +220,7 @@
<record id="account_tax_report_line_placeni_usluge_10" model="account.tax.report.line">
<field name="name">III.5. Plaćeni PP na ino usluge 10%</field>
- <field name="tag_name">III.5. Plaćeni PP na ino usluge 10%</field>
+ <field name="tag_name">III.5. Plaćeni PP na ino usluge 10% (osnovica)</field>
<field name="code">placeni_usluge_10</field>
<field name="sequence" eval="5"/>
<field name="parent_id" ref="account_tax_report_line_obracunani"/>
@@ -237,7 +237,7 @@
<record id="account_tax_report_line_placeni_usluge_25" model="account.tax.report.line">
<field name="name">III.7. Plaćeni PP na ino usluge 25%</field>
- <field name="tag_name">III.7. Plaćeni PP na ino usluge 25%</field>
+ <field name="tag_name">III.7. Plaćeni PP na ino usluge 25% (osnovica)</field>
<field name="code">placeni_usluge_25</field>
<field name="sequence" eval="7"/>
<field name="parent_id" ref="account_tax_report_line_obracunani"/>
@@ -283,7 +283,7 @@
<record id="account_tax_report_line_izdani_racuni" model="account.tax.report.line">
<field name="name">II.1 Izdani raÄuni po stopi 10%</field>
- <field name="tag_name">II.1 Izdani raÄuni po stopi 10%</field>
+ <field name="tag_name">II.1 Izdani raÄuni po stopi 10% (porez)</field>
<field name="code">izdani_racuni</field>
<field name="sequence" eval="1"/>
<field name="parent_id" ref="account_tax_report_line_oporezive_isporuke"/>
@@ -299,7 +299,7 @@
<record id="account_tax_report_line_izdani_racuni_25" model="account.tax.report.line">
<field name="name">II.3 Izdani raÄuni po stopi 25%</field>
- <field name="tag_name">II.3 Izdani raÄuni po stopi 25%</field>
+ <field name="tag_name">II.3 Izdani raÄuni po stopi 25% (porez)</field>
<field name="code">izdani_racuni_25</field>
<field name="sequence" eval="3"/>
<field name="parent_id" ref="account_tax_report_line_oporezive_isporuke"/>
@@ -322,7 +322,7 @@
<record id="account_tax_report_line_pretporez_10_tax" model="account.tax.report.line">
<field name="name">III.1. Pretporez 10%</field>
- <field name="tag_name">III.1. Pretporez 10%</field>
+ <field name="tag_name">III.1. Pretporez 10% (porez)</field>
<field name="code">pretporez_10_tax</field>
<field name="sequence" eval="1"/>
<field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/>
@@ -347,7 +347,7 @@
<record id="account_tax_report_line_placeni_uvozu_tax" model="account.tax.report.line">
<field name="name">III.4. Plaćeni PP pri uvozu</field>
- <field name="tag_name">III.4. Plaćeni PP pri uvozu</field>
+ <field name="tag_name">III.4. Plaćeni PP pri uvozu (porez)</field>
<field name="code">placeni_uvozu_tax</field>
<field name="sequence" eval="4"/>
<field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/>
@@ -356,7 +356,7 @@
<record id="account_tax_report_line_placeni_usluge_10_tax" model="account.tax.report.line">
<field name="name">III.5. Plaćeni PP na ino usluge 10%</field>
- <field name="tag_name">III.5. Plaćeni PP na ino usluge 10%</field>
+ <field name="tag_name">III.5. Plaćeni PP na ino usluge 10% (porez)</field>
<field name="code">placeni_usluge_10_tax</field>
<field name="sequence" eval="5"/>
<field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/>
@@ -372,7 +372,7 @@
<record id="account_tax_report_line_placeni_usluge_25_tax" model="account.tax.report.line">
<field name="name">III.7. Plaćeni PP na ino usluge 25%</field>
- <field name="tag_name">III.7. Plaćeni PP na ino usluge 25%</field>
+ <field name="tag_name">III.7. Plaćeni PP na ino usluge 25% (porez)</field>
<field name="code">placeni_usluge_25_ta</field>
<field name="sequence" eval="7"/>
<field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/>
diff --git a/addons/l10n_hr/data/account_tax_template_data.xml b/addons/l10n_hr/data/account_tax_template_data.xml
index a3d8ce3f29c3051d09b2a2bf29805c3d22916ff4..242cae42c052e96c7ac6c2ea812b27b208374dfd 100644
--- a/addons/l10n_hr/data/account_tax_template_data.xml
+++ b/addons/l10n_hr/data/account_tax_template_data.xml
@@ -131,7 +131,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('kp_rrif4199'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -143,7 +142,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('kp_rrif4199'),
}),
]"/>
</record>
@@ -240,7 +238,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('kp_rrif4199'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -252,7 +249,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('kp_rrif4199'),
}),
]"/>
</record>
@@ -349,7 +345,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('kp_rrif4199'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -361,7 +356,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('kp_rrif4199'),
}),
]"/>
</record>
@@ -384,7 +378,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('kp_rrif4199'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -396,7 +389,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('kp_rrif4199'),
}),
]"/>
</record>
@@ -419,7 +411,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('kp_rrif4199'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -431,7 +422,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('kp_rrif4199'),
}),
]"/>
</record>
@@ -454,7 +444,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('kp_rrif4199'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -466,7 +455,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('kp_rrif4199'),
}),
]"/>
</record>
@@ -489,7 +477,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('kp_rrif4199'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -501,7 +488,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('kp_rrif4199'),
}),
]"/>
</record>
@@ -524,7 +510,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('kp_rrif4199'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -536,7 +521,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('kp_rrif4199'),
}),
]"/>
</record>
@@ -666,7 +650,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('kp_rrif4199'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -678,7 +661,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('kp_rrif4199'),
}),
]"/>
</record>
@@ -736,7 +718,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('kp_rrif4199'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -748,7 +729,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('kp_rrif4199'),
}),
]"/>
</record>
@@ -845,7 +825,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('kp_rrif4199'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -857,7 +836,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('kp_rrif4199'),
}),
]"/>
</record>
diff --git a/addons/l10n_hr/migrations/9.0.13.0/post-migrate_tags_on_taxes.py b/addons/l10n_hr/migrations/9.0.13.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index 404cdd185d4fd371aa6283dd21292151a7b3b0fa..0000000000000000000000000000000000000000
--- a/addons/l10n_hr/migrations/9.0.13.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
- registry = odoo.registry(cr.dbname)
- from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_hu/data/account_tax_template_data.xml b/addons/l10n_hu/data/account_tax_template_data.xml
index 46a16e9879ca51f9b49c82adb95c3c2829a7cbb0..0cde0b968b53b430360748278d50d77914b0dcef 100644
--- a/addons/l10n_hu/data/account_tax_template_data.xml
+++ b/addons/l10n_hu/data/account_tax_template_data.xml
@@ -134,7 +134,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_hu_467'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -146,7 +145,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_hu_467'),
}),
]"/>
</record>
@@ -170,7 +168,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_hu_467'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -182,7 +179,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_hu_467'),
}),
]"/>
</record>
@@ -206,7 +202,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_hu_467'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -218,7 +213,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_hu_467'),
}),
]"/>
</record>
@@ -242,7 +236,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_hu_467'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -254,7 +247,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_hu_467'),
}),
]"/>
</record>
@@ -278,7 +270,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_hu_467'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -290,7 +281,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_hu_467'),
}),
]"/>
</record>
@@ -428,7 +418,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_hu_466'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -440,7 +429,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_hu_466'),
}),
]"/>
</record>
@@ -464,7 +452,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_hu_466'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -476,7 +463,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_hu_466'),
}),
]"/>
</record>
@@ -499,7 +485,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_hu_466'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -510,7 +495,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_hu_466'),
}),
]"/>
</record>
@@ -534,7 +518,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_hu_466'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -546,7 +529,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_hu_466'),
}),
]"/>
</record>
@@ -570,7 +552,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_hu_466'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -582,7 +563,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_hu_466'),
}),
]"/>
</record>
@@ -606,7 +586,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_hu_466'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -618,7 +597,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart_hu_466'),
}),
]"/>
</record>
diff --git a/addons/l10n_hu/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_hu/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index 404cdd185d4fd371aa6283dd21292151a7b3b0fa..0000000000000000000000000000000000000000
--- a/addons/l10n_hu/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
- registry = odoo.registry(cr.dbname)
- from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_ie/data/account_tax_data.xml b/addons/l10n_ie/data/account_tax_data.xml
index 91491dea46ae55845f68de7f6de8d6ba5b084b19..e7f10a3e60d1ab26a4eb52b8471fd0679ace39aa 100644
--- a/addons/l10n_ie/data/account_tax_data.xml
+++ b/addons/l10n_ie/data/account_tax_data.xml
@@ -16,7 +16,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_ie_a2200'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -27,7 +26,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_ie_a2200'),
}),
]"/>
</record>
@@ -78,7 +76,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_ie_a2200'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -89,7 +86,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_ie_a2200'),
}),
]"/>
</record>
@@ -109,7 +105,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_ie_a2201'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -120,7 +115,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_ie_a2201'),
}),
]"/>
</record>
@@ -171,7 +165,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_ie_a2201'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -182,7 +175,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_ie_a2201'),
}),
]"/>
</record>
@@ -274,7 +266,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_ie_a2200'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -285,7 +276,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_ie_a2200'),
}),
]"/>
</record>
@@ -305,7 +295,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_ie_a2201'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -316,7 +305,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('l10n_ie_a2201'),
}),
]"/>
</record>
diff --git a/addons/l10n_in/data/account_tax_template_data.xml b/addons/l10n_in/data/account_tax_template_data.xml
index 6e043599d86b81901b762b8035c79906019f59ab..6c0d3b8892e85dcea62fc68e7796198ed7298c1f 100644
--- a/addons/l10n_in/data/account_tax_template_data.xml
+++ b/addons/l10n_in/data/account_tax_template_data.xml
@@ -185,7 +185,6 @@ if tax > result:result=tax</field>
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('p11236'),
}),
]"/>
@@ -198,7 +197,6 @@ if tax > result:result=tax</field>
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('p10056'),
}),
]"/>
@@ -224,7 +222,6 @@ if tax > result:result=tax</field>
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('p11236'),
}),
]"/>
@@ -237,7 +234,6 @@ if tax > result:result=tax</field>
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('p10056'),
}),
]"/>
@@ -506,7 +502,7 @@ if tax > result:result=tax</field>
'factor_percent': 50,
'repartition_type': 'tax',
'account_id': ref('p10052'),
- 'plus_report_line_ids': [ref('tax_report_line_cgst')],
+ 'minus_report_line_ids': [ref('tax_report_line_cgst')],
}),
]"/>
</record>
@@ -554,7 +550,7 @@ if tax > result:result=tax</field>
'factor_percent': 50,
'repartition_type': 'tax',
'account_id': ref('p10052'),
- 'plus_report_line_ids': [ref('tax_report_line_cgst')],
+ 'minus_report_line_ids': [ref('tax_report_line_cgst')],
}),
]"/>
</record>
@@ -602,7 +598,7 @@ if tax > result:result=tax</field>
'factor_percent': 50,
'repartition_type': 'tax',
'account_id': ref('p10052'),
- 'plus_report_line_ids': [ref('tax_report_line_cgst')],
+ 'minus_report_line_ids': [ref('tax_report_line_cgst')],
}),
]"/>
</record>
@@ -650,7 +646,7 @@ if tax > result:result=tax</field>
'factor_percent': 50,
'repartition_type': 'tax',
'account_id': ref('p10052'),
- 'plus_report_line_ids': [ref('tax_report_line_cgst')],
+ 'minus_report_line_ids': [ref('tax_report_line_cgst')],
}),
]"/>
</record>
@@ -698,7 +694,7 @@ if tax > result:result=tax</field>
'factor_percent': 50,
'repartition_type': 'tax',
'account_id': ref('p10052'),
- 'plus_report_line_ids': [ref('tax_report_line_cgst')],
+ 'minus_report_line_ids': [ref('tax_report_line_cgst')],
}),
]"/>
</record>
@@ -747,7 +743,7 @@ if tax > result:result=tax</field>
'factor_percent': 50,
'repartition_type': 'tax',
'account_id': ref('p10052'),
- 'plus_report_line_ids': [ref('tax_report_line_cgst')],
+ 'minus_report_line_ids': [ref('tax_report_line_cgst')],
}),
]"/>
</record>
@@ -898,7 +894,6 @@ if tax > result:result=tax</field>
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('p10056'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -910,7 +905,6 @@ if tax > result:result=tax</field>
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('p11236'),
}),
]"/>
</record>
@@ -935,7 +929,6 @@ if tax > result:result=tax</field>
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('p10056'),
}),
]"/>
@@ -948,7 +941,6 @@ if tax > result:result=tax</field>
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('p11236'),
}),
]"/>
@@ -1215,7 +1207,7 @@ if tax > result:result=tax</field>
'factor_percent': 50,
'repartition_type': 'tax',
'account_id': ref('p11233'),
- 'plus_report_line_ids': [ref('tax_report_line_cgst')],
+ 'minus_report_line_ids': [ref('tax_report_line_cgst')],
}),
]"/>
</record>
@@ -1263,7 +1255,7 @@ if tax > result:result=tax</field>
'factor_percent': 50,
'repartition_type': 'tax',
'account_id': ref('p11233'),
- 'plus_report_line_ids': [ref('tax_report_line_cgst')],
+ 'minus_report_line_ids': [ref('tax_report_line_cgst')],
}),
]"/>
</record>
@@ -1311,7 +1303,7 @@ if tax > result:result=tax</field>
'factor_percent': 50,
'repartition_type': 'tax',
'account_id': ref('p11233'),
- 'plus_report_line_ids': [ref('tax_report_line_cgst')],
+ 'minus_report_line_ids': [ref('tax_report_line_cgst')],
}),
]"/>
</record>
@@ -1359,7 +1351,7 @@ if tax > result:result=tax</field>
'factor_percent': 50,
'repartition_type': 'tax',
'account_id': ref('p11233'),
- 'plus_report_line_ids': [ref('tax_report_line_cgst')],
+ 'minus_report_line_ids': [ref('tax_report_line_cgst')],
}),
]"/>
</record>
@@ -1407,7 +1399,7 @@ if tax > result:result=tax</field>
'factor_percent': 50,
'repartition_type': 'tax',
'account_id': ref('p11233'),
- 'plus_report_line_ids': [ref('tax_report_line_cgst')],
+ 'minus_report_line_ids': [ref('tax_report_line_cgst')],
}),
]"/>
</record>
@@ -1456,7 +1448,7 @@ if tax > result:result=tax</field>
'factor_percent': 50,
'repartition_type': 'tax',
'account_id': ref('p11233'),
- 'plus_report_line_ids': [ref('tax_report_line_cgst')],
+ 'minus_report_line_ids': [ref('tax_report_line_cgst')],
}),
]"/>
</record>
diff --git a/addons/l10n_in/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_in/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index 404cdd185d4fd371aa6283dd21292151a7b3b0fa..0000000000000000000000000000000000000000
--- a/addons/l10n_in/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
- registry = odoo.registry(cr.dbname)
- from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_in_schedule6/l10n_in_schedule6_tax_template.xml b/addons/l10n_in_schedule6/l10n_in_schedule6_tax_template.xml
index d1400e7ac07f7b101c489a48d202721a3f371956..502854e8eca297331864d86d0258c393f90f9d43 100644
--- a/addons/l10n_in_schedule6/l10n_in_schedule6_tax_template.xml
+++ b/addons/l10n_in_schedule6/l10n_in_schedule6_tax_template.xml
@@ -1,230 +1,243 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
- <record id="schedule6_sgst_tag_tax" model="account.account.tag">
- <field name="name">SGST</field>
- <field name="applicability">taxes</field>
- </record>
- <record id="schedule6_cgst_tag_tax" model="account.account.tag">
- <field name="name">CGST</field>
- <field name="applicability">taxes</field>
- </record>
- <record id="schedule6_igst_tag_tax" model="account.account.tag">
- <field name="name">IGST</field>
- <field name="applicability">taxes</field>
- </record>
- <record id="schedule6_cess_tag_tax" model="account.account.tag">
- <field name="name">CESS</field>
- <field name="applicability">taxes</field>
- </record>
-
<!-- Account Tax Templates -->
<!-- Sale Taxes -->
- <record id="schedule6_sgst_sale_0_5" model="account.tax.template">
- <field name="name">(schedule6)SGST Sale 0.5%</field>
- <field name="description">SGST 0.5%</field>
- <field name="type_tax_use">none</field>
- <field name="amount_type">percent</field>
- <field name="amount">0.5</field>
- <field name="account_id" ref="c114210"/>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_sgst_group"/>
-
- </record>
-
- <record id="schedule6_cgst_sale_0_5" model="account.tax.template">
- <field name="name">(schedule6)CGST Sale 0.5%</field>
- <field name="description">CGST 0.5%</field>
- <field name="type_tax_use">none</field>
- <field name="amount_type">percent</field>
- <field name="amount">0.5</field>
- <field name="account_id" ref="c114211"/>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_cgst_group"/>
- </record>
-
<record id="schedule6_sgst_sale_1" model="account.tax.template">
<field name="name">(schedule6)GST 1%</field>
<field name="description">GST 1%</field>
<field name="type_tax_use">sale</field>
- <field name="amount_type">group</field>
- <field name="amount">0</field>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_sale_0_5'), ref('schedule6_cgst_sale_0_5'),])]"/>
- </record>
-
- <record id="schedule6_sgst_sale_1_2" model="account.tax.template">
- <field name="name">(schedule6)SGST Sale 1%</field>
- <field name="description">SGST 1%</field>
- <field name="type_tax_use">none</field>
- <field name="amount_type">percent</field>
- <field name="amount">1</field>
- <field name="account_id" ref="c114210"/>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_sgst_group"/>
- </record>
-
- <record id="schedule6_cgst_sale_1_2" model="account.tax.template">
- <field name="name">(schedule6)CGST Sale 1%</field>
- <field name="description">CGST 1%</field>
- <field name="type_tax_use">none</field>
<field name="amount_type">percent</field>
<field name="amount">1</field>
- <field name="account_id" ref="c114211"/>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_cgst_group"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c114210'),
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c114211'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="schedule6_sgst_sale_2" model="account.tax.template">
<field name="name">(schedule6)GST 2%</field>
<field name="description">GST 2%</field>
<field name="type_tax_use">sale</field>
- <field name="amount_type">group</field>
- <field name="amount">0</field>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_sale_1_2'), ref('schedule6_cgst_sale_1_2'),])]"/>
- </record>
-
- <record id="schedule6_sgst_sale_2_5" model="account.tax.template">
- <field name="name">(schedule6)SGST Sale 2.5%</field>
- <field name="description">SGST 2.5%</field>
- <field name="type_tax_use">none</field>
- <field name="amount_type">percent</field>
- <field name="amount">2.5</field>
- <field name="account_id" ref="c114210"/>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_sgst_group"/>
- </record>
-
- <record id="schedule6_cgst_sale_2_5" model="account.tax.template">
- <field name="name">(schedule6)CGST Sale 2.5%</field>
- <field name="description">CGST 2.5%</field>
- <field name="type_tax_use">none</field>
<field name="amount_type">percent</field>
- <field name="amount">2.5</field>
- <field name="account_id" ref="c114211"/>
+ <field name="amount">2</field>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_cgst_group"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base'
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c114210'),
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c114211'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base'
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="schedule6_sgst_sale_5" model="account.tax.template">
<field name="name">(schedule6)GST 5%</field>
<field name="description">GST 5%</field>
<field name="type_tax_use">sale</field>
- <field name="amount_type">group</field>
- <field name="amount">0</field>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_sale_2_5'), ref('schedule6_cgst_sale_2_5'),])]"/>
- </record>
-
- <record id="schedule6_sgst_sale_6" model="account.tax.template">
- <field name="name">(schedule6)SGST Sale 6%</field>
- <field name="description">SGST 6%</field>
- <field name="type_tax_use">none</field>
- <field name="amount_type">percent</field>
- <field name="amount">6</field>
- <field name="account_id" ref="c114210"/>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_sgst_group"/>
- </record>
-
- <record id="schedule6_cgst_sale_6" model="account.tax.template">
- <field name="name">(schedule6)CGST Sale 6%</field>
- <field name="description">CGST 6%</field>
- <field name="type_tax_use">none</field>
<field name="amount_type">percent</field>
- <field name="amount">6</field>
- <field name="account_id" ref="c114211"/>
+ <field name="amount">5</field>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_cgst_group"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base'
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c114210'),
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c114211'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base'
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="schedule6_sgst_sale_12" model="account.tax.template">
<field name="name">(schedule6)GST 12%</field>
<field name="description">GST 12%</field>
<field name="type_tax_use">sale</field>
- <field name="amount_type">group</field>
- <field name="amount">0</field>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_sale_6'),ref('schedule6_cgst_sale_6'),])]"/>
- </record>
-
- <record id="schedule6_sgst_sale_9" model="account.tax.template">
- <field name="name">(schedule6)SGST Sale 9%</field>
- <field name="description">SGST 9%</field>
- <field name="type_tax_use">none</field>
<field name="amount_type">percent</field>
- <field name="amount">9</field>
- <field name="account_id" ref="c114210"/>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_sgst_group"/>
- </record>
-
- <record id="schedule6_cgst_sale_9" model="account.tax.template">
- <field name="name">(schedule6)CGST Sale 9%</field>
- <field name="description">CGST 9%</field>
- <field name="type_tax_use">none</field>
- <field name="amount_type">percent</field>
- <field name="amount">9</field>
- <field name="account_id" ref="c114211"/>
+ <field name="amount">12</field>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_cgst_group"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base'
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c114210'),
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c114211'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base'
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="schedule6_sgst_sale_18" model="account.tax.template">
<field name="name">(schedule6)GST 18%</field>
<field name="description">GST 18%</field>
<field name="type_tax_use">sale</field>
- <field name="amount_type">group</field>
- <field name="amount">0</field>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_sale_9'),ref('schedule6_cgst_sale_9'),])]"/>
- </record>
-
- <record id="schedule6_sgst_sale_14" model="account.tax.template">
- <field name="name">(schedule6)SGST Sale 14%</field>
- <field name="description">SGST 14%</field>
- <field name="type_tax_use">none</field>
<field name="amount_type">percent</field>
- <field name="amount">14</field>
- <field name="account_id" ref="c114210"/>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_sgst_group"/>
- </record>
-
- <record id="schedule6_cgst_sale_14" model="account.tax.template">
- <field name="name">(schedule6)CGST Sale 14%</field>
- <field name="description">CGST 14%</field>
- <field name="type_tax_use">none</field>
- <field name="amount_type">percent</field>
- <field name="amount">14</field>
- <field name="account_id" ref="c114211"/>
+ <field name="amount">18</field>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_cgst_group"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base'
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c114210'),
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c114211'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base'
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="schedule6_sgst_sale_28" model="account.tax.template">
<field name="name">(schedule6)GST 28%</field>
<field name="description">GST 28%</field>
<field name="type_tax_use">sale</field>
- <field name="amount_type">group</field>
- <field name="amount">0</field>
+ <field name="amount_type">percent</field>
+ <field name="amount">28</field>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_sale_14'),ref('schedule6_cgst_sale_14'),])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base'
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c114210'),
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c114211'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base'
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
+
</record>
<record id="schedule6_igst_sale_1" model="account.tax.template">
@@ -233,9 +246,28 @@
<field name="type_tax_use">sale</field>
<field name="amount_type">percent</field>
<field name="amount">1</field>
- <field name="account_id" ref="c114212"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c114212'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/>
<field name="tax_group_id" ref="schedule6_igst_group"/>
</record>
@@ -245,9 +277,28 @@
<field name="type_tax_use">sale</field>
<field name="amount_type">percent</field>
<field name="amount">2</field>
- <field name="account_id" ref="c114212"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c114212'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/>
<field name="tax_group_id" ref="schedule6_igst_group"/>
</record>
@@ -257,9 +308,28 @@
<field name="type_tax_use">sale</field>
<field name="amount_type">percent</field>
<field name="amount">5</field>
- <field name="account_id" ref="c114212"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c114212'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/>
<field name="tax_group_id" ref="schedule6_igst_group"/>
</record>
@@ -269,9 +339,28 @@
<field name="type_tax_use">sale</field>
<field name="amount_type">percent</field>
<field name="amount">12</field>
- <field name="account_id" ref="c114212"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c114212'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/>
<field name="tax_group_id" ref="schedule6_igst_group"/>
</record>
@@ -281,9 +370,28 @@
<field name="type_tax_use">sale</field>
<field name="amount_type">percent</field>
<field name="amount">18</field>
- <field name="account_id" ref="c114212"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c114212'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/>
<field name="tax_group_id" ref="schedule6_igst_group"/>
</record>
@@ -293,9 +401,28 @@
<field name="type_tax_use">sale</field>
<field name="amount_type">percent</field>
<field name="amount">28</field>
- <field name="account_id" ref="c114212"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c114212'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/>
<field name="tax_group_id" ref="schedule6_igst_group"/>
</record>
@@ -307,7 +434,26 @@
<field name="amount">5</field>
<field name="tax_group_id" ref="schedule6_cess_group"/>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_cess_tag_tax'),])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="schedule6_cess_sale_1591" model="account.tax.template">
@@ -318,7 +464,26 @@
<field name="amount">1.591</field>
<field name="tax_group_id" ref="schedule6_cess_group"/>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_cess_tag_tax'),])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="schedule6_cess_5_plus_1591_sale" model="account.tax.template">
@@ -329,7 +494,6 @@
<field name="amount">0</field>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
<field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_cess_sale_5'),ref('schedule6_cess_sale_1591'),])]"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_cess_tag_tax'),])]"/>
</record>
<record id="schedule6_cess_21_4170_higer_sale" model="account.tax.template">
@@ -343,213 +507,262 @@ tax=quantity * 4.17
if tax > result:result=tax</field>
<field name="tax_group_id" ref="schedule6_cess_group"/>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_cess_tag_tax'),])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<!-- Purchase Taxes -->
- <record id="schedule6_sgst_purchase_0_5" model="account.tax.template">
- <field name="name">(schedule6)SGST Purchase 0.5%</field>
- <field name="description">SGST 0.5%</field>
- <field name="type_tax_use">none</field>
- <field name="amount_type">percent</field>
- <field name="amount">0.5</field>
- <field name="account_id" ref="c121611"/>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_sgst_group"/>
- </record>
-
- <record id="schedule6_cgst_purchase_0_5" model="account.tax.template">
- <field name="name">(schedule6)CGST Purchase 0.5%</field>
- <field name="description">CGST 0.5%</field>
- <field name="type_tax_use">none</field>
- <field name="amount_type">percent</field>
- <field name="amount">0.5</field>
- <field name="account_id" ref="c121612"/>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_cgst_group"/>
- </record>
-
<record id="schedule6_sgst_purchase_1" model="account.tax.template">
<field name="name">(schedule6)GST 1%</field>
<field name="description">GST 1%</field>
<field name="type_tax_use">purchase</field>
- <field name="amount_type">group</field>
- <field name="amount">0</field>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_purchase_0_5'),ref('schedule6_cgst_purchase_0_5'),])]"/>
- </record>
-
- <record id="schedule6_sgst_purchase_1_2" model="account.tax.template">
- <field name="name">(schedule6)SGST Purchase 1%</field>
- <field name="description">SGST 1%</field>
- <field name="type_tax_use">none</field>
<field name="amount_type">percent</field>
<field name="amount">1</field>
- <field name="account_id" ref="c121611"/>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_sgst_group"/>
- </record>
-
- <record id="schedule6_cgst_purchase_1_2" model="account.tax.template">
- <field name="name">(schedule6)CGST Purchase 1%</field>
- <field name="description">CGST 1%</field>
- <field name="type_tax_use">none</field>
- <field name="amount_type">percent</field>
- <field name="amount">1</field>
- <field name="account_id" ref="c121612"/>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_cgst_group"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c121611'),
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c121612'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="schedule6_sgst_purchase_2" model="account.tax.template">
<field name="name">(schedule6)GST 2%</field>
<field name="description">GST 2%</field>
<field name="type_tax_use">purchase</field>
- <field name="amount_type">group</field>
- <field name="amount">0</field>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_purchase_1_2'),ref('schedule6_cgst_purchase_1_2'),])]"/>
- </record>
-
- <record id="schedule6_sgst_purchase_2_5" model="account.tax.template">
- <field name="name">(schedule6)SGST Purchase 2.5%</field>
- <field name="description">SGST 2.5%</field>
- <field name="type_tax_use">none</field>
<field name="amount_type">percent</field>
- <field name="amount">2.5</field>
- <field name="account_id" ref="c121611"/>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_sgst_group"/>
- </record>
-
- <record id="schedule6_cgst_purchase_2_5" model="account.tax.template">
- <field name="name">(schedule6)CGST Purchase 2.5%</field>
- <field name="description">CGST 2.5%</field>
- <field name="type_tax_use">none</field>
- <field name="amount_type">percent</field>
- <field name="amount">2.5</field>
- <field name="account_id" ref="c121612"/>
+ <field name="amount">2</field>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_cgst_group"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c121611'),
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c121612'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="schedule6_sgst_purchase_5" model="account.tax.template">
<field name="name">(schedule6)GST 5%</field>
<field name="description">GST 5%</field>
<field name="type_tax_use">purchase</field>
- <field name="amount_type">group</field>
- <field name="amount">0</field>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_purchase_2_5'),ref('schedule6_cgst_purchase_2_5'),])]"/>
- </record>
-
- <record id="schedule6_sgst_purchase_6" model="account.tax.template">
- <field name="name">(schedule6)SGST Purchase 6%</field>
- <field name="description">SGST 6%</field>
- <field name="type_tax_use">none</field>
- <field name="amount_type">percent</field>
- <field name="amount">6</field>
- <field name="account_id" ref="c121611"/>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_sgst_group"/>
- </record>
-
- <record id="schedule6_cgst_purchase_6" model="account.tax.template">
- <field name="name">(schedule6)CGST Purchase 6%</field>
- <field name="description">CGST 6%</field>
- <field name="type_tax_use">none</field>
<field name="amount_type">percent</field>
- <field name="amount">6</field>
- <field name="account_id" ref="c121612"/>
+ <field name="amount">5</field>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_cgst_group"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c121611'),
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c121612'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="schedule6_sgst_purchase_12" model="account.tax.template">
<field name="name">(schedule6)GST 12%</field>
<field name="description">GST 12%</field>
<field name="type_tax_use">purchase</field>
- <field name="amount_type">group</field>
- <field name="amount">0</field>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_purchase_6'),ref('schedule6_cgst_purchase_6'),])]"/>
- </record>
-
- <record id="schedule6_sgst_purchase_9" model="account.tax.template">
- <field name="name">(schedule6)SGST Purchase 9%</field>
- <field name="description">SGST 9%</field>
- <field name="type_tax_use">none</field>
- <field name="amount_type">percent</field>
- <field name="amount">9</field>
- <field name="account_id" ref="c121611"/>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_sgst_group"/>
- </record>
-
- <record id="schedule6_cgst_purchase_9" model="account.tax.template">
- <field name="name">(schedule6)CGST Purchase 9%</field>
- <field name="description">CGST 9%</field>
- <field name="type_tax_use">none</field>
<field name="amount_type">percent</field>
- <field name="amount">9</field>
- <field name="account_id" ref="c121612"/>
+ <field name="amount">12</field>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_cgst_group"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c121611'),
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c121612'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="schedule6_sgst_purchase_18" model="account.tax.template">
<field name="name">(schedule6)GST 18%</field>
<field name="description">GST 18%</field>
<field name="type_tax_use">purchase</field>
- <field name="amount_type">group</field>
- <field name="amount">0</field>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_purchase_9'),ref('schedule6_cgst_purchase_9'),])]"/>
- </record>
-
- <record id="schedule6_sgst_purchase_14" model="account.tax.template">
- <field name="name">(schedule6)SGST Purchase 14%</field>
- <field name="description">SGST 14%</field>
- <field name="type_tax_use">none</field>
<field name="amount_type">percent</field>
- <field name="amount">14</field>
- <field name="account_id" ref="c121611"/>
- <field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_sgst_group"/>
- </record>
-
- <record id="schedule6_cgst_purchase_14" model="account.tax.template">
- <field name="name">(schedule6)CGST Purchase 14%</field>
- <field name="description">CGST 14%</field>
- <field name="type_tax_use">none</field>
- <field name="amount_type">percent</field>
- <field name="amount">14</field>
- <field name="account_id" ref="c121612"/>
+ <field name="amount">18</field>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/>
- <field name="tax_group_id" ref="schedule6_cgst_group"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c121611'),
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c121612'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="schedule6_sgst_purchase_28" model="account.tax.template">
<field name="name">(schedule6)GST 28%</field>
<field name="description">GST 28%</field>
<field name="type_tax_use">purchase</field>
- <field name="amount_type">group</field>
- <field name="amount">0</field>
+ <field name="amount_type">percent</field>
+ <field name="amount">28</field>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_purchase_14'),ref('schedule6_cgst_purchase_14'),])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c121611'),
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c121612'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ (0, 0, {
+ 'factor_percent': 50,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="schedule6_igst_purchase_1" model="account.tax.template">
@@ -558,9 +771,28 @@ if tax > result:result=tax</field>
<field name="type_tax_use">purchase</field>
<field name="amount_type">percent</field>
<field name="amount">1</field>
- <field name="account_id" ref="c121613"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c121613'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/>
<field name="tax_group_id" ref="schedule6_igst_group"/>
</record>
@@ -570,9 +802,28 @@ if tax > result:result=tax</field>
<field name="type_tax_use">purchase</field>
<field name="amount_type">percent</field>
<field name="amount">2</field>
- <field name="account_id" ref="c121613"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c121613'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/>
<field name="tax_group_id" ref="schedule6_igst_group"/>
</record>
@@ -582,9 +833,28 @@ if tax > result:result=tax</field>
<field name="type_tax_use">purchase</field>
<field name="amount_type">percent</field>
<field name="amount">5</field>
- <field name="account_id" ref="c121613"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c121613'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/>
<field name="tax_group_id" ref="schedule6_igst_group"/>
</record>
@@ -594,9 +864,28 @@ if tax > result:result=tax</field>
<field name="type_tax_use">purchase</field>
<field name="amount_type">percent</field>
<field name="amount">12</field>
- <field name="account_id" ref="c121613"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c121613'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/>
<field name="tax_group_id" ref="schedule6_igst_group"/>
</record>
@@ -606,9 +895,28 @@ if tax > result:result=tax</field>
<field name="type_tax_use">purchase</field>
<field name="amount_type">percent</field>
<field name="amount">18</field>
- <field name="account_id" ref="c121613"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c121613'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/>
<field name="tax_group_id" ref="schedule6_igst_group"/>
</record>
@@ -618,9 +926,28 @@ if tax > result:result=tax</field>
<field name="type_tax_use">purchase</field>
<field name="amount_type">percent</field>
<field name="amount">28</field>
- <field name="account_id" ref="c121613"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('c121613'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/>
<field name="tax_group_id" ref="schedule6_igst_group"/>
</record>
@@ -632,7 +959,26 @@ if tax > result:result=tax</field>
<field name="amount">5</field>
<field name="tax_group_id" ref="schedule6_cess_group"/>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_cess_tag_tax'),])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="schedule6_cess_purchase_1591" model="account.tax.template">
@@ -643,7 +989,26 @@ if tax > result:result=tax</field>
<field name="amount">1.591</field>
<field name="tax_group_id" ref="schedule6_cess_group"/>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_cess_tag_tax'),])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="schedule6_cess_5_plus_1591_purchase" model="account.tax.template">
@@ -667,7 +1032,26 @@ tax=quantity * 4.17
if tax > result:result=tax</field>
<field name="tax_group_id" ref="schedule6_cess_group"/>
<field name="chart_template_id" ref="indian_chart_template_schedule6"/>
- <field name="tag_ids" eval="[(6,0,[ref('schedule6_cess_tag_tax'),])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
</odoo>
diff --git a/addons/l10n_it/data/account_tax_template.xml b/addons/l10n_it/data/account_tax_template.xml
index 0adb0478db46d826a3099fb5decbc198bd0fb08b..36635b55b0129e8bd282257b0b8d7bc24759dc4a 100644
--- a/addons/l10n_it/data/account_tax_template.xml
+++ b/addons/l10n_it/data/account_tax_template.xml
@@ -356,11 +356,6 @@
'factor_percent': 100,
'repartition_type': 'base',
}),
- (0,0, {
- 'factor_percent': 0,
- 'repartition_type': 'tax',
- 'account_id': ref('1601'),
- }),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
@@ -371,11 +366,6 @@
'factor_percent': 100,
'repartition_type': 'base',
}),
- (0,0, {
- 'factor_percent': 0,
- 'repartition_type': 'tax',
- 'account_id': ref('1601'),
- }),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
@@ -592,11 +582,6 @@
'factor_percent': 100,
'repartition_type': 'base',
}),
- (0,0, {
- 'factor_percent': 0,
- 'repartition_type': 'tax',
- 'account_id': ref('1601'),
- }),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
@@ -607,11 +592,6 @@
'factor_percent': 100,
'repartition_type': 'base',
}),
- (0,0, {
- 'factor_percent': 0,
- 'repartition_type': 'tax',
- 'account_id': ref('1601'),
- }),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
@@ -812,11 +792,6 @@
'factor_percent': 100,
'repartition_type': 'base',
}),
- (0,0, {
- 'factor_percent': 0,
- 'repartition_type': 'tax',
- 'account_id': ref('1601'),
- }),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
@@ -827,11 +802,6 @@
'factor_percent': 100,
'repartition_type': 'base',
}),
- (0,0, {
- 'factor_percent': 0,
- 'repartition_type': 'tax',
- 'account_id': ref('1601'),
- }),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
@@ -993,7 +963,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('2601'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1004,7 +973,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('2601'),
}),
]"/>
</record>
@@ -1027,7 +995,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('1601'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1038,7 +1005,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('1601'),
}),
]"/>
</record>
@@ -1061,7 +1027,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('2601'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1072,7 +1037,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('2601'),
}),
]"/>
</record>
@@ -1095,7 +1059,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('1601'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1106,7 +1069,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('1601'),
}),
]"/>
</record>
@@ -1367,7 +1329,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('2601'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1378,7 +1339,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('2601'),
}),
]"/>
</record>
@@ -1524,11 +1484,6 @@
'factor_percent': 100,
'repartition_type': 'base',
}),
- (0,0, {
- 'factor_percent': 0,
- 'repartition_type': 'tax',
- 'account_id': ref('1601'),
- }),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
@@ -1539,11 +1494,6 @@
'factor_percent': 100,
'repartition_type': 'base',
}),
- (0,0, {
- 'factor_percent': 0,
- 'repartition_type': 'tax',
- 'account_id': ref('1601'),
- }),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
@@ -1734,11 +1684,6 @@
'factor_percent': 100,
'repartition_type': 'base',
}),
- (0,0, {
- 'factor_percent': 0,
- 'repartition_type': 'tax',
- 'account_id': ref('1601'),
- }),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
@@ -1749,11 +1694,6 @@
'factor_percent': 100,
'repartition_type': 'base',
}),
- (0,0, {
- 'factor_percent': 0,
- 'repartition_type': 'tax',
- 'account_id': ref('1601'),
- }),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
diff --git a/addons/l10n_jp/data/account_tax_report_data.xml b/addons/l10n_jp/data/account_tax_report_data.xml
index 02ec7767d09796fe99d87eb47a15887a53c5575b..a822b13da646cc14d29e8d1477bb2c334f3b1fbf 100644
--- a/addons/l10n_jp/data/account_tax_report_data.xml
+++ b/addons/l10n_jp/data/account_tax_report_data.xml
@@ -32,7 +32,7 @@
<record id="tax_report_to_pay_temp_tx_tax_free" model="account.tax.report.line">
<field name="name">ä¸èª²ç¨Ž</field>
- <field name="tag_name">ä¸èª²ç¨Ž</field>
+ <field name="tag_name">ä¸èª²ç¨Ž (ä»®å—税é¡)</field>
<field name="parent_id" ref="tax_report_to_pay_temp_tx"/>
<field name="sequence">3</field>
<field name="country_id" ref="base.jp"/>
@@ -63,7 +63,7 @@
<record id="tax_report_to_pay_temp_pmt_tax_free" model="account.tax.report.line">
<field name="name">ä¸èª²ç¨Ž</field>
- <field name="tag_name">ä¸èª²ç¨Ž</field>
+ <field name="tag_name">ä¸èª²ç¨Ž (仮払税é¡)</field>
<field name="parent_id" ref="tax_report_to_pay_temp_pmt"/>
<field name="sequence">3</field>
<field name="country_id" ref="base.jp"/>
diff --git a/addons/l10n_jp/data/account_tax_template_data.xml b/addons/l10n_jp/data/account_tax_template_data.xml
index c28e3319af5f4e6e09c5a32abfce0bdb45051a83..fbb1a01406c6ae97608e361a8e19930eabcb4815 100644
--- a/addons/l10n_jp/data/account_tax_template_data.xml
+++ b/addons/l10n_jp/data/account_tax_template_data.xml
@@ -20,6 +20,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
+ 'account_id': ref('A21809'),
'plus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_output_8')],
}),
]"/>
@@ -32,6 +33,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
+ 'account_id': ref('A21809'),
'minus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_output_8')],
}),
]"/>
@@ -56,6 +58,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
+ 'account_id': ref('A21809'),
'plus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_output_8')],
}),
]"/>
@@ -68,6 +71,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
+ 'account_id': ref('A21809'),
'minus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_output_8')],
}),
]"/>
@@ -92,7 +96,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_duty_free')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -104,7 +107,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_duty_free')],
}),
]"/>
<field name="tax_group_id" ref="tax_group_0"/>
@@ -128,12 +130,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_pmt_tax_free')],
- }),
- (0,0, {
- 'factor_percent': 100,
- 'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_tax_free')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -145,12 +141,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_pmt_tax_free')],
- }),
- (0,0, {
- 'factor_percent': 100,
- 'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_tax_free')],
}),
]"/>
<field name="tax_group_id" ref="tax_group_0"/>
@@ -250,7 +240,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_pmt_import_8')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -262,7 +251,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_pmt_import_8')],
}),
]"/>
<field name="tax_group_id" ref="tax_group_0"/>
diff --git a/addons/l10n_jp/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_jp/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index 404cdd185d4fd371aa6283dd21292151a7b3b0fa..0000000000000000000000000000000000000000
--- a/addons/l10n_jp/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
- registry = odoo.registry(cr.dbname)
- from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_lu/data/account_tax_template_2015.xml b/addons/l10n_lu/data/account_tax_template_2015.xml
index 20acaf701cd007dd9b11ff57180ec3c5a6d88adf..e70d0cb53c8d02cf7da8de9bc2b5e49a360e5e88 100644
--- a/addons/l10n_lu/data/account_tax_template_2015.xml
+++ b/addons/l10n_lu/data/account_tax_template_2015.xml
@@ -51,7 +51,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -70,7 +70,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -100,7 +100,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -119,7 +119,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -149,7 +149,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -168,7 +168,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
}),
(0,0, {
'factor_percent': 100,
@@ -198,7 +198,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -217,7 +217,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -280,7 +280,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -299,7 +299,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
}),
(0,0, {
'factor_percent': 100,
@@ -329,7 +329,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -348,7 +348,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
}),
(0,0, {
'factor_percent': 100,
@@ -378,7 +378,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
}),
(0,0, {
'factor_percent': 100,
@@ -397,7 +397,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
}),
(0,0, {
'factor_percent': 100,
@@ -427,7 +427,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
}),
(0,0, {
'factor_percent': 100,
@@ -446,7 +446,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')]
}),
(0,0, {
'factor_percent': 100,
@@ -509,7 +509,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
}),
(0,0, {
'factor_percent': 100,
@@ -528,7 +528,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
}),
(0,0, {
'factor_percent': 100,
@@ -558,7 +558,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
}),
(0,0, {
'factor_percent': 100,
@@ -577,7 +577,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
}),
(0,0, {
'factor_percent': 100,
@@ -607,7 +607,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
}),
(0,0, {
'factor_percent': 100,
@@ -626,7 +626,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')]
}),
(0,0, {
'factor_percent': 100,
@@ -656,7 +656,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
}),
(0,0, {
'factor_percent': 100,
@@ -675,7 +675,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
}),
(0,0, {
'factor_percent': 100,
@@ -920,7 +920,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -939,7 +939,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -969,7 +969,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -988,7 +988,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -1018,7 +1018,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -1037,7 +1037,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -1067,7 +1067,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -1086,7 +1086,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -1149,7 +1149,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -1168,7 +1168,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -1198,7 +1198,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -1217,7 +1217,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -1247,7 +1247,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -1266,7 +1266,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -1296,7 +1296,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -1315,7 +1315,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -1559,7 +1559,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -1578,7 +1578,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -1608,7 +1608,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -1627,7 +1627,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -1657,7 +1657,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -1676,7 +1676,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -1706,7 +1706,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -1725,7 +1725,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -1788,7 +1788,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -1807,7 +1807,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -1837,7 +1837,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -1856,7 +1856,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -1886,7 +1886,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -1905,7 +1905,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -1935,7 +1935,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -1954,7 +1954,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -2017,7 +2017,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
}),
(0,0, {
'factor_percent': 100,
@@ -2036,7 +2036,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
}),
(0,0, {
'factor_percent': 100,
@@ -2066,7 +2066,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
}),
(0,0, {
'factor_percent': 100,
@@ -2085,7 +2085,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
}),
(0,0, {
'factor_percent': 100,
@@ -2115,7 +2115,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
}),
(0,0, {
'factor_percent': 100,
@@ -2134,7 +2134,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
}),
(0,0, {
'factor_percent': 100,
@@ -2164,7 +2164,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
}),
(0,0, {
'factor_percent': 100,
@@ -2183,7 +2183,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
}),
(0,0, {
'factor_percent': 100,
@@ -2427,7 +2427,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -2446,7 +2446,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -2476,7 +2476,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -2495,7 +2495,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -2525,7 +2525,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -2544,7 +2544,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -2574,7 +2574,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -2593,7 +2593,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -2656,7 +2656,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -2675,7 +2675,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -2705,7 +2705,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -2724,7 +2724,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -2754,7 +2754,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -2773,7 +2773,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -2803,7 +2803,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -2822,7 +2822,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -3066,7 +3066,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -3085,7 +3085,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -3115,7 +3115,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -3134,7 +3134,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -3164,7 +3164,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -3183,7 +3183,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -3213,7 +3213,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -3232,7 +3232,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -3295,7 +3295,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -3314,7 +3314,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -3344,7 +3344,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -3363,7 +3363,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -3393,7 +3393,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -3412,7 +3412,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -3442,7 +3442,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -3461,7 +3461,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')],
}),
(0,0, {
'factor_percent': 100,
@@ -3524,7 +3524,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
}),
(0,0, {
'factor_percent': 100,
@@ -3543,7 +3543,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
}),
(0,0, {
'factor_percent': 100,
@@ -3573,7 +3573,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
}),
(0,0, {
'factor_percent': 100,
@@ -3592,7 +3592,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
}),
(0,0, {
'factor_percent': 100,
@@ -3622,7 +3622,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
}),
(0,0, {
'factor_percent': 100,
@@ -3641,7 +3641,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
}),
(0,0, {
'factor_percent': 100,
@@ -3671,7 +3671,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
}),
(0,0, {
'factor_percent': 100,
@@ -3690,7 +3690,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')],
}),
(0,0, {
'factor_percent': 100,
@@ -3934,7 +3934,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -3953,7 +3953,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -3983,7 +3983,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -4002,7 +4002,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -4032,7 +4032,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -4051,7 +4051,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -4081,7 +4081,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -4100,7 +4100,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614113'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -4163,7 +4163,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -4182,7 +4182,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -4212,7 +4212,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -4231,7 +4231,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -4261,7 +4261,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -4280,7 +4280,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -4310,7 +4310,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
@@ -4329,7 +4329,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('lu_2011_account_4614112'),
- 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')],
}),
(0,0, {
'factor_percent': 100,
diff --git a/addons/l10n_lu/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_lu/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index fa56fd00dfa98b748849f30c6930fd3ce71d6448..0000000000000000000000000000000000000000
--- a/addons/l10n_lu/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from openerp.modules.registry import RegistryManager
-
-def migrate(cr, version):
- registry = RegistryManager.get(cr.dbname)
- from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_ma/data/account_tax_data.xml b/addons/l10n_ma/data/account_tax_data.xml
index f316c4d6b566093a01eae6c26ac9e9cdfc25540f..c112839f15b0c9da44f377420899c7b821efa260 100644
--- a/addons/l10n_ma/data/account_tax_data.xml
+++ b/addons/l10n_ma/data/account_tax_data.xml
@@ -334,7 +334,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'plus_report_line_ids': [ref('tax_report_achats_interieur_ht_10')],
+ 'plus_report_line_ids': [ref('tax_report_achats_importation_ht_10')],
}),
(0,0, {
'factor_percent': 100,
@@ -347,7 +347,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'minus_report_line_ids': [ref('tax_report_achats_interieur_ht_10')],
+ 'minus_report_line_ids': [ref('tax_report_achats_importation_ht_10')],
}),
(0,0, {
'factor_percent': 100,
diff --git a/addons/l10n_ma/data/account_tax_report_data.xml b/addons/l10n_ma/data/account_tax_report_data.xml
index b838d152ffe65fe305180bbf3ea45dc2bc5ecd4d..220bad623802a0b7249f2102b45ae6d6c764a54f 100644
--- a/addons/l10n_ma/data/account_tax_report_data.xml
+++ b/addons/l10n_ma/data/account_tax_report_data.xml
@@ -145,7 +145,7 @@
<field name="country_id" ref="base.ma"/>
</record>
- <record id="tax_report_achats_interieur_ht_10" model="account.tax.report.line">
+ <record id="tax_report_achats_importation_ht_10" model="account.tax.report.line">
<field name="name">Achats à l'importation (10%) (HT)</field>
<field name="tag_name">Achats à l'importation (10%) (HT)</field>
<field name="parent_id" ref="tax_report_biens_materiels_ht"/>
diff --git a/addons/l10n_mn/data/account_tax_template_data.xml b/addons/l10n_mn/data/account_tax_template_data.xml
index 8f5d16d9b752cdba8a0335b6144387360d6e6912..95b5ec15261bfed19abeb3c7b2325986f8bae12a 100644
--- a/addons/l10n_mn/data/account_tax_template_data.xml
+++ b/addons/l10n_mn/data/account_tax_template_data.xml
@@ -96,7 +96,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_1204_0301'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -108,7 +107,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_1204_0301'),
}),
]"/>
</record>
@@ -132,7 +130,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_3401_0201'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -144,7 +141,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_3401_0201'),
}),
]"/>
</record>
@@ -168,7 +164,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_3401_0201'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -180,7 +175,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_3401_0201'),
}),
]"/>
</record>
@@ -926,7 +920,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_3401_0201'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -938,7 +931,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_3401_0201'),
}),
]"/>
</record>
@@ -962,7 +954,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_3401_0201'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -974,7 +965,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_template_3401_0201'),
}),
]"/>
</record>
diff --git a/addons/l10n_mx/data/account_tax_data.xml b/addons/l10n_mx/data/account_tax_data.xml
index a01635f2f651b43ec2372886650cf67e165f811f..7d5a3faf852700bfaaad8877741d1979bfef1369 100644
--- a/addons/l10n_mx/data/account_tax_data.xml
+++ b/addons/l10n_mx/data/account_tax_data.xml
@@ -69,8 +69,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'tag_ids': [ref('l10n_mx.tag_iva')],
- 'account_id': ref('cuenta208_01'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -82,8 +80,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'tag_ids': [ref('l10n_mx.tag_iva')],
- 'account_id': ref('cuenta209_01'),
}),
]"/>
</record>
@@ -110,6 +106,7 @@
'repartition_type': 'tax',
'tag_ids': [ref('l10n_mx.tag_iva')],
'account_id': ref('cuenta208_01'),
+ 'tag_ids': [ref('tag_iva')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -123,6 +120,7 @@
'repartition_type': 'tax',
'tag_ids': [ref('l10n_mx.tag_iva')],
'account_id': ref('cuenta209_01'),
+ 'tag_ids': [ref('tag_iva')],
}),
]"/>
</record>
@@ -372,7 +370,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('cuenta118_01'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -385,7 +382,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('cuenta119_01'),
}),
]"/>
</record>
@@ -490,6 +486,7 @@
'repartition_type': 'tax',
'tag_ids': [ref('l10n_mx.tag_iva')],
'account_id': ref('cuenta208_01'),
+ 'tag_ids': [ref('tag_iva')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -503,6 +500,7 @@
'repartition_type': 'tax',
'tag_ids': [ref('l10n_mx.tag_iva')],
'account_id': ref('cuenta209_01'),
+ 'tag_ids': [ref('tag_iva')],
}),
]"/>
</record>
diff --git a/addons/l10n_nl/data/account_tax_template.xml b/addons/l10n_nl/data/account_tax_template.xml
index e56f19142888505a6b120bc69e49c4c5318bdf05..db153988ede3c076641dd70fa859520728fd4318 100644
--- a/addons/l10n_nl/data/account_tax_template.xml
+++ b/addons/l10n_nl/data/account_tax_template.xml
@@ -21,7 +21,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('vat_payable_0'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -33,7 +32,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('vat_payable_0'),
}),
]"/>
</record>
@@ -200,7 +198,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('vat_payable_0_d'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -212,7 +209,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('vat_payable_0_d'),
}),
]"/>
</record>
@@ -759,7 +755,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('vat_payable_v'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -771,7 +766,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('vat_payable_v'),
}),
]"/>
</record>
@@ -800,7 +794,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_v'),
- 'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+ 'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -819,7 +813,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_v'),
- 'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
+ 'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
}),
]"/>
</record>
@@ -844,7 +838,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_l_eu'),
- 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+ 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
}),
(0,0, {
'factor_percent': 100,
@@ -863,7 +857,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_l_eu'),
- 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+ 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
}),
(0,0, {
'factor_percent': 100,
@@ -892,7 +886,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_l_eu'),
- 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+ 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
}),
(0,0, {
'factor_percent': 100,
@@ -911,7 +905,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_l_eu'),
- 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+ 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
}),
(0,0, {
'factor_percent': 100,
@@ -940,7 +934,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_h_eu'),
- 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+ 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
}),
(0,0, {
'factor_percent': 100,
@@ -959,7 +953,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_h_eu'),
- 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+ 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
}),
(0,0, {
'factor_percent': 100,
@@ -987,14 +981,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('vat_payable_h_eu'),
- 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
- }),
- (0,0, {
- 'factor_percent': 100,
- 'repartition_type': 'tax',
- 'account_id': ref('vat_refund_h_eu'),
- 'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -1006,14 +992,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('vat_payable_h_eu'),
- 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
- }),
- (0,0, {
- 'factor_percent': 100,
- 'repartition_type': 'tax',
- 'account_id': ref('vat_refund_h_eu'),
- 'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
}),
]"/>
</record>
@@ -1036,7 +1014,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('vat_payable_0_eu'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -1048,7 +1025,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('vat_payable_0_eu'),
}),
]"/>
</record>
@@ -1070,7 +1046,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('vat_payable_0_eu'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -1082,7 +1057,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('vat_payable_0_eu'),
}),
]"/>
</record>
@@ -1104,7 +1078,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('vat_payable_0_eu'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -1116,7 +1089,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('vat_payable_0_eu'),
}),
]"/>
</record>
@@ -1140,7 +1112,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_l_d_eu'),
- 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+ 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
}),
(0,0, {
'factor_percent': 100,
@@ -1159,7 +1131,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_l_d_eu'),
- 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+ 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
}),
(0,0, {
'factor_percent': 100,
@@ -1188,7 +1160,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_l_d_eu'),
- 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+ 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
}),
(0,0, {
'factor_percent': 100,
@@ -1207,7 +1179,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_l_d_eu'),
- 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+ 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
}),
(0,0, {
'factor_percent': 100,
@@ -1236,7 +1208,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_h_d_eu'),
- 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+ 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
}),
(0,0, {
'factor_percent': 100,
@@ -1255,7 +1227,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_h_d_eu'),
- 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
+ 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
}),
(0,0, {
'factor_percent': 100,
@@ -1283,14 +1255,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('vat_payable_h_d_eu'),
- 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')],
- }),
- (0,0, {
- 'factor_percent': 100,
- 'repartition_type': 'tax',
- 'account_id': ref('vat_refund_h_d_eu'),
- 'plus_report_line_ids': [ref('tax_report_rub_btw_5b')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -1302,14 +1266,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('vat_payable_h_d_eu'),
- 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')],
- }),
- (0,0, {
- 'factor_percent': 100,
- 'repartition_type': 'tax',
- 'account_id': ref('vat_refund_h_d_eu'),
- 'minus_report_line_ids': [ref('tax_report_rub_btw_5b')],
}),
]"/>
</record>
@@ -1335,7 +1291,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_l_non_eu'),
- 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+ 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
}),
(0,0, {
'factor_percent': 100,
@@ -1354,7 +1310,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_l_non_eu'),
- 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+ 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
}),
(0,0, {
'factor_percent': 100,
@@ -1383,7 +1339,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_l_non_eu'),
- 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+ 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
}),
(0,0, {
'factor_percent': 100,
@@ -1402,7 +1358,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_l_non_eu'),
- 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+ 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
}),
(0,0, {
'factor_percent': 100,
@@ -1431,7 +1387,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_h_non_eu'),
- 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+ 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
}),
(0,0, {
'factor_percent': 100,
@@ -1450,7 +1406,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_h_non_eu'),
- 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+ 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
}),
(0,0, {
'factor_percent': 100,
@@ -1479,7 +1435,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_h_non_eu'),
- 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+ 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
}),
(0,0, {
'factor_percent': 100,
@@ -1498,7 +1454,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_h_non_eu'),
- 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+ 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
}),
(0,0, {
'factor_percent': 100,
@@ -1527,7 +1483,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('vat_payable_0_non_eu'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -1539,7 +1494,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('vat_payable_0_non_eu'),
}),
]"/>
</record>
@@ -1561,7 +1515,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('vat_payable_0_non_eu'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -1573,7 +1526,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('vat_payable_0_non_eu'),
}),
]"/>
</record>
@@ -1597,7 +1549,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_l_d_non_eu'),
- 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+ 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
}),
(0,0, {
'factor_percent': 100,
@@ -1616,7 +1568,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_l_d_non_eu'),
- 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+ 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
}),
(0,0, {
'factor_percent': 100,
@@ -1645,7 +1597,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_l_d_non_eu'),
- 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+ 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
}),
(0,0, {
'factor_percent': 100,
@@ -1664,7 +1616,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_l_d_non_eu'),
- 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+ 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
}),
(0,0, {
'factor_percent': 100,
@@ -1693,7 +1645,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_h_d_non_eu'),
- 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+ 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
}),
(0,0, {
'factor_percent': 100,
@@ -1712,7 +1664,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_h_d_non_eu'),
- 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+ 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
}),
(0,0, {
'factor_percent': 100,
@@ -1741,7 +1693,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_h_d_non_eu'),
- 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+ 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
}),
(0,0, {
'factor_percent': 100,
@@ -1760,7 +1712,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('vat_payable_h_d_non_eu'),
- 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')],
+ 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')],
}),
(0,0, {
'factor_percent': 100,
diff --git a/addons/l10n_nl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_nl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index 404cdd185d4fd371aa6283dd21292151a7b3b0fa..0000000000000000000000000000000000000000
--- a/addons/l10n_nl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import odoo
-
-def migrate(cr, version):
- registry = odoo.registry(cr.dbname)
- from odoo.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_no/data/account_tax_data.xml b/addons/l10n_no/data/account_tax_data.xml
index 9eebd2dbe177357be791e06a54bd7472c111659a..341f52076890683b6ba74276d8ddcf9542b1794d 100644
--- a/addons/l10n_no/data/account_tax_data.xml
+++ b/addons/l10n_no/data/account_tax_data.xml
@@ -306,7 +306,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart2714'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -317,7 +316,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart2714'),
}),
]"/>
</record>
@@ -339,7 +337,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart2704'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -351,7 +348,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart2704'),
}),
]"/>
</record>
diff --git a/addons/l10n_no/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_no/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index a37770d2c1c8db1cbf8b121823c2bbcd05fd4aa9..0000000000000000000000000000000000000000
--- a/addons/l10n_no/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from openerp.modules.registry import RegistryManager
-
-
-def migrate(cr, version):
- registry = RegistryManager.get(cr.dbname)
- from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_nz/data/account_tax_template_data.xml b/addons/l10n_nz/data/account_tax_template_data.xml
index 272d267882e17adcb5cd82b17abbd93e1f89da67..d06eb0f14944f5d581b1ff782823401508e5103c 100644
--- a/addons/l10n_nz/data/account_tax_template_data.xml
+++ b/addons/l10n_nz/data/account_tax_template_data.xml
@@ -89,7 +89,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('nz_21310'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -101,7 +100,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('nz_21310'),
}),
]"/>
</record>
@@ -194,7 +192,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('nz_21330'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -206,7 +203,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('nz_21330'),
}),
]"/>
</record>
@@ -229,7 +225,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('nz_21330'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -241,7 +236,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('nz_21330'),
}),
]"/>
</record>
diff --git a/addons/l10n_pl/data/account_tax_data.xml b/addons/l10n_pl/data/account_tax_data.xml
index 61d64d306482a5210042e092140838d31f2b4a8f..e92ba5d5aad4ef9cbfced5ba8a2ad4ce61e1ebb8 100644
--- a/addons/l10n_pl/data/account_tax_data.xml
+++ b/addons/l10n_pl/data/account_tax_data.xml
@@ -592,7 +592,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -604,7 +603,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
}),
]"/>
<field name="tax_group_id" ref="tax_group_vat_0"/>
@@ -626,7 +624,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -638,7 +635,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')],
}),
]"/>
<field name="tax_group_id" ref="tax_group_vat_0"/>
@@ -870,7 +866,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('chart22030400'),
- 'plus_report_line_ids': [ref('account_tax_report_line_podatek_podatnik_nabywca')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_podatek_podatnik_nabywca')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -889,7 +885,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('chart22030400'),
- 'minus_report_line_ids': [ref('account_tax_report_line_podatek_podatnik_nabywca')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_podatek_podatnik_nabywca')],
}),
]"/>
<field name="tax_group_id" ref="tax_group_vat_0"/>
@@ -953,7 +949,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('chart22030400'),
- 'plus_report_line_ids': [ref('account_tax_report_line_podatek_nabycie_towarow')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_podatek_nabycie_towarow')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -972,7 +968,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('chart22030400'),
- 'minus_report_line_ids': [ref('account_tax_report_line_podatek_nabycie_towarow')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_podatek_nabycie_towarow')],
}),
]"/>
<field name="tax_group_id" ref="tax_group_vat_0"/>
@@ -1033,7 +1029,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('chart22030400'),
- 'plus_report_line_ids': [ref('account_tax_report_line_podatek_art_28b')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_podatek_art_28b')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1052,7 +1048,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('chart22030400'),
- 'minus_report_line_ids': [ref('account_tax_report_line_podatek_art_28b')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_podatek_art_28b')],
}),
]"/>
<field name="tax_group_id" ref="tax_group_vat_0"/>
@@ -1117,7 +1113,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('chart22030400'),
- 'plus_report_line_ids': [ref('account_tax_report_line_podatek_art_33a')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_podatek_art_33a')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1136,7 +1132,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('chart22030400'),
- 'minus_report_line_ids': [ref('account_tax_report_line_podatek_art_33a')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_podatek_art_33a')],
}),
]"/>
<field name="tax_group_id" ref="tax_group_vat_0"/>
@@ -1160,7 +1156,7 @@
'repartition_type': 'tax',
}),
]"/>
- <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
@@ -1197,7 +1193,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('chart22030400'),
- 'plus_report_line_ids': [ref('account_tax_report_line_podatek_import_uslug')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_podatek_import_uslug')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -1216,7 +1212,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('chart22030400'),
- 'minus_report_line_ids': [ref('account_tax_report_line_podatek_import_uslug')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_podatek_import_uslug')],
}),
]"/>
<field name="tax_group_id" ref="tax_group_vat_0"/>
diff --git a/addons/l10n_pl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_pl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index fa56fd00dfa98b748849f30c6930fd3ce71d6448..0000000000000000000000000000000000000000
--- a/addons/l10n_pl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from openerp.modules.registry import RegistryManager
-
-def migrate(cr, version):
- registry = RegistryManager.get(cr.dbname)
- from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_ro/data/account_tax_data.xml b/addons/l10n_ro/data/account_tax_data.xml
index b45514104279288a43f4542c7ee7a66620b0f32a..3409d10ad0f697e4a716e8e1ba09a173c2ccbc15 100644
--- a/addons/l10n_ro/data/account_tax_data.xml
+++ b/addons/l10n_ro/data/account_tax_data.xml
@@ -18,8 +18,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
- 'plus_report_line_ids': [ref('account_tax_report_tva_0')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -31,8 +29,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
- 'minus_report_line_ids': [ref('account_tax_report_tva_0')],
}),
]"/>
</record>
@@ -236,8 +232,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
- 'plus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_0')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -249,8 +243,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
- 'minus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_0')],
}),
]"/>
</record>
@@ -273,7 +265,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
+ 'account_id': ref('pcg_4426'),
'plus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_5')],
}),
]"/>
@@ -286,7 +278,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
+ 'account_id': ref('pcg_4426'),
'minus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_5')],
}),
]"/>
@@ -310,7 +302,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
+ 'account_id': ref('pcg_4426'),
'plus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_9')],
}),
]"/>
@@ -323,7 +315,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
+ 'account_id': ref('pcg_4426'),
'minus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_9')],
}),
]"/>
@@ -347,7 +339,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
+ 'account_id': ref('pcg_4426'),
'plus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_19')],
}),
]"/>
@@ -360,7 +352,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
+ 'account_id': ref('pcg_4426'),
'minus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_19')],
}),
]"/>
@@ -383,7 +375,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
+ 'account_id': ref('pcg_4426'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -394,7 +386,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
+ 'account_id': ref('pcg_4426'),
}),
]"/>
</record>
@@ -417,7 +409,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
+ 'account_id': ref('pcg_4426'),
'plus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_24')],
}),
]"/>
@@ -430,7 +422,7 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
+ 'account_id': ref('pcg_4426'),
'minus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_24')],
}),
]"/>
@@ -449,24 +441,22 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx1_invrsa')],
+ 'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa')],
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx1_invrsa')],
+ 'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa')],
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
}),
]"/>
</record>
@@ -484,36 +474,24 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx1_invrsa')],
- 'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx1_invrsa')],
- }),
- (0,0, {
- 'factor_percent': 100,
- 'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
+ 'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa')],
+ 'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx_invrsa')],
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4426'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx1_invrsa')],
- 'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx1_invrsa')],
+ 'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa')],
+ 'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx_invrsa')],
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
- }),
- (0,0, {
- 'factor_percent': 100,
- 'repartition_type': 'tax',
- 'account_id': ref('pcg_4426'),
}),
]"/>
</record>
@@ -531,40 +509,40 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx2_invrsa'),
- ref('account_tax_report_ro_baza_tva_tx2_invrsa')],
+ 'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa'),
+ ref('account_tax_report_ro_baza_tva_tx_invrsa')],
}),
(0,0, {
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('pcg_4427'),
- 'minus_report_line_ids': [ref('account_tax_report_tva_tx2_invrsa')],
+ 'plus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')],
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
- 'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx2_invrsa')],
+ 'account_id': ref('pcg_4426'),
+ 'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx2_invrsa'),
- ref('account_tax_report_ro_baza_tva_tx2_invrsa')],
+ 'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa'),
+ ref('account_tax_report_ro_baza_tva_tx_invrsa')],
}),
(0,0, {
- 'factor_percent': 100,
+ 'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('pcg_4427'),
- 'plus_report_line_ids': [ref('account_tax_report_tva_tx2_invrsa')],
+ 'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')],
}),
(0,0, {
- 'factor_percent': -100,
+ 'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
- 'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx2_invrsa')],
+ 'account_id': ref('pcg_4426'),
+ 'minus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')],
}),
]"/>
</record>
@@ -582,40 +560,40 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx3_invrsa'),
- ref('account_tax_report_baza_tva_tx3_invrsa')],
+ 'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx_invrsa'),
+ ref('account_tax_report_baza_tva_tx_invrsa')],
}),
(0,0, {
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('pcg_4427'),
- 'minus_report_line_ids': [ref('account_tax_report_tva_tx3_invrsa')],
+ 'plus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')],
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('pcg_4426'),
- 'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx3_invrsa')],
+ 'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx3_invrsa'),
- ref('account_tax_report_baza_tva_tx3_invrsa')],
+ 'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx_invrsa'),
+ ref('account_tax_report_baza_tva_tx_invrsa')],
}),
(0,0, {
- 'factor_percent': 100,
+ 'factor_percent': -100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
- 'plus_report_line_ids': [ref('account_tax_report_tva_tx3_invrsa')],
+ 'account_id': ref('pcg_4426'),
+ 'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')],
}),
(0,0, {
- 'factor_percent': -100,
+ 'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4426'),
- 'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx3_invrsa')],
+ 'account_id': ref('pcg_4427'),
+ 'minus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')],
}),
]"/>
</record>
@@ -651,14 +629,14 @@
'repartition_type': 'base',
}),
(0,0, {
- 'factor_percent': 100,
+ 'factor_percent': -100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
+ 'account_id': ref('pcg_4426'),
}),
(0,0, {
- 'factor_percent': -100,
+ 'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4426'),
+ 'account_id': ref('pcg_4427'),
}),
]"/>
</record>
@@ -694,14 +672,14 @@
'repartition_type': 'base',
}),
(0,0, {
- 'factor_percent': 100,
+ 'factor_percent': -100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
+ 'account_id': ref('pcg_4426'),
}),
(0,0, {
- 'factor_percent': -100,
+ 'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4426'),
+ 'account_id': ref('pcg_4427'),
}),
]"/>
</record>
@@ -719,39 +697,39 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx4_invrsa'), ref('account_tax_report_ro_baza_tva_tx4_invrsa')],
+ 'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa'), ref('account_tax_report_ro_baza_tva_tx_invrsa')],
}),
(0,0, {
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('pcg_4427'),
- 'minus_report_line_ids': [ref('account_tax_report_tva_tx4_invrsa')],
+ 'plus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')],
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('pcg_4426'),
- 'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx4_invrsa')],
+ 'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx4_invrsa'),
- ref('account_tax_report_ro_baza_tva_tx4_invrsa')],
+ 'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa'),
+ ref('account_tax_report_ro_baza_tva_tx_invrsa')],
}),
(0,0, {
- 'factor_percent': 100,
+ 'factor_percent': -100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
- 'plus_report_line_ids': [ref('account_tax_report_tva_tx4_invrsa')],
+ 'account_id': ref('pcg_4426'),
+ 'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')],
}),
(0,0, {
- 'factor_percent': -100,
+ 'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4426'),
- 'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx4_invrsa')],
+ 'account_id': ref('pcg_4427'),
+ 'minus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')],
}),
]"/>
</record>
@@ -774,7 +752,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -786,7 +763,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
}),
]"/>
</record>
@@ -810,7 +786,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -823,7 +798,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
}),
]"/>
</record>
@@ -846,7 +820,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -858,7 +831,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
}),
]"/>
</record>
@@ -881,7 +853,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4426'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -893,7 +864,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4426'),
}),
]"/>
</record>
@@ -914,7 +884,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -925,7 +894,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
}),
]"/>
</record>
@@ -942,36 +910,24 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'minus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr1_bnr')],
- 'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr1_bnuri')],
- }),
- (0,0, {
- 'factor_percent': 100,
- 'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
+ 'minus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr_bnr')],
+ 'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri')],
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4426'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'plus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr1_bnr')],
- 'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr1_bnuri')],
- }),
- (0,0, {
- 'factor_percent': 100,
- 'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
+ 'plus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr_bnr')],
+ 'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri')],
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4426'),
}),
]"/>
</record>
@@ -988,39 +944,42 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr2_bnuri'),
- ref('account_tax_report_baza_tva_intrcmtr2_bnr')],
+ 'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri'),
+ ref('account_tax_report_baza_tva_intrcmtr_bnr')],
}),
(0,0, {
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('pcg_4427'),
- 'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr2_bunri')],
+ 'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')],
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr2_bunri')],
+ 'account_id': ref('pcg_4426'),
+ 'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr2_bnuri'),
- ref('account_tax_report_baza_tva_intrcmtr2_bnr')],
+ 'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri'),
+ ref('account_tax_report_baza_tva_intrcmtr_bnr')],
}),
(0,0, {
- 'factor_percent': 100,
+ 'factor_percent': -100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
- 'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr2_bunri')],
+ 'account_id': ref('pcg_4426'),
+ 'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')],
}),
(0,0, {
- 'factor_percent': -100,
+ 'factor_percent': 100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr2_bunri')],
+ 'account_id': ref('pcg_4427'),
+ 'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')],
}),
+
]"/>
</record>
@@ -1036,40 +995,40 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'plus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr3_bnr'),
- ref('account_tax_report_ro_baza_tva_intracmunitr3_bnuri')],
+ 'plus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr_bnr'),
+ ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri')],
}),
(0,0, {
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('pcg_4427'),
- 'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr3_bunri')],
+ 'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')],
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('pcg_4426'),
- 'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr3_bunri')],
+ 'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'minus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr3_bnr'),
- ref('account_tax_report_ro_baza_tva_intracmunitr3_bnuri')],
+ 'minus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr_bnr'),
+ ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri')],
}),
(0,0, {
- 'factor_percent': 100,
+ 'factor_percent': -100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
- 'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr3_bunri')],
+ 'account_id': ref('pcg_4426'),
+ 'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')],
}),
(0,0, {
- 'factor_percent': -100,
+ 'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4426'),
- 'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr3_bunri')],
+ 'account_id': ref('pcg_4427'),
+ 'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')],
}),
]"/>
</record>
@@ -1104,14 +1063,14 @@
'repartition_type': 'base',
}),
(0,0, {
- 'factor_percent': 100,
+ 'factor_percent': -100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
+ 'account_id': ref('pcg_4426'),
}),
(0,0, {
- 'factor_percent': -100,
+ 'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4426'),
+ 'account_id': ref('pcg_4427'),
}),
]"/>
</record>
@@ -1121,7 +1080,7 @@
<field name="sequence">61</field>
<field name="name">TVA Intracomunitara Achizitii 20%</field>
<field name="amount">20</field>
- <field name="amount_type">group</field>
+ <field name="amount_type">percent</field>
<field name="type_tax_use">purchase</field>
<field name="tax_group_id" ref="tax_group_tva_0"/>
<field name="invoice_repartition_line_ids" eval="[(5,0,0),
@@ -1146,14 +1105,14 @@
'repartition_type': 'base',
}),
(0,0, {
- 'factor_percent': 100,
+ 'factor_percent': -100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4427'),
+ 'account_id': ref('pcg_4426'),
}),
(0,0, {
- 'factor_percent': -100,
+ 'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4426'),
+ 'account_id': ref('pcg_4427'),
}),
]"/>
</record>
@@ -1170,38 +1129,40 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr4_bnuri'),
- ref('account_tax_report_baza_tva_intrcmtr4_bnr')],
+ 'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri'),
+ ref('account_tax_report_baza_tva_intrcmtr_bnr')],
}),
(0,0, {
'factor_percent': -100,
'repartition_type': 'tax',
- 'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr4_bunri')],
+ 'account_id': ref('pcg_4427'),
+ 'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')],
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('pcg_4426'),
- 'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr4_bunri')],
+ 'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr4_bnuri'),
- ref('account_tax_report_baza_tva_intrcmtr4_bnr')],
+ 'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri'),
+ ref('account_tax_report_baza_tva_intrcmtr_bnr')],
}),
(0,0, {
- 'factor_percent': 100,
+ 'factor_percent': -100,
'repartition_type': 'tax',
- 'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr4_bunri')],
+ 'account_id': ref('pcg_4426'),
+ 'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')],
}),
(0,0, {
- 'factor_percent': -100,
+ 'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('pcg_4426'),
- 'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr4_bunri')],
+ 'account_id': ref('pcg_4427'),
+ 'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')],
}),
]"/>
</record>
diff --git a/addons/l10n_ro/data/account_tax_report_data.xml b/addons/l10n_ro/data/account_tax_report_data.xml
index c8fd6e4019d6a5c3f220089d30755880597844c5..a390419ef688a0a231fa58783e56be08843cb889 100644
--- a/addons/l10n_ro/data/account_tax_report_data.xml
+++ b/addons/l10n_ro/data/account_tax_report_data.xml
@@ -54,125 +54,28 @@
<record id="account_tax_report_baza_tva_intrcmtr_bnr" model="account.tax.report.line">
<field name="name">Baza TVA Intracomunitar Bunuri</field>
+ <field name="tag_name">Baza TVA Intracomunitar Bunuri</field>
<field name="sequence" eval="6"/>
<field name="parent_id" ref="account_tax_report_baza_tva_clt"/>
<field name="country_id" ref="base.ro"/>
</record>
- <record id="account_tax_report_baza_tva_intrcmtr1_bnr" model="account.tax.report.line">
- <field name="name">Baza TVA Intracomunitar Bunuri</field>
- <field name="tag_name">Baza TVA Intracomunitar Bunuri</field>
- <field name="code">ROTAX_TVA_colectata_00_intracomunitar_bunuri_Baza</field>
- <field name="sequence" eval="1"/>
- <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_bnr"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_baza_tva_intrcmtr2_bnr" model="account.tax.report.line">
- <field name="name">Baza TVA Intracomunitar Bunuri</field>
- <field name="tag_name">Baza TVA Intracomunitar Bunuri</field>
- <field name="code">ROTAX_TVA_colectata_05_intracomunitar_bunuri_Baza</field>
- <field name="sequence" eval="2"/>
- <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_bnr"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_baza_tva_intrcmtr3_bnr" model="account.tax.report.line">
- <field name="name">Baza TVA Intracomunitar Bunuri</field>
- <field name="tag_name">Baza TVA Intracomunitar Bunuri</field>
- <field name="code">ROTAX_TVA_colectata_09_intracomunitar_bunuri_Baza</field>
- <field name="sequence" eval="3"/>
- <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_bnr"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_baza_tva_intrcmtr4_bnr" model="account.tax.report.line">
- <field name="name">Baza TVA Intracomunitar Bunuri</field>
- <field name="tag_name">Baza TVA Intracomunitar Bunuri</field>
- <field name="code">ROTAX_TVA_colectata_24_intracomunitar_bunuri_Baza</field>
- <field name="sequence" eval="4"/>
- <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_bnr"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
<record id="account_tax_report_baza_tva_intrcmtr_srvci" model="account.tax.report.line">
<field name="name">Baza TVA Intracomunitar Servicii</field>
+ <field name="tag_name">Baza TVA Intracomunitar Servicii</field>
<field name="sequence" eval="7"/>
<field name="parent_id" ref="account_tax_report_baza_tva_clt"/>
<field name="country_id" ref="base.ro"/>
</record>
- <record id="account_tax_report_baza_tva_intrcmtr1_srvci" model="account.tax.report.line">
- <field name="name">Baza TVA Intracomunitar Servicii</field>
- <field name="sequence" eval="1"/>
- <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_srvci"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_baza_tva_intrcmtr2_srvci" model="account.tax.report.line">
- <field name="name">Baza TVA Intracomunitar Servicii</field>
- <field name="sequence" eval="2"/>
- <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_srvci"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_baza_tva_intrcmtr3_srvci" model="account.tax.report.line">
- <field name="name">Baza TVA Intracomunitar Servicii</field>
- <field name="sequence" eval="3"/>
- <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_srvci"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_baza_tva_intrcmtr4_srvci" model="account.tax.report.line">
- <field name="name">Baza TVA Intracomunitar Servicii</field>
- <field name="sequence" eval="4"/>
- <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_srvci"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
<record id="account_tax_report_baza_tva_tx_invrsa" model="account.tax.report.line">
<field name="name">Baza TVA Taxare Inversa</field>
+ <field name="tag_name">Baza TVA Taxare Inversa</field>
<field name="sequence" eval="8"/>
<field name="parent_id" ref="account_tax_report_baza_tva_clt"/>
<field name="country_id" ref="base.ro"/>
</record>
- <record id="account_tax_report_baza_tva_tx1_invrsa" model="account.tax.report.line">
- <field name="name">Baza TVA Taxare Inversa</field>
- <field name="tag_name">Baza TVA Taxare Inversa</field>
- <field name="code">ROTAX_TVA_colectata_00_taxare_inversa_Baza</field>
- <field name="sequence" eval="1"/>
- <field name="parent_id" ref="account_tax_report_baza_tva_tx_invrsa"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_baza_tva_tx2_invrsa" model="account.tax.report.line">
- <field name="name">Baza TVA Taxare Inversa</field>
- <field name="tag_name">Baza TVA Taxare Inversa</field>
- <field name="code">ROTAX_TVA_colectata_05_taxare_inversa_Baza</field>
- <field name="sequence" eval="2"/>
- <field name="parent_id" ref="account_tax_report_baza_tva_tx_invrsa"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_baza_tva_tx3_invrsa" model="account.tax.report.line">
- <field name="name">Baza TVA Taxare Inversa</field>
- <field name="tag_name">Baza TVA Taxare Inversa</field>
- <field name="code">ROTAX_TVA_colectata_09_taxare_inversa_Baza</field>
- <field name="sequence" eval="3"/>
- <field name="parent_id" ref="account_tax_report_baza_tva_tx_invrsa"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_baza_tva_tx4_invrsa" model="account.tax.report.line">
- <field name="name">Baza TVA Taxare Inversa</field>
- <field name="tag_name">Baza TVA Taxare Inversa</field>
- <field name="code">ROTAX_TVA_colectata_24_taxare_inversa_Baza</field>
- <field name="sequence" eval="4"/>
- <field name="parent_id" ref="account_tax_report_baza_tva_tx_invrsa"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
<record id="account_tax_report_tva_colcta" model="account.tax.report.line">
<field name="name">TVA COLECTATA</field>
<field name="sequence" eval="2"/>
@@ -181,7 +84,7 @@
<record id="account_tax_report_tva_0" model="account.tax.report.line">
<field name="name">TVA 0%</field>
- <field name="tag_name">TVA 0%</field>
+ <field name="tag_name">TVA 0% (TVA colectata)</field>
<field name="code">ROTAX_TVA_colectata_0</field>
<field name="sequence" eval="1"/>
<field name="parent_id" ref="account_tax_report_tva_colcta"/>
@@ -190,7 +93,7 @@
<record id="account_tax_report_tva_19" model="account.tax.report.line">
<field name="name">TVA 19%</field>
- <field name="tag_name">TVA 19%</field>
+ <field name="tag_name">TVA 19% (TVA colectata)</field>
<field name="code">ROTAX_TVA_colectata_19</field>
<field name="sequence" eval="2"/>
<field name="parent_id" ref="account_tax_report_tva_colcta"/>
@@ -199,7 +102,7 @@
<record id="account_tax_report_tva_24" model="account.tax.report.line">
<field name="name">TVA 24%</field>
- <field name="tag_name">TVA 24%</field>
+ <field name="tag_name">TVA 24% (TVA colectata)</field>
<field name="code">ROTAX_TVA_colectata_24</field>
<field name="sequence" eval="3"/>
<field name="parent_id" ref="account_tax_report_tva_colcta"/>
@@ -208,7 +111,7 @@
<record id="account_tax_report_tva_5" model="account.tax.report.line">
<field name="name">TVA 5%</field>
- <field name="tag_name">TVA 5%</field>
+ <field name="tag_name">TVA 5% (TVA colectata)</field>
<field name="code">ROTAX_TVA_colectata_5</field>
<field name="sequence" eval="4"/>
<field name="parent_id" ref="account_tax_report_tva_colcta"/>
@@ -217,7 +120,7 @@
<record id="account_tax_report_tva_9" model="account.tax.report.line">
<field name="name">TVA 9%</field>
- <field name="tag_name">TVA 9%</field>
+ <field name="tag_name">TVA 9% (TVA colectata)</field>
<field name="code">ROTAX_TVA_colectata_9</field>
<field name="sequence" eval="5"/>
<field name="parent_id" ref="account_tax_report_tva_colcta"/>
@@ -225,131 +128,38 @@
</record>
<record id="account_tax_report_tva_intracmunitr_bunri" model="account.tax.report.line">
- <field name="name">TVA Intracomunitar Bunuri</field>
+ <field name="name">TVA Intracomunitar Bunuri (TVA colectata)</field>
+ <field name="tag_name">TVA Intracomunitar Bunuri (TVA colectata)</field>
<field name="sequence" eval="6"/>
<field name="parent_id" ref="account_tax_report_tva_colcta"/>
<field name="country_id" ref="base.ro"/>
</record>
- <record id="account_tax_report_tva_intracmunitr1_bunri" model="account.tax.report.line">
- <field name="name">TVA Intracomunitar Bunuri</field>
- <field name="sequence" eval="1"/>
- <field name="parent_id" ref="account_tax_report_tva_intracmunitr_bunri"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_tva_intracmunitr2_bunri" model="account.tax.report.line">
- <field name="name">TVA Intracomunitar Bunuri</field>
- <field name="tag_name">TVA Intracomunitar Bunuri</field>
- <field name="code">ROTAX_TVA_colectata_05_intracomunitar_bunuri</field>
- <field name="sequence" eval="2"/>
- <field name="parent_id" ref="account_tax_report_tva_intracmunitr_bunri"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_tva_intracmunitr3_bunri" model="account.tax.report.line">
- <field name="name">TVA Intracomunitar Bunuri</field>
- <field name="tag_name">TVA Intracomunitar Bunuri</field>
- <field name="code">ROTAX_TVA_colectata_09_intracomunitar_bunuri</field>
- <field name="sequence" eval="3"/>
- <field name="parent_id" ref="account_tax_report_tva_intracmunitr_bunri"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_tva_intracmunitr4_bunri" model="account.tax.report.line">
- <field name="name">TVA Intracomunitar Bunuri</field>
- <field name="tag_name">TVA Intracomunitar Bunuri</field>
- <field name="code">ROTAX_TVA_colectata_24_intracomunitar_bunuri</field>
- <field name="sequence" eval="4"/>
- <field name="parent_id" ref="account_tax_report_tva_intracmunitr_bunri"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
<record id="account_tax_report_tva_intra_srvci" model="account.tax.report.line">
- <field name="name">TVA Intracomunitar Servicii</field>
+ <field name="name">TVA Intracomunitar Servicii (TVA colectata)</field>
+ <field name="tag_name">TVA Intracomunitar Servicii (TVA colectata)</field>
<field name="sequence" eval="7"/>
<field name="parent_id" ref="account_tax_report_tva_colcta"/>
<field name="country_id" ref="base.ro"/>
</record>
- <record id="account_tax_report_tva_intra1_srvci" model="account.tax.report.line">
- <field name="name">TVA Intracomunitar Servicii</field>
- <field name="sequence" eval="1"/>
- <field name="parent_id" ref="account_tax_report_tva_intra_srvci"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_tva_intra2_srvci" model="account.tax.report.line">
- <field name="name">TVA Intracomunitar Servicii</field>
- <field name="sequence" eval="2"/>
- <field name="parent_id" ref="account_tax_report_tva_intra_srvci"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_tva_intra3_srvci" model="account.tax.report.line">
- <field name="name">TVA Intracomunitar Servicii</field>
- <field name="sequence" eval="3"/>
- <field name="parent_id" ref="account_tax_report_tva_intra_srvci"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_tva_intra4_srvci" model="account.tax.report.line">
- <field name="name">TVA Intracomunitar Servicii</field>
- <field name="sequence" eval="4"/>
- <field name="parent_id" ref="account_tax_report_tva_intra_srvci"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
<record id="account_tax_report_tva_tx_invrsa" model="account.tax.report.line">
- <field name="name">TVA Taxare Inversa</field>
+ <field name="name">TVA Taxare Inversa (TVA colectata)</field>
+ <field name="tag_name">TVA Taxare Inversa (TVA colectata)</field>
<field name="sequence" eval="8"/>
<field name="parent_id" ref="account_tax_report_tva_colcta"/>
<field name="country_id" ref="base.ro"/>
</record>
- <record id="account_tax_report_tva_tx1_invrsa" model="account.tax.report.line">
- <field name="name">TVA Taxare Inversa</field>
- <field name="sequence" eval="1"/>
- <field name="parent_id" ref="account_tax_report_tva_tx_invrsa"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_tva_tx2_invrsa" model="account.tax.report.line">
- <field name="name">TVA Taxare Inversa</field>
- <field name="tag_name">TVA Taxare Inversa</field>
- <field name="code">ROTAX_TVA_colectata_05_taxare_inversa</field>
- <field name="sequence" eval="2"/>
- <field name="parent_id" ref="account_tax_report_tva_tx_invrsa"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_tva_tx3_invrsa" model="account.tax.report.line">
- <field name="name">TVA Taxare Inversa</field>
- <field name="tag_name">TVA Taxare Inversa</field>
- <field name="code">ROTAX_TVA_colectata_09_taxare_inversa</field>
- <field name="sequence" eval="3"/>
- <field name="parent_id" ref="account_tax_report_tva_tx_invrsa"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_tva_tx4_invrsa" model="account.tax.report.line">
- <field name="name">TVA Taxare Inversa</field>
- <field name="tag_name">TVA Taxare Inversa</field>
- <field name="code">ROTAX_TVA_colectata_24_taxare_inversa</field>
- <field name="sequence" eval="4"/>
- <field name="parent_id" ref="account_tax_report_tva_tx_invrsa"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
<record id="account_tax_report_baza_tva_deducbl" model="account.tax.report.line">
- <field name="name">BAZA TVA DEDUCTIBIL</field>
+ <field name="name">BAZA TVA DEDUCTIBILA</field>
<field name="sequence" eval="3"/>
<field name="country_id" ref="base.ro"/>
</record>
<record id="account_tax_report_baza_tva_deducbl_0" model="account.tax.report.line">
<field name="name">Baza TVA 0%</field>
- <field name="tag_name">Baza TVA 0%</field>
+ <field name="tag_name">Baza TVA 0% (deductibila)</field>
<field name="code">ROTAX_TVA_deductibila_0_Baza</field>
<field name="sequence" eval="1"/>
<field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
@@ -358,7 +168,7 @@
<record id="account_tax_report_baza_tva_deducbl_19" model="account.tax.report.line">
<field name="name">Baza TVA 19%</field>
- <field name="tag_name">Baza TVA 19%</field>
+ <field name="tag_name">Baza TVA 19% (deductibila)</field>
<field name="code">ROTAX_TVA_deductibila_19_Baza</field>
<field name="sequence" eval="2"/>
<field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
@@ -367,7 +177,7 @@
<record id="account_tax_report_baza_tva_deducbl_24" model="account.tax.report.line">
<field name="name">Baza TVA 24%</field>
- <field name="tag_name">Baza TVA 24%</field>
+ <field name="tag_name">Baza TVA 24% (deductibila)</field>
<field name="code">ROTAX_TVA_deductibila_24_Baza</field>
<field name="sequence" eval="3"/>
<field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
@@ -376,7 +186,7 @@
<record id="account_tax_report_baza_tva_deducbl_5" model="account.tax.report.line">
<field name="name">Baza TVA 5%</field>
- <field name="tag_name">Baza TVA 5%</field>
+ <field name="tag_name">Baza TVA 5% (deductibila)</field>
<field name="code">ROTAX_TVA_deductibila_5_Baza</field>
<field name="sequence" eval="4"/>
<field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
@@ -385,7 +195,7 @@
<record id="account_tax_report_baza_tva_deducbl_9" model="account.tax.report.line">
<field name="name">Baza TVA 9%</field>
- <field name="tag_name">Baza TVA 9%</field>
+ <field name="tag_name">Baza TVA 9% (deductibila)</field>
<field name="code">ROTAX_TVA_deductibila_9_Baza</field>
<field name="sequence" eval="5"/>
<field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
@@ -393,126 +203,29 @@
</record>
<record id="account_tax_report_ro_baza_tva_intracmunitr_bnuri" model="account.tax.report.line">
- <field name="name">Baza TVA Intracomunitar Bunuri%</field>
+ <field name="name">Baza TVA Intracomunitar Bunuri (deductibila)</field>
+ <field name="tag_name">Baza TVA Intracomunitar Bunuri (deductibila)</field>
<field name="sequence" eval="6"/>
<field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
<field name="country_id" ref="base.ro"/>
</record>
- <record id="account_tax_report_ro_baza_tva_intracmunitr1_bnuri" model="account.tax.report.line">
- <field name="name">Baza TVA Intracomunitar Bunuri%</field>
- <field name="tag_name">Baza TVA Intracomunitar Bunuri%</field>
- <field name="code">ROTAX_TVA_deductibila_00_intracomunitar_bunuri_Baza</field>
- <field name="sequence" eval="1"/>
- <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_bnuri"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_ro_baza_tva_intracmunitr2_bnuri" model="account.tax.report.line">
- <field name="name">Baza TVA Intracomunitar Bunuri%</field>
- <field name="tag_name">Baza TVA Intracomunitar Bunuri%</field>
- <field name="code">ROTAX_TVA_deductibila_05_intracomunitar_bunuri_Baza</field>
- <field name="sequence" eval="2"/>
- <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_bnuri"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_ro_baza_tva_intracmunitr3_bnuri" model="account.tax.report.line">
- <field name="name">Baza TVA Intracomunitar Bunuri%</field>
- <field name="tag_name">Baza TVA Intracomunitar Bunuri%</field>
- <field name="code">ROTAX_TVA_deductibila_09_intracomunitar_bunuri_Baza</field>
- <field name="sequence" eval="3"/>
- <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_bnuri"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_ro_baza_tva_intracmunitr4_bnuri" model="account.tax.report.line">
- <field name="name">Baza TVA Intracomunitar Bunuri%</field>
- <field name="tag_name">Baza TVA Intracomunitar Bunuri%</field>
- <field name="code">ROTAX_TVA_deductibila_24_intracomunitar_bunuri_Baza</field>
- <field name="sequence" eval="4"/>
- <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_bnuri"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
<record id="account_tax_report_ro_baza_tva_intracmunitr_srvci" model="account.tax.report.line">
- <field name="name">Baza TVA Intracomunitar Servicii%</field>
+ <field name="name">Baza TVA Intracomunitar Servicii (deductibila)</field>
+ <field name="tag_name">Baza TVA Intracomunitar Servicii (deductibila)</field>
<field name="sequence" eval="7"/>
<field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
<field name="country_id" ref="base.ro"/>
</record>
- <record id="account_tax_report_ro_baza_tva_intracmunitr1_srvci" model="account.tax.report.line">
- <field name="name">Baza TVA Intracomunitar Servicii%</field>
- <field name="sequence" eval="1"/>
- <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_srvci"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_ro_baza_tva_intracmunitr2_srvci" model="account.tax.report.line">
- <field name="name">Baza TVA Intracomunitar Servicii%</field>
- <field name="sequence" eval="2"/>
- <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_srvci"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_ro_baza_tva_intracmunitr3_srvci" model="account.tax.report.line">
- <field name="name">Baza TVA Intracomunitar Servicii%</field>
- <field name="sequence" eval="3"/>
- <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_srvci"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_ro_baza_tva_intracmunitr4_srvci" model="account.tax.report.line">
- <field name="name">Baza TVA Intracomunitar Servicii%</field>
- <field name="sequence" eval="4"/>
- <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_srvci"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
<record id="account_tax_report_ro_baza_tva_tx_invrsa" model="account.tax.report.line">
- <field name="name">Baza TVA Taxare Inversa</field>
+ <field name="name">Baza TVA Taxare Inversa (deductibila)</field>
+ <field name="tag_name">Baza TVA Taxare Inversa (deductibila)</field>
<field name="sequence" eval="8"/>
<field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
<field name="country_id" ref="base.ro"/>
</record>
- <record id="account_tax_report_ro_baza_tva_tx1_invrsa" model="account.tax.report.line">
- <field name="name">Baza TVA Taxare Inversa</field>
- <field name="tag_name">Baza TVA Taxare Inversa</field>
- <field name="code">ROTAX_TVA_deductibila_00_taxare_inversa_Baza</field>
- <field name="sequence" eval="1"/>
- <field name="parent_id" ref="account_tax_report_ro_baza_tva_tx_invrsa"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_ro_baza_tva_tx2_invrsa" model="account.tax.report.line">
- <field name="name">Baza TVA Taxare Inversa</field>
- <field name="tag_name">Baza TVA Taxare Inversa</field>
- <field name="code">ROTAX_TVA_deductibila_05_taxare_inversa_Baza</field>
- <field name="sequence" eval="2"/>
- <field name="parent_id" ref="account_tax_report_ro_baza_tva_tx_invrsa"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_ro_baza_tva_tx3_invrsa" model="account.tax.report.line">
- <field name="name">Baza TVA Taxare Inversa</field>
- <field name="tag_name">Baza TVA Taxare Inversa</field>
- <field name="code">ROTAX_TVA_deductibila_09_taxare_inversa_Baza</field>
- <field name="sequence" eval="3"/>
- <field name="parent_id" ref="account_tax_report_ro_baza_tva_tx_invrsa"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_ro_baza_tva_tx4_invrsa" model="account.tax.report.line">
- <field name="name">Baza TVA Taxare Inversa</field>
- <field name="tag_name">Baza TVA Taxare Inversa</field>
- <field name="code">ROTAX_TVA_deductibila_24_taxare_inversa_Baza</field>
- <field name="sequence" eval="4"/>
- <field name="parent_id" ref="account_tax_report_ro_baza_tva_tx_invrsa"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
<record id="account_tax_report_ro_tva_decucible" model="account.tax.report.line">
<field name="name">TVA DEDUCTIBILA</field>
<field name="sequence" eval="4"/>
@@ -529,8 +242,8 @@
</record>
<record id="account_tax_report_ro_tva_decucible_19" model="account.tax.report.line">
- <field name="name">TVA 19%</field>
- <field name="tag_name">TVA 19%</field>
+ <field name="name">TVA 19% (deductibila)</field>
+ <field name="tag_name">TVA 19% (deductibila)</field>
<field name="code">ROTAX_TVA_deductibila_19</field>
<field name="sequence" eval="2"/>
<field name="parent_id" ref="account_tax_report_ro_tva_decucible"/>
@@ -538,8 +251,8 @@
</record>
<record id="account_tax_report_ro_tva_decucible_24" model="account.tax.report.line">
- <field name="name">TVA 24%</field>
- <field name="tag_name">TVA 24%</field>
+ <field name="name">TVA 24% (deductibila)</field>
+ <field name="tag_name">TVA 24% (deductibila)</field>
<field name="code">ROTAX_TVA_deductibila_24</field>
<field name="sequence" eval="3"/>
<field name="parent_id" ref="account_tax_report_ro_tva_decucible"/>
@@ -547,8 +260,8 @@
</record>
<record id="account_tax_report_ro_tva_decucible_5" model="account.tax.report.line">
- <field name="name">TVA 5%</field>
- <field name="tag_name">TVA 5%</field>
+ <field name="name">TVA 5% (deductibila)</field>
+ <field name="tag_name">TVA 5% (deductibila)</field>
<field name="code">ROTAX_TVA_deductibila_5</field>
<field name="sequence" eval="4"/>
<field name="parent_id" ref="account_tax_report_ro_tva_decucible"/>
@@ -556,8 +269,8 @@
</record>
<record id="account_tax_report_ro_tva_decucible_9" model="account.tax.report.line">
- <field name="name">TVA 9%</field>
- <field name="tag_name">TVA 9%</field>
+ <field name="name">TVA 9% (deductibila)</field>
+ <field name="tag_name">TVA 9% (deductibila)</field>
<field name="code">ROTAX_TVA_deductibila_9</field>
<field name="sequence" eval="5"/>
<field name="parent_id" ref="account_tax_report_ro_tva_decucible"/>
@@ -565,122 +278,29 @@
</record>
<record id="account_tax_report_ro_tva_intracmunitr_bunri" model="account.tax.report.line">
- <field name="name">TVA Intracomunitar Bunuri</field>
+ <field name="name">TVA Intracomunitar Bunuri (deductibila)</field>
+ <field name="tag_name">TVA Intracomunitar Bunuri (deductibila)</field>
<field name="sequence" eval="6"/>
<field name="parent_id" ref="account_tax_report_ro_tva_decucible"/>
<field name="country_id" ref="base.ro"/>
</record>
- <record id="account_tax_report_ro_tva_intracmunitr1_bunri" model="account.tax.report.line">
- <field name="name">TVA Intracomunitar Bunuri</field>
- <field name="sequence" eval="1"/>
- <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_bunri"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_ro_tva_intracmunitr2_bunri" model="account.tax.report.line">
- <field name="name">TVA Intracomunitar Bunuri</field>
- <field name="tag_name">TVA Intracomunitar Bunuri</field>
- <field name="code">ROTAX_TVA_deductibila_05_intracomunitar_bunuri</field>
- <field name="sequence" eval="2"/>
- <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_bunri"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_ro_tva_intracmunitr3_bunri" model="account.tax.report.line">
- <field name="name">TVA Intracomunitar Bunuri</field>
- <field name="tag_name">TVA Intracomunitar Bunuri</field>
- <field name="code">ROTAX_TVA_deductibila_09_intracomunitar_bunuri</field>
- <field name="sequence" eval="3"/>
- <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_bunri"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_ro_tva_intracmunitr4_bunri" model="account.tax.report.line">
- <field name="name">TVA Intracomunitar Bunuri</field>
- <field name="tag_name">TVA Intracomunitar Bunuri</field>
- <field name="code">ROTAX_TVA_deductibila_24_intracomunitar_bunuri</field>
- <field name="sequence" eval="4"/>
- <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_bunri"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
<record id="account_tax_report_ro_tva_intracmunitr_srvci" model="account.tax.report.line">
- <field name="name">TVA Intracomunitar Servicii</field>
+ <field name="name">TVA Intracomunitar Servicii (deductibila)</field>
+ <field name="tag_name">TVA Intracomunitar Servicii (deductibila)</field>
<field name="sequence" eval="7"/>
<field name="parent_id" ref="account_tax_report_ro_tva_decucible"/>
<field name="country_id" ref="base.ro"/>
</record>
- <record id="account_tax_report_ro_tva_intracmunitr1_srvci" model="account.tax.report.line">
- <field name="name">TVA Intracomunitar Servicii</field>
- <field name="sequence" eval="1"/>
- <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_srvci"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_ro_tva_intracmunitr2_srvci" model="account.tax.report.line">
- <field name="name">TVA Intracomunitar Servicii</field>
- <field name="sequence" eval="2"/>
- <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_srvci"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_ro_tva_intracmunitr3_srvci" model="account.tax.report.line">
- <field name="name">TVA Intracomunitar Servicii</field>
- <field name="sequence" eval="3"/>
- <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_srvci"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_ro_tva_intracmunitr4_srvci" model="account.tax.report.line">
- <field name="name">TVA Intracomunitar Servicii</field>
- <field name="sequence" eval="4"/>
- <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_srvci"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
<record id="account_tax_report_ro_tva_tx_invrsa" model="account.tax.report.line">
- <field name="name">TVA Taxare Inversa</field>
+ <field name="name">TVA Taxare Inversa (deductibila)</field>
+ <field name="tag_name">TVA Taxare Inversa (deductibila)</field>
<field name="sequence" eval="8"/>
<field name="parent_id" ref="account_tax_report_ro_tva_decucible"/>
<field name="country_id" ref="base.ro"/>
</record>
- <record id="account_tax_report_ro_tva_tx1_invrsa" model="account.tax.report.line">
- <field name="name">TVA Taxare Inversa</field>
- <field name="sequence" eval="1"/>
- <field name="parent_id" ref="account_tax_report_ro_tva_tx_invrsa"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_ro_tva_tx2_invrsa" model="account.tax.report.line">
- <field name="name">TVA Taxare Inversa</field>
- <field name="tag_name">TVA Taxare Inversa</field>
- <field name="code">ROTAX_TVA_deductibila_05_taxare_inversa</field>
- <field name="sequence" eval="2"/>
- <field name="parent_id" ref="account_tax_report_ro_tva_tx_invrsa"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_ro_tva_tx3_invrsa" model="account.tax.report.line">
- <field name="name">TVA Taxare Inversa</field>
- <field name="tag_name">TVA Taxare Inversa</field>
- <field name="code">ROTAX_TVA_deductibila_09_taxare_inversa</field>
- <field name="sequence" eval="3"/>
- <field name="parent_id" ref="account_tax_report_ro_tva_tx_invrsa"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
- <record id="account_tax_report_ro_tva_tx4_invrsa" model="account.tax.report.line">
- <field name="name">TVA Taxare Inversa</field>
- <field name="tag_name">TVA Taxare Inversa</field>
- <field name="code">ROTAX_TVA_deductibila_24_taxare_inversa</field>
- <field name="sequence" eval="4"/>
- <field name="parent_id" ref="account_tax_report_ro_tva_tx_invrsa"/>
- <field name="country_id" ref="base.ro"/>
- </record>
-
<record id="account_tax_report_ro_baza_tva_nxgibl" model="account.tax.report.line">
<field name="name">BAZA TVA NEEXIGIBILA</field>
<field name="sequence" eval="5"/>
diff --git a/addons/l10n_sg/data/account_tax_data.xml b/addons/l10n_sg/data/account_tax_data.xml
index e6eda67eee51a13c1bf466128d908c688d0980ca..706697d870cb1e414183e047e73f0284ba1e1160 100644
--- a/addons/l10n_sg/data/account_tax_data.xml
+++ b/addons/l10n_sg/data/account_tax_data.xml
@@ -20,7 +20,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_account_791'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -32,7 +31,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_account_791'),
}),
]"/>
</record>
@@ -92,7 +90,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_account_793'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -104,7 +101,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_account_793'),
}),
]"/>
</record>
@@ -126,7 +122,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_account_794'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -137,7 +132,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_account_794'),
}),
]"/>
</record>
@@ -160,7 +154,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_account_795'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -172,7 +165,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_account_795'),
}),
]"/>
</record>
@@ -232,7 +224,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_account_797'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -244,7 +235,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_account_797'),
}),
]"/>
</record>
@@ -523,7 +513,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_account_744'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -534,7 +523,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_account_744'),
}),
]"/>
</record>
@@ -557,8 +545,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_account_745'),
- 'plus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -570,8 +556,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_account_745'),
- 'minus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')],
}),
]"/>
</record>
@@ -593,7 +577,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_account_746'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -604,7 +587,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_account_746'),
}),
]"/>
</record>
@@ -626,7 +608,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_account_747'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -637,7 +618,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_account_747'),
}),
]"/>
</record>
@@ -660,7 +640,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_account_748'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -672,7 +651,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_account_748'),
}),
]"/>
</record>
diff --git a/addons/l10n_sg/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_sg/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index fa56fd00dfa98b748849f30c6930fd3ce71d6448..0000000000000000000000000000000000000000
--- a/addons/l10n_sg/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from openerp.modules.registry import RegistryManager
-
-def migrate(cr, version):
- registry = RegistryManager.get(cr.dbname)
- from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_si/data/account_tax_data.xml b/addons/l10n_si/data/account_tax_data.xml
index 8d070c926bed19823a4645aebea67aed7974c96d..bd7bbff6738ea13e731e13a2c774e9fcec749b3e 100644
--- a/addons/l10n_si/data/account_tax_data.xml
+++ b/addons/l10n_si/data/account_tax_data.xml
@@ -314,7 +314,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('gd_acc_260001'),
- 'minus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_zni')],
+ 'plus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_zni')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -333,7 +333,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('gd_acc_260001'),
- 'plus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_zni')],
+ 'minus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_zni')],
}),
]"/>
</record>
@@ -363,7 +363,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('gd_acc_260002'),
- 'minus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_osn')],
+ 'plus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_osn')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -382,7 +382,7 @@
'factor_percent': -100,
'repartition_type': 'tax',
'account_id': ref('gd_acc_260002'),
- 'plus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_osn')],
+ 'minus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_osn')],
}),
]"/>
</record>
diff --git a/addons/l10n_si/data/account_tax_report_data.xml b/addons/l10n_si/data/account_tax_report_data.xml
index 3405e73645179d4ada31e2a4a1bb87d2cc8f21ae..92366c3efd6cac0f71c50c6b985a6ae2ee35ff68 100644
--- a/addons/l10n_si/data/account_tax_report_data.xml
+++ b/addons/l10n_si/data/account_tax_report_data.xml
@@ -23,7 +23,7 @@
<record id="tax_report_zo_dvd_neo_sdtopni_osno" model="account.tax.report.line">
<field name="name">Nabave po osnovni stopnji DDV</field>
- <field name="tag_name">Nabave po osnovni stopnji DDV</field>
+ <field name="tag_name">Nabave po osnovni stopnji DDV (Neodbitni)</field>
<field name="sequence" eval="1"/>
<field name="parent_id" ref="tax_report_zo_dvd_neo_sdtopni"/>
<field name="country_id" ref="base.si"/>
@@ -31,7 +31,7 @@
<record id="tax_report_zo_dvd_neo_sdtopni_zni" model="account.tax.report.line">
<field name="name">Nabave po znižani stopnji DDV</field>
- <field name="tag_name">Nabave po znižani stopnji DDV</field>
+ <field name="tag_name">Nabave po znižani stopnji DDV (Neodbitni)</field>
<field name="sequence" eval="2"/>
<field name="parent_id" ref="tax_report_zo_dvd_neo_sdtopni"/>
<field name="country_id" ref="base.si"/>
@@ -92,7 +92,7 @@
<record id="tax_report_zo_dvd_odb_vstopni_osn" model="account.tax.report.line">
<field name="name">Nabave po osnovni stopnji DDV</field>
- <field name="tag_name">Nabave po osnovni stopnji DDV</field>
+ <field name="tag_name">Nabave po osnovni stopnji DDV (Vstopni)</field>
<field name="sequence" eval="2"/>
<field name="parent_id" ref="tax_report_zo_dvd_odb_vstopni"/>
<field name="country_id" ref="base.si"/>
@@ -100,7 +100,7 @@
<record id="tax_report_zo_dvd_odb_vstopni_zni" model="account.tax.report.line">
<field name="name">Nabave po znižani stopnji DDV</field>
- <field name="tag_name">Nabave po znižani stopnji DDV</field>
+ <field name="tag_name">Nabave po znižani stopnji DDV (Vstopni)</field>
<field name="sequence" eval="3"/>
<field name="parent_id" ref="tax_report_zo_dvd_odb_vstopni"/>
<field name="country_id" ref="base.si"/>
diff --git a/addons/l10n_th/data/account_tax_report_data.xml b/addons/l10n_th/data/account_tax_report_data.xml
index 4977a0d8da63d8c9e79808f4c060911c0eda1f39..66ce5a979b1f0bb18685d6ea5685660634fe1d37 100644
--- a/addons/l10n_th/data/account_tax_report_data.xml
+++ b/addons/l10n_th/data/account_tax_report_data.xml
@@ -25,7 +25,7 @@
<record id="tax_report_tp_wht_per_service" model="account.tax.report.line">
<field name="name">Personal Withholding Tax (Service)</field>
- <field name="tag_name">Personal Withholding Tax (Service)</field>
+ <field name="tag_name">Personal Withholding Tax (Service) (to be paid)</field>
<field name="sequence" eval="1"/>
<field name="parent_id" ref="tax_report_tp_wht_per"/>
<field name="country_id" ref="base.th"/>
@@ -48,7 +48,7 @@
<record id="tax_report_tp_wht_cmp_service" model="account.tax.report.line">
<field name="name">Company Withholding Tax (Service)</field>
- <field name="tag_name">Company Withholding Tax (Service)</field>
+ <field name="tag_name">Company Withholding Tax (Service) (to be paid)</field>
<field name="sequence" eval="1"/>
<field name="parent_id" ref="tax_report_tp_wht_cmp"/>
<field name="country_id" ref="base.th"/>
@@ -56,7 +56,7 @@
<record id="tax_report_tp_wht_cmp_other" model="account.tax.report.line">
<field name="name">Company Withholding Tax (Other)</field>
- <field name="tag_name">Company Withholding Tax (Other)</field>
+ <field name="tag_name">Company Withholding Tax (Other) (to be paid)</field>
<field name="sequence" eval="2"/>
<field name="parent_id" ref="tax_report_tp_wht_cmp"/>
<field name="country_id" ref="base.th"/>
@@ -72,7 +72,7 @@
<record id="tax_report_tp_vat_out" model="account.tax.report.line">
<field name="name">Output VAT</field>
- <field name="tag_name">Output VAT</field>
+ <field name="tag_name">Output VAT (to be paid)</field>
<field name="code">tax_th_PP30_5</field>
<field name="sequence" eval="3"/>
<field name="parent_id" ref="tax_report_tp_vat"/>
@@ -81,7 +81,7 @@
<record id="tax_report_tp_vat_in" model="account.tax.report.line">
<field name="name">Input VAT</field>
- <field name="tag_name">Input VAT</field>
+ <field name="tag_name">Input VAT (to be paid)</field>
<field name="code">tax_th_PP30_7</field>
<field name="sequence" eval="4"/>
<field name="parent_id" ref="tax_report_tp_vat"/>
@@ -111,7 +111,7 @@
<record id="tax_report_ta_wht_per_service" model="account.tax.report.line">
<field name="name">Personal Withholding Tax (Service)</field>
- <field name="tag_name">Personal Withholding Tax (Service)</field>
+ <field name="tag_name">Personal Withholding Tax (Service) (taxable)</field>
<field name="sequence" eval="1"/>
<field name="parent_id" ref="tax_report_ta_wht_per"/>
<field name="country_id" ref="base.th"/>
@@ -133,7 +133,7 @@
<record id="tax_report_ta_wht_cmp_service" model="account.tax.report.line">
<field name="name">Company Withholding Tax (Service)</field>
- <field name="tag_name">Company Withholding Tax (Service)</field>
+ <field name="tag_name">Company Withholding Tax (Service) (taxable)</field>
<field name="sequence" eval="1"/>
<field name="parent_id" ref="tax_report_ta_wht_cmp"/>
<field name="country_id" ref="base.th"/>
@@ -141,7 +141,7 @@
<record id="tax_report_ta_wht_cmp_other" model="account.tax.report.line">
<field name="name">Company Withholding Tax (Other)</field>
- <field name="tag_name">Company Withholding Tax (Other)</field>
+ <field name="tag_name">Company Withholding Tax (Other) (taxable)</field>
<field name="sequence" eval="2"/>
<field name="parent_id" ref="tax_report_ta_wht_cmp"/>
<field name="country_id" ref="base.th"/>
@@ -156,7 +156,7 @@
<record id="tax_report_ta_vat_out" model="account.tax.report.line">
<field name="name">Output VAT</field>
- <field name="tag_name">Output VAT</field>
+ <field name="tag_name">Output VAT (taxable)</field>
<field name="sequence" eval="1"/>
<field name="parent_id" ref="tax_report_ta_vat"/>
<field name="country_id" ref="base.th"/>
@@ -164,7 +164,7 @@
<record id="tax_report_ta_vat_in" model="account.tax.report.line">
<field name="name">Input VAT</field>
- <field name="tag_name">Input VAT</field>
+ <field name="tag_name">Input VAT (taxable)</field>
<field name="sequence" eval="2"/>
<field name="parent_id" ref="tax_report_ta_vat"/>
<field name="country_id" ref="base.th"/>
diff --git a/addons/l10n_th/data/account_tax_template_data.xml b/addons/l10n_th/data/account_tax_template_data.xml
index 67c3ba846e383b5289602ac9a4362123943e2de3..a3b4b2727ba6b62c5647a438dc3a6f041360b2e4 100644
--- a/addons/l10n_th/data/account_tax_template_data.xml
+++ b/addons/l10n_th/data/account_tax_template_data.xml
@@ -88,7 +88,7 @@
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('a_wht'),
- 'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
+ 'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -101,7 +101,7 @@
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('a_wht'),
- 'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
+ 'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
}),
]"/>
</record>
@@ -123,7 +123,7 @@
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('a_wht'),
- 'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
+ 'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -136,7 +136,7 @@
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('a_wht'),
- 'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
+ 'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
}),
]"/>
</record>
@@ -158,7 +158,7 @@
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('a_wht'),
- 'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_service')],
+ 'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_service')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -171,7 +171,7 @@
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('a_wht'),
- 'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_service')],
+ 'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_service')],
}),
]"/>
</record>
@@ -193,7 +193,7 @@
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('a_wht'),
- 'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
+ 'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -206,7 +206,7 @@
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('a_wht'),
- 'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
+ 'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')],
}),
]"/>
</record>
@@ -228,7 +228,7 @@
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('a_wht'),
- 'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
+ 'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -241,7 +241,7 @@
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('a_wht'),
- 'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
+ 'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
}),
]"/>
</record>
@@ -263,7 +263,7 @@
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('a_wht'),
- 'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
+ 'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -276,7 +276,7 @@
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('a_wht'),
- 'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
+ 'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
}),
]"/>
</record>
@@ -298,7 +298,7 @@
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('a_wht'),
- 'plus_report_line_ids': [ref('tax_report_tp_wht_per_service')],
+ 'minus_report_line_ids': [ref('tax_report_tp_wht_per_service')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -311,7 +311,7 @@
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('a_wht'),
- 'minus_report_line_ids': [ref('tax_report_tp_wht_per_service')],
+ 'plus_report_line_ids': [ref('tax_report_tp_wht_per_service')],
}),
]"/>
</record>
@@ -333,7 +333,7 @@
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('a_wht'),
- 'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
+ 'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -346,7 +346,7 @@
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('a_wht'),
- 'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
+ 'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')],
}),
]"/>
</record>
diff --git a/addons/l10n_th/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_th/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index fa56fd00dfa98b748849f30c6930fd3ce71d6448..0000000000000000000000000000000000000000
--- a/addons/l10n_th/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from openerp.modules.registry import RegistryManager
-
-def migrate(cr, version):
- registry = RegistryManager.get(cr.dbname)
- from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_ua/__manifest__.py b/addons/l10n_ua/__manifest__.py
index b2f451de461bba2a6c57ce796bafa1a458b3cd48..b0cfadebb97bbd53379380dffc42ba3788464ed3 100644
--- a/addons/l10n_ua/__manifest__.py
+++ b/addons/l10n_ua/__manifest__.py
@@ -17,7 +17,6 @@ Ukraine - Chart of accounts.
'data/account_chart_template.xml',
'data/account.account.template.csv',
'data/account_account_tag_data.xml',
- 'data/account_tax_tag_data.xml',
'data/account_tax_group_data.xml',
'data/account_tax_template.xml',
'data/account_chart_template_config.xml',
diff --git a/addons/l10n_ua/data/account_tax_tag_data.xml b/addons/l10n_ua/data/account_tax_tag_data.xml
deleted file mode 100644
index ce86c0f17b025d8328bad73d5090022dc0931a0a..0000000000000000000000000000000000000000
--- a/addons/l10n_ua/data/account_tax_tag_data.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
- <data noupdate="1">
- <record id="tax_tag_vat20" model="account.account.tag">
- <field name="name">ПДВ 20%</field>
- <field name="applicability">taxes</field>
- </record>
- <record id="tax_tag_vat7" model="account.account.tag">
- <field name="name">ПДВ 7%</field>
- <field name="applicability">taxes</field>
- </record>
- <record id="tax_tag_vat0" model="account.account.tag">
- <field name="name">ПДВ 0%</field>
- <field name="applicability">taxes</field>
- </record>
- <record id="tax_tag_vat_free" model="account.account.tag">
- <field name="name">Звільнено від ПДВ</field>
- <field name="applicability">taxes</field>
- </record>
- <record id="tax_tag_vat_not" model="account.account.tag">
- <field name="name">Ðе Ñ” об'єктом ПДВ</field>
- <field name="applicability">taxes</field>
- </record>
- </data>
-</odoo>
diff --git a/addons/l10n_ua/data/account_tax_template.xml b/addons/l10n_ua/data/account_tax_template.xml
index e165b0440020a43cff090753b22b8d75e2b0ea3e..0d7a221c7449e51980174409d18b2720cdadae09 100644
--- a/addons/l10n_ua/data/account_tax_template.xml
+++ b/addons/l10n_ua/data/account_tax_template.xml
@@ -13,9 +13,28 @@
<field name="description">+ ПДВ 20%</field>
<field name="amount">20</field>
<field name="type_tax_use">sale</field>
- <field name="account_id" ref="ua_psbp_6431"/>
- <field name="refund_account_id" ref="ua_psbp_6431"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base'
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_psbp_6431'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_psbp_6431'),
+ }),
+ ]"/>
<field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/>
</record>
<record id="sale_tax_template_vat20incl_psbo" model="account.tax.template">
@@ -26,9 +45,28 @@
<field name="amount">20</field>
<field name="type_tax_use">sale</field>
<field name="price_include" eval="1"/>
- <field name="account_id" ref="ua_psbp_6431"/>
- <field name="refund_account_id" ref="ua_psbp_6431"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_psbp_6431'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_psbp_6431'),
+ }),
+ ]"/>
<field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/>
</record>
<record id="sale_tax_template_vat7_psbo" model="account.tax.template">
@@ -38,9 +76,28 @@
<field name="description">+ ПДВ 7%</field>
<field name="amount">7</field>
<field name="type_tax_use">sale</field>
- <field name="account_id" ref="ua_psbp_6431"/>
- <field name="refund_account_id" ref="ua_psbp_6431"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_psbp_6431'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_psbp_6431'),
+ }),
+ ]"/>
<field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/>
</record>
<record id="sale_tax_template_vat7incl_psbo" model="account.tax.template">
@@ -51,9 +108,28 @@
<field name="amount">7</field>
<field name="type_tax_use">sale</field>
<field name="price_include" eval="1"/>
- <field name="account_id" ref="ua_psbp_6431"/>
- <field name="refund_account_id" ref="ua_psbp_6431"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_psbp_6431'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_psbp_6431'),
+ }),
+ ]"/>
<field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/>
</record>
<record id="sale_tax_template_vat0_psbo" model="account.tax.template">
@@ -63,9 +139,26 @@
<field name="description">ПДВ 0%</field>
<field name="amount">0</field>
<field name="type_tax_use">sale</field>
- <field name="account_id" ref="ua_psbp_6431"/>
- <field name="refund_account_id" ref="ua_psbp_6431"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat0')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="sale_tax_template_vat_free_psbo" model="account.tax.template">
<field name="chart_template_id" ref="l10n_ua_psbo_chart_template"/>
@@ -74,9 +167,26 @@
<field name="description">Звільнено від ПДВ</field>
<field name="amount">0</field>
<field name="type_tax_use">sale</field>
- <field name="account_id" ref="ua_psbp_6431"/>
- <field name="refund_account_id" ref="ua_psbp_6431"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_free')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="sale_tax_template_vat_not_psbo" model="account.tax.template">
<field name="chart_template_id" ref="l10n_ua_psbo_chart_template"/>
@@ -85,9 +195,26 @@
<field name="description">Ðе Ñ” об'єктом ПДВ</field>
<field name="amount">0</field>
<field name="type_tax_use">sale</field>
- <field name="account_id" ref="ua_psbp_6431"/>
- <field name="refund_account_id" ref="ua_psbp_6431"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_not')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="purchase_tax_template_vat20_psbo" model="account.tax.template">
@@ -97,9 +224,28 @@
<field name="description">+ ПДВ 20%</field>
<field name="amount">20</field>
<field name="type_tax_use">purchase</field>
- <field name="account_id" ref="ua_psbp_6441"/>
- <field name="refund_account_id" ref="ua_psbp_6441"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_psbp_6441'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_psbp_6441'),
+ }),
+ ]"/>
<field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/>
</record>
<record id="purchase_tax_template_vat20incl_psbo" model="account.tax.template">
@@ -110,9 +256,28 @@
<field name="amount">20</field>
<field name="type_tax_use">purchase</field>
<field name="price_include" eval="1"/>
- <field name="account_id" ref="ua_psbp_6441"/>
- <field name="refund_account_id" ref="ua_psbp_6441"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_psbp_6441'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_psbp_6441'),
+ }),
+ ]"/>
<field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/>
</record>
<record id="purchase_tax_template_vat7_psbo" model="account.tax.template">
@@ -122,9 +287,28 @@
<field name="description">+ ПДВ 7%</field>
<field name="amount">7</field>
<field name="type_tax_use">purchase</field>
- <field name="account_id" ref="ua_psbp_6441"/>
- <field name="refund_account_id" ref="ua_psbp_6441"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_psbp_6441'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_psbp_6441'),
+ }),
+ ]"/>
<field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/>
</record>
<record id="purchase_tax_template_vat7incl_psbo" model="account.tax.template">
@@ -135,9 +319,28 @@
<field name="amount">7</field>
<field name="type_tax_use">purchase</field>
<field name="price_include" eval="1"/>
- <field name="account_id" ref="ua_psbp_6441"/>
- <field name="refund_account_id" ref="ua_psbp_6441"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_psbp_6441'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_psbp_6441'),
+ }),
+ ]"/>
<field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/>
</record>
<record id="purchase_tax_template_vat0_psbo" model="account.tax.template">
@@ -147,9 +350,26 @@
<field name="description">ПДВ 0%</field>
<field name="amount">0</field>
<field name="type_tax_use">purchase</field>
- <field name="account_id" ref="ua_psbp_6441"/>
- <field name="refund_account_id" ref="ua_psbp_6441"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat0')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="purchase_tax_template_vat_free_psbo" model="account.tax.template">
<field name="chart_template_id" ref="l10n_ua_psbo_chart_template"/>
@@ -158,9 +378,26 @@
<field name="description">Звільнено від ПДВ</field>
<field name="amount">0</field>
<field name="type_tax_use">purchase</field>
- <field name="account_id" ref="ua_psbp_6441"/>
- <field name="refund_account_id" ref="ua_psbp_6441"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_free')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="purchase_tax_template_vat_not_psbo" model="account.tax.template">
<field name="chart_template_id" ref="l10n_ua_psbo_chart_template"/>
@@ -169,9 +406,26 @@
<field name="description">Ðе Ñ” об'єктом ПДВ</field>
<field name="amount">0</field>
<field name="type_tax_use">purchase</field>
- <field name="account_id" ref="ua_psbp_6441"/>
- <field name="refund_account_id" ref="ua_psbp_6441"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_not')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<!-- Simplified tax system -->
<!-- Sale taxes -->
@@ -254,9 +508,28 @@
<field name="description">+ ПДВ 20%</field>
<field name="amount">20</field>
<field name="type_tax_use">sale</field>
- <field name="account_id" ref="ua_ias_1204"/>
- <field name="refund_account_id" ref="ua_ias_1204"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_ias_1204'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_ias_1204'),
+ }),
+ ]"/>
<field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/>
</record>
<record id="sale_tax_template_vat20incl" model="account.tax.template">
@@ -267,9 +540,28 @@
<field name="amount">20</field>
<field name="type_tax_use">sale</field>
<field name="price_include" eval="1"/>
- <field name="account_id" ref="ua_ias_1204"/>
- <field name="refund_account_id" ref="ua_ias_1204"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_ias_1204'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_ias_1204'),
+ }),
+ ]"/>
<field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/>
</record>
<record id="sale_tax_template_vat7" model="account.tax.template">
@@ -279,9 +571,28 @@
<field name="description">+ ПДВ 7%</field>
<field name="amount">7</field>
<field name="type_tax_use">sale</field>
- <field name="account_id" ref="ua_ias_1204"/>
- <field name="refund_account_id" ref="ua_ias_1204"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_ias_1204'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_ias_1204'),
+ }),
+ ]"/>
<field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/>
</record>
<record id="sale_tax_template_vat7incl" model="account.tax.template">
@@ -292,9 +603,28 @@
<field name="amount">7</field>
<field name="type_tax_use">sale</field>
<field name="price_include" eval="1"/>
- <field name="account_id" ref="ua_ias_1204"/>
- <field name="refund_account_id" ref="ua_ias_1204"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_ias_1204'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_ias_1204'),
+ }),
+ ]"/>
<field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/>
</record>
<record id="sale_tax_template_vat0" model="account.tax.template">
@@ -304,9 +634,26 @@
<field name="description">ПДВ 0%</field>
<field name="amount">0</field>
<field name="type_tax_use">sale</field>
- <field name="account_id" ref="ua_ias_1204"/>
- <field name="refund_account_id" ref="ua_ias_1204"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat0')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="sale_tax_template_vat_free" model="account.tax.template">
<field name="chart_template_id" ref="l10n_ua_ias_chart_template"/>
@@ -315,9 +662,26 @@
<field name="description">Звільнено від ПДВ</field>
<field name="amount">0</field>
<field name="type_tax_use">sale</field>
- <field name="account_id" ref="ua_ias_1204"/>
- <field name="refund_account_id" ref="ua_ias_1204"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_free')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="sale_tax_template_vat_not" model="account.tax.template">
<field name="chart_template_id" ref="l10n_ua_ias_chart_template"/>
@@ -326,9 +690,26 @@
<field name="description">Ðе Ñ” об'єктом ПДВ</field>
<field name="amount">0</field>
<field name="type_tax_use">sale</field>
- <field name="account_id" ref="ua_ias_1204"/>
- <field name="refund_account_id" ref="ua_ias_1204"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_not')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="purchase_tax_template_vat20" model="account.tax.template">
@@ -338,9 +719,28 @@
<field name="description">+ ПДВ 20%</field>
<field name="amount">20</field>
<field name="type_tax_use">purchase</field>
- <field name="account_id" ref="ua_ias_1140"/>
- <field name="refund_account_id" ref="ua_ias_1140"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_ias_1140'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_ias_1140'),
+ }),
+ ]"/>
<field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/>
</record>
<record id="purchase_tax_template_vat20incl" model="account.tax.template">
@@ -351,9 +751,28 @@
<field name="amount">20</field>
<field name="type_tax_use">purchase</field>
<field name="price_include" eval="1"/>
- <field name="account_id" ref="ua_ias_1140"/>
- <field name="refund_account_id" ref="ua_ias_1140"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_ias_1140'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_ias_1140'),
+ }),
+ ]"/>
<field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/>
</record>
<record id="purchase_tax_template_vat7" model="account.tax.template">
@@ -363,9 +782,28 @@
<field name="description">+ ПДВ 7%</field>
<field name="amount">7</field>
<field name="type_tax_use">purchase</field>
- <field name="account_id" ref="ua_ias_1140"/>
- <field name="refund_account_id" ref="ua_ias_1140"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_ias_1140'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_ias_1140'),
+ }),
+ ]"/>
<field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/>
</record>
<record id="purchase_tax_template_vat7incl" model="account.tax.template">
@@ -376,9 +814,28 @@
<field name="amount">7</field>
<field name="type_tax_use">purchase</field>
<field name="price_include" eval="1"/>
- <field name="account_id" ref="ua_ias_1140"/>
- <field name="refund_account_id" ref="ua_ias_1140"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_ias_1140'),
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ 'account_id': ref('ua_ias_1140'),
+ }),
+ ]"/>
<field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/>
</record>
<record id="purchase_tax_template_vat0" model="account.tax.template">
@@ -388,9 +845,26 @@
<field name="description">ПДВ 0%</field>
<field name="amount">0</field>
<field name="type_tax_use">purchase</field>
- <field name="account_id" ref="ua_ias_1140"/>
- <field name="refund_account_id" ref="ua_ias_1140"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat0')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="purchase_tax_template_vat_free" model="account.tax.template">
<field name="chart_template_id" ref="l10n_ua_ias_chart_template"/>
@@ -399,9 +873,26 @@
<field name="description">Звільнено від ПДВ</field>
<field name="amount">0</field>
<field name="type_tax_use">purchase</field>
- <field name="account_id" ref="ua_ias_1140"/>
- <field name="refund_account_id" ref="ua_ias_1140"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_free')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<record id="purchase_tax_template_vat_not" model="account.tax.template">
<field name="chart_template_id" ref="l10n_ua_ias_chart_template"/>
@@ -410,9 +901,26 @@
<field name="description">Ðе Ñ” об'єктом ПДВ</field>
<field name="amount">0</field>
<field name="type_tax_use">purchase</field>
- <field name="account_id" ref="ua_ias_1140"/>
- <field name="refund_account_id" ref="ua_ias_1140"/>
- <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_not')])]"/>
+ <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
+ <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'base',
+ }),
+ (0, 0, {
+ 'factor_percent': 100,
+ 'repartition_type': 'tax',
+ }),
+ ]"/>
</record>
<!-- Simplified tax system -->
<!-- Sale taxes -->
diff --git a/addons/l10n_uk/data/account_tax_data.xml b/addons/l10n_uk/data/account_tax_data.xml
index aede4a9750ffbdf139d37eac78a77cdcb16eb6c3..db1a6429c2ec2a84163b8764e0ddcb500f4ddea0 100644
--- a/addons/l10n_uk/data/account_tax_data.xml
+++ b/addons/l10n_uk/data/account_tax_data.xml
@@ -18,8 +18,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('2200'),
- 'plus_report_line_ids': [ref('account_tax_report_line_vat_box1')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -31,8 +29,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('2200'),
- 'minus_report_line_ids': [ref('account_tax_report_line_vat_box1')],
}),
]"/>
</record>
@@ -54,8 +50,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('2200'),
- 'plus_report_line_ids': [ref('account_tax_report_line_vat_box1')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -67,8 +61,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('2200'),
- 'minus_report_line_ids': [ref('account_tax_report_line_vat_box1')],
}),
]"/>
</record>
@@ -90,8 +82,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('2201'),
- 'plus_report_line_ids': [ref('account_tax_report_line_vat_box4')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -103,8 +93,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('2201'),
- 'minus_report_line_ids': [ref('account_tax_report_line_vat_box4')],
}),
]"/>
</record>
@@ -126,8 +114,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('2201'),
- 'plus_report_line_ids': [ref('account_tax_report_line_vat_box4')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -139,8 +125,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('2201'),
- 'minus_report_line_ids': [ref('account_tax_report_line_vat_box4')],
}),
]"/>
</record>
@@ -282,7 +266,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('2200'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -294,7 +277,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('2200'),
}),
]"/>
</record>
@@ -316,7 +298,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('2201'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -328,7 +309,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('2201'),
}),
]"/>
</record>
diff --git a/addons/l10n_ve/data/account_tax_data.xml b/addons/l10n_ve/data/account_tax_data.xml
index 348211df64d5548667e485d8703d84d7ea780365..1e68b59a4bc2b4a0a9ae9db1d9dd03c3cc719656 100644
--- a/addons/l10n_ve/data/account_tax_data.xml
+++ b/addons/l10n_ve/data/account_tax_data.xml
@@ -18,7 +18,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_activa_account_2172003'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -29,7 +28,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_activa_account_2172003'),
}),
]"/>
</record>
@@ -142,7 +140,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_activa_account_2172003'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -153,7 +150,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('account_activa_account_2172003'),
}),
]"/>
</record>
diff --git a/addons/l10n_vn/data/account_tax_data.xml b/addons/l10n_vn/data/account_tax_data.xml
index 134cb99d16b6307365a5e477105c48f7267d46cc..c7c549f35444c07272cc578bc0fc8113aa1a0a2a 100644
--- a/addons/l10n_vn/data/account_tax_data.xml
+++ b/addons/l10n_vn/data/account_tax_data.xml
@@ -14,26 +14,26 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'minus_report_line_ids': [ref('account_tax_report_line_03_02_01_vn')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_03_02_01_vn')],
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('chart1331'),
- 'minus_report_line_ids': [ref('account_tax_report_line_03_01_01_vn')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_03_01_01_vn')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'plus_report_line_ids': [ref('account_tax_report_line_03_02_01_vn')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_03_02_01_vn')],
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('chart1331'),
- 'plus_report_line_ids': [ref('account_tax_report_line_03_01_01_vn')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_03_01_01_vn')],
}),
]"/>
</record>
@@ -49,26 +49,26 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'minus_report_line_ids': [ref('account_tax_report_line_02_02_01_vn')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_02_02_01_vn')],
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('chart1331'),
- 'minus_report_line_ids': [ref('account_tax_report_line_02_01_01_vn')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_02_01_01_vn')],
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'plus_report_line_ids': [ref('account_tax_report_line_02_02_01_vn')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_02_02_01_vn')],
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('chart1331'),
- 'plus_report_line_ids': [ref('account_tax_report_line_02_01_01_vn')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_02_01_01_vn')],
}),
]"/>
</record>
@@ -84,24 +84,22 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'minus_report_line_ids': [ref('account_tax_report_line_01_02_01_vn')],
+ 'plus_report_line_ids': [ref('account_tax_report_line_01_02_01_vn')],
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart1331'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
- 'plus_report_line_ids': [ref('account_tax_report_line_01_02_01_vn')],
+ 'minus_report_line_ids': [ref('account_tax_report_line_01_02_01_vn')],
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart1331'),
}),
]"/>
</record>
@@ -194,7 +192,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart33311'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -206,7 +203,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('chart33311'),
}),
]"/>
</record>
diff --git a/addons/l10n_vn/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_vn/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
deleted file mode 100644
index fa56fd00dfa98b748849f30c6930fd3ce71d6448..0000000000000000000000000000000000000000
--- a/addons/l10n_vn/migrations/9.0.2.0/post-migrate_tags_on_taxes.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from openerp.modules.registry import RegistryManager
-
-def migrate(cr, version):
- registry = RegistryManager.get(cr.dbname)
- from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
- migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_za/data/account_tax_template_data.xml b/addons/l10n_za/data/account_tax_template_data.xml
index 60c867581176bfc50de8bc59d5b5d61ae61c007f..8c1622a265998c2e7e2ec40e27a8de25ac8ab0c1 100644
--- a/addons/l10n_za/data/account_tax_template_data.xml
+++ b/addons/l10n_za/data/account_tax_template_data.xml
@@ -90,7 +90,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('200060'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -102,7 +101,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('200060'),
}),
]"/>
</record>
@@ -124,7 +122,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('200060'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -136,7 +133,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('200060'),
}),
]"/>
</record>
@@ -158,7 +154,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('200060'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
@@ -170,7 +165,6 @@
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
- 'account_id': ref('200060'),
}),
]"/>
</record>