From 040ee809a84c19d415a611884c450241b3892332 Mon Sep 17 00:00:00 2001 From: Michiel Valee Date: Sat, 13 Jun 2026 15:45:58 +0200 Subject: [PATCH 1/2] [OU-FIX] account_edi_ubl_cii: guard map_values when source column is absent --- .../19.0.1.0/pre-migration.py | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/openupgrade_scripts/scripts/account_edi_ubl_cii/19.0.1.0/pre-migration.py b/openupgrade_scripts/scripts/account_edi_ubl_cii/19.0.1.0/pre-migration.py index 9347b84a788c..6a0af45d41af 100644 --- a/openupgrade_scripts/scripts/account_edi_ubl_cii/19.0.1.0/pre-migration.py +++ b/openupgrade_scripts/scripts/account_edi_ubl_cii/19.0.1.0/pre-migration.py @@ -19,10 +19,18 @@ @openupgrade.migrate() def migrate(env, version): - openupgrade.map_values( - env.cr, - "ubl_cii_tax_exemption_reason_code", - "ubl_cii_tax_exemption_reason_code", - _reason_code_map, - table="account_tax", - ) + # The ``ubl_cii_tax_exemption_reason_code`` column is not present on every + # 18.0 database (e.g. Community installs that never stored it). Guard the + # value remap so a missing column does not raise UndefinedColumn and abort + # the whole upgrade. When the column is absent there is nothing to remap; + # the 19.0 module update creates it afterwards. + if openupgrade.column_exists( + env.cr, "account_tax", "ubl_cii_tax_exemption_reason_code" + ): + openupgrade.map_values( + env.cr, + "ubl_cii_tax_exemption_reason_code", + "ubl_cii_tax_exemption_reason_code", + _reason_code_map, + table="account_tax", + ) From f799261fdf8284ee7f945935aab9d840b38b9594 Mon Sep 17 00:00:00 2001 From: Michiel Valee Date: Wed, 17 Jun 2026 20:52:52 +0200 Subject: [PATCH 2/2] [OU-FIX] account_edi_ubl_cii: condense guard comment Co-Authored-By: Claude Opus 4.8 (1M context) --- .../scripts/account_edi_ubl_cii/19.0.1.0/pre-migration.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/openupgrade_scripts/scripts/account_edi_ubl_cii/19.0.1.0/pre-migration.py b/openupgrade_scripts/scripts/account_edi_ubl_cii/19.0.1.0/pre-migration.py index 6a0af45d41af..eb2d841f220f 100644 --- a/openupgrade_scripts/scripts/account_edi_ubl_cii/19.0.1.0/pre-migration.py +++ b/openupgrade_scripts/scripts/account_edi_ubl_cii/19.0.1.0/pre-migration.py @@ -19,11 +19,9 @@ @openupgrade.migrate() def migrate(env, version): - # The ``ubl_cii_tax_exemption_reason_code`` column is not present on every - # 18.0 database (e.g. Community installs that never stored it). Guard the - # value remap so a missing column does not raise UndefinedColumn and abort - # the whole upgrade. When the column is absent there is nothing to remap; - # the 19.0 module update creates it afterwards. + # ubl_cii_tax_exemption_reason_code came from account_edi_ubl_cii_tax_extension + # (not auto-installed in 18.0), merged into this module in 19.0. DBs without + # that extension lack the column, so guard the remap. if openupgrade.column_exists( env.cr, "account_tax", "ubl_cii_tax_exemption_reason_code" ):