[MIG] stock_picking_batch_extended: Migration to 18.0

OCA · Jan 28, 2025 · 3d36345 · 3d36345
1 parent a3a7973
commit 3d36345
Show file tree

Hide file tree

Showing 26 changed files with 190 additions and 181 deletions.
diff --git a/stock_picking_batch_extended/__manifest__.py b/stock_picking_batch_extended/__manifest__.py
@@ -5,12 +5,12 @@
 {
     "name": "Stock batch picking extended",
     "summary": "Allows manage a lot of pickings in batch",
-    "version": "16.0.1.1.1",
+    "version": "18.0.1.0.0",
     "author": "Camptocamp, " "Tecnativa, " "Odoo Community Association (OCA)",
     "development_status": "Mature",
     "maintainers": ["gurneyalex", "carlosdauden", "i-vyshnevska"],
     "category": "Warehouse Management",
-    "depends": ["stock_picking_batch", "delivery"],
+    "depends": ["stock_picking_batch", "stock_delivery"],
     "website": "https://github.com/OCA/stock-logistics-workflow",
     "data": [
         "security/ir.model.access.csv",

diff --git a/stock_picking_batch_extended/hooks.py b/stock_picking_batch_extended/hooks.py
@@ -1,10 +1,6 @@
 # Copyright 2019 Camptocamp - Iryna Vyshnevska
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
-from odoo import SUPERUSER_ID, api
-
-
-def post_init_hook(cr, registry):
-    env = api.Environment(cr, SUPERUSER_ID, {})
 
+def post_init_hook(env):
     env["res.company"].search([]).write({"use_oca_batch_validation": True})
diff --git a/stock_picking_batch_extended/i18n/de.po b/stock_picking_batch_extended/i18n/de.po
@@ -336,7 +336,7 @@ msgid "Warehouse"
 msgstr "Warenlager"
 
 #. module: stock_picking_batch_extended
-#: model:ir.model.fields,field_description:stock_picking_batch_extended.field_product_product__description_warehouse
+#: model:ir.model.fields,field_description:stock_picking_batch_extended.field_product_product__description_picking
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_extended.product_normal_form_view
 msgid "Warehouse Description"
 msgstr "Warenlager-Beschreibung"

diff --git a/stock_picking_batch_extended/i18n/es.po b/stock_picking_batch_extended/i18n/es.po
@@ -332,7 +332,7 @@ msgid "Warehouse"
 msgstr "Almacén"
 
 #. module: stock_picking_batch_extended
-#: model:ir.model.fields,field_description:stock_picking_batch_extended.field_product_product__description_warehouse
+#: model:ir.model.fields,field_description:stock_picking_batch_extended.field_product_product__description_picking
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_extended.product_normal_form_view
 msgid "Warehouse Description"
 msgstr "Descripción del almacén"

diff --git a/stock_picking_batch_extended/i18n/es_CL.po b/stock_picking_batch_extended/i18n/es_CL.po
@@ -328,7 +328,7 @@ msgid "Warehouse"
 msgstr "Bodega"
 
 #. module: stock_picking_batch_extended
-#: model:ir.model.fields,field_description:stock_picking_batch_extended.field_product_product__description_warehouse
+#: model:ir.model.fields,field_description:stock_picking_batch_extended.field_product_product__description_picking
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_extended.product_normal_form_view
 msgid "Warehouse Description"
 msgstr "Descripción de Bodega"

diff --git a/stock_picking_batch_extended/i18n/fr.po b/stock_picking_batch_extended/i18n/fr.po
@@ -335,7 +335,7 @@ msgid "Warehouse"
 msgstr ""
 
 #. module: stock_picking_batch_extended
-#: model:ir.model.fields,field_description:stock_picking_batch_extended.field_product_product__description_warehouse
+#: model:ir.model.fields,field_description:stock_picking_batch_extended.field_product_product__description_picking
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_extended.product_normal_form_view
 msgid "Warehouse Description"
 msgstr "Warehouse Description"

diff --git a/stock_picking_batch_extended/i18n/it.po b/stock_picking_batch_extended/i18n/it.po
@@ -331,7 +331,7 @@ msgid "Warehouse"
 msgstr "Magazzino"
 
 #. module: stock_picking_batch_extended
-#: model:ir.model.fields,field_description:stock_picking_batch_extended.field_product_product__description_warehouse
+#: model:ir.model.fields,field_description:stock_picking_batch_extended.field_product_product__description_picking
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_extended.product_normal_form_view
 msgid "Warehouse Description"
 msgstr "Descrizione magazzino"

diff --git a/stock_picking_batch_extended/i18n/pt_BR.po b/stock_picking_batch_extended/i18n/pt_BR.po
@@ -332,7 +332,7 @@ msgid "Warehouse"
 msgstr "Armazém"
 
 #. module: stock_picking_batch_extended
-#: model:ir.model.fields,field_description:stock_picking_batch_extended.field_product_product__description_warehouse
+#: model:ir.model.fields,field_description:stock_picking_batch_extended.field_product_product__description_picking
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_extended.product_normal_form_view
 msgid "Warehouse Description"
 msgstr "Descrição do Armazém"

diff --git a/stock_picking_batch_extended/i18n/sl.po b/stock_picking_batch_extended/i18n/sl.po
@@ -330,7 +330,7 @@ msgid "Warehouse"
 msgstr "Skladišče"
 
 #. module: stock_picking_batch_extended
-#: model:ir.model.fields,field_description:stock_picking_batch_extended.field_product_product__description_warehouse
+#: model:ir.model.fields,field_description:stock_picking_batch_extended.field_product_product__description_picking
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_extended.product_normal_form_view
 msgid "Warehouse Description"
 msgstr "Opis skladišča"

diff --git a/stock_picking_batch_extended/i18n/stock_picking_batch_extended.pot b/stock_picking_batch_extended/i18n/stock_picking_batch_extended.pot
@@ -322,7 +322,7 @@ msgid "Warehouse"
 msgstr ""
 
 #. module: stock_picking_batch_extended
-#: model:ir.model.fields,field_description:stock_picking_batch_extended.field_product_product__description_warehouse
+#: model:ir.model.fields,field_description:stock_picking_batch_extended.field_product_product__description_picking
 #: model_terms:ir.ui.view,arch_db:stock_picking_batch_extended.product_normal_form_view
 msgid "Warehouse Description"
 msgstr ""

diff --git a/stock_picking_batch_extended/migrations/18.0.1.0.0/pre-migrate.py b/stock_picking_batch_extended/migrations/18.0.1.0.0/pre-migrate.py
@@ -0,0 +1,16 @@
+#  Copyright 2025 Camptocamp SA
+#  License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+
+def migrate(cr, version):
+    cr.execute("""
+        UPDATE product_template
+            SET description_picking =
+                CASE
+                    WHEN description_picking IS NOT NULL THEN
+                        description_picking || '\n' || description_warehouse
+                    ELSE
+                        description_warehouse
+                END
+            WHERE description_warehouse IS NOT NULL;
+    """)
diff --git a/stock_picking_batch_extended/models/__init__.py b/stock_picking_batch_extended/models/__init__.py
@@ -1,5 +1,6 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
+from . import res_company
 from . import res_config_settings
 from . import stock_batch_picking
 from . import product_product

diff --git a/stock_picking_batch_extended/models/product_product.py b/stock_picking_batch_extended/models/product_product.py
@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class Product(models.Model):
-    _inherit = "product.product"
-    # TODO: Integrate in existent field
-    description_warehouse = fields.Text("Warehouse Description", translate=True)
+class ProductTemplate(models.Model):
+    _inherit = "product.template"
+
+    description_picking = fields.Text(string="Warehouse Description", translate=True)
diff --git a/stock_picking_batch_extended/models/res_company.py b/stock_picking_batch_extended/models/res_company.py
@@ -0,0 +1,10 @@
+# Copyright 2019 Camptocamp - Iryna Vyshnevska
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class Company(models.Model):
+    _inherit = "res.company"
+
+    use_oca_batch_validation = fields.Boolean()
diff --git a/stock_picking_batch_extended/models/res_config_settings.py b/stock_picking_batch_extended/models/res_config_settings.py
@@ -12,9 +12,3 @@ class ResConfigSettings(models.TransientModel):
         related="company_id.use_oca_batch_validation",
         readonly=False,
     )
-
-
-class Company(models.Model):
-    _inherit = "res.company"
-
-    use_oca_batch_validation = fields.Boolean()
diff --git a/stock_picking_batch_extended/models/stock_batch_picking.py b/stock_picking_batch_extended/models/stock_batch_picking.py
@@ -1,7 +1,7 @@
 # Copyright 2012-2014 Alexandre Fayolle, Camptocamp SA
 # Copyright 2018-2020 Tecnativa - Carlos Dauden
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-from odoo import _, fields, models
+from odoo import fields, models
 from odoo.exceptions import UserError
 
 
@@ -12,13 +12,12 @@ class StockPickingBatch(models.Model):
 
     name = fields.Char(
         index=True,
-        states={"draft": [("readonly", False)]},
+        readonly=False,  # allow edition in draft state
     )
     date = fields.Date(
         required=True,
-        readonly=True,
+        readonly=False,  # allow edition in draft,in_progress state
         index=True,
-        states={"draft": [("readonly", False)], "in_progress": [("readonly", False)]},
         default=fields.Date.context_today,
         help="date on which the batch picking is to be processed",
     )
@@ -66,7 +65,7 @@ def action_cancel(self):
     def action_print_picking(self):
         pickings = self.mapped("picking_ids")
         if not pickings:
-            raise UserError(_("Nothing to print."))
+            raise UserError(self.env._("Nothing to print."))
         return self.env.ref("stock.action_report_delivery").report_action(
             self.picking_ids
         )

diff --git a/stock_picking_batch_extended/report/batch_report.py b/stock_picking_batch_extended/report/batch_report.py
@@ -22,7 +22,9 @@ def key_level_1(self, operation):
 
     @api.model
     def new_level_0(self, operation):
-        level_0_name = f"{operation.location_id.name_get()[0][1]} \u21e8 {operation.location_dest_id.name_get()[0][1]}"
+        location_name = operation.location_id.name_get()[0][1]
+        location_dest_name = operation.location_dest_id.name_get()[0][1]
+        level_0_name = f"{location_name} \u21e8 {location_dest_name}"
         return {
             "name": level_0_name,
             "location": operation.location_id,