[IMP] stock_secondary_unit: assign secondary_uom_id when generate or import serials/lots

Author: AungKoKoLin1997

stock_secondary_unit/README.rst

@@ -1,7 +1,3 @@
-.. image:: https://odoo-community.org/readme-banner-image
-   :target: https://odoo-community.org/get-involved?utm_source=readme
-   :alt: Odoo Community Association
-
 ====================
 Stock Secondary Unit
 ====================
@@ -17,7 +13,7 @@ Stock Secondary Unit
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
     :target: https://odoo-community.org/page/development-status
     :alt: Production/Stable
-.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github
@@ -52,6 +48,14 @@ To use this module you need to:
 5. Push button 'On hand' and set quantities in stock for this product.
 6. Go to product list and you can see the secondary unit value.
 
+Known issues / Roadmap
+======================
+
+When generating or importing serials/lots, the default secondary unit
+for move lines is taken from the first matching stock move that has a
+secondary UoM. It is assumed that the same product will not use
+different secondary units within the same picking.
+
 Bug Tracker
 ===========
 
@@ -73,15 +77,15 @@ Authors
 Contributors
 ------------
 
-- `Tecnativa <https://www.tecnativa.com>`__
+-  `Tecnativa <https://www.tecnativa.com>`__
 
-  - Carlos Dauden
-  - Sergio Teruel
-  - Carlos Roca
+   -  Carlos Dauden
+   -  Sergio Teruel
+   -  Carlos Roca
 
-- Kitti Upariphutthiphong <kittiu@ecosoft.co.th>
-- Pimolnat Suntian <pimolnats@ecosoft.co.th>
-- Alan Ramos <alan.ramos@jarsa.com.mx>
+-  Kitti Upariphutthiphong <kittiu@ecosoft.co.th>
+-  Pimolnat Suntian <pimolnats@ecosoft.co.th>
+-  Alan Ramos <alan.ramos@jarsa.com.mx>
 
 Maintainers
 -----------

stock_secondary_unit/models/stock_move.py

@@ -42,6 +42,38 @@ def _recompute_state(self):
             move.onchange_product_uom_for_secondary()
         return res
 
+    @api.model
+    def action_generate_lot_line_vals(self, context, mode, first_lot, count, lot_text):
+        vals_list = super().action_generate_lot_line_vals(
+            context, mode, first_lot, count, lot_text
+        )
+        product_id = context.get("default_product_id")
+        picking_id = context.get("default_picking_id")
+        move = self.env["stock.move"].search(
+            [
+                ("picking_id", "=", picking_id),
+                ("product_id", "=", product_id),
+                ("secondary_uom_id", "!=", False),
+            ],
+            limit=1,
+        )
+        if not move:
+            return vals_list
+        if move.secondary_uom_id.dependency_type == "independent":
+            return vals_list
+        # Assume same uom with move and move line when it is generated
+        factor = move._get_factor_line()
+        for vals in vals_list:
+            qty = self._calc_secondary_uom_qty(
+                factor, vals["quantity"], move.secondary_uom_id
+            )
+            vals["secondary_uom_qty"] = qty
+            vals["secondary_uom_id"] = {
+                "id": move.secondary_uom_id.id,
+                "display_name": move.secondary_uom_id.display_name,
+            }
+        return vals_list
+
 
 class StockMoveLine(models.Model):
     _inherit = ["stock.move.line", "product.secondary.unit.mixin"]
@@ -52,6 +84,16 @@ class StockMoveLine(models.Model):
         store=True, readonly=False, compute="_compute_quantity", precompute=True
     )
 
+    @api.model
+    def default_get(self, fields_list):
+        res = super().default_get(fields_list)
+        move_id = self.env.context.get("default_move_id") or res.get("move_id")
+        if move_id and not res.get("secondary_uom_id"):
+            move = self.env["stock.move"].browse(move_id)
+            if move.secondary_uom_id:
+                res["secondary_uom_id"] = move.secondary_uom_id.id
+        return res
+
     @api.model_create_multi
     def create(self, vals_list):
         for vals in vals_list:

stock_secondary_unit/readme/ROADMAP.md

@@ -0,0 +1,4 @@
+When generating or importing serials/lots, the default secondary unit for move
+lines is taken from the first matching stock move that has a secondary UoM.
+It is assumed that the same product will not use different secondary units
+within the same picking.

stock_secondary_unit/static/description/index.html

@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>README.rst</title>
+<title>Stock Secondary Unit</title>
 <style type="text/css">
 
 /*
@@ -360,38 +360,34 @@
 </style>
 </head>
 <body>
-<div class="document">
+<div class="document" id="stock-secondary-unit">
+<h1 class="title">Stock Secondary Unit</h1>
 
-
-<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
-<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
-</a>
-<div class="section" id="stock-secondary-unit">
-<h1>Stock Secondary Unit</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:74d27f6a71ab6acf126e480ea7dcfdc84c09d7269ff765dd075e960ecf101647
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/stock-logistics-warehouse/tree/18.0/stock_secondary_unit"><img alt="OCA/stock-logistics-warehouse" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-18-0/stock-logistics-warehouse-18-0-stock_secondary_unit"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-warehouse&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/stock-logistics-warehouse/tree/18.0/stock_secondary_unit"><img alt="OCA/stock-logistics-warehouse" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-18-0/stock-logistics-warehouse-18-0-stock_secondary_unit"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-warehouse&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module extends the functionality of stock module to allow define
 other units with their conversion factor.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
 <li><a class="reference internal" href="#usage" id="toc-entry-1">Usage</a></li>
-<li><a class="reference internal" href="#bug-tracker" id="toc-entry-2">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="toc-entry-3">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="toc-entry-4">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="toc-entry-5">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="toc-entry-6">Maintainers</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="toc-entry-2">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-6">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-7">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="section" id="usage">
-<h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
 <p>To use this module you need to:</p>
 <ol class="arabic simple">
 <li>Go to a <em>Product &gt; General Information tab</em>.</li>
@@ -402,24 +398,31 @@ <h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
 <li>Go to product list and you can see the secondary unit value.</li>
 </ol>
 </div>
+<div class="section" id="known-issues-roadmap">
+<h1><a class="toc-backref" href="#toc-entry-2">Known issues / Roadmap</a></h1>
+<p>When generating or importing serials/lots, the default secondary unit
+for move lines is taken from the first matching stock move that has a
+secondary UoM. It is assumed that the same product will not use
+different secondary units within the same picking.</p>
+</div>
 <div class="section" id="bug-tracker">
-<h2><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
 <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_secondary_unit%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h2><a class="toc-backref" href="#toc-entry-3">Credits</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1>
 <div class="section" id="authors">
-<h3><a class="toc-backref" href="#toc-entry-4">Authors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
 <ul class="simple">
 <li>Tecnativa</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h3><a class="toc-backref" href="#toc-entry-5">Contributors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 <ul class="simple">
 <li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a><ul>
 <li>Carlos Dauden</li>
@@ -433,7 +436,7 @@ <h3><a class="toc-backref" href="#toc-entry-5">Contributors</a></h3>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h3><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
@@ -446,6 +449,5 @@ <h3><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h3>
 </div>
 </div>
 </div>
-</div>
 </body>
 </html>

stock_secondary_unit/tests/test_stock_secondary_unit.py

@@ -33,6 +33,25 @@ def setUpClass(cls):
         cls.attribute_value_black = ProductAttributeValue.create(
             {"name": "test_black", "attribute_id": cls.attribute_color.id}
         )
+        cls.serial_product = cls.env["product.product"].create(
+            {
+                "name": "Serial Product",
+                "uom_id": cls.product_uom_unit.id,
+                "type": "consu",
+                "is_storable": True,
+                "tracking": "serial",
+                "secondary_uom_ids": [
+                    Command.create(
+                        {
+                            "code": "A",
+                            "name": "Double",
+                            "uom_id": cls.product_uom_unit.id,
+                            "factor": 2,
+                        },
+                    )
+                ],
+            }
+        )
         cls.product_template = cls.env["product.template"].create(
             {
                 "name": "test",
@@ -225,3 +244,79 @@ def test_secondary_unit_merge_move_same_uom(self):
         picking.action_confirm()
         self.assertEqual(len(picking.move_ids), 1)
         self.assertEqual(picking.move_ids.secondary_uom_qty, 2)
+
+    def test_action_generate_lot_line_vals(self):
+        picking = self.env["stock.picking"].create(
+            {
+                "location_id": self.location_supplier.id,
+                "location_dest_id": self.location_stock.id,
+                "picking_type_id": self.picking_type_in.id,
+            }
+        )
+        move = self.env["stock.move"].create(
+            {
+                "name": "Test Move",
+                "product_id": self.serial_product.id,
+                "product_uom_qty": 2.0,
+                "picking_id": picking.id,
+                "location_id": self.location_supplier.id,
+                "location_dest_id": self.location_stock.id,
+                "secondary_uom_id": self.serial_product.secondary_uom_ids[0].id,
+            }
+        )
+        # Import serials
+        vals = self.env["stock.move"].action_generate_lot_line_vals(
+            {
+                "default_tracking": "serial",
+                "default_product_id": move.product_id.id,
+                "default_picking_id": picking.id,
+                "default_location_dest_id": self.location_stock.id,
+            },
+            "import",
+            "",
+            0,
+            "001\n002",
+        )
+        self.assertEqual(len(vals), 2)
+        self.assertEqual(vals[0]["lot_name"], "001")
+        self.assertEqual(
+            vals[0]["secondary_uom_id"]["id"],
+            self.serial_product.secondary_uom_ids[0].id,
+        )
+        self.assertEqual(vals[0]["quantity"], 1)
+        self.assertEqual(vals[0]["secondary_uom_qty"], 0.5)
+        self.assertEqual(vals[1]["lot_name"], "002")
+        self.assertEqual(
+            vals[1]["secondary_uom_id"]["id"],
+            self.serial_product.secondary_uom_ids[0].id,
+        )
+        self.assertEqual(vals[1]["quantity"], 1)
+        self.assertEqual(vals[1]["secondary_uom_qty"], 0.5)
+        # Generate serials
+        vals = self.env["stock.move"].action_generate_lot_line_vals(
+            {
+                "default_tracking": "serial",
+                "default_product_id": move.product_id.id,
+                "default_picking_id": picking.id,
+                "default_location_dest_id": self.location_stock.id,
+            },
+            "generate",
+            "001",
+            2,
+            False,
+        )
+        self.assertEqual(len(vals), 2)
+        self.assertEqual(vals[0]["lot_name"], "001")
+        self.assertEqual(
+            vals[0]["secondary_uom_id"]["id"],
+            self.serial_product.secondary_uom_ids[0].id,
+        )
+        self.assertEqual(vals[0]["quantity"], 1)
+        self.assertEqual(vals[0]["secondary_uom_qty"], 0.5)
+        self.assertEqual(vals[1]["lot_name"], "002")
+        self.assertEqual(
+            vals[1]["secondary_uom_id"]["id"],
+            self.serial_product.secondary_uom_ids[0].id,
+        )
+        self.assertEqual(vals[1]["quantity"], 1)
+        self.assertEqual(vals[1]["secondary_uom_qty"], 0.5)