[OU-IMP] delivery (and stock_delivery): finish migration

ForgeFlow · Feb 20, 2025 · 8fe68bb · 8fe68bb
1 parent b41ab68
commit 8fe68bb
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 17 deletions.
diff --git a/docsource/modules160-170.rst b/docsource/modules160-170.rst
@@ -958,7 +958,7 @@ Module coverage 16.0 -> 17.0
 +---------------------------------------------------+----------------------+-------------------------------------------------+
 | stock_account                                     | Done                 |                                                 |
 +---------------------------------------------------+----------------------+-------------------------------------------------+
-| |new| stock_delivery                              |                      |                                                 |
+| |new| stock_delivery                              | Nothing to do        | Split from delivery.                            |
 +---------------------------------------------------+----------------------+-------------------------------------------------+
 | stock_dropshipping                                |                      |                                                 |
 +---------------------------------------------------+----------------------+-------------------------------------------------+

diff --git a/openupgrade_scripts/scripts/delivery/17.0.1.0/pre-migration.py b/openupgrade_scripts/scripts/delivery/17.0.1.0/pre-migration.py
@@ -1,17 +1,5 @@
 from openupgradelib import openupgrade
 
-_new_fields = [
-    (
-        "carrier_id",  # Field name
-        "stock.move.line",  # Model name
-        "stock_move_line",  # Table name
-        "many2one",  # Odoo Field type (in lower case)
-        False,  # [Optional] SQL type (if custom fields)
-        "delivery",  # Module name
-        False,  # [Optional] Default value
-    )
-]
-
 _xmlids_renames = [
     (
         "delivery.act_delivery_trackers_url",
@@ -45,6 +33,10 @@
         "delivery.menu_delivery_zip_prefix",
         "stock_delivery.menu_delivery_zip_prefix",
     ),
+    (
+        "delivery.model_choose_delivery_package",
+        "stock_delivery.model_choose_delivery_package",
+    ),
 ]
 
 
@@ -57,6 +49,13 @@ def _delete_sql_constraints(env):
 
 def _fill_stock_move_line_carrier_id(env):
     """Field `carrier_id` on stock.move.line is now a stored field."""
+    openupgrade.logged_query(
+        env.cr,
+        """
+        ALTER TABLE stock_move_line
+        ADD COLUMN IF NOT EXISTS carrier_id INTEGER;
+        """,
+    )
     openupgrade.logged_query(
         env.cr,
         """
@@ -71,6 +70,12 @@ def _fill_stock_move_line_carrier_id(env):
 @openupgrade.migrate()
 def migrate(env, version):
     openupgrade.rename_xmlids(env.cr, _xmlids_renames)
-    openupgrade.add_fields(env, _new_fields)
     _delete_sql_constraints(env)
     _fill_stock_move_line_carrier_id(env)
+    openupgrade.logged_query(  # just to be sure
+        env.cr,
+        """
+        UPDATE ir_module_module
+        SET state='to install'
+        WHERE name = 'stock_delivery' AND state='uninstalled'""",
+    )
diff --git a/openupgrade_scripts/scripts/delivery/17.0.1.0/upgrade_analysis_work.txt b/openupgrade_scripts/scripts/delivery/17.0.1.0/upgrade_analysis_work.txt
@@ -1,11 +1,11 @@
 ---Models in module 'delivery'---
 model choose.delivery.package (moved to stock_delivery) [column['model_type']]
-# DONE: in migration script of module stock_delivery
+# DONE: pre-migration: moved to stock_delivery
 
 ---Fields in module 'delivery'---
 delivery     / delivery.carrier         / fixed_margin (float)          : NEW
 delivery     / delivery.carrier         / invoice_policy (selection)    : selection_keys is now '['estimated']' ('['estimated', 'real']')
-# NOTHING TO DO:
+# NOTHING TO DO
 
 delivery     / sale.order               / shipping_weight (float)       : NEW hasdefault: compute
 # NOTHING TO DO: new features
@@ -14,7 +14,7 @@ delivery     / stock.move.line          / carrier_id (many2one)         : is now
 # DONE: pre-migration: Add new column & set value for it
 
 delivery     / stock.move.line          / carrier_name (char)           : DEL
-# NOTHING TO DO:
+# NOTHING TO DO
 
 delivery     / product.product          / country_of_origin (many2one)  : module is now 'stock_delivery' ('delivery')
 delivery     / product.product          / hs_code (char)                : module is now 'stock_delivery' ('delivery')