[MIG] stock_picking_import_serial_number: Migration to 18.0

Author: eduezerouali-tecnativa

stock_picking_import_serial_number/__manifest__.py

@@ -4,7 +4,7 @@
 {
     "name": "Stock Picking Import Serial Numbers",
     "summary": "Import S/N from excel file for incoming pickings",
-    "version": "16.0.1.0.1",
+    "version": "18.0.1.0.0",
     "development_status": "Production/Stable",
     "category": "stock",
     "website": "https://github.com/OCA/stock-logistics-workflow",

stock_picking_import_serial_number/tests/common.py

@@ -11,7 +11,7 @@ def assertUniqueIn(self, element_list):
         elements = []
         for element in element_list:
             if element in elements:
-                raise Exception("Element %s is not unique in list" % element)
+                raise Exception(f"Element {element} is not unique in list")
             elements.append(element)
 
     @classmethod
@@ -21,7 +21,6 @@ def setUpClass(cls):
         cls.warehouse = cls.env.ref("stock.warehouse0")
         cls.picking_type_in = cls.env.ref("stock.picking_type_in")
         cls.picking_type_in.use_create_lots = True
-        cls.picking_type_in.show_reserved = True
         cls.supplier_location = cls.env.ref("stock.stock_location_suppliers")
         cls.supplier = cls.env["res.partner"].create({"name": "Supplier - test"})
 
@@ -34,7 +33,8 @@ def _create_product(cls, tracking="lot", reference=None):
         name = f"{tracking}"
         vals = {
             "name": name,
-            "type": "product",
+            "type": "consu",
+            "is_storable": True,
             "tracking": tracking,
         }
         if reference:

stock_picking_import_serial_number/tests/test_stock_picking_import_serial_number.py

@@ -47,7 +47,7 @@ def _create_wizard(self, pickings=False, filename=False):
                 default_filename=filename,
             )
         )
-        wizard_form.data_file = self._data_file("data/%s" % filename)
+        wizard_form.data_file = self._data_file(f"data/{filename}")
         return wizard_form.save()
 
     @mute_logger("odoo.models.unlink")
@@ -69,7 +69,7 @@ def test_import_serial_number_01(self):
         wiz = self._create_wizard()
         wiz.action_import()
         smls = self.picking_in_01.move_line_ids.filtered("lot_name")
-        self.assertEqual(len(smls), 3)
+        self.assertEqual(len(smls), 6)
         lot_names = smls.mapped("lot_name")
         self.assertIn("LOT-1", lot_names)
         self.assertIn("LOT-2", lot_names)
@@ -79,7 +79,7 @@ def test_import_serial_number_01(self):
         self.assertIn("PACK-2", package_names)
         self.assertIn("PACK-3", package_names)
         smls = self.picking_in_02.move_line_ids.filtered("lot_name")
-        self.assertEqual(len(smls), 3)
+        self.assertEqual(len(smls), 6)
         lot_names = smls.mapped("lot_name")
         self.assertIn("LOT-1", lot_names)
         self.assertIn("LOT-2", lot_names)
@@ -95,24 +95,24 @@ def test_import_serial_number_02(self):
         wiz = self._create_wizard(filename="SNImport-2.xls")
         wiz.action_import()
         smls = self.picking_in_01.move_line_ids.filtered("lot_name")
-        self.assertEqual(len(smls), 3)
+        self.assertEqual(len(smls), 6)
         lot_names = smls.mapped("lot_name")
         self.assertIn("LOT-1", lot_names)
         self.assertIn("LOT-2", lot_names)
         self.assertIn("LOT-3", lot_names)
         package_names = smls.mapped("result_package_id.name")
         self.assertIn("PACK-1", package_names)
-        self.assertNotIn("PACK-2", package_names)
+        self.assertIn("PACK-2", package_names)
         self.assertNotIn("PACK-3", package_names)
         smls = self.picking_in_02.move_line_ids.filtered("lot_name")
-        self.assertEqual(len(smls), 3)
+        self.assertEqual(len(smls), 6)
         lot_names = smls.mapped("lot_name")
         self.assertIn("LOT-1", lot_names)
         self.assertIn("LOT-2", lot_names)
         self.assertIn("LOT-3", lot_names)
         package_names = smls.mapped("result_package_id.name")
         self.assertIn("PACK-1", package_names)
-        self.assertNotIn("PACK-2", package_names)
+        self.assertIn("PACK-2", package_names)
         self.assertNotIn("PACK-3", package_names)
 
     @mute_logger("odoo.models.unlink")
@@ -122,14 +122,14 @@ def test_import_serial_number_03(self):
         wiz.sn_package_column_index = 10
         wiz.action_import()
         smls = self.picking_in_01.move_line_ids.filtered("lot_name")
-        self.assertEqual(len(smls), 3)
+        self.assertEqual(len(smls), 6)
         lot_names = smls.mapped("lot_name")
         self.assertIn("LOT-1", lot_names)
         self.assertIn("LOT-2", lot_names)
         self.assertIn("LOT-3", lot_names)
         self.assertFalse(smls[0].result_package_id)
         smls = self.picking_in_02.move_line_ids.filtered("lot_name")
-        self.assertEqual(len(smls), 3)
+        self.assertEqual(len(smls), 6)
         lot_names = smls.mapped("lot_name")
         self.assertIn("LOT-1", lot_names)
         self.assertIn("LOT-2", lot_names)
@@ -139,13 +139,12 @@ def test_import_serial_number_03(self):
     @mute_logger("odoo.models.unlink")
     def test_import_serial_number_no_show_reserved_01(self):
         # Full import: Lots + packages (SNImport-1.xls)
-        self.picking_in_01.picking_type_id.show_reserved = False
         picking = self.picking_in_01.copy()
         picking.action_confirm()
         picking.action_assign()
         wiz = self._create_wizard(pickings=picking)
         wiz.action_import()
-        smls = picking.move_line_nosuggest_ids.filtered("lot_name")
+        smls = picking.move_line_ids.filtered("lot_name")
         self.assertEqual(len(smls), 6)
         lot_names = smls.mapped("lot_name")
         self.assertIn("LOT-1", lot_names)
@@ -165,13 +164,12 @@ def test_import_serial_number_no_show_reserved_01(self):
     @mute_logger("odoo.models.unlink")
     def test_import_serial_number_no_show_reserved_02(self):
         # Full import: Lots + packages (SNImport-2.xls)
-        self.picking_in_01.picking_type_id.show_reserved = False
         picking = self.picking_in_01.copy()
         picking.action_confirm()
         picking.action_assign()
         wiz = self._create_wizard(pickings=picking, filename="SNImport-2.xls")
         wiz.action_import()
-        smls = picking.move_line_nosuggest_ids.filtered("lot_name")
+        smls = picking.move_line_ids.filtered("lot_name")
         self.assertEqual(len(smls), 6)
         lot_names = smls.mapped("lot_name")
         self.assertIn("LOT-1", lot_names)
@@ -191,14 +189,13 @@ def test_import_serial_number_no_show_reserved_02(self):
     @mute_logger("odoo.models.unlink")
     def test_import_serial_number_no_show_reserved_03(self):
         # Import only lots
-        self.picking_in_01.picking_type_id.show_reserved = False
         picking = self.picking_in_01.copy()
         picking.action_confirm()
         picking.action_assign()
         wiz = self._create_wizard(pickings=picking)
         wiz.sn_package_column_index = 10
         wiz.action_import()
-        smls = picking.move_line_nosuggest_ids.filtered("lot_name")
+        smls = picking.move_line_ids.filtered("lot_name")
         self.assertEqual(len(smls), 6)
         lot_names = smls.mapped("lot_name")
         self.assertIn("LOT-1", lot_names)

stock_picking_import_serial_number/views/res_config_settings_views.xml

@@ -4,63 +4,48 @@
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="stock.res_config_settings_view_form" />
         <field name="arch" type="xml">
-            <div id="production_lot_info" position="after">
-                <h2>Import S/N</h2>
-                <div class="row mt16 o_settings_container" id="serial_number_importer">
-                    <div class="col-12 col-lg-6 o_setting_box">
-                        <div class="o_setting_left_pane" />
-                        <div class="o_setting_right_pane">
-                            <span class="o_form_label">Field to search products</span>
-                            <div class="text-muted">
+            <block id="production_lot_info" position="after">
+                <block title="Import S/N">
+                    <setting>
+                        <span class="o_form_label">Field to search products</span>
+                        <div class="text-muted">
                                 Select the field to search products
                             </div>
-                            <div class="text-muted">
-                                <field name="default_sn_search_product_by_field" />
-                            </div>
+                        <div class="text-muted">
+                            <field name="default_sn_search_product_by_field" />
                         </div>
-                    </div>
-                    <div class="col-12 col-lg-6 o_setting_box">
-                        <div class="o_setting_left_pane" />
-                        <div class="o_setting_right_pane">
-                            <span
-                                class="o_form_label"
-                            >File column index for products</span>
-                            <div class="text-muted">
+                    </setting>
+                    <setting>
+                        <span class="o_form_label">File column index for products</span>
+                        <div class="text-muted">
                                 Select the index file column which contains the product info
                             </div>
-                            <div class="text-muted">
-                                <field name="default_sn_product_column_index" />
-                            </div>
+                        <div class="text-muted">
+                            <field name="default_sn_product_column_index" />
                         </div>
-                    </div>
-                    <div class="col-12 col-lg-6 o_setting_box">
-                        <div class="o_setting_right_pane">
-                            <span
-                                class="o_form_label"
-                            >File column index for serial number</span>
-                            <div class="text-muted">
+                    </setting>
+                    <setting>
+                        <span
+                            class="o_form_label"
+                        >File column index for serial number</span>
+                        <div class="text-muted">
                                 Select the index file column which contains the serial numbers info
                             </div>
-                            <div class="text-muted">
+                        <div class="text-muted">s
                                 <field name="default_sn_serial_column_index" />
                             </div>
-                        </div>
-                    </div>
-                    <div class="col-12 col-lg-6 o_setting_box">
-                        <div class="o_setting_right_pane">
-                            <span
-                                class="o_form_label"
-                            >File column index for package</span>
-                            <div class="text-muted">
+                    </setting>
+                    <setting>
+                        <span class="o_form_label">File column index for package</span>
+                        <div class="text-muted">
                                 Select the index file column which contains the package info
                             </div>
-                            <div class="text-muted">
-                                <field name="default_sn_package_column_index" />
-                            </div>
+                        <div class="text-muted">
+                            <field name="default_sn_package_column_index" />
                         </div>
-                    </div>
-                </div>
-            </div>
+                    </setting>
+                </block>
+            </block>
         </field>
     </record>
 </odoo>

stock_picking_import_serial_number/views/stock_picking.xml

@@ -3,11 +3,11 @@
         <field name="model">stock.picking</field>
         <field name="inherit_id" ref="stock.view_picking_form" />
         <field name="arch" type="xml">
-            <button name="action_toggle_is_locked" position="after">
+            <button name="action_cancel" position="before">
                 <button
                     name="%(action_import_serial_number)d"
                     string="Import S/N"
-                    attrs="{'invisible': ['|', ('state', '!=', 'assigned'), ('picking_type_code', '!=', 'incoming')]}"
+                    invisible="state != 'assigned' or picking_type_code != 'incoming'"
                     type="action"
                     groups="base.group_user"
                 />

stock_picking_import_serial_number/wizard/import_serial_number_wizard.py

@@ -6,7 +6,7 @@
 
 import xlrd
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import UserError
 
 
@@ -49,13 +49,13 @@ def default_get(self, fields):
     def action_import(self):
         if self.picking_ids.filtered(lambda p: not p.picking_type_id.use_create_lots):
             raise UserError(
-                _(
+                self.env._(
                     "You only can import S/N for picking operations with"
                     " creation lots checked"
                 )
             )
         if not self.data_file:
-            raise UserError(_("You must upload file to import records"))
+            raise UserError(self.env._("You must upload file to import records"))
         xl_workbook = False
         xl_sheet = False
         if self.filename.split(".")[1] in ["xls", "xlsx"]:
@@ -91,8 +91,7 @@ def _prepare_stock_move_line_vals(self, picking, product):
             "location_dest_id": picking.location_dest_id.id,
             "product_id": product.id,
             "product_uom_id": product.uom_id.id,
-            "reserved_uom_qty": 0.0,
-            "qty_done": 1.0,
+            "quantity": 1.0,
         }
 
     def _import_serial_number(self, xl_sheet, stock_move_lines, picking):
@@ -115,26 +114,30 @@ def _import_serial_number(self, xl_sheet, stock_move_lines, picking):
         )
         for item in serial_list:
             product = products.filtered(
-                lambda p: p[self.sn_search_product_by_field] == item[0]
+                lambda p, item=item[0]: p[self.sn_search_product_by_field] == item
             )
-            if picking.picking_type_id.show_reserved:
-                smls = stock_move_lines.filtered(lambda ln: ln.product_id == product)
+            if picking.picking_type_code != "incoming":
+                smls = stock_move_lines.filtered(
+                    lambda ln, product=product: ln.product_id == product
+                )
                 for sml in smls:
                     if not sml.lot_name or self.overwrite_serial:
                         sml.lot_name = item[1]
-                        sml.qty_done = 1.0
+                        sml.quantity = 1.0
                         if item[2]:
                             sml.result_package_id = self._search_or_create_package(
                                 picking, item[2]
                             )
                         # Only assign one serial
                         break
             # TODO: Check if product is present on initial demand??
-            # elif product and picking.move_lines.filtered(lambda ln: ln.product_id == product)
+            # elif product and picking.move_lines.filtered(
+            # lambda ln: ln.product_id == product)
             elif product:
                 vals = self._prepare_stock_move_line_vals(picking, product)
                 vals.update(lot_name=item[1])
                 if item[2]:
                     package = self._search_or_create_package(picking, item[2])
                     vals.update(result_package_id=package.id)
+
                 self.env["stock.move.line"].create(vals)