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

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

Hide file tree

Showing 5 changed files with 103 additions and 19 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/noupdate_changes.xml b/openupgrade_scripts/scripts/delivery/17.0.1.0/noupdate_changes.xml
@@ -4,8 +4,8 @@
     <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
   </record>
   <record id="free_delivery_carrier" model="delivery.carrier">
-    <field name="amount"/>
-    <field name="free_over"/>
+    <!--<field name="amount"/>
+    <field name="free_over"/>-->
     <field name="name">Standard delivery</field>
   </record>
   <record id="product_product_delivery" model="product.product">

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')

diff --git a/openupgrade_scripts/scripts/stock_delivery/17.0.1.0/upgrade_analysis_work.txt b/openupgrade_scripts/scripts/stock_delivery/17.0.1.0/upgrade_analysis_work.txt
@@ -0,0 +1,79 @@
+---Models in module 'stock_delivery'---
+model choose.delivery.package (moved from delivery) [transient]
+# NOTHING TO DO
+
+---Fields in module 'stock_delivery'---
+stock_delivery / delivery.carrier         / invoice_policy (False)        : NEW selection_keys: ['estimated', 'real'], mode: modify
+# NOTHING TO DO
+
+stock_delivery / product.product          / country_of_origin (many2one)  : previously in module delivery
+stock_delivery / product.product          / hs_code (char)                : previously in module delivery
+stock_delivery / product.template         / country_of_origin (many2one)  : previously in module delivery
+stock_delivery / product.template         / hs_code (char)                : previously in module delivery
+stock_delivery / stock.move               / weight (float)                : previously in module delivery
+stock_delivery / stock.move.line          / carrier_id (many2one)         : previously in module delivery
+stock_delivery / stock.move.line          / destination_country_code (char): previously in module delivery
+stock_delivery / stock.move.line          / sale_price (float)            : previously in module delivery
+stock_delivery / stock.package.type       / package_carrier_type (selection): previously in module delivery
+stock_delivery / stock.package.type       / shipper_package_code (char)   : previously in module delivery
+stock_delivery / stock.picking            / carrier_id (many2one)         : previously in module delivery
+stock_delivery / stock.picking            / carrier_price (float)         : previously in module delivery
+stock_delivery / stock.picking            / carrier_tracking_ref (char)   : previously in module delivery
+stock_delivery / stock.picking            / carrier_tracking_url (char)   : previously in module delivery
+stock_delivery / stock.picking            / delivery_type (selection)     : previously in module delivery
+stock_delivery / stock.picking            / destination_country_code (char): previously in module delivery
+stock_delivery / stock.picking            / is_return_picking (boolean)   : previously in module delivery
+stock_delivery / stock.picking            / package_ids (many2many)       : previously in module delivery
+stock_delivery / stock.picking            / return_label_ids (one2many)   : previously in module delivery
+stock_delivery / stock.picking            / shipping_weight (float)       : previously in module delivery
+stock_delivery / stock.picking            / weight (float)                : previously in module delivery
+stock_delivery / stock.picking            / weight_bulk (float)           : previously in module delivery
+stock_delivery / stock.picking            / weight_uom_name (char)        : previously in module delivery
+stock_delivery / stock.quant.package      / shipping_weight (float)       : previously in module delivery
+stock_delivery / stock.quant.package      / weight (float)                : previously in module delivery
+stock_delivery / stock.quant.package      / weight_is_kg (boolean)        : previously in module delivery
+stock_delivery / stock.quant.package      / weight_uom_name (char)        : previously in module delivery
+stock_delivery / stock.quant.package      / weight_uom_rounding (float)   : previously in module delivery
+# NOTHING TO DO
+
+stock_delivery / delivery.carrier         / route_ids (many2many)         : NEW relation: stock.route
+stock_delivery / stock.route              / shipping_selectable (boolean) : NEW
+# NOTHING TO DO: new feature that works only if shipping_selectable = True (by default is false)
+
+---XML records in module 'stock_delivery'---
+NEW ir.actions.act_window: stock_delivery.act_delivery_trackers_url [renamed from delivery module]
+NEW ir.model.access: stock_delivery.access_choose_delivery_carrier_stock_user
+NEW ir.model.access: stock_delivery.access_choose_delivery_package [renamed from delivery module]
+NEW ir.model.access: stock_delivery.access_delivery_carrier_stock_manager [renamed from delivery module]
+NEW ir.model.access: stock_delivery.access_delivery_carrier_stock_user [renamed from delivery module]
+NEW ir.model.access: stock_delivery.access_delivery_price_rule_stock_manager [renamed from delivery module]
+NEW ir.model.access: stock_delivery.access_delivery_zip_prefix_stock_manager [renamed from delivery module]
+NEW ir.ui.menu: stock_delivery.menu_action_delivery_carrier_form [renamed from delivery module]
+NEW ir.ui.menu: stock_delivery.menu_delivery_zip_prefix [renamed from delivery module]
+NEW ir.ui.view: stock_delivery.choose_delivery_carrier_view_form
+NEW ir.ui.view: stock_delivery.choose_delivery_package_view_form
+NEW ir.ui.view: stock_delivery.delivery_stock_report_delivery_no_package_section_line
+NEW ir.ui.view: stock_delivery.delivery_tracking_url_warning_form
+NEW ir.ui.view: stock_delivery.label_package_template_view_delivery
+NEW ir.ui.view: stock_delivery.product_template_hs_code
+NEW ir.ui.view: stock_delivery.report_delivery_document2
+NEW ir.ui.view: stock_delivery.report_package_barcode_delivery
+NEW ir.ui.view: stock_delivery.report_package_barcode_small_delivery
+NEW ir.ui.view: stock_delivery.report_shipping2
+NEW ir.ui.view: stock_delivery.sale_order_portal_content_inherit_sale_stock_inherit_website_sale
+NEW ir.ui.view: stock_delivery.stock_location_route_view_form_inherit_stock_delivery
+NEW ir.ui.view: stock_delivery.stock_move_line_view_search_delivery
+NEW ir.ui.view: stock_delivery.stock_package_type_form_delivery
+NEW ir.ui.view: stock_delivery.stock_package_type_tree_delivery
+NEW ir.ui.view: stock_delivery.stock_report_delivery_aggregated_move_lines_inherit_delivery
+NEW ir.ui.view: stock_delivery.stock_report_delivery_has_serial_move_line_inherit_delivery
+NEW ir.ui.view: stock_delivery.stock_report_delivery_package_section_line_inherit_delivery
+NEW ir.ui.view: stock_delivery.view_delivery_carrier_form_inherit_stock_delivery
+NEW ir.ui.view: stock_delivery.view_move_line_tree_detailed_delivery
+NEW ir.ui.view: stock_delivery.view_picking_type_form_delivery
+NEW ir.ui.view: stock_delivery.view_picking_withcarrier_out_form
+NEW ir.ui.view: stock_delivery.view_picking_withweight_internal_move_form
+NEW ir.ui.view: stock_delivery.view_quant_package_weight_form
+NEW ir.ui.view: stock_delivery.view_stock_rule_form_delivery
+NEW ir.ui.view: stock_delivery.vpicktree_view_tree
+# NOTHING TO DO