[IMP] account, l10n_vn: apply new solution

Viindoo · Jun 8, 2024 · 399e92c · 399e92c
1 parent 13909d8
commit 399e92c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 35 deletions.
diff --git a/openupgrade_scripts/scripts/account/17.0.1.2/pre-migration.py b/openupgrade_scripts/scripts/account/17.0.1.2/pre-migration.py
@@ -1,13 +1,7 @@
 # Copyright 2024 Viindoo Technology Joint Stock Company (Viindoo)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-import logging
-
 from openupgradelib import openupgrade
 
-from odoo import api, models
-
-_logger = logging.getLogger(__name__)
-
 _fields_renames = [
     (
         "res.company",
@@ -124,35 +118,6 @@
 ]
 
 
-@api.model_create_multi
-def create(self, vals_list):
-    """Remove delete account.report.expression record that violates constraints
-    account_report_expression_line_label_uniq.
-    """
-    if self._name != "account.report.expression":
-        return models.BaseModel.create._original_method(self, vals_list)
-
-    for vals in vals_list:
-        expression = self.search(
-            [
-                ("report_line_id", "=", vals["report_line_id"]),
-                ("label", "=", vals["label"]),
-            ],
-        )
-        if expression:
-            _logger.warning(
-                "Delete obsolete account.report.expression record: %s",
-                str(expression.read([])),
-            )
-
-            expression.unlink()
-    return models.BaseModel.create._original_method(self, vals_list)
-
-
-create._original_method = models.BaseModel.create
-models.BaseModel.create = create
-
-
 def _map_account_report_filter_account_type(env):
     openupgrade.rename_columns(
         env.cr,

diff --git a/openupgrade_scripts/scripts/l10n_vn/17.0.2.0.3/pre-migration.py b/openupgrade_scripts/scripts/l10n_vn/17.0.2.0.3/pre-migration.py
@@ -42,3 +42,17 @@ def _vn_coa_rename_xml_id(env):
 @openupgrade.migrate()
 def migrate(env, version):
     _vn_coa_rename_xml_id(env)
+    # https://github.com/odoo/odoo/commit/f639de48eaee991b37bbaf8c62aecc4f425ea5e2
+    openupgrade.rename_xmlids(
+        env.cr,
+        [
+            (
+                "l10n_vn_viin.account_tax_report_line_purchase_val_exemption",
+                "l10n_vn.account_tax_report_line_04_02_01_vn",
+            ),
+            (
+                "l10n_vn_viin.account_tax_report_line_sale_val_exemption",
+                "l10n_vn.account_tax_report_line_04_02_02_vn",
+            ),
+        ],
+    )