From 7532f7f5ebe74c312c9566e6b1af8622007e5a85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miquel=20Ra=C3=AFch?= <miquel.raich@forgeflow.com>
Date: Thu, 3 Sep 2026 12:31:26 +0200
Subject: [PATCH] [IMP] apriori: base_vat_optional_vies -> base_vat

---
 openupgrade_scripts/apriori.py                     |  2 ++
 .../scripts/base_vat/17.0.1.0/post-migration.py    |  3 ++-
 .../scripts/base_vat/17.0.1.0/pre-migration.py     | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/openupgrade_scripts/apriori.py b/openupgrade_scripts/apriori.py
index f357a8a2d66b..c04f07727026 100644
--- a/openupgrade_scripts/apriori.py
+++ b/openupgrade_scripts/apriori.py
@@ -46,6 +46,8 @@
     "website_sale_digital": "website_sale",
     "website_sale_loyalty_delivery": "website_sale_loyalty",
     "website_sale_stock_product_configurator": "website_sale_product_configurator",
+    # OCA/account-financial-tools
+    "base_vat_optional_vies": "base_vat",
     # OCA/account-invoicing
     "account_invoice_fiscal_position_update": "account",
     # OCA/e-commerce
diff --git a/openupgrade_scripts/scripts/base_vat/17.0.1.0/post-migration.py b/openupgrade_scripts/scripts/base_vat/17.0.1.0/post-migration.py
index f979b3c10d2a..8603e0a64859 100644
--- a/openupgrade_scripts/scripts/base_vat/17.0.1.0/post-migration.py
+++ b/openupgrade_scripts/scripts/base_vat/17.0.1.0/post-migration.py
@@ -34,7 +34,8 @@ def _partner_fill_vies_valid(env):
                     ) IN (SELECT code FROM eu_countries)
                 ) THEN TRUE
             ELSE FALSE
-        END;
+        END
+        WHERE vies_valid IS NULL;
         """,
     )
 
diff --git a/openupgrade_scripts/scripts/base_vat/17.0.1.0/pre-migration.py b/openupgrade_scripts/scripts/base_vat/17.0.1.0/pre-migration.py
index 1e5a30183277..457ee66233ed 100644
--- a/openupgrade_scripts/scripts/base_vat/17.0.1.0/pre-migration.py
+++ b/openupgrade_scripts/scripts/base_vat/17.0.1.0/pre-migration.py
@@ -4,6 +4,20 @@
 
 
 def _partner_create_vies_valid_column(env):
+    if openupgrade.column_exists(env.cr, "res_partner", "vies_passed"):
+        # coming from base_vat_optional_vies module
+        openupgrade.rename_fields(
+            env,
+            [
+                (
+                    "res.partner",
+                    "res_partner",
+                    "vies_passed",
+                    "vies_valid",
+                ),
+            ],
+        )
+        return
     openupgrade.logged_query(
         env.cr,
         """