[FIX] l10n_ae, l10n_at: migrate tax-report lines reused as expressions

docsource/modules180-190.rst

@@ -248,7 +248,7 @@ Module coverage 18.0 -> 19.0
 +---------------------------------------------------+----------------------+-------------------------------------------------+
 | l10n_account_withholding_tax_pos                  |                      |                                                 |
 +---------------------------------------------------+----------------------+-------------------------------------------------+
-| l10n_ae                                           |                      |                                                 |
+| l10n_ae                                           | Done                 |                                                 |
 +---------------------------------------------------+----------------------+-------------------------------------------------+
 | |new| l10n_ae_pos                                 |                      |                                                 |
 +---------------------------------------------------+----------------------+-------------------------------------------------+
@@ -264,7 +264,7 @@ Module coverage 18.0 -> 19.0
 +---------------------------------------------------+----------------------+-------------------------------------------------+
 | l10n_ar_withholding                               |                      |No DB layout changes.                            |
 +---------------------------------------------------+----------------------+-------------------------------------------------+
-| l10n_at                                           |                      |                                                 |
+| l10n_at                                           | Done                 |                                                 |
 +---------------------------------------------------+----------------------+-------------------------------------------------+
 | l10n_au                                           |                      |                                                 |
 +---------------------------------------------------+----------------------+-------------------------------------------------+

openupgrade_scripts/scripts/l10n_ae/19.0.1.0/post-migration.py

@@ -0,0 +1,6 @@
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    openupgrade.load_data(env, "l10n_ae", "19.0.1.0/noupdate_changes.xml")

openupgrade_scripts/scripts/l10n_ae/19.0.1.0/pre-migration.py

@@ -0,0 +1,31 @@
+from openupgradelib import openupgrade
+
+# 19.0 consolidated the VAT tax report: section "*_base"/sub-line xml_ids that
+# were account.report.line in 18.0 are reused as account.report.expression on the
+# merged lines. The data load can't overwrite a line record with expression
+# values; free those xml_ids so the new expressions are created cleanly (the
+# superseded 18.0 lines are residual -> database_cleanup).
+_REUSED_AS_EXPRESSION = (
+    "tax_report_line_adjustment_import_uae_base",
+    "tax_report_line_exempt_supplies_base",
+    "tax_report_line_expense_supplies_reverse_base",
+    "tax_report_line_import_uae_base",
+    "tax_report_line_standard_rated_expense_base",
+    "tax_report_line_supplies_reverse_charge_base",
+    "tax_report_line_tax_refund_tourist_base",
+    "tax_report_line_zero_rated_supplies_base",
+)
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    openupgrade.logged_query(
+        env.cr,
+        """
+        DELETE FROM ir_model_data
+        WHERE module = 'l10n_ae'
+          AND model = 'account.report.line'
+          AND name IN %s
+        """,
+        (_REUSED_AS_EXPRESSION,),
+    )

openupgrade_scripts/scripts/l10n_ae/19.0.1.0/upgrade_analysis_work.txt

@@ -0,0 +1,160 @@
+---Models in module 'l10n_ae'---
+---Fields in module 'l10n_ae'---
+---XML records in module 'l10n_ae'---
+NEW account.report.column: l10n_ae.tax_report_adj
+NEW account.report.column: l10n_ae.tax_report_base
+NEW account.report.column: l10n_ae.tax_report_tax
+DEL account.report.column: l10n_ae.tax_report_balance
+NEW account.report.expression: l10n_ae.tax_report_line_adjustment_import_uae_base
+NEW account.report.expression: l10n_ae.tax_report_line_adjustment_import_uae_tax
+NEW account.report.expression: l10n_ae.tax_report_line_all_expense_total_adj
+NEW account.report.expression: l10n_ae.tax_report_line_all_expense_total_base
+NEW account.report.expression: l10n_ae.tax_report_line_all_expense_total_tax
+NEW account.report.expression: l10n_ae.tax_report_line_all_sales_total_adj
+NEW account.report.expression: l10n_ae.tax_report_line_all_sales_total_base
+NEW account.report.expression: l10n_ae.tax_report_line_all_sales_total_tax
+NEW account.report.expression: l10n_ae.tax_report_line_exempt_supplies_base
+NEW account.report.expression: l10n_ae.tax_report_line_expense_supplies_reverse_base
+NEW account.report.expression: l10n_ae.tax_report_line_expense_supplies_reverse_tax
+NEW account.report.expression: l10n_ae.tax_report_line_import_uae_base
+NEW account.report.expression: l10n_ae.tax_report_line_import_uae_tax
+NEW account.report.expression: l10n_ae.tax_report_line_net_vat_due_period_tax
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_expense_adj
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_expense_base
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_expense_tax
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_abu_dhabi_adj
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_abu_dhabi_base
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_abu_dhabi_tax
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_ajman_adj
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_ajman_base
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_ajman_tax
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_dubai_adj
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_dubai_base
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_dubai_tax
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_fujairah_adj
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_fujairah_base
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_fujairah_tax
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_ras_al_khaima_adj
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_ras_al_khaima_base
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_ras_al_khaima_tax
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_sharjah_adj
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_sharjah_base
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_sharjah_tax
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_umm_al_quwain_adj
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_umm_al_quwain_base
+NEW account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_umm_al_quwain_tax
+NEW account.report.expression: l10n_ae.tax_report_line_supplies_reverse_charge_base
+NEW account.report.expression: l10n_ae.tax_report_line_supplies_reverse_charge_tax
+NEW account.report.expression: l10n_ae.tax_report_line_tax_refund_tourist_base
+NEW account.report.expression: l10n_ae.tax_report_line_tax_refund_tourist_tax
+NEW account.report.expression: l10n_ae.tax_report_line_total_value_due_tax_period_tax
+NEW account.report.expression: l10n_ae.tax_report_line_total_value_recoverable_tax_period_tax
+NEW account.report.expression: l10n_ae.tax_report_line_zero_rated_supplies_base
+DEL account.report.expression: l10n_ae.tax_report_line_adjustment_import_uae_base_formula
+DEL account.report.expression: l10n_ae.tax_report_line_adjustment_import_uae_vat_formula
+DEL account.report.expression: l10n_ae.tax_report_line_exempt_supplies_base_tag
+DEL account.report.expression: l10n_ae.tax_report_line_exempt_supplies_vat_tag
+DEL account.report.expression: l10n_ae.tax_report_line_expense_out_of_scope_formula
+DEL account.report.expression: l10n_ae.tax_report_line_expense_out_of_scope_vat_formula
+DEL account.report.expression: l10n_ae.tax_report_line_expense_supplies_reverse_base_tag
+DEL account.report.expression: l10n_ae.tax_report_line_expense_supplies_reverse_vat_tag
+DEL account.report.expression: l10n_ae.tax_report_line_import_uae_base_tag
+DEL account.report.expression: l10n_ae.tax_report_line_import_uae_vat_tag
+DEL account.report.expression: l10n_ae.tax_report_line_standard_rated_expense_base_tag
+DEL account.report.expression: l10n_ae.tax_report_line_standard_rated_expense_vat_tag
+DEL account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_base_abu_dhabi_tag
+DEL account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_base_ajman_tag
+DEL account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_base_dubai_tag
+DEL account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_base_fujairah_tag
+DEL account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_base_ras_al_khaima_tag
+DEL account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_base_sharjah_tag
+DEL account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_base_umm_al_quwain_tag
+DEL account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_vat_abu_dhabi_tag
+DEL account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_vat_ajman_tag
+DEL account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_vat_dubai_tag
+DEL account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_vat_fujairah_tag
+DEL account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_vat_ras_al_khaima_tag
+DEL account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_vat_sharjah_tag
+DEL account.report.expression: l10n_ae.tax_report_line_standard_rated_supplies_vat_umm_al_quwain_tag
+DEL account.report.expression: l10n_ae.tax_report_line_supplies_out_of_scope_base_formula
+DEL account.report.expression: l10n_ae.tax_report_line_supplies_out_of_scope_vat_formula
+DEL account.report.expression: l10n_ae.tax_report_line_supplies_reverse_charge_base_tag
+DEL account.report.expression: l10n_ae.tax_report_line_supplies_reverse_charge_vat_tag
+DEL account.report.expression: l10n_ae.tax_report_line_tax_refund_tourist_base_tag
+DEL account.report.expression: l10n_ae.tax_report_line_tax_refund_tourist_vat_tag
+DEL account.report.expression: l10n_ae.tax_report_line_zero_rated_supplies_base_tag
+DEL account.report.expression: l10n_ae.tax_report_line_zero_rated_supplies_vat_tag
+NEW account.report.line: l10n_ae.tax_report_line_adjustment_import_uae
+NEW account.report.line: l10n_ae.tax_report_line_all_expense
+NEW account.report.line: l10n_ae.tax_report_line_all_expense_total
+NEW account.report.line: l10n_ae.tax_report_line_all_sales
+NEW account.report.line: l10n_ae.tax_report_line_all_sales_total
+NEW account.report.line: l10n_ae.tax_report_line_exempt_supplies
+NEW account.report.line: l10n_ae.tax_report_line_expense_supplies_reverse
+NEW account.report.line: l10n_ae.tax_report_line_import_uae
+NEW account.report.line: l10n_ae.tax_report_line_standard_rated_expense
+NEW account.report.line: l10n_ae.tax_report_line_standard_rated_supplies
+NEW account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_abu_dhabi
+NEW account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_ajman
+NEW account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_dubai
+NEW account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_fujairah
+NEW account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_ras_al_khaima
+NEW account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_sharjah
+NEW account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_umm_al_quwain
+NEW account.report.line: l10n_ae.tax_report_line_supplies_reverse_charge
+NEW account.report.line: l10n_ae.tax_report_line_tax_refund_tourist
+NEW account.report.line: l10n_ae.tax_report_line_zero_rated_supplies
+DEL account.report.line: l10n_ae.tax_report_line_adjustment_import_uae_base
+DEL account.report.line: l10n_ae.tax_report_line_adjustment_import_uae_vat
+DEL account.report.line: l10n_ae.tax_report_line_base_all_expense
+DEL account.report.line: l10n_ae.tax_report_line_base_all_expense_total
+DEL account.report.line: l10n_ae.tax_report_line_base_all_sales
+DEL account.report.line: l10n_ae.tax_report_line_base_all_sales_total
+DEL account.report.line: l10n_ae.tax_report_line_exempt_supplies_base
+DEL account.report.line: l10n_ae.tax_report_line_exempt_supplies_vat
+DEL account.report.line: l10n_ae.tax_report_line_expense_out_of_scope
+DEL account.report.line: l10n_ae.tax_report_line_expense_out_of_scope_vat
+DEL account.report.line: l10n_ae.tax_report_line_expense_supplies_reverse_base
+DEL account.report.line: l10n_ae.tax_report_line_expense_supplies_reverse_vat
+DEL account.report.line: l10n_ae.tax_report_line_import_uae_base
+DEL account.report.line: l10n_ae.tax_report_line_import_uae_vat
+DEL account.report.line: l10n_ae.tax_report_line_standard_rated_expense_base
+DEL account.report.line: l10n_ae.tax_report_line_standard_rated_expense_vat
+DEL account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_base
+DEL account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_base_abu_dhabi
+DEL account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_base_ajman
+DEL account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_base_dubai
+DEL account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_base_fujairah
+DEL account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_base_ras_al_khaima
+DEL account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_base_sharjah
+DEL account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_base_subtotal
+DEL account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_base_umm_al_quwain
+DEL account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_vat
+DEL account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_vat_abu_dhabi
+DEL account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_vat_ajman
+DEL account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_vat_dubai
+DEL account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_vat_fujairah
+DEL account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_vat_ras_al_khaima
+DEL account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_vat_sharjah
+DEL account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_vat_subtotal
+DEL account.report.line: l10n_ae.tax_report_line_standard_rated_supplies_vat_umm_al_quwain
+DEL account.report.line: l10n_ae.tax_report_line_supplies_out_of_scope_base
+DEL account.report.line: l10n_ae.tax_report_line_supplies_out_of_scope_vat
+DEL account.report.line: l10n_ae.tax_report_line_supplies_reverse_charge_base
+DEL account.report.line: l10n_ae.tax_report_line_supplies_reverse_charge_vat
+DEL account.report.line: l10n_ae.tax_report_line_tax_refund_tourist_base
+DEL account.report.line: l10n_ae.tax_report_line_tax_refund_tourist_vat
+DEL account.report.line: l10n_ae.tax_report_line_vat_all_expense
+DEL account.report.line: l10n_ae.tax_report_line_vat_all_expense_total
+DEL account.report.line: l10n_ae.tax_report_line_vat_all_sales
+DEL account.report.line: l10n_ae.tax_report_line_vat_all_sales_total
+DEL account.report.line: l10n_ae.tax_report_line_zero_rated_supplies_base
+DEL account.report.line: l10n_ae.tax_report_line_zero_rated_supplies_vat
+# NOTHING TO DO — tax-report line→expression restructure; account.report.* are noupdate=False definition records reloaded by the module on -u, not referenced by transactional data.
+NEW ir.ui.view: l10n_ae.l10n_ae_report_invoice_document
+NEW ir.ui.view: l10n_ae.report_invoice
+DEL ir.ui.view: l10n_ae.document_tax_totals_company_currency_template
+DEL ir.ui.view: l10n_ae.report_invoice_document
+# NOTHING TO DO — view definitions reloaded by the module on update.
+res.country.group: l10n_ae.gcc_countries_group (noupdate) (noupdate switched)
+# DONE: gcc_countries_group noupdate flag switched; reloaded via post-migration load_data(noupdate_changes.xml).

openupgrade_scripts/scripts/l10n_at/19.0.3.2.1/pre-migration.py

@@ -0,0 +1,25 @@
+from openupgradelib import openupgrade
+
+# 19.0 consolidated the VAT tax report: section "*_base"/sub-line xml_ids that
+# were account.report.line in 18.0 are reused as account.report.expression on the
+# merged lines. The data load can't overwrite a line record with expression
+# values; free those xml_ids so the new expressions are created cleanly (the
+# superseded 18.0 lines are residual -> database_cleanup).
+_REUSED_AS_EXPRESSION = (
+    "tax_report_line_at_tax_title_4_14_19",
+    "tax_report_line_at_tax_title_4_28_31",
+)
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    openupgrade.logged_query(
+        env.cr,
+        """
+        DELETE FROM ir_model_data
+        WHERE module = 'l10n_at'
+          AND model = 'account.report.line'
+          AND name IN %s
+        """,
+        (_REUSED_AS_EXPRESSION,),
+    )