diff --git a/addons/account/models/chart_template.py b/addons/account/models/chart_template.py index fc6fdbf175b..94f30d68177 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 5614c43941f..f95b45efa0e 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'), }), ]"/> @@ -295,7 +293,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('uae_account_3785'), }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> 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 404cdd185d4..00000000000 --- 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 026c890d973..ee3ce61b822 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'), }), ]"/> @@ -440,7 +440,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart3500'), }), ]"/> 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 404cdd185d4..00000000000 --- 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 4b604e1a6be..b43521d7fdb 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')], }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> diff --git a/addons/l10n_be/data/account_tax_template_data.xml b/addons/l10n_be/data/account_tax_template_data.xml index 70c71a446b2..67ce4fc506f 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'), }), ]"/> @@ -304,8 +302,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451054'), - 'plus_report_line_ids': [], }), ]"/> @@ -344,7 +338,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451054'), }), ]"/> @@ -383,7 +375,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451054'), }), ]"/> @@ -421,7 +411,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451054'), }), ]"/> @@ -460,7 +448,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451054'), }), ]"/> @@ -498,7 +484,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451054'), }), ]"/> @@ -659,7 +643,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> @@ -992,7 +974,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> @@ -1032,7 +1012,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> @@ -1198,7 +1176,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> @@ -1396,7 +1372,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> @@ -1595,7 +1569,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> @@ -1794,7 +1766,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451056'), }), ]"/> @@ -2048,7 +2018,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> @@ -2406,7 +2374,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> @@ -2499,7 +2465,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> @@ -2645,7 +2609,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> @@ -2843,7 +2805,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> @@ -3042,7 +3002,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> @@ -3241,7 +3199,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> 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 404cdd185d4..00000000000 --- 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 404cdd185d4..00000000000 --- 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 5515bb686ff..d5e90d15dfb 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')], }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> @@ -2113,7 +2097,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('tax_report_icmsst_1')], }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> @@ -2370,7 +2344,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('tax_report_icmsst_1')], }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> @@ -2849,7 +2805,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('tax_report_irpj_2')], }), ]"/> @@ -2884,7 +2838,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('tax_report_ir_2')], }), ]"/> @@ -2919,7 +2871,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('tax_report_issqn_2')], }), ]"/> @@ -3163,7 +3113,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('tax_report_csll_2')], }), ]"/> 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 404cdd185d4..00000000000 --- 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 f846e0e0378..9939461933a 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'), }), ]"/> @@ -656,7 +654,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('ch_coa_2200'), }), ]"/> @@ -701,7 +697,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('ch_coa_1171'), }), ]"/> @@ -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')], }), ]"/> 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 404cdd185d4..00000000000 --- 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 404cdd185d4..00000000000 --- 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 388c9998230..7fe340bfd3a 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'), }), ]"/> @@ -1424,7 +1422,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('co_puc_236805'), }), ]"/> 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 2bc8cfc4e67..c95fff75bf5 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'), }), ]"/> 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 404cdd185d4..00000000000 --- 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 3d004e18c59..79295d820bd 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 404cdd185d4..00000000000 --- 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 dfb8cd06bd1..7aaf53e8cee 100644 --- a/addons/l10n_do/data/account.tax.template.xml +++ b/addons/l10n_do/data/account.tax.template.xml @@ -1217,36 +1217,6 @@ - - - 62 - Retención a Jurídica (Servicios Construcción con Materiales) - group - - none - - - - - 58 diff --git a/addons/l10n_et/data/account_tax_data.xml b/addons/l10n_et/data/account_tax_data.xml index 85b898caf80..04a84a9627a 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'), }), ]"/> @@ -89,7 +87,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_et3007'), }), ]"/> @@ -123,7 +119,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_et3007'), }), ]"/> @@ -301,7 +295,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_et2212'), }), ]"/> @@ -335,7 +327,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_et2212'), }), ]"/> @@ -369,7 +359,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_et2212'), }), ]"/> 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 404cdd185d4..00000000000 --- 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 a32488d9c33..f8938c2f145 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'), }), ]"/> @@ -1771,7 +1769,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_445663'), }), ]"/> diff --git a/addons/l10n_fr/data/tax_report_data.xml b/addons/l10n_fr/data/tax_report_data.xml index 71363f0b6cb..bf10b7c3a2f 100644 --- a/addons/l10n_fr/data/tax_report_data.xml +++ b/addons/l10n_fr/data/tax_report_data.xml @@ -569,8 +569,8 @@ - Base H.T. 20% - Base déductible intracom. 20% + Base H.T. 20.0% + Base déductible intracom. 20.0% 1 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 44367687c8f..00000000000 --- 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 6f933404f1d..00000000000 --- 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 5b85ffadada..9598ccf3452 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')] }), ]"/> II.1 Izdani računi po stopi 10% - II.1 Izdani računi po stopi 10% + II.1 Izdani računi po stopi 10% (osnovica) izdani_10 @@ -137,7 +137,7 @@ II.3 Izdani računi po stopi 25% - II.3 Izdani računi po stopi 25% + II.3 Izdani računi po stopi 25% (osnovica) izdani_25 @@ -168,7 +168,7 @@ III.1. Pretporez 10% - III.1. Pretporez 10% + III.1. Pretporez 10% (osnovica) pretporez_10 @@ -211,7 +211,7 @@ III.4. Plaćeni PP pri uvozu - III.4. Plaćeni PP pri uvozu + III.4. Plaćeni PP pri uvozu (osnovica) placeni_uvozu @@ -220,7 +220,7 @@ III.5. Plaćeni PP na ino usluge 10% - III.5. Plaćeni PP na ino usluge 10% + III.5. Plaćeni PP na ino usluge 10% (osnovica) placeni_usluge_10 @@ -237,7 +237,7 @@ III.7. Plaćeni PP na ino usluge 25% - III.7. Plaćeni PP na ino usluge 25% + III.7. Plaćeni PP na ino usluge 25% (osnovica) placeni_usluge_25 @@ -283,7 +283,7 @@ II.1 Izdani računi po stopi 10% - II.1 Izdani računi po stopi 10% + II.1 Izdani računi po stopi 10% (porez) izdani_racuni @@ -299,7 +299,7 @@ II.3 Izdani računi po stopi 25% - II.3 Izdani računi po stopi 25% + II.3 Izdani računi po stopi 25% (porez) izdani_racuni_25 @@ -322,7 +322,7 @@ III.1. Pretporez 10% - III.1. Pretporez 10% + III.1. Pretporez 10% (porez) pretporez_10_tax @@ -347,7 +347,7 @@ III.4. Plaćeni PP pri uvozu - III.4. Plaćeni PP pri uvozu + III.4. Plaćeni PP pri uvozu (porez) placeni_uvozu_tax @@ -356,7 +356,7 @@ III.5. Plaćeni PP na ino usluge 10% - III.5. Plaćeni PP na ino usluge 10% + III.5. Plaćeni PP na ino usluge 10% (porez) placeni_usluge_10_tax @@ -372,7 +372,7 @@ III.7. Plaćeni PP na ino usluge 25% - III.7. Plaćeni PP na ino usluge 25% + III.7. Plaćeni PP na ino usluge 25% (porez) placeni_usluge_25_ta diff --git a/addons/l10n_hr/data/account_tax_template_data.xml b/addons/l10n_hr/data/account_tax_template_data.xml index a3d8ce3f29c..242cae42c05 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'), }), ]"/> @@ -240,7 +238,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> @@ -349,7 +345,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> @@ -384,7 +378,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> @@ -419,7 +411,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> @@ -454,7 +444,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> @@ -489,7 +477,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> @@ -524,7 +510,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> @@ -666,7 +650,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> @@ -736,7 +718,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> @@ -845,7 +825,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> 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 404cdd185d4..00000000000 --- 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 46a16e9879c..0cde0b968b5 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'), }), ]"/> @@ -170,7 +168,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_467'), }), ]"/> @@ -206,7 +202,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_467'), }), ]"/> @@ -242,7 +236,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_467'), }), ]"/> @@ -278,7 +270,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_467'), }), ]"/> @@ -428,7 +418,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_466'), }), ]"/> @@ -464,7 +452,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_466'), }), ]"/> @@ -499,7 +485,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_466'), }), ]"/> @@ -534,7 +518,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_466'), }), ]"/> @@ -570,7 +552,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_466'), }), ]"/> @@ -606,7 +586,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_466'), }), ]"/> 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 404cdd185d4..00000000000 --- 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 91491dea46a..e7f10a3e60d 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'), }), ]"/> @@ -78,7 +76,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_ie_a2200'), }), ]"/> @@ -109,7 +105,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_ie_a2201'), }), ]"/> @@ -171,7 +165,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_ie_a2201'), }), ]"/> @@ -274,7 +266,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_ie_a2200'), }), ]"/> @@ -305,7 +295,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_ie_a2201'), }), ]"/> diff --git a/addons/l10n_in/data/account_tax_template_data.xml b/addons/l10n_in/data/account_tax_template_data.xml index 6e043599d86..6c0d3b8892e 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 (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('p11236'), }), ]"/> @@ -198,7 +197,6 @@ if tax > result:result=tax (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('p10056'), }), ]"/> @@ -224,7 +222,6 @@ if tax > result:result=tax (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('p11236'), }), ]"/> @@ -237,7 +234,6 @@ if tax > result:result=tax (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('p10056'), }), ]"/> @@ -506,7 +502,7 @@ if tax > result:result=tax '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')], }), ]"/> @@ -554,7 +550,7 @@ if tax > result:result=tax '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')], }), ]"/> @@ -602,7 +598,7 @@ if tax > result:result=tax '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')], }), ]"/> @@ -650,7 +646,7 @@ if tax > result:result=tax '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')], }), ]"/> @@ -698,7 +694,7 @@ if tax > result:result=tax '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')], }), ]"/> @@ -747,7 +743,7 @@ if tax > result:result=tax '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')], }), ]"/> @@ -898,7 +894,6 @@ if tax > result:result=tax (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('p10056'), }), ]"/> @@ -935,7 +929,6 @@ if tax > result:result=tax (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('p10056'), }), ]"/> @@ -948,7 +941,6 @@ if tax > result:result=tax (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('p11236'), }), ]"/> @@ -1215,7 +1207,7 @@ if tax > result:result=tax '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')], }), ]"/> @@ -1263,7 +1255,7 @@ if tax > result:result=tax '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')], }), ]"/> @@ -1311,7 +1303,7 @@ if tax > result:result=tax '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')], }), ]"/> @@ -1359,7 +1351,7 @@ if tax > result:result=tax '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')], }), ]"/> @@ -1407,7 +1399,7 @@ if tax > result:result=tax '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')], }), ]"/> @@ -1456,7 +1448,7 @@ if tax > result:result=tax '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')], }), ]"/> 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 404cdd185d4..00000000000 --- 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 d1400e7ac07..502854e8eca 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 @@ - - SGST - taxes - - - CGST - taxes - - - IGST - taxes - - - CESS - taxes - - - - (schedule6)SGST Sale 0.5% - SGST 0.5% - none - percent - 0.5 - - - - - - - - - (schedule6)CGST Sale 0.5% - CGST 0.5% - none - percent - 0.5 - - - - - - (schedule6)GST 1% GST 1% sale - group - 0 - - - - - - (schedule6)SGST Sale 1% - SGST 1% - none percent 1 - - - - - - - (schedule6)CGST Sale 1% - CGST 1% - none - percent - 1 - - - - + + (schedule6)GST 2% GST 2% sale - group - 0 - - - - - - (schedule6)SGST Sale 2.5% - SGST 2.5% - none percent - 2.5 - + 2 - - - - - - (schedule6)CGST Sale 2.5% - CGST 2.5% - none - percent - 2.5 - - - - + + (schedule6)GST 5% GST 5% sale - group - 0 - - - - - - (schedule6)SGST Sale 6% - SGST 6% - none percent - 6 - + 5 - - - - - - (schedule6)CGST Sale 6% - CGST 6% - none - percent - 6 - - - - + + (schedule6)GST 12% GST 12% sale - group - 0 - - - - - - (schedule6)SGST Sale 9% - SGST 9% - none percent - 9 - + 12 - - - - - - (schedule6)CGST Sale 9% - CGST 9% - none - percent - 9 - - - - + + (schedule6)GST 18% GST 18% sale - group - 0 - - - - - - (schedule6)SGST Sale 14% - SGST 14% - none percent - 14 - + 18 - - - - - - (schedule6)CGST Sale 14% - CGST 14% - none - percent - 14 - - - - + + (schedule6)GST 28% GST 28% sale - group - 0 + percent + 28 - + + + @@ -233,9 +246,28 @@ sale percent 1 - + + - @@ -245,9 +277,28 @@ sale percent 2 - + + - @@ -257,9 +308,28 @@ sale percent 5 - + + - @@ -269,9 +339,28 @@ sale percent 12 - + + - @@ -281,9 +370,28 @@ sale percent 18 - + + - @@ -293,9 +401,28 @@ sale percent 28 - + + - @@ -307,7 +434,26 @@ 5 - + + @@ -318,7 +464,26 @@ 1.591 - + + @@ -329,7 +494,6 @@ 0 - @@ -343,213 +507,262 @@ tax=quantity * 4.17 if tax > result:result=tax - + + - - (schedule6)SGST Purchase 0.5% - SGST 0.5% - none - percent - 0.5 - - - - - - - - (schedule6)CGST Purchase 0.5% - CGST 0.5% - none - percent - 0.5 - - - - - - (schedule6)GST 1% GST 1% purchase - group - 0 - - - - - - (schedule6)SGST Purchase 1% - SGST 1% - none percent 1 - - - - - - - (schedule6)CGST Purchase 1% - CGST 1% - none - percent - 1 - - - - + + (schedule6)GST 2% GST 2% purchase - group - 0 - - - - - - (schedule6)SGST Purchase 2.5% - SGST 2.5% - none percent - 2.5 - + 2 - - - - - - (schedule6)CGST Purchase 2.5% - CGST 2.5% - none - percent - 2.5 - - - - + + (schedule6)GST 5% GST 5% purchase - group - 0 - - - - - - (schedule6)SGST Purchase 6% - SGST 6% - none percent - 6 - + 5 - - - - - - (schedule6)CGST Purchase 6% - CGST 6% - none - percent - 6 - - - - + + (schedule6)GST 12% GST 12% purchase - group - 0 - - - - - - (schedule6)SGST Purchase 9% - SGST 9% - none percent - 9 - + 12 - - - - - - (schedule6)CGST Purchase 9% - CGST 9% - none - percent - 9 - - - - + + (schedule6)GST 18% GST 18% purchase - group - 0 - - - - - - (schedule6)SGST Purchase 14% - SGST 14% - none percent - 14 - + 18 - - - - - - (schedule6)CGST Purchase 14% - CGST 14% - none - percent - 14 - - - - + + (schedule6)GST 28% GST 28% purchase - group - 0 + percent + 28 - + + @@ -558,9 +771,28 @@ if tax > result:result=tax purchase percent 1 - + + - @@ -570,9 +802,28 @@ if tax > result:result=tax purchase percent 2 - + + - @@ -582,9 +833,28 @@ if tax > result:result=tax purchase percent 5 - + + - @@ -594,9 +864,28 @@ if tax > result:result=tax purchase percent 12 - + + - @@ -606,9 +895,28 @@ if tax > result:result=tax purchase percent 18 - + + - @@ -618,9 +926,28 @@ if tax > result:result=tax purchase percent 28 - + + - @@ -632,7 +959,26 @@ if tax > result:result=tax 5 - + + @@ -643,7 +989,26 @@ if tax > result:result=tax 1.591 - + + @@ -667,7 +1032,26 @@ tax=quantity * 4.17 if tax > result:result=tax - + + diff --git a/addons/l10n_it/data/account_tax_template.xml b/addons/l10n_it/data/account_tax_template.xml index 0adb0478db4..36635b55b01 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'), }), ]"/> @@ -1027,7 +995,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('1601'), }), ]"/> @@ -1061,7 +1027,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('2601'), }), ]"/> @@ -1095,7 +1059,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('1601'), }), ]"/> @@ -1367,7 +1329,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('2601'), }), ]"/> @@ -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 02ec7767d09..a822b13da64 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 @@ 不課税 - 不課税 + 不課税 (仮受税額) 3 @@ -63,7 +63,7 @@ 不課税 - 不課税 + 不課税 (仮払税額) 3 diff --git a/addons/l10n_jp/data/account_tax_template_data.xml b/addons/l10n_jp/data/account_tax_template_data.xml index c28e3319af5..fbb1a01406c 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')], }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> 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 404cdd185d4..00000000000 --- 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 20acaf701cd..e70d0cb53c8 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 fa56fd00dfa..00000000000 --- 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 f316c4d6b56..c112839f15b 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 b838d152ffe..220bad62380 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 @@ - + Achats à l'importation (10%) (HT) Achats à l'importation (10%) (HT) diff --git a/addons/l10n_mn/data/account_tax_template_data.xml b/addons/l10n_mn/data/account_tax_template_data.xml index 8f5d16d9b75..95b5ec15261 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'), }), ]"/> @@ -132,7 +130,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_3401_0201'), }), ]"/> @@ -168,7 +164,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_3401_0201'), }), ]"/> @@ -926,7 +920,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_3401_0201'), }), ]"/> @@ -962,7 +954,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_3401_0201'), }), ]"/> diff --git a/addons/l10n_mx/data/account_tax_data.xml b/addons/l10n_mx/data/account_tax_data.xml index a01635f2f65..7d5a3faf852 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'), }), ]"/> @@ -110,6 +106,7 @@ 'repartition_type': 'tax', 'tag_ids': [ref('l10n_mx.tag_iva')], 'account_id': ref('cuenta208_01'), + 'tag_ids': [ref('tag_iva')], }), ]"/> @@ -372,7 +370,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('cuenta118_01'), }), ]"/> @@ -490,6 +486,7 @@ 'repartition_type': 'tax', 'tag_ids': [ref('l10n_mx.tag_iva')], 'account_id': ref('cuenta208_01'), + 'tag_ids': [ref('tag_iva')], }), ]"/> diff --git a/addons/l10n_nl/data/account_tax_template.xml b/addons/l10n_nl/data/account_tax_template.xml index e56f1914288..db153988ede 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'), }), ]"/> @@ -200,7 +198,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_0_d'), }), ]"/> @@ -759,7 +755,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_v'), }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> @@ -1036,7 +1014,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_0_eu'), }), ]"/> @@ -1070,7 +1046,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_0_eu'), }), ]"/> @@ -1104,7 +1078,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_0_eu'), }), ]"/> @@ -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')], }), ]"/> @@ -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'), }), ]"/> @@ -1561,7 +1515,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_0_non_eu'), }), ]"/> @@ -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 404cdd185d4..00000000000 --- 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 9eebd2dbe17..341f5207689 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'), }), ]"/> @@ -339,7 +337,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart2704'), }), ]"/> 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 a37770d2c1c..00000000000 --- 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 272d267882e..d06eb0f1494 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'), }), ]"/> @@ -194,7 +192,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('nz_21330'), }), ]"/> @@ -229,7 +225,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('nz_21330'), }), ]"/> diff --git a/addons/l10n_pl/data/account_tax_data.xml b/addons/l10n_pl/data/account_tax_data.xml index 61d64d30648..e92ba5d5aad 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')], }), ]"/> @@ -626,7 +624,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')], }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> @@ -1160,7 +1156,7 @@ 'repartition_type': 'tax', }), ]"/> - 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 fa56fd00dfa..00000000000 --- 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 b4551410427..3409d10ad0f 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')], }), ]"/> @@ -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')], }), ]"/> @@ -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'), }), ]"/> @@ -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'), }), ]"/> @@ -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')], + '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_4427'), - }), - (0,0, { - 'factor_percent': 100, - 'repartition_type': 'tax', - 'account_id': ref('pcg_4426'), }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> @@ -650,16 +628,16 @@ 'factor_percent': 100, 'repartition_type': 'base', }), - (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'), }), + (0,0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('pcg_4427'), + }), ]"/> @@ -693,16 +671,16 @@ 'factor_percent': 100, 'repartition_type': 'base', }), - (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'), }), + (0,0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('pcg_4427'), + }), ]"/> @@ -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')], }), ]"/> @@ -774,7 +752,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), }), ]"/> @@ -810,7 +786,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), }), ]"/> @@ -846,7 +820,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), }), ]"/> @@ -881,7 +853,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4426'), }), ]"/> @@ -914,7 +884,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), }), ]"/> @@ -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')], + '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_4427'), - }), - (0,0, { - 'factor_percent': 100, - 'repartition_type': 'tax', - 'account_id': ref('pcg_4426'), }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> @@ -1103,16 +1062,16 @@ 'factor_percent': 100, 'repartition_type': 'base', }), - (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'), }), + (0,0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('pcg_4427'), + }), ]"/> @@ -1121,7 +1080,7 @@ 61 TVA Intracomunitara Achizitii 20% 20 - group + percent purchase @@ -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')], }), ]"/> diff --git a/addons/l10n_ro/data/account_tax_report_data.xml b/addons/l10n_ro/data/account_tax_report_data.xml index c8fd6e4019d..a390419ef68 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 @@ Baza TVA Intracomunitar Bunuri + Baza TVA Intracomunitar Bunuri - - Baza TVA Intracomunitar Bunuri - Baza TVA Intracomunitar Bunuri - ROTAX_TVA_colectata_00_intracomunitar_bunuri_Baza - - - - - - - Baza TVA Intracomunitar Bunuri - Baza TVA Intracomunitar Bunuri - ROTAX_TVA_colectata_05_intracomunitar_bunuri_Baza - - - - - - - Baza TVA Intracomunitar Bunuri - Baza TVA Intracomunitar Bunuri - ROTAX_TVA_colectata_09_intracomunitar_bunuri_Baza - - - - - - - Baza TVA Intracomunitar Bunuri - Baza TVA Intracomunitar Bunuri - ROTAX_TVA_colectata_24_intracomunitar_bunuri_Baza - - - - - Baza TVA Intracomunitar Servicii + Baza TVA Intracomunitar Servicii - - Baza TVA Intracomunitar Servicii - - - - - - - Baza TVA Intracomunitar Servicii - - - - - - - Baza TVA Intracomunitar Servicii - - - - - - - Baza TVA Intracomunitar Servicii - - - - - Baza TVA Taxare Inversa + Baza TVA Taxare Inversa - - Baza TVA Taxare Inversa - Baza TVA Taxare Inversa - ROTAX_TVA_colectata_00_taxare_inversa_Baza - - - - - - - Baza TVA Taxare Inversa - Baza TVA Taxare Inversa - ROTAX_TVA_colectata_05_taxare_inversa_Baza - - - - - - - Baza TVA Taxare Inversa - Baza TVA Taxare Inversa - ROTAX_TVA_colectata_09_taxare_inversa_Baza - - - - - - - Baza TVA Taxare Inversa - Baza TVA Taxare Inversa - ROTAX_TVA_colectata_24_taxare_inversa_Baza - - - - - TVA COLECTATA @@ -181,7 +84,7 @@ TVA 0% - TVA 0% + TVA 0% (TVA colectata) ROTAX_TVA_colectata_0 @@ -190,7 +93,7 @@ TVA 19% - TVA 19% + TVA 19% (TVA colectata) ROTAX_TVA_colectata_19 @@ -199,7 +102,7 @@ TVA 24% - TVA 24% + TVA 24% (TVA colectata) ROTAX_TVA_colectata_24 @@ -208,7 +111,7 @@ TVA 5% - TVA 5% + TVA 5% (TVA colectata) ROTAX_TVA_colectata_5 @@ -217,7 +120,7 @@ TVA 9% - TVA 9% + TVA 9% (TVA colectata) ROTAX_TVA_colectata_9 @@ -225,131 +128,38 @@ - TVA Intracomunitar Bunuri + TVA Intracomunitar Bunuri (TVA colectata) + TVA Intracomunitar Bunuri (TVA colectata) - - TVA Intracomunitar Bunuri - - - - - - - TVA Intracomunitar Bunuri - TVA Intracomunitar Bunuri - ROTAX_TVA_colectata_05_intracomunitar_bunuri - - - - - - - TVA Intracomunitar Bunuri - TVA Intracomunitar Bunuri - ROTAX_TVA_colectata_09_intracomunitar_bunuri - - - - - - - TVA Intracomunitar Bunuri - TVA Intracomunitar Bunuri - ROTAX_TVA_colectata_24_intracomunitar_bunuri - - - - - - TVA Intracomunitar Servicii + TVA Intracomunitar Servicii (TVA colectata) + TVA Intracomunitar Servicii (TVA colectata) - - TVA Intracomunitar Servicii - - - - - - - TVA Intracomunitar Servicii - - - - - - - TVA Intracomunitar Servicii - - - - - - - TVA Intracomunitar Servicii - - - - - - TVA Taxare Inversa + TVA Taxare Inversa (TVA colectata) + TVA Taxare Inversa (TVA colectata) - - TVA Taxare Inversa - - - - - - - TVA Taxare Inversa - TVA Taxare Inversa - ROTAX_TVA_colectata_05_taxare_inversa - - - - - - - TVA Taxare Inversa - TVA Taxare Inversa - ROTAX_TVA_colectata_09_taxare_inversa - - - - - - - TVA Taxare Inversa - TVA Taxare Inversa - ROTAX_TVA_colectata_24_taxare_inversa - - - - - - BAZA TVA DEDUCTIBIL + BAZA TVA DEDUCTIBILA Baza TVA 0% - Baza TVA 0% + Baza TVA 0% (deductibila) ROTAX_TVA_deductibila_0_Baza @@ -358,7 +168,7 @@ Baza TVA 19% - Baza TVA 19% + Baza TVA 19% (deductibila) ROTAX_TVA_deductibila_19_Baza @@ -367,7 +177,7 @@ Baza TVA 24% - Baza TVA 24% + Baza TVA 24% (deductibila) ROTAX_TVA_deductibila_24_Baza @@ -376,7 +186,7 @@ Baza TVA 5% - Baza TVA 5% + Baza TVA 5% (deductibila) ROTAX_TVA_deductibila_5_Baza @@ -385,7 +195,7 @@ Baza TVA 9% - Baza TVA 9% + Baza TVA 9% (deductibila) ROTAX_TVA_deductibila_9_Baza @@ -393,126 +203,29 @@ - Baza TVA Intracomunitar Bunuri% + Baza TVA Intracomunitar Bunuri (deductibila) + Baza TVA Intracomunitar Bunuri (deductibila) - - Baza TVA Intracomunitar Bunuri% - Baza TVA Intracomunitar Bunuri% - ROTAX_TVA_deductibila_00_intracomunitar_bunuri_Baza - - - - - - - Baza TVA Intracomunitar Bunuri% - Baza TVA Intracomunitar Bunuri% - ROTAX_TVA_deductibila_05_intracomunitar_bunuri_Baza - - - - - - - Baza TVA Intracomunitar Bunuri% - Baza TVA Intracomunitar Bunuri% - ROTAX_TVA_deductibila_09_intracomunitar_bunuri_Baza - - - - - - - Baza TVA Intracomunitar Bunuri% - Baza TVA Intracomunitar Bunuri% - ROTAX_TVA_deductibila_24_intracomunitar_bunuri_Baza - - - - - - Baza TVA Intracomunitar Servicii% + Baza TVA Intracomunitar Servicii (deductibila) + Baza TVA Intracomunitar Servicii (deductibila) - - Baza TVA Intracomunitar Servicii% - - - - - - - Baza TVA Intracomunitar Servicii% - - - - - - - Baza TVA Intracomunitar Servicii% - - - - - - - Baza TVA Intracomunitar Servicii% - - - - - - Baza TVA Taxare Inversa + Baza TVA Taxare Inversa (deductibila) + Baza TVA Taxare Inversa (deductibila) - - Baza TVA Taxare Inversa - Baza TVA Taxare Inversa - ROTAX_TVA_deductibila_00_taxare_inversa_Baza - - - - - - - Baza TVA Taxare Inversa - Baza TVA Taxare Inversa - ROTAX_TVA_deductibila_05_taxare_inversa_Baza - - - - - - - Baza TVA Taxare Inversa - Baza TVA Taxare Inversa - ROTAX_TVA_deductibila_09_taxare_inversa_Baza - - - - - - - Baza TVA Taxare Inversa - Baza TVA Taxare Inversa - ROTAX_TVA_deductibila_24_taxare_inversa_Baza - - - - - TVA DEDUCTIBILA @@ -529,8 +242,8 @@ - TVA 19% - TVA 19% + TVA 19% (deductibila) + TVA 19% (deductibila) ROTAX_TVA_deductibila_19 @@ -538,8 +251,8 @@ - TVA 24% - TVA 24% + TVA 24% (deductibila) + TVA 24% (deductibila) ROTAX_TVA_deductibila_24 @@ -547,8 +260,8 @@ - TVA 5% - TVA 5% + TVA 5% (deductibila) + TVA 5% (deductibila) ROTAX_TVA_deductibila_5 @@ -556,8 +269,8 @@ - TVA 9% - TVA 9% + TVA 9% (deductibila) + TVA 9% (deductibila) ROTAX_TVA_deductibila_9 @@ -565,122 +278,29 @@ - TVA Intracomunitar Bunuri + TVA Intracomunitar Bunuri (deductibila) + TVA Intracomunitar Bunuri (deductibila) - - TVA Intracomunitar Bunuri - - - - - - - TVA Intracomunitar Bunuri - TVA Intracomunitar Bunuri - ROTAX_TVA_deductibila_05_intracomunitar_bunuri - - - - - - - TVA Intracomunitar Bunuri - TVA Intracomunitar Bunuri - ROTAX_TVA_deductibila_09_intracomunitar_bunuri - - - - - - - TVA Intracomunitar Bunuri - TVA Intracomunitar Bunuri - ROTAX_TVA_deductibila_24_intracomunitar_bunuri - - - - - - TVA Intracomunitar Servicii + TVA Intracomunitar Servicii (deductibila) + TVA Intracomunitar Servicii (deductibila) - - TVA Intracomunitar Servicii - - - - - - - TVA Intracomunitar Servicii - - - - - - - TVA Intracomunitar Servicii - - - - - - - TVA Intracomunitar Servicii - - - - - - TVA Taxare Inversa + TVA Taxare Inversa (deductibila) + TVA Taxare Inversa (deductibila) - - TVA Taxare Inversa - - - - - - - TVA Taxare Inversa - TVA Taxare Inversa - ROTAX_TVA_deductibila_05_taxare_inversa - - - - - - - TVA Taxare Inversa - TVA Taxare Inversa - ROTAX_TVA_deductibila_09_taxare_inversa - - - - - - - TVA Taxare Inversa - TVA Taxare Inversa - ROTAX_TVA_deductibila_24_taxare_inversa - - - - - BAZA TVA NEEXIGIBILA diff --git a/addons/l10n_sg/data/account_tax_data.xml b/addons/l10n_sg/data/account_tax_data.xml index e6eda67eee5..706697d870c 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'), }), ]"/> @@ -92,7 +90,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_793'), }), ]"/> @@ -126,7 +122,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_794'), }), ]"/> @@ -160,7 +154,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_795'), }), ]"/> @@ -232,7 +224,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_797'), }), ]"/> @@ -523,7 +513,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_744'), }), ]"/> @@ -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')], }), ]"/> @@ -593,7 +577,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_746'), }), ]"/> @@ -626,7 +608,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_747'), }), ]"/> @@ -660,7 +640,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_748'), }), ]"/> 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 fa56fd00dfa..00000000000 --- 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 8d070c926be..bd7bbff6738 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')], }), ]"/> @@ -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')], }), ]"/> diff --git a/addons/l10n_si/data/account_tax_report_data.xml b/addons/l10n_si/data/account_tax_report_data.xml index 3405e736451..92366c3efd6 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 @@ Nabave po osnovni stopnji DDV - Nabave po osnovni stopnji DDV + Nabave po osnovni stopnji DDV (Neodbitni) @@ -31,7 +31,7 @@ Nabave po znižani stopnji DDV - Nabave po znižani stopnji DDV + Nabave po znižani stopnji DDV (Neodbitni) @@ -92,7 +92,7 @@ Nabave po osnovni stopnji DDV - Nabave po osnovni stopnji DDV + Nabave po osnovni stopnji DDV (Vstopni) @@ -100,7 +100,7 @@ Nabave po znižani stopnji DDV - Nabave po znižani stopnji DDV + Nabave po znižani stopnji DDV (Vstopni) diff --git a/addons/l10n_th/data/account_tax_report_data.xml b/addons/l10n_th/data/account_tax_report_data.xml index 4977a0d8da6..66ce5a979b1 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 @@ Personal Withholding Tax (Service) - Personal Withholding Tax (Service) + Personal Withholding Tax (Service) (to be paid) @@ -48,7 +48,7 @@ Company Withholding Tax (Service) - Company Withholding Tax (Service) + Company Withholding Tax (Service) (to be paid) @@ -56,7 +56,7 @@ Company Withholding Tax (Other) - Company Withholding Tax (Other) + Company Withholding Tax (Other) (to be paid) @@ -72,7 +72,7 @@ Output VAT - Output VAT + Output VAT (to be paid) tax_th_PP30_5 @@ -81,7 +81,7 @@ Input VAT - Input VAT + Input VAT (to be paid) tax_th_PP30_7 @@ -111,7 +111,7 @@ Personal Withholding Tax (Service) - Personal Withholding Tax (Service) + Personal Withholding Tax (Service) (taxable) @@ -133,7 +133,7 @@ Company Withholding Tax (Service) - Company Withholding Tax (Service) + Company Withholding Tax (Service) (taxable) @@ -141,7 +141,7 @@ Company Withholding Tax (Other) - Company Withholding Tax (Other) + Company Withholding Tax (Other) (taxable) @@ -156,7 +156,7 @@ Output VAT - Output VAT + Output VAT (taxable) @@ -164,7 +164,7 @@ Input VAT - Input VAT + Input VAT (taxable) diff --git a/addons/l10n_th/data/account_tax_template_data.xml b/addons/l10n_th/data/account_tax_template_data.xml index 67c3ba846e3..a3b4b2727ba 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')], }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> 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 fa56fd00dfa..00000000000 --- 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 b2f451de461..b0cfadebb97 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 ce86c0f17b0..00000000000 --- a/addons/l10n_ua/data/account_tax_tag_data.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - ПДВ 20% - taxes - - - ПДВ 7% - taxes - - - ПДВ 0% - taxes - - - Звільнено від ПДВ - taxes - - - Не є об'єктом ПДВ - taxes - - - diff --git a/addons/l10n_ua/data/account_tax_template.xml b/addons/l10n_ua/data/account_tax_template.xml index e165b044002..0d7a221c744 100644 --- a/addons/l10n_ua/data/account_tax_template.xml +++ b/addons/l10n_ua/data/account_tax_template.xml @@ -13,9 +13,28 @@ + ПДВ 20% 20 sale - - - + + @@ -26,9 +45,28 @@ 20 sale - - - + + @@ -38,9 +76,28 @@ + ПДВ 7% 7 sale - - - + + @@ -51,9 +108,28 @@ 7 sale - - - + + @@ -63,9 +139,26 @@ ПДВ 0% 0 sale - - - + + @@ -74,9 +167,26 @@ Звільнено від ПДВ 0 sale - - - + + @@ -85,9 +195,26 @@ Не є об'єктом ПДВ 0 sale - - - + + @@ -97,9 +224,28 @@ + ПДВ 20% 20 purchase - - - + + @@ -110,9 +256,28 @@ 20 purchase - - - + + @@ -122,9 +287,28 @@ + ПДВ 7% 7 purchase - - - + + @@ -135,9 +319,28 @@ 7 purchase - - - + + @@ -147,9 +350,26 @@ ПДВ 0% 0 purchase - - - + + @@ -158,9 +378,26 @@ Звільнено від ПДВ 0 purchase - - - + + @@ -169,9 +406,26 @@ Не є об'єктом ПДВ 0 purchase - - - + + @@ -254,9 +508,28 @@ + ПДВ 20% 20 sale - - - + + @@ -267,9 +540,28 @@ 20 sale - - - + + @@ -279,9 +571,28 @@ + ПДВ 7% 7 sale - - - + + @@ -292,9 +603,28 @@ 7 sale - - - + + @@ -304,9 +634,26 @@ ПДВ 0% 0 sale - - - + + @@ -315,9 +662,26 @@ Звільнено від ПДВ 0 sale - - - + + @@ -326,9 +690,26 @@ Не є об'єктом ПДВ 0 sale - - - + + @@ -338,9 +719,28 @@ + ПДВ 20% 20 purchase - - - + + @@ -351,9 +751,28 @@ 20 purchase - - - + + @@ -363,9 +782,28 @@ + ПДВ 7% 7 purchase - - - + + @@ -376,9 +814,28 @@ 7 purchase - - - + + @@ -388,9 +845,26 @@ ПДВ 0% 0 purchase - - - + + @@ -399,9 +873,26 @@ Звільнено від ПДВ 0 purchase - - - + + @@ -410,9 +901,26 @@ Не є об'єктом ПДВ 0 purchase - - - + + diff --git a/addons/l10n_uk/data/account_tax_data.xml b/addons/l10n_uk/data/account_tax_data.xml index aede4a9750f..db1a6429c2e 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')], }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> @@ -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')], }), ]"/> @@ -282,7 +266,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('2200'), }), ]"/> @@ -316,7 +298,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('2201'), }), ]"/> diff --git a/addons/l10n_ve/data/account_tax_data.xml b/addons/l10n_ve/data/account_tax_data.xml index 348211df64d..1e68b59a4bc 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'), }), ]"/> @@ -142,7 +140,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_activa_account_2172003'), }), ]"/> diff --git a/addons/l10n_vn/data/account_tax_data.xml b/addons/l10n_vn/data/account_tax_data.xml index 134cb99d16b..c7c549f3544 100644 --- a/addons/l10n_vn/data/account_tax_data.xml +++ b/addons/l10n_vn/data/account_tax_data.xml @@ -11,19 +11,6 @@ purchase - + @@ -46,19 +46,6 @@ purchase - + @@ -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'), }), ]"/> @@ -194,7 +192,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart33311'), }), ]"/> 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 fa56fd00dfa..00000000000 --- 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 60c86758117..8c1622a2659 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'), }), ]"/> @@ -124,7 +122,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('200060'), }), ]"/> @@ -158,7 +154,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('200060'), }), ]"/>