From e82106392015b0bb46091f7283d9cf55aca08a05 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 26 May 2020 10:40:07 +0200
Subject: [PATCH 01/38] Add stock_packaging_calculator

---
 stock_packaging_calculator/__init__.py        |  1 +
 stock_packaging_calculator/__manifest__.py    | 15 +++++
 stock_packaging_calculator/models/__init__.py |  1 +
 stock_packaging_calculator/models/product.py  | 51 ++++++++++++++
 .../readme/CONTRIBUTORS.rst                   |  1 +
 .../readme/DESCRIPTION.rst                    | 18 +++++
 stock_packaging_calculator/readme/ROADMAP.rst |  4 ++
 stock_packaging_calculator/tests/__init__.py  |  1 +
 .../tests/test_packaging_calc.py              | 66 +++++++++++++++++++
 9 files changed, 158 insertions(+)
 create mode 100644 stock_packaging_calculator/__init__.py
 create mode 100644 stock_packaging_calculator/__manifest__.py
 create mode 100644 stock_packaging_calculator/models/__init__.py
 create mode 100644 stock_packaging_calculator/models/product.py
 create mode 100644 stock_packaging_calculator/readme/CONTRIBUTORS.rst
 create mode 100644 stock_packaging_calculator/readme/DESCRIPTION.rst
 create mode 100644 stock_packaging_calculator/readme/ROADMAP.rst
 create mode 100644 stock_packaging_calculator/tests/__init__.py
 create mode 100644 stock_packaging_calculator/tests/test_packaging_calc.py

diff --git a/stock_packaging_calculator/__init__.py b/stock_packaging_calculator/__init__.py
new file mode 100644
index 000000000..0650744f6
--- /dev/null
+++ b/stock_packaging_calculator/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/stock_packaging_calculator/__manifest__.py b/stock_packaging_calculator/__manifest__.py
new file mode 100644
index 000000000..4399bba90
--- /dev/null
+++ b/stock_packaging_calculator/__manifest__.py
@@ -0,0 +1,15 @@
+# Copyright 2020 Camptocamp SA
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
+{
+    "name": "Stock packaging calculator",
+    "summary": "Compute product quantity to pick by packaging",
+    "version": "13.0.1.0.0",
+    "development_status": "Alpha",
+    "category": "Warehouse Management",
+    "website": "https://github.com/OCA/stock-logistics-warehouse",
+    "author": "Camptocamp, Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "application": False,
+    "installable": True,
+    "depends": ["product"],
+}
diff --git a/stock_packaging_calculator/models/__init__.py b/stock_packaging_calculator/models/__init__.py
new file mode 100644
index 000000000..9649db77a
--- /dev/null
+++ b/stock_packaging_calculator/models/__init__.py
@@ -0,0 +1 @@
+from . import product
diff --git a/stock_packaging_calculator/models/product.py b/stock_packaging_calculator/models/product.py
new file mode 100644
index 000000000..5dd73bac3
--- /dev/null
+++ b/stock_packaging_calculator/models/product.py
@@ -0,0 +1,51 @@
+# Copyright 2020 Camptocamp SA
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
+
+from odoo import models
+from odoo.tools import float_compare
+
+
+class Product(models.Model):
+    _inherit = "product.product"
+
+    def product_qty_by_packaging(self, prod_qty, min_unit=None):
+        """Calculate quantity by packaging.
+
+        Limitation: fractional quantities are lost.
+
+        :prod_qty: total qty to satisfy.
+        :min_unit: minimal unit of measure as a tuple (qty, name).
+                   Default: to UoM unit.
+        :returns: list of tuple in the form [(qty_per_package, package_name)]
+
+        """
+        packagings = [(x.qty, x.name) for x in self.packaging_ids]
+        if min_unit is None:
+            # You can pass `False` to skip it.
+            single_unit = self.uom_id
+            min_unit = (single_unit.factor, single_unit.name)
+        if min_unit:
+            packagings.append(min_unit)
+        return self._product_qty_by_packaging(
+            sorted(packagings, reverse=True), prod_qty
+        )
+
+    def _product_qty_by_packaging(self, pkg_by_qty, qty):
+        """Produce a list of tuple of packaging qty and packaging name."""
+        # TODO: refactor to handle fractional quantities (eg: 0.5 Kg)
+        res = []
+        for pkg_qty, pkg in pkg_by_qty:
+            qty_per_pkg, qty = self._qty_by_pkg(pkg_qty, qty)
+            if qty_per_pkg:
+                res.append((qty_per_pkg, pkg))
+            if not qty:
+                break
+        return res
+
+    def _qty_by_pkg(self, pkg_qty, qty):
+        """Calculate qty needed for given package qty."""
+        qty_per_pkg = 0
+        while float_compare(qty - pkg_qty, 0.0, precision_digits=3) >= 0.0:
+            qty -= pkg_qty
+            qty_per_pkg += 1
+        return qty_per_pkg, qty
diff --git a/stock_packaging_calculator/readme/CONTRIBUTORS.rst b/stock_packaging_calculator/readme/CONTRIBUTORS.rst
new file mode 100644
index 000000000..f583948be
--- /dev/null
+++ b/stock_packaging_calculator/readme/CONTRIBUTORS.rst
@@ -0,0 +1 @@
+* Simone Orsi <simahawk@gmail.com>
diff --git a/stock_packaging_calculator/readme/DESCRIPTION.rst b/stock_packaging_calculator/readme/DESCRIPTION.rst
new file mode 100644
index 000000000..b470f8a94
--- /dev/null
+++ b/stock_packaging_calculator/readme/DESCRIPTION.rst
@@ -0,0 +1,18 @@
+
+Basic module providing an helper method to calculate the quantity of product by packaging.
+
+Imagine you have the following packagings:
+
+* Pallet: 1000 Units
+* Big box: 500 Units
+* Box: 50 Units
+
+and you have to pick from your warehouse 2860 Units.
+
+Then you can do:
+
+    >>> product.product_qty_by_packaging(2860)
+
+    [(2, "Pallet"), (1, "Big Box"), (7, "Box"), (10, "Units")]
+
+With this you can show a proper message to warehouse operators to quickly pick the quantity they need.
diff --git a/stock_packaging_calculator/readme/ROADMAP.rst b/stock_packaging_calculator/readme/ROADMAP.rst
new file mode 100644
index 000000000..e4881d5e6
--- /dev/null
+++ b/stock_packaging_calculator/readme/ROADMAP.rst
@@ -0,0 +1,4 @@
+TODO
+
+1. Fractional quantities (eg: 0.5 Kg) are lost when counting units
+2. Maybe rely on `packaging_uom`
diff --git a/stock_packaging_calculator/tests/__init__.py b/stock_packaging_calculator/tests/__init__.py
new file mode 100644
index 000000000..04c47e711
--- /dev/null
+++ b/stock_packaging_calculator/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_packaging_calc
diff --git a/stock_packaging_calculator/tests/test_packaging_calc.py b/stock_packaging_calculator/tests/test_packaging_calc.py
new file mode 100644
index 000000000..c5836b941
--- /dev/null
+++ b/stock_packaging_calculator/tests/test_packaging_calc.py
@@ -0,0 +1,66 @@
+# Copyright 2020 Camptocamp SA
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
+from odoo.tests import SavepointCase
+
+
+class TestCalc(SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True))
+        cls.uom_unit = cls.env.ref("uom.product_uom_unit")
+        cls.uom_kg = cls.env.ref("uom.product_uom_kgm")
+        cls.product_a = cls.env["product.product"].create(
+            {
+                "name": "Product A",
+                "type": "product",
+                "uom_id": cls.uom_unit.id,
+                "uom_po_id": cls.uom_unit.id,
+            }
+        )
+        cls.pkg_box = cls.env["product.packaging"].create(
+            {"name": "Box", "product_id": cls.product_a.id, "qty": 50}
+        )
+        cls.pkg_big_box = cls.env["product.packaging"].create(
+            {"name": "Big Box", "product_id": cls.product_a.id, "qty": 200}
+        )
+        cls.pkg_pallet = cls.env["product.packaging"].create(
+            {"name": "Pallet", "product_id": cls.product_a.id, "qty": 2000}
+        )
+
+    def test_calc_1(self):
+        """Test easy behavior 1."""
+        self.assertEqual(
+            self.product_a.product_qty_by_packaging(2655),
+            [(1, "Pallet"), (3, "Big Box"), (1, "Box"), (5, self.uom_unit.name)],
+        )
+
+    def test_calc_2(self):
+        """Test easy behavior 2."""
+        self.assertEqual(
+            self.product_a.product_qty_by_packaging(350), [(1, "Big Box"), (3, "Box")]
+        )
+
+    def test_calc_3(self):
+        """Test easy behavior 3."""
+        self.assertEqual(
+            self.product_a.product_qty_by_packaging(80),
+            [(1, "Box"), (30, self.uom_unit.name)],
+        )
+
+    def test_calc_4(self):
+        """Test minimal unit override."""
+        self.assertEqual(
+            self.product_a.product_qty_by_packaging(80, min_unit=(5, "Pack 5")),
+            [(1, "Box"), (6, "Pack 5")],
+        )
+
+    def test_calc_5(self):
+        """Test no minimal unit."""
+        self.assertEqual(
+            self.product_a.product_qty_by_packaging(80, min_unit=False), [(1, "Box")]
+        )
+
+    def test_calc_6(self):
+        """Test fractional qty is lost."""
+        self.assertEqual(self.product_a.product_qty_by_packaging(50.5), [(1, "Box")])

From 57761fcd37519a697b74583cf4f7266967b256df Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Mon, 8 Jun 2020 09:56:12 +0200
Subject: [PATCH 02/38] stock_packaging_calculator: make product uom the
 minimal unit

Customizing the minimal unit was not needed at all.
This way we always assume the precision is the on of the UoM.
---
 stock_packaging_calculator/models/product.py  | 20 +++++++++----------
 .../tests/test_packaging_calc.py              | 13 ------------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/stock_packaging_calculator/models/product.py b/stock_packaging_calculator/models/product.py
index 5dd73bac3..68907d2a4 100644
--- a/stock_packaging_calculator/models/product.py
+++ b/stock_packaging_calculator/models/product.py
@@ -8,24 +8,19 @@ from odoo.tools import float_compare
 class Product(models.Model):
     _inherit = "product.product"
 
-    def product_qty_by_packaging(self, prod_qty, min_unit=None):
+    def product_qty_by_packaging(self, prod_qty):
         """Calculate quantity by packaging.
 
+        The minimal quantity is always represented by the UoM of the product.
+
         Limitation: fractional quantities are lost.
 
         :prod_qty: total qty to satisfy.
-        :min_unit: minimal unit of measure as a tuple (qty, name).
-                   Default: to UoM unit.
         :returns: list of tuple in the form [(qty_per_package, package_name)]
-
         """
         packagings = [(x.qty, x.name) for x in self.packaging_ids]
-        if min_unit is None:
-            # You can pass `False` to skip it.
-            single_unit = self.uom_id
-            min_unit = (single_unit.factor, single_unit.name)
-        if min_unit:
-            packagings.append(min_unit)
+        # Add minimal unit
+        packagings.append((self.uom_id.factor, self.uom_id.name))
         return self._product_qty_by_packaging(
             sorted(packagings, reverse=True), prod_qty
         )
@@ -45,7 +40,10 @@ class Product(models.Model):
     def _qty_by_pkg(self, pkg_qty, qty):
         """Calculate qty needed for given package qty."""
         qty_per_pkg = 0
-        while float_compare(qty - pkg_qty, 0.0, precision_digits=3) >= 0.0:
+        while (
+            float_compare(qty - pkg_qty, 0.0, precision_digits=self.uom_id.rounding)
+            >= 0.0
+        ):
             qty -= pkg_qty
             qty_per_pkg += 1
         return qty_per_pkg, qty
diff --git a/stock_packaging_calculator/tests/test_packaging_calc.py b/stock_packaging_calculator/tests/test_packaging_calc.py
index c5836b941..af1c11541 100644
--- a/stock_packaging_calculator/tests/test_packaging_calc.py
+++ b/stock_packaging_calculator/tests/test_packaging_calc.py
@@ -48,19 +48,6 @@ class TestCalc(SavepointCase):
             [(1, "Box"), (30, self.uom_unit.name)],
         )
 
-    def test_calc_4(self):
-        """Test minimal unit override."""
-        self.assertEqual(
-            self.product_a.product_qty_by_packaging(80, min_unit=(5, "Pack 5")),
-            [(1, "Box"), (6, "Pack 5")],
-        )
-
-    def test_calc_5(self):
-        """Test no minimal unit."""
-        self.assertEqual(
-            self.product_a.product_qty_by_packaging(80, min_unit=False), [(1, "Box")]
-        )
-
     def test_calc_6(self):
         """Test fractional qty is lost."""
         self.assertEqual(self.product_a.product_qty_by_packaging(50.5), [(1, "Box")])

From 86ba203ea37ad72d23a8c42e2a96c8543fcb73f8 Mon Sep 17 00:00:00 2001
From: oca-travis <oca+oca-travis@odoo-community.org>
Date: Mon, 8 Jun 2020 08:00:41 +0000
Subject: [PATCH 03/38] [UPD] Update stock_packaging_calculator.pot

---
 .../i18n/stock_packaging_calculator.pot       | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 stock_packaging_calculator/i18n/stock_packaging_calculator.pot

diff --git a/stock_packaging_calculator/i18n/stock_packaging_calculator.pot b/stock_packaging_calculator/i18n/stock_packaging_calculator.pot
new file mode 100644
index 000000000..775124a33
--- /dev/null
+++ b/stock_packaging_calculator/i18n/stock_packaging_calculator.pot
@@ -0,0 +1,19 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* stock_packaging_calculator
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 13.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: stock_packaging_calculator
+#: model:ir.model,name:stock_packaging_calculator.model_product_product
+msgid "Product"
+msgstr ""

From 7f3e3239e9e6143d0c7fa727c1e7e3b6e192f80b Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Mon, 8 Jun 2020 10:18:02 +0200
Subject: [PATCH 04/38] stock_packaging_calculator: return dict instead of
 tuple

Allows to ship more information with each element in the list.
---
 stock_packaging_calculator/README.rst         | 103 ++++
 stock_packaging_calculator/models/product.py  |  27 +-
 .../static/description/icon.png               | Bin 0 -> 9455 bytes
 .../static/description/index.html             | 449 ++++++++++++++++++
 .../tests/test_packaging_calc.py              |  33 +-
 5 files changed, 592 insertions(+), 20 deletions(-)
 create mode 100644 stock_packaging_calculator/README.rst
 create mode 100644 stock_packaging_calculator/static/description/icon.png
 create mode 100644 stock_packaging_calculator/static/description/index.html

diff --git a/stock_packaging_calculator/README.rst b/stock_packaging_calculator/README.rst
new file mode 100644
index 000000000..54e81badc
--- /dev/null
+++ b/stock_packaging_calculator/README.rst
@@ -0,0 +1,103 @@
+==========================
+Stock packaging calculator
+==========================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Alpha
+.. |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
+    :target: https://github.com/OCA/stock-logistics-warehouse/tree/13.0/stock_packaging_calculator
+    :alt: OCA/stock-logistics-warehouse
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-13-0/stock-logistics-warehouse-13-0-stock_packaging_calculator
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
+    :target: https://runbot.odoo-community.org/runbot/153/13.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+
+Basic module providing an helper method to calculate the quantity of product by packaging.
+
+Imagine you have the following packagings:
+
+* Pallet: 1000 Units
+* Big box: 500 Units
+* Box: 50 Units
+
+and you have to pick from your warehouse 2860 Units.
+
+Then you can do:
+
+    >>> product.product_qty_by_packaging(2860)
+
+    [(2, "Pallet"), (1, "Big Box"), (7, "Box"), (10, "Units")]
+
+With this you can show a proper message to warehouse operators to quickly pick the quantity they need.
+
+.. IMPORTANT::
+   This is an alpha version, the data model and design can change at any time without warning.
+   Only for development or testing purpose, do not use in production.
+   `More details on development status <https://odoo-community.org/page/development-status>`_
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Known issues / Roadmap
+======================
+
+TODO
+
+1. Fractional quantities (eg: 0.5 Kg) are lost when counting units
+2. Maybe rely on `packaging_uom`
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/stock-logistics-warehouse/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_packaging_calculator%0Aversion:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Camptocamp
+
+Contributors
+~~~~~~~~~~~~
+
+* Simone Orsi <simahawk@gmail.com>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+This module is part of the `OCA/stock-logistics-warehouse <https://github.com/OCA/stock-logistics-warehouse/tree/13.0/stock_packaging_calculator>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/stock_packaging_calculator/models/product.py b/stock_packaging_calculator/models/product.py
index 68907d2a4..d5dca58e1 100644
--- a/stock_packaging_calculator/models/product.py
+++ b/stock_packaging_calculator/models/product.py
@@ -1,9 +1,14 @@
 # Copyright 2020 Camptocamp SA
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
 
+from collections import namedtuple
+
 from odoo import models
 from odoo.tools import float_compare
 
+# Unify records as we mix up w/ UoM
+Packaging = namedtuple("Packaging", "id name qty")
+
 
 class Product(models.Model):
     _inherit = "product.product"
@@ -16,23 +21,29 @@ class Product(models.Model):
         Limitation: fractional quantities are lost.
 
         :prod_qty: total qty to satisfy.
-        :returns: list of tuple in the form [(qty_per_package, package_name)]
+        :with_subpackaging: include calculation of contained packagings.
+            eg: 1 pallet contains 4 big boxes and 6 little boxes.
+        :returns: list of dict in the form
+            [{id: 1, qty: qty_per_package, name: package_name}]
         """
-        packagings = [(x.qty, x.name) for x in self.packaging_ids]
+        packagings = [Packaging(x.id, x.name, x.qty) for x in self.packaging_ids]
         # Add minimal unit
-        packagings.append((self.uom_id.factor, self.uom_id.name))
+        packagings.append(
+            Packaging(self.uom_id.id, self.uom_id.name, self.uom_id.factor)
+        )
         return self._product_qty_by_packaging(
-            sorted(packagings, reverse=True), prod_qty
+            sorted(packagings, reverse=True, key=lambda x: x.qty), prod_qty,
         )
 
     def _product_qty_by_packaging(self, pkg_by_qty, qty):
-        """Produce a list of tuple of packaging qty and packaging name."""
+        """Produce a list of dictionaries of packaging info."""
         # TODO: refactor to handle fractional quantities (eg: 0.5 Kg)
         res = []
-        for pkg_qty, pkg in pkg_by_qty:
-            qty_per_pkg, qty = self._qty_by_pkg(pkg_qty, qty)
+        for pkg in pkg_by_qty:
+            qty_per_pkg, qty = self._qty_by_pkg(pkg.qty, qty)
             if qty_per_pkg:
-                res.append((qty_per_pkg, pkg))
+                value = {"id": pkg.id, "qty": qty_per_pkg, "name": pkg.name}
+                res.append(value)
             if not qty:
                 break
         return res
diff --git a/stock_packaging_calculator/static/description/icon.png b/stock_packaging_calculator/static/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d
GIT binary patch
literal 9455
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
Xviia!U7SGha1wx#SCgwmn*{w2TRX*I

literal 0
HcmV?d00001

diff --git a/stock_packaging_calculator/static/description/index.html b/stock_packaging_calculator/static/description/index.html
new file mode 100644
index 000000000..b786d10ea
--- /dev/null
+++ b/stock_packaging_calculator/static/description/index.html
@@ -0,0 +1,449 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<title>Stock packaging calculator</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="stock-packaging-calculator">
+<h1 class="title">Stock packaging calculator</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external" 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" href="https://github.com/OCA/stock-logistics-warehouse/tree/13.0/stock_packaging_calculator"><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" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-13-0/stock-logistics-warehouse-13-0-stock_packaging_calculator"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/153/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>Basic module providing an helper method to calculate the quantity of product by packaging.</p>
+<p>Imagine you have the following packagings:</p>
+<ul class="simple">
+<li>Pallet: 1000 Units</li>
+<li>Big box: 500 Units</li>
+<li>Box: 50 Units</li>
+</ul>
+<p>and you have to pick from your warehouse 2860 Units.</p>
+<p>Then you can do:</p>
+<blockquote>
+<pre class="doctest-block">
+&gt;&gt;&gt; product.product_qty_by_packaging(2860)
+</pre>
+<p>[(2, “Pallet”), (1, “Big Box”), (7, “Box”), (10, “Units”)]</p>
+</blockquote>
+<p>With this you can show a proper message to warehouse operators to quickly pick the quantity they need.</p>
+<div class="admonition important">
+<p class="first admonition-title">Important</p>
+<p class="last">This is an alpha version, the data model and design can change at any time without warning.
+Only for development or testing purpose, do not use in production.
+<a class="reference external" href="https://odoo-community.org/page/development-status">More details on development status</a></p>
+</div>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#known-issues-roadmap" id="id1">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id2">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id3">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id4">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id5">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="known-issues-roadmap">
+<h1><a class="toc-backref" href="#id1">Known issues / Roadmap</a></h1>
+<p>TODO</p>
+<ol class="arabic simple">
+<li>Fractional quantities (eg: 0.5 Kg) are lost when counting units</li>
+<li>Maybe rely on <cite>packaging_uom</cite></li>
+</ol>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id2">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 smashing it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_packaging_calculator%0Aversion:%2013.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">
+<h1><a class="toc-backref" href="#id3">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id4">Authors</a></h2>
+<ul class="simple">
+<li>Camptocamp</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id5">Contributors</a></h2>
+<ul class="simple">
+<li>Simone Orsi &lt;<a class="reference external" href="mailto:simahawk&#64;gmail.com">simahawk&#64;gmail.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id6">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" /></a>
+<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/13.0/stock_packaging_calculator">OCA/stock-logistics-warehouse</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/stock_packaging_calculator/tests/test_packaging_calc.py b/stock_packaging_calculator/tests/test_packaging_calc.py
index af1c11541..b25d8cb9c 100644
--- a/stock_packaging_calculator/tests/test_packaging_calc.py
+++ b/stock_packaging_calculator/tests/test_packaging_calc.py
@@ -30,24 +30,33 @@ class TestCalc(SavepointCase):
 
     def test_calc_1(self):
         """Test easy behavior 1."""
-        self.assertEqual(
-            self.product_a.product_qty_by_packaging(2655),
-            [(1, "Pallet"), (3, "Big Box"), (1, "Box"), (5, self.uom_unit.name)],
-        )
+        expected = [
+            {"id": self.pkg_pallet.id, "qty": 1, "name": self.pkg_pallet.name},
+            {"id": self.pkg_big_box.id, "qty": 3, "name": self.pkg_big_box.name},
+            {"id": self.pkg_box.id, "qty": 1, "name": self.pkg_box.name},
+            {"id": self.uom_unit.id, "qty": 5, "name": self.uom_unit.name},
+        ]
+        self.assertEqual(self.product_a.product_qty_by_packaging(2655), expected)
 
     def test_calc_2(self):
         """Test easy behavior 2."""
-        self.assertEqual(
-            self.product_a.product_qty_by_packaging(350), [(1, "Big Box"), (3, "Box")]
-        )
+        expected = [
+            {"id": self.pkg_big_box.id, "qty": 1, "name": self.pkg_big_box.name},
+            {"id": self.pkg_box.id, "qty": 3, "name": self.pkg_box.name},
+        ]
+        self.assertEqual(self.product_a.product_qty_by_packaging(350), expected)
 
     def test_calc_3(self):
         """Test easy behavior 3."""
-        self.assertEqual(
-            self.product_a.product_qty_by_packaging(80),
-            [(1, "Box"), (30, self.uom_unit.name)],
-        )
+        expected = [
+            {"id": self.pkg_box.id, "qty": 1, "name": self.pkg_box.name},
+            {"id": self.uom_unit.id, "qty": 30, "name": self.uom_unit.name},
+        ]
+        self.assertEqual(self.product_a.product_qty_by_packaging(80), expected)
 
     def test_calc_6(self):
         """Test fractional qty is lost."""
-        self.assertEqual(self.product_a.product_qty_by_packaging(50.5), [(1, "Box")])
+        expected = [
+            {"id": self.pkg_box.id, "qty": 1, "name": self.pkg_box.name},
+        ]
+        self.assertEqual(self.product_a.product_qty_by_packaging(50.5), expected)

From dfb9ccc4fc5e4f9ec22749fb86f666bfb4625a49 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Mon, 8 Jun 2020 11:47:32 +0200
Subject: [PATCH 05/38] stock_packaging_calculator: add contained packaging
 compute

Optionally include contained packaging qty.
---
 stock_packaging_calculator/README.rst         | 43 ++++++---
 stock_packaging_calculator/models/product.py  | 26 ++++--
 .../readme/DESCRIPTION.rst                    | 17 ----
 stock_packaging_calculator/readme/USAGE.rst   | 36 ++++++++
 .../static/description/index.html             | 77 ++++++++++------
 .../tests/test_packaging_calc.py              | 89 ++++++++++++++++++-
 6 files changed, 228 insertions(+), 60 deletions(-)
 create mode 100644 stock_packaging_calculator/readme/USAGE.rst

diff --git a/stock_packaging_calculator/README.rst b/stock_packaging_calculator/README.rst
index 54e81badc..5bde39e25 100644
--- a/stock_packaging_calculator/README.rst
+++ b/stock_packaging_calculator/README.rst
@@ -25,9 +25,21 @@ Stock packaging calculator
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
-
 Basic module providing an helper method to calculate the quantity of product by packaging.
 
+.. IMPORTANT::
+   This is an alpha version, the data model and design can change at any time without warning.
+   Only for development or testing purpose, do not use in production.
+   `More details on development status <https://odoo-community.org/page/development-status>`_
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Usage
+=====
+
 Imagine you have the following packagings:
 
 * Pallet: 1000 Units
@@ -38,21 +50,32 @@ and you have to pick from your warehouse 2860 Units.
 
 Then you can do:
 
-    >>> product.product_qty_by_packaging(2860)
+    .. code-block::
 
-    [(2, "Pallet"), (1, "Big Box"), (7, "Box"), (10, "Units")]
+        >>> product.product_qty_by_packaging(2860)
+
+        [
+            {"id": 1, "qty": 2, "name": "Pallet"},
+            {"id": 2, "qty": 1, "name": "Big box"},
+            {"id": 3, "qty": 7, "name": "Box"},
+            {"id": 100, "qty": 10, "name": "Units"},
+        ]
 
 With this you can show a proper message to warehouse operators to quickly pick the quantity they need.
 
-.. IMPORTANT::
-   This is an alpha version, the data model and design can change at any time without warning.
-   Only for development or testing purpose, do not use in production.
-   `More details on development status <https://odoo-community.org/page/development-status>`_
+Optionally you can get contained packaging by passing `with_contained` flag:
 
-**Table of contents**
 
-.. contents::
-   :local:
+    .. code-block::
+
+        >>> product.product_qty_by_packaging(2860, with_contained=True)
+
+        [
+            {"id": 1, "qty": 2, "name": "Pallet", "contained": [{"id": 2, "qty": 2, "name": "Big box"}]},
+            {"id": 2, "qty": 1, "name": "Big box", "contained": [{"id": 3, "qty": 10, "name": "Box"}]},
+            {"id": 3, "qty": 7, "name": "Box", "contained": [{"id": 100, "qty": 50, "name": "Units"}]},
+            {"id": 100, "qty": 10, "name": "Units", "contained": []},},
+        ]
 
 Known issues / Roadmap
 ======================
diff --git a/stock_packaging_calculator/models/product.py b/stock_packaging_calculator/models/product.py
index d5dca58e1..2679b0fd6 100644
--- a/stock_packaging_calculator/models/product.py
+++ b/stock_packaging_calculator/models/product.py
@@ -13,7 +13,7 @@ Packaging = namedtuple("Packaging", "id name qty")
 class Product(models.Model):
     _inherit = "product.product"
 
-    def product_qty_by_packaging(self, prod_qty):
+    def product_qty_by_packaging(self, prod_qty, with_contained=False):
         """Calculate quantity by packaging.
 
         The minimal quantity is always represented by the UoM of the product.
@@ -21,28 +21,44 @@ class Product(models.Model):
         Limitation: fractional quantities are lost.
 
         :prod_qty: total qty to satisfy.
-        :with_subpackaging: include calculation of contained packagings.
+        :with_contained: include calculation of contained packagings.
+
             eg: 1 pallet contains 4 big boxes and 6 little boxes.
+
         :returns: list of dict in the form
+
             [{id: 1, qty: qty_per_package, name: package_name}]
+
+            If `with_contained` is passed, each element will include
+            the quantity of smaller packaging, like:
+
+            {contained: [{id: 1, qty: 4, name: "Big box"}]}
         """
         packagings = [Packaging(x.id, x.name, x.qty) for x in self.packaging_ids]
         # Add minimal unit
         packagings.append(
+            # NOTE: the ID here could clash w/ one of the packaging's.
+            # If you create a mapping based on IDs, keep this in mind.
             Packaging(self.uom_id.id, self.uom_id.name, self.uom_id.factor)
         )
         return self._product_qty_by_packaging(
-            sorted(packagings, reverse=True, key=lambda x: x.qty), prod_qty,
+            sorted(packagings, reverse=True, key=lambda x: x.qty),
+            prod_qty,
+            with_contained=with_contained,
         )
 
-    def _product_qty_by_packaging(self, pkg_by_qty, qty):
+    def _product_qty_by_packaging(self, pkg_by_qty, qty, with_contained=False):
         """Produce a list of dictionaries of packaging info."""
         # TODO: refactor to handle fractional quantities (eg: 0.5 Kg)
         res = []
-        for pkg in pkg_by_qty:
+        for i, pkg in enumerate(pkg_by_qty):
             qty_per_pkg, qty = self._qty_by_pkg(pkg.qty, qty)
             if qty_per_pkg:
                 value = {"id": pkg.id, "qty": qty_per_pkg, "name": pkg.name}
+                if with_contained:
+                    value["contained"] = self._product_qty_by_packaging(
+                        pkg_by_qty[i + 1 :], pkg.qty
+                    )
                 res.append(value)
             if not qty:
                 break
diff --git a/stock_packaging_calculator/readme/DESCRIPTION.rst b/stock_packaging_calculator/readme/DESCRIPTION.rst
index b470f8a94..1d6fceb5c 100644
--- a/stock_packaging_calculator/readme/DESCRIPTION.rst
+++ b/stock_packaging_calculator/readme/DESCRIPTION.rst
@@ -1,18 +1 @@
-
 Basic module providing an helper method to calculate the quantity of product by packaging.
-
-Imagine you have the following packagings:
-
-* Pallet: 1000 Units
-* Big box: 500 Units
-* Box: 50 Units
-
-and you have to pick from your warehouse 2860 Units.
-
-Then you can do:
-
-    >>> product.product_qty_by_packaging(2860)
-
-    [(2, "Pallet"), (1, "Big Box"), (7, "Box"), (10, "Units")]
-
-With this you can show a proper message to warehouse operators to quickly pick the quantity they need.
diff --git a/stock_packaging_calculator/readme/USAGE.rst b/stock_packaging_calculator/readme/USAGE.rst
new file mode 100644
index 000000000..73f05a708
--- /dev/null
+++ b/stock_packaging_calculator/readme/USAGE.rst
@@ -0,0 +1,36 @@
+Imagine you have the following packagings:
+
+* Pallet: 1000 Units
+* Big box: 500 Units
+* Box: 50 Units
+
+and you have to pick from your warehouse 2860 Units.
+
+Then you can do:
+
+    .. code-block::
+
+        >>> product.product_qty_by_packaging(2860)
+
+        [
+            {"id": 1, "qty": 2, "name": "Pallet"},
+            {"id": 2, "qty": 1, "name": "Big box"},
+            {"id": 3, "qty": 7, "name": "Box"},
+            {"id": 100, "qty": 10, "name": "Units"},
+        ]
+
+With this you can show a proper message to warehouse operators to quickly pick the quantity they need.
+
+Optionally you can get contained packaging by passing `with_contained` flag:
+
+
+    .. code-block::
+
+        >>> product.product_qty_by_packaging(2860, with_contained=True)
+
+        [
+            {"id": 1, "qty": 2, "name": "Pallet", "contained": [{"id": 2, "qty": 2, "name": "Big box"}]},
+            {"id": 2, "qty": 1, "name": "Big box", "contained": [{"id": 3, "qty": 10, "name": "Box"}]},
+            {"id": 3, "qty": 7, "name": "Box", "contained": [{"id": 100, "qty": 50, "name": "Units"}]},
+            {"id": 100, "qty": 10, "name": "Units", "contained": []},},
+        ]
diff --git a/stock_packaging_calculator/static/description/index.html b/stock_packaging_calculator/static/description/index.html
index b786d10ea..62793c551 100644
--- a/stock_packaging_calculator/static/description/index.html
+++ b/stock_packaging_calculator/static/description/index.html
@@ -369,21 +369,6 @@ ul.auto-toc {
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external" 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" href="https://github.com/OCA/stock-logistics-warehouse/tree/13.0/stock_packaging_calculator"><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" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-13-0/stock-logistics-warehouse-13-0-stock_packaging_calculator"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/153/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>Basic module providing an helper method to calculate the quantity of product by packaging.</p>
-<p>Imagine you have the following packagings:</p>
-<ul class="simple">
-<li>Pallet: 1000 Units</li>
-<li>Big box: 500 Units</li>
-<li>Box: 50 Units</li>
-</ul>
-<p>and you have to pick from your warehouse 2860 Units.</p>
-<p>Then you can do:</p>
-<blockquote>
-<pre class="doctest-block">
-&gt;&gt;&gt; product.product_qty_by_packaging(2860)
-</pre>
-<p>[(2, “Pallet”), (1, “Big Box”), (7, “Box”), (10, “Units”)]</p>
-</blockquote>
-<p>With this you can show a proper message to warehouse operators to quickly pick the quantity they need.</p>
 <div class="admonition important">
 <p class="first admonition-title">Important</p>
 <p class="last">This is an alpha version, the data model and design can change at any time without warning.
@@ -393,18 +378,56 @@ Only for development or testing purpose, do not use in production.
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
-<li><a class="reference internal" href="#known-issues-roadmap" id="id1">Known issues / Roadmap</a></li>
-<li><a class="reference internal" href="#bug-tracker" id="id2">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id3">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id4">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id5">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li>
+<li><a class="reference internal" href="#usage" id="id1">Usage</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="id2">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id7">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id1">Usage</a></h1>
+<p>Imagine you have the following packagings:</p>
+<ul class="simple">
+<li>Pallet: 1000 Units</li>
+<li>Big box: 500 Units</li>
+<li>Box: 50 Units</li>
+</ul>
+<p>and you have to pick from your warehouse 2860 Units.</p>
+<p>Then you can do:</p>
+<blockquote>
+<pre class="code literal-block">
+&gt;&gt;&gt; product.product_qty_by_packaging(2860)
+
+[
+    {&quot;id&quot;: 1, &quot;qty&quot;: 2, &quot;name&quot;: &quot;Pallet&quot;},
+    {&quot;id&quot;: 2, &quot;qty&quot;: 1, &quot;name&quot;: &quot;Big box&quot;},
+    {&quot;id&quot;: 3, &quot;qty&quot;: 7, &quot;name&quot;: &quot;Box&quot;},
+    {&quot;id&quot;: 100, &quot;qty&quot;: 10, &quot;name&quot;: &quot;Units&quot;},
+]
+</pre>
+</blockquote>
+<p>With this you can show a proper message to warehouse operators to quickly pick the quantity they need.</p>
+<p>Optionally you can get contained packaging by passing <cite>with_contained</cite> flag:</p>
+<blockquote>
+<pre class="code literal-block">
+&gt;&gt;&gt; product.product_qty_by_packaging(2860, with_contained=True)
+
+[
+    {&quot;id&quot;: 1, &quot;qty&quot;: 2, &quot;name&quot;: &quot;Pallet&quot;, &quot;contained&quot;: [{&quot;id&quot;: 2, &quot;qty&quot;: 2, &quot;name&quot;: &quot;Big box&quot;}]},
+    {&quot;id&quot;: 2, &quot;qty&quot;: 1, &quot;name&quot;: &quot;Big box&quot;, &quot;contained&quot;: [{&quot;id&quot;: 3, &quot;qty&quot;: 10, &quot;name&quot;: &quot;Box&quot;}]},
+    {&quot;id&quot;: 3, &quot;qty&quot;: 7, &quot;name&quot;: &quot;Box&quot;, &quot;contained&quot;: [{&quot;id&quot;: 100, &quot;qty&quot;: 50, &quot;name&quot;: &quot;Units&quot;}]},
+    {&quot;id&quot;: 100, &quot;qty&quot;: 10, &quot;name&quot;: &quot;Units&quot;, &quot;contained&quot;: []},},
+]
+</pre>
+</blockquote>
+</div>
 <div class="section" id="known-issues-roadmap">
-<h1><a class="toc-backref" href="#id1">Known issues / Roadmap</a></h1>
+<h1><a class="toc-backref" href="#id2">Known issues / Roadmap</a></h1>
 <p>TODO</p>
 <ol class="arabic simple">
 <li>Fractional quantities (eg: 0.5 Kg) are lost when counting units</li>
@@ -412,7 +435,7 @@ Only for development or testing purpose, do not use in production.
 </ol>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#id3">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 smashing it by providing a detailed and welcomed
@@ -420,21 +443,21 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#id3">Credits</a></h1>
+<h1><a class="toc-backref" href="#id4">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#id4">Authors</a></h2>
+<h2><a class="toc-backref" href="#id5">Authors</a></h2>
 <ul class="simple">
 <li>Camptocamp</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id5">Contributors</a></h2>
+<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
 <ul class="simple">
 <li>Simone Orsi &lt;<a class="reference external" href="mailto:simahawk&#64;gmail.com">simahawk&#64;gmail.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#id7">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" /></a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
diff --git a/stock_packaging_calculator/tests/test_packaging_calc.py b/stock_packaging_calculator/tests/test_packaging_calc.py
index b25d8cb9c..39d03e01b 100644
--- a/stock_packaging_calculator/tests/test_packaging_calc.py
+++ b/stock_packaging_calculator/tests/test_packaging_calc.py
@@ -9,7 +9,6 @@ class TestCalc(SavepointCase):
         super().setUpClass()
         cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True))
         cls.uom_unit = cls.env.ref("uom.product_uom_unit")
-        cls.uom_kg = cls.env.ref("uom.product_uom_kgm")
         cls.product_a = cls.env["product.product"].create(
             {
                 "name": "Product A",
@@ -60,3 +59,91 @@ class TestCalc(SavepointCase):
             {"id": self.pkg_box.id, "qty": 1, "name": self.pkg_box.name},
         ]
         self.assertEqual(self.product_a.product_qty_by_packaging(50.5), expected)
+
+    def test_calc_sub1(self):
+        """Test contained packaging behavior 1."""
+        expected = [
+            {
+                "id": self.pkg_pallet.id,
+                "qty": 1,
+                "name": self.pkg_pallet.name,
+                "contained": [
+                    {
+                        "id": self.pkg_big_box.id,
+                        "qty": 10,
+                        "name": self.pkg_big_box.name,
+                    },
+                ],
+            },
+            {
+                "id": self.pkg_big_box.id,
+                "qty": 3,
+                "name": self.pkg_big_box.name,
+                "contained": [
+                    {"id": self.pkg_box.id, "qty": 4, "name": self.pkg_box.name},
+                ],
+            },
+            {
+                "id": self.pkg_box.id,
+                "qty": 1,
+                "name": self.pkg_box.name,
+                "contained": [
+                    {"id": self.uom_unit.id, "qty": 50, "name": self.uom_unit.name},
+                ],
+            },
+            {
+                "id": self.uom_unit.id,
+                "qty": 5,
+                "name": self.uom_unit.name,
+                "contained": [],
+            },
+        ]
+        self.assertEqual(
+            self.product_a.product_qty_by_packaging(2655, with_contained=True),
+            expected,
+        )
+
+    def test_calc_sub2(self):
+        """Test contained packaging behavior 1."""
+        self.pkg_box.qty = 30
+        expected = [
+            {
+                "id": self.pkg_pallet.id,
+                "qty": 1,
+                "name": self.pkg_pallet.name,
+                "contained": [
+                    {
+                        "id": self.pkg_big_box.id,
+                        "qty": 10,
+                        "name": self.pkg_big_box.name,
+                    },
+                ],
+            },
+            {
+                "id": self.pkg_big_box.id,
+                "qty": 3,
+                "name": self.pkg_big_box.name,
+                "contained": [
+                    {"id": self.pkg_box.id, "qty": 6, "name": self.pkg_box.name},
+                    {"id": self.uom_unit.id, "qty": 20, "name": self.uom_unit.name},
+                ],
+            },
+            {
+                "id": self.pkg_box.id,
+                "qty": 1,
+                "name": self.pkg_box.name,
+                "contained": [
+                    {"id": self.uom_unit.id, "qty": 30, "name": self.uom_unit.name},
+                ],
+            },
+            {
+                "id": self.uom_unit.id,
+                "qty": 25,
+                "name": self.uom_unit.name,
+                "contained": [],
+            },
+        ]
+        self.assertEqual(
+            self.product_a.product_qty_by_packaging(2655, with_contained=True),
+            expected,
+        )

From b2812f668dd0867dc71a4d3e29b868e3616e5b92 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 9 Jun 2020 08:09:47 +0000
Subject: [PATCH 06/38] stock_packaging_calculator 13.0.1.1.0

---
 stock_packaging_calculator/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stock_packaging_calculator/__manifest__.py b/stock_packaging_calculator/__manifest__.py
index 4399bba90..731c263b0 100644
--- a/stock_packaging_calculator/__manifest__.py
+++ b/stock_packaging_calculator/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Stock packaging calculator",
     "summary": "Compute product quantity to pick by packaging",
-    "version": "13.0.1.0.0",
+    "version": "13.0.1.1.0",
     "development_status": "Alpha",
     "category": "Warehouse Management",
     "website": "https://github.com/OCA/stock-logistics-warehouse",

From d4683ba7649ec38c36a90e89c7f24ff78e7b736c Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 9 Jun 2020 10:35:32 +0200
Subject: [PATCH 07/38] stock_packaging_calculator: make contained mapping
 computed

Allows to reuse the mapping every time is needed.
---
 .../i18n/stock_packaging_calculator.pot       | 10 +++
 stock_packaging_calculator/models/product.py  | 66 +++++++++++++++----
 .../tests/test_packaging_calc.py              | 49 +++++++++++++-
 3 files changed, 109 insertions(+), 16 deletions(-)

diff --git a/stock_packaging_calculator/i18n/stock_packaging_calculator.pot b/stock_packaging_calculator/i18n/stock_packaging_calculator.pot
index 775124a33..92a274c4a 100644
--- a/stock_packaging_calculator/i18n/stock_packaging_calculator.pot
+++ b/stock_packaging_calculator/i18n/stock_packaging_calculator.pot
@@ -13,7 +13,17 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: stock_packaging_calculator
+#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_product__packaging_contained_mapping
+msgid "Packaging Contained Mapping"
+msgstr ""
+
 #. module: stock_packaging_calculator
 #: model:ir.model,name:stock_packaging_calculator.model_product_product
 msgid "Product"
 msgstr ""
+
+#. module: stock_packaging_calculator
+#: model:ir.model.fields,help:stock_packaging_calculator.field_product_product__packaging_contained_mapping
+msgid "Technical field to store contained packaging. "
+msgstr ""
diff --git a/stock_packaging_calculator/models/product.py b/stock_packaging_calculator/models/product.py
index 2679b0fd6..4d74f5652 100644
--- a/stock_packaging_calculator/models/product.py
+++ b/stock_packaging_calculator/models/product.py
@@ -3,16 +3,45 @@
 
 from collections import namedtuple
 
-from odoo import models
+from odoo import api, models
 from odoo.tools import float_compare
 
+from odoo.addons.base_sparse_field.models.fields import Serialized
+
 # Unify records as we mix up w/ UoM
-Packaging = namedtuple("Packaging", "id name qty")
+Packaging = namedtuple("Packaging", "id name qty is_unit")
 
 
 class Product(models.Model):
     _inherit = "product.product"
 
+    packaging_contained_mapping = Serialized(
+        compute="_compute_packaging_contained_mapping",
+        help="Technical field to store contained packaging. ",
+    )
+
+    @api.depends("packaging_ids.qty")
+    def _compute_packaging_contained_mapping(self):
+        for rec in self:
+            rec.packaging_contained_mapping = rec._packaging_contained_mapping()
+
+    def _packaging_contained_mapping(self):
+        """Produce a mapping of packaging and contained packagings.
+
+        Used mainly for `product_qty_by_packaging` but can be used
+        to display info as you prefer.
+
+        :returns: a dictionary in the form {pkg.id: [contained packages]}
+        """
+        res = {}
+        packaging = self._ordered_packaging()
+        for i, pkg in enumerate(packaging):
+            if pkg.is_unit:
+                # skip minimal unit
+                continue
+            res[pkg.id] = self._product_qty_by_packaging(packaging[i + 1 :], pkg.qty)
+        return res
+
     def product_qty_by_packaging(self, prod_qty, with_contained=False):
         """Calculate quantity by packaging.
 
@@ -34,31 +63,42 @@ class Product(models.Model):
 
             {contained: [{id: 1, qty: 4, name: "Big box"}]}
         """
-        packagings = [Packaging(x.id, x.name, x.qty) for x in self.packaging_ids]
+        return self._product_qty_by_packaging(
+            self._ordered_packaging(), prod_qty, with_contained=with_contained,
+        )
+
+    def _ordered_packaging(self):
+        """Prepare packaging ordered by qty and exclude empty ones."""
+        packagings = [
+            Packaging(x.id, x.name, x.qty, False)
+            for x in self.packaging_ids
+            # Exclude the ones w/ zero qty as they are useless for the math
+            if x.qty
+        ]
         # Add minimal unit
         packagings.append(
             # NOTE: the ID here could clash w/ one of the packaging's.
             # If you create a mapping based on IDs, keep this in mind.
-            Packaging(self.uom_id.id, self.uom_id.name, self.uom_id.factor)
-        )
-        return self._product_qty_by_packaging(
-            sorted(packagings, reverse=True, key=lambda x: x.qty),
-            prod_qty,
-            with_contained=with_contained,
+            # You can use `is_unit` to check this.
+            Packaging(self.uom_id.id, self.uom_id.name, self.uom_id.factor, True)
         )
+        return sorted(packagings, reverse=True, key=lambda x: x.qty)
 
     def _product_qty_by_packaging(self, pkg_by_qty, qty, with_contained=False):
         """Produce a list of dictionaries of packaging info."""
         # TODO: refactor to handle fractional quantities (eg: 0.5 Kg)
         res = []
-        for i, pkg in enumerate(pkg_by_qty):
+        for pkg in pkg_by_qty:
             qty_per_pkg, qty = self._qty_by_pkg(pkg.qty, qty)
             if qty_per_pkg:
                 value = {"id": pkg.id, "qty": qty_per_pkg, "name": pkg.name}
                 if with_contained:
-                    value["contained"] = self._product_qty_by_packaging(
-                        pkg_by_qty[i + 1 :], pkg.qty
-                    )
+                    contained = None
+                    if not pkg.is_unit:
+                        mapping = self.packaging_contained_mapping
+                        # integer keys are serialized as strings :/
+                        contained = mapping.get(str(pkg.id))
+                    value["contained"] = contained
                 res.append(value)
             if not qty:
                 break
diff --git a/stock_packaging_calculator/tests/test_packaging_calc.py b/stock_packaging_calculator/tests/test_packaging_calc.py
index 39d03e01b..3482d4329 100644
--- a/stock_packaging_calculator/tests/test_packaging_calc.py
+++ b/stock_packaging_calculator/tests/test_packaging_calc.py
@@ -4,6 +4,10 @@ from odoo.tests import SavepointCase
 
 
 class TestCalc(SavepointCase):
+
+    at_install = False
+    post_install = True
+
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
@@ -12,7 +16,6 @@ class TestCalc(SavepointCase):
         cls.product_a = cls.env["product.product"].create(
             {
                 "name": "Product A",
-                "type": "product",
                 "uom_id": cls.uom_unit.id,
                 "uom_po_id": cls.uom_unit.id,
             }
@@ -27,6 +30,46 @@ class TestCalc(SavepointCase):
             {"name": "Pallet", "product_id": cls.product_a.id, "qty": 2000}
         )
 
+    def test_contained_mapping(self):
+        self.assertEqual(
+            self.product_a.packaging_contained_mapping,
+            {
+                str(self.pkg_pallet.id): [
+                    {
+                        "id": self.pkg_big_box.id,
+                        "qty": 10,
+                        "name": self.pkg_big_box.name,
+                    },
+                ],
+                str(self.pkg_big_box.id): [
+                    {"id": self.pkg_box.id, "qty": 4, "name": self.pkg_box.name},
+                ],
+                str(self.pkg_box.id): [
+                    {"id": self.uom_unit.id, "qty": 50, "name": self.uom_unit.name},
+                ],
+            },
+        )
+        # Update pkg qty
+        self.pkg_pallet.qty = 4000
+        self.assertEqual(
+            self.product_a.packaging_contained_mapping,
+            {
+                str(self.pkg_pallet.id): [
+                    {
+                        "id": self.pkg_big_box.id,
+                        "qty": 20,
+                        "name": self.pkg_big_box.name,
+                    },
+                ],
+                str(self.pkg_big_box.id): [
+                    {"id": self.pkg_box.id, "qty": 4, "name": self.pkg_box.name},
+                ],
+                str(self.pkg_box.id): [
+                    {"id": self.uom_unit.id, "qty": 50, "name": self.uom_unit.name},
+                ],
+            },
+        )
+
     def test_calc_1(self):
         """Test easy behavior 1."""
         expected = [
@@ -95,7 +138,7 @@ class TestCalc(SavepointCase):
                 "id": self.uom_unit.id,
                 "qty": 5,
                 "name": self.uom_unit.name,
-                "contained": [],
+                "contained": None,
             },
         ]
         self.assertEqual(
@@ -140,7 +183,7 @@ class TestCalc(SavepointCase):
                 "id": self.uom_unit.id,
                 "qty": 25,
                 "name": self.uom_unit.name,
-                "contained": [],
+                "contained": None,
             },
         ]
         self.assertEqual(

From ecbc07b0b68ad544ac9e42f10b3ae7dccac82e71 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 22 Jun 2020 13:05:22 +0000
Subject: [PATCH 08/38] stock_packaging_calculator 13.0.1.2.0

---
 stock_packaging_calculator/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stock_packaging_calculator/__manifest__.py b/stock_packaging_calculator/__manifest__.py
index 731c263b0..3285010a5 100644
--- a/stock_packaging_calculator/__manifest__.py
+++ b/stock_packaging_calculator/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Stock packaging calculator",
     "summary": "Compute product quantity to pick by packaging",
-    "version": "13.0.1.1.0",
+    "version": "13.0.1.2.0",
     "development_status": "Alpha",
     "category": "Warehouse Management",
     "website": "https://github.com/OCA/stock-logistics-warehouse",

From d60d56b300dcdec37863ee7323cd2efaff1d480e Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 30 Jun 2020 14:16:42 +0200
Subject: [PATCH 09/38] stock_packaging_calculator: add support for packaging
 filter

---
 stock_packaging_calculator/models/product.py       |  9 +++++++--
 .../tests/test_packaging_calc.py                   | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/stock_packaging_calculator/models/product.py b/stock_packaging_calculator/models/product.py
index 4d74f5652..88332de81 100644
--- a/stock_packaging_calculator/models/product.py
+++ b/stock_packaging_calculator/models/product.py
@@ -68,10 +68,15 @@ class Product(models.Model):
         )
 
     def _ordered_packaging(self):
-        """Prepare packaging ordered by qty and exclude empty ones."""
+        """Prepare packaging ordered by qty and exclude empty ones.
+
+        Use ctx key `_packaging_filter` to pass a function to filter packaging
+        to be considered.
+        """
+        custom_filter = self.env.context.get("_packaging_filter", lambda x: x)
         packagings = [
             Packaging(x.id, x.name, x.qty, False)
-            for x in self.packaging_ids
+            for x in self.packaging_ids.filtered(custom_filter)
             # Exclude the ones w/ zero qty as they are useless for the math
             if x.qty
         ]
diff --git a/stock_packaging_calculator/tests/test_packaging_calc.py b/stock_packaging_calculator/tests/test_packaging_calc.py
index 3482d4329..fcee8dd5a 100644
--- a/stock_packaging_calculator/tests/test_packaging_calc.py
+++ b/stock_packaging_calculator/tests/test_packaging_calc.py
@@ -103,6 +103,20 @@ class TestCalc(SavepointCase):
         ]
         self.assertEqual(self.product_a.product_qty_by_packaging(50.5), expected)
 
+    def test_calc_filter(self):
+        """Test packaging filter."""
+        expected = [
+            {"id": self.pkg_big_box.id, "qty": 13, "name": self.pkg_big_box.name},
+            {"id": self.pkg_box.id, "qty": 1, "name": self.pkg_box.name},
+            {"id": self.uom_unit.id, "qty": 5, "name": self.uom_unit.name},
+        ]
+        self.assertEqual(
+            self.product_a.with_context(
+                _packaging_filter=lambda x: x != self.pkg_pallet
+            ).product_qty_by_packaging(2655),
+            expected,
+        )
+
     def test_calc_sub1(self):
         """Test contained packaging behavior 1."""
         expected = [

From f989e720de6aa379fe9ced2c5b1a931da49c92b4 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 30 Jun 2020 14:29:58 +0200
Subject: [PATCH 10/38] stock_packaging_calculator: add support for custom
 packaging name

---
 stock_packaging_calculator/models/product.py  |  6 +++++-
 .../tests/test_packaging_calc.py              | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/stock_packaging_calculator/models/product.py b/stock_packaging_calculator/models/product.py
index 88332de81..b81ac2107 100644
--- a/stock_packaging_calculator/models/product.py
+++ b/stock_packaging_calculator/models/product.py
@@ -72,10 +72,14 @@ class Product(models.Model):
 
         Use ctx key `_packaging_filter` to pass a function to filter packaging
         to be considered.
+
+        Use ctx key `_packaging_name_getter` to pass a function to change
+        the display name of the packaging.
         """
         custom_filter = self.env.context.get("_packaging_filter", lambda x: x)
+        name_getter = self.env.context.get("_packaging_name_getter", lambda x: x.name)
         packagings = [
-            Packaging(x.id, x.name, x.qty, False)
+            Packaging(x.id, name_getter(x), x.qty, False)
             for x in self.packaging_ids.filtered(custom_filter)
             # Exclude the ones w/ zero qty as they are useless for the math
             if x.qty
diff --git a/stock_packaging_calculator/tests/test_packaging_calc.py b/stock_packaging_calculator/tests/test_packaging_calc.py
index fcee8dd5a..7a6b643b3 100644
--- a/stock_packaging_calculator/tests/test_packaging_calc.py
+++ b/stock_packaging_calculator/tests/test_packaging_calc.py
@@ -117,6 +117,25 @@ class TestCalc(SavepointCase):
             expected,
         )
 
+    def test_calc_name_get(self):
+        """Test custom name getter."""
+        expected = [
+            {"id": self.pkg_pallet.id, "qty": 1, "name": "FOO " + self.pkg_pallet.name},
+            {
+                "id": self.pkg_big_box.id,
+                "qty": 3,
+                "name": "FOO " + self.pkg_big_box.name,
+            },
+            {"id": self.pkg_box.id, "qty": 1, "name": "FOO " + self.pkg_box.name},
+            {"id": self.uom_unit.id, "qty": 5, "name": self.uom_unit.name},
+        ]
+        self.assertEqual(
+            self.product_a.with_context(
+                _packaging_name_getter=lambda x: "FOO " + x.name
+            ).product_qty_by_packaging(2655),
+            expected,
+        )
+
     def test_calc_sub1(self):
         """Test contained packaging behavior 1."""
         expected = [

From 0a0fa94d2818bf7e2035d510a2290dc72d84d15d Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 1 Jul 2020 06:51:32 +0000
Subject: [PATCH 11/38] stock_packaging_calculator 13.0.1.3.0

---
 stock_packaging_calculator/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stock_packaging_calculator/__manifest__.py b/stock_packaging_calculator/__manifest__.py
index 3285010a5..1fa33ec03 100644
--- a/stock_packaging_calculator/__manifest__.py
+++ b/stock_packaging_calculator/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Stock packaging calculator",
     "summary": "Compute product quantity to pick by packaging",
-    "version": "13.0.1.2.0",
+    "version": "13.0.1.3.0",
     "development_status": "Alpha",
     "category": "Warehouse Management",
     "website": "https://github.com/OCA/stock-logistics-warehouse",

From aa4d9b348de8de9a9c8e47a2b2f4545ae11c141f Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Wed, 15 Jul 2020 17:29:44 +0200
Subject: [PATCH 12/38] Re-license stock_packaging_calculator w/ LGPL

---
 stock_packaging_calculator/README.rst                    | 6 +++---
 stock_packaging_calculator/__manifest__.py               | 4 ++--
 stock_packaging_calculator/models/product.py             | 2 +-
 stock_packaging_calculator/static/description/index.html | 2 +-
 stock_packaging_calculator/tests/test_packaging_calc.py  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/stock_packaging_calculator/README.rst b/stock_packaging_calculator/README.rst
index 5bde39e25..d6cc846cd 100644
--- a/stock_packaging_calculator/README.rst
+++ b/stock_packaging_calculator/README.rst
@@ -10,9 +10,9 @@ Stock packaging calculator
 .. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
     :target: https://odoo-community.org/page/development-status
     :alt: Alpha
-.. |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
+.. |badge2| image:: https://img.shields.io/badge/licence-LGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
+    :alt: License: LGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github
     :target: https://github.com/OCA/stock-logistics-warehouse/tree/13.0/stock_packaging_calculator
     :alt: OCA/stock-logistics-warehouse
diff --git a/stock_packaging_calculator/__manifest__.py b/stock_packaging_calculator/__manifest__.py
index 1fa33ec03..3ab1b5ebd 100644
--- a/stock_packaging_calculator/__manifest__.py
+++ b/stock_packaging_calculator/__manifest__.py
@@ -1,5 +1,5 @@
 # Copyright 2020 Camptocamp SA
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
+# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl)
 {
     "name": "Stock packaging calculator",
     "summary": "Compute product quantity to pick by packaging",
@@ -8,7 +8,7 @@
     "category": "Warehouse Management",
     "website": "https://github.com/OCA/stock-logistics-warehouse",
     "author": "Camptocamp, Odoo Community Association (OCA)",
-    "license": "AGPL-3",
+    "license": "LGPL-3",
     "application": False,
     "installable": True,
     "depends": ["product"],
diff --git a/stock_packaging_calculator/models/product.py b/stock_packaging_calculator/models/product.py
index b81ac2107..752af5d3f 100644
--- a/stock_packaging_calculator/models/product.py
+++ b/stock_packaging_calculator/models/product.py
@@ -1,5 +1,5 @@
 # Copyright 2020 Camptocamp SA
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
+# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl)
 
 from collections import namedtuple
 
diff --git a/stock_packaging_calculator/static/description/index.html b/stock_packaging_calculator/static/description/index.html
index 62793c551..ebff58a67 100644
--- a/stock_packaging_calculator/static/description/index.html
+++ b/stock_packaging_calculator/static/description/index.html
@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external" 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" href="https://github.com/OCA/stock-logistics-warehouse/tree/13.0/stock_packaging_calculator"><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" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-13-0/stock-logistics-warehouse-13-0-stock_packaging_calculator"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/153/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/13.0/stock_packaging_calculator"><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" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-13-0/stock-logistics-warehouse-13-0-stock_packaging_calculator"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/153/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>Basic module providing an helper method to calculate the quantity of product by packaging.</p>
 <div class="admonition important">
 <p class="first admonition-title">Important</p>
diff --git a/stock_packaging_calculator/tests/test_packaging_calc.py b/stock_packaging_calculator/tests/test_packaging_calc.py
index 7a6b643b3..b3b4fbbd6 100644
--- a/stock_packaging_calculator/tests/test_packaging_calc.py
+++ b/stock_packaging_calculator/tests/test_packaging_calc.py
@@ -1,5 +1,5 @@
 # Copyright 2020 Camptocamp SA
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
+# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl)
 from odoo.tests import SavepointCase
 
 

From ed50ffbcbcdf9fbb95f1e7a81b0ae9f48b08106b Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 16 Jul 2020 11:23:27 +0000
Subject: [PATCH 13/38] stock_packaging_calculator 13.0.1.4.0

---
 stock_packaging_calculator/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stock_packaging_calculator/__manifest__.py b/stock_packaging_calculator/__manifest__.py
index 3ab1b5ebd..cfbf256af 100644
--- a/stock_packaging_calculator/__manifest__.py
+++ b/stock_packaging_calculator/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Stock packaging calculator",
     "summary": "Compute product quantity to pick by packaging",
-    "version": "13.0.1.3.0",
+    "version": "13.0.1.4.0",
     "development_status": "Alpha",
     "category": "Warehouse Management",
     "website": "https://github.com/OCA/stock-logistics-warehouse",

From 9b00109e5c8ddb44862e783adee51c154a861899 Mon Sep 17 00:00:00 2001
From: Tonow-c2c <thomas.nowicki@camptocamp.com>
Date: Mon, 6 Jul 2020 16:26:25 +0200
Subject: [PATCH 14/38] [IMP][stock_packaging_calculator] Add key is_unit for
 in the packaging calculator return

---
 stock_packaging_calculator/models/product.py  |   7 +-
 .../tests/test_packaging_calc.py              | 137 +++++++++++++++---
 2 files changed, 125 insertions(+), 19 deletions(-)

diff --git a/stock_packaging_calculator/models/product.py b/stock_packaging_calculator/models/product.py
index 752af5d3f..31e8db70b 100644
--- a/stock_packaging_calculator/models/product.py
+++ b/stock_packaging_calculator/models/product.py
@@ -100,7 +100,12 @@ class Product(models.Model):
         for pkg in pkg_by_qty:
             qty_per_pkg, qty = self._qty_by_pkg(pkg.qty, qty)
             if qty_per_pkg:
-                value = {"id": pkg.id, "qty": qty_per_pkg, "name": pkg.name}
+                value = {
+                    "id": pkg.id,
+                    "qty": qty_per_pkg,
+                    "name": pkg.name,
+                    "is_unit": pkg.is_unit,
+                }
                 if with_contained:
                     contained = None
                     if not pkg.is_unit:
diff --git a/stock_packaging_calculator/tests/test_packaging_calc.py b/stock_packaging_calculator/tests/test_packaging_calc.py
index b3b4fbbd6..19207c592 100644
--- a/stock_packaging_calculator/tests/test_packaging_calc.py
+++ b/stock_packaging_calculator/tests/test_packaging_calc.py
@@ -39,13 +39,24 @@ class TestCalc(SavepointCase):
                         "id": self.pkg_big_box.id,
                         "qty": 10,
                         "name": self.pkg_big_box.name,
+                        "is_unit": False,
                     },
                 ],
                 str(self.pkg_big_box.id): [
-                    {"id": self.pkg_box.id, "qty": 4, "name": self.pkg_box.name},
+                    {
+                        "id": self.pkg_box.id,
+                        "qty": 4,
+                        "name": self.pkg_box.name,
+                        "is_unit": False,
+                    },
                 ],
                 str(self.pkg_box.id): [
-                    {"id": self.uom_unit.id, "qty": 50, "name": self.uom_unit.name},
+                    {
+                        "id": self.uom_unit.id,
+                        "qty": 50,
+                        "name": self.uom_unit.name,
+                        "is_unit": False,
+                    },
                 ],
             },
         )
@@ -59,13 +70,24 @@ class TestCalc(SavepointCase):
                         "id": self.pkg_big_box.id,
                         "qty": 20,
                         "name": self.pkg_big_box.name,
+                        "is_unit": False,
                     },
                 ],
                 str(self.pkg_big_box.id): [
-                    {"id": self.pkg_box.id, "qty": 4, "name": self.pkg_box.name},
+                    {
+                        "id": self.pkg_box.id,
+                        "qty": 4,
+                        "name": self.pkg_box.name,
+                        "is_unit": False,
+                    },
                 ],
                 str(self.pkg_box.id): [
-                    {"id": self.uom_unit.id, "qty": 50, "name": self.uom_unit.name},
+                    {
+                        "id": self.uom_unit.id,
+                        "qty": 50,
+                        "name": self.uom_unit.name,
+                        "is_unit": False,
+                    },
                 ],
             },
         )
@@ -73,42 +95,102 @@ class TestCalc(SavepointCase):
     def test_calc_1(self):
         """Test easy behavior 1."""
         expected = [
-            {"id": self.pkg_pallet.id, "qty": 1, "name": self.pkg_pallet.name},
-            {"id": self.pkg_big_box.id, "qty": 3, "name": self.pkg_big_box.name},
-            {"id": self.pkg_box.id, "qty": 1, "name": self.pkg_box.name},
-            {"id": self.uom_unit.id, "qty": 5, "name": self.uom_unit.name},
+            {
+                "id": self.pkg_pallet.id,
+                "qty": 1,
+                "name": self.pkg_pallet.name,
+                "is_unit": False,
+            },
+            {
+                "id": self.pkg_big_box.id,
+                "qty": 3,
+                "name": self.pkg_big_box.name,
+                "is_unit": False,
+            },
+            {
+                "id": self.pkg_box.id,
+                "qty": 1,
+                "name": self.pkg_box.name,
+                "is_unit": False,
+            },
+            {
+                "id": self.uom_unit.id,
+                "qty": 5,
+                "name": self.uom_unit.name,
+                "is_unit": True,
+            },
         ]
         self.assertEqual(self.product_a.product_qty_by_packaging(2655), expected)
 
     def test_calc_2(self):
         """Test easy behavior 2."""
         expected = [
-            {"id": self.pkg_big_box.id, "qty": 1, "name": self.pkg_big_box.name},
-            {"id": self.pkg_box.id, "qty": 3, "name": self.pkg_box.name},
+            {
+                "id": self.pkg_big_box.id,
+                "qty": 1,
+                "name": self.pkg_big_box.name,
+                "is_unit": False,
+            },
+            {
+                "id": self.pkg_box.id,
+                "qty": 3,
+                "name": self.pkg_box.name,
+                "is_unit": False,
+            },
         ]
         self.assertEqual(self.product_a.product_qty_by_packaging(350), expected)
 
     def test_calc_3(self):
         """Test easy behavior 3."""
         expected = [
-            {"id": self.pkg_box.id, "qty": 1, "name": self.pkg_box.name},
-            {"id": self.uom_unit.id, "qty": 30, "name": self.uom_unit.name},
+            {
+                "id": self.pkg_box.id,
+                "qty": 1,
+                "name": self.pkg_box.name,
+                "is_unit": False,
+            },
+            {
+                "id": self.uom_unit.id,
+                "qty": 30,
+                "name": self.uom_unit.name,
+                "is_unit": True,
+            },
         ]
         self.assertEqual(self.product_a.product_qty_by_packaging(80), expected)
 
     def test_calc_6(self):
         """Test fractional qty is lost."""
         expected = [
-            {"id": self.pkg_box.id, "qty": 1, "name": self.pkg_box.name},
+            {
+                "id": self.pkg_box.id,
+                "qty": 1,
+                "name": self.pkg_box.name,
+                "is_unit": False,
+            },
         ]
         self.assertEqual(self.product_a.product_qty_by_packaging(50.5), expected)
 
     def test_calc_filter(self):
         """Test packaging filter."""
         expected = [
-            {"id": self.pkg_big_box.id, "qty": 13, "name": self.pkg_big_box.name},
-            {"id": self.pkg_box.id, "qty": 1, "name": self.pkg_box.name},
-            {"id": self.uom_unit.id, "qty": 5, "name": self.uom_unit.name},
+            {
+                "id": self.pkg_big_box.id,
+                "qty": 13,
+                "name": self.pkg_big_box.name,
+                "is_unit": False,
+            },
+            {
+                "id": self.pkg_box.id,
+                "qty": 1,
+                "name": self.pkg_box.name,
+                "is_unit": False,
+            },
+            {
+                "id": self.uom_unit.id,
+                "qty": 5,
+                "name": self.uom_unit.name,
+                "is_unit": True,
+            },
         ]
         self.assertEqual(
             self.product_a.with_context(
@@ -125,9 +207,20 @@ class TestCalc(SavepointCase):
                 "id": self.pkg_big_box.id,
                 "qty": 3,
                 "name": "FOO " + self.pkg_big_box.name,
+                "is_unit": False,
+            },
+            {
+                "id": self.pkg_box.id,
+                "qty": 1,
+                "name": "FOO " + self.pkg_box.name,
+                "is_unit": False,
+            },
+            {
+                "id": self.uom_unit.id,
+                "qty": 5,
+                "name": self.uom_unit.name,
+                "is_unit": True,
             },
-            {"id": self.pkg_box.id, "qty": 1, "name": "FOO " + self.pkg_box.name},
-            {"id": self.uom_unit.id, "qty": 5, "name": self.uom_unit.name},
         ]
         self.assertEqual(
             self.product_a.with_context(
@@ -143,6 +236,7 @@ class TestCalc(SavepointCase):
                 "id": self.pkg_pallet.id,
                 "qty": 1,
                 "name": self.pkg_pallet.name,
+                "is_unit": False,
                 "contained": [
                     {
                         "id": self.pkg_big_box.id,
@@ -155,6 +249,7 @@ class TestCalc(SavepointCase):
                 "id": self.pkg_big_box.id,
                 "qty": 3,
                 "name": self.pkg_big_box.name,
+                "is_unit": False,
                 "contained": [
                     {"id": self.pkg_box.id, "qty": 4, "name": self.pkg_box.name},
                 ],
@@ -163,6 +258,7 @@ class TestCalc(SavepointCase):
                 "id": self.pkg_box.id,
                 "qty": 1,
                 "name": self.pkg_box.name,
+                "is_unit": False,
                 "contained": [
                     {"id": self.uom_unit.id, "qty": 50, "name": self.uom_unit.name},
                 ],
@@ -171,6 +267,7 @@ class TestCalc(SavepointCase):
                 "id": self.uom_unit.id,
                 "qty": 5,
                 "name": self.uom_unit.name,
+                "is_unit": True,
                 "contained": None,
             },
         ]
@@ -192,6 +289,7 @@ class TestCalc(SavepointCase):
                         "id": self.pkg_big_box.id,
                         "qty": 10,
                         "name": self.pkg_big_box.name,
+                        "is_unit": False,
                     },
                 ],
             },
@@ -199,6 +297,7 @@ class TestCalc(SavepointCase):
                 "id": self.pkg_big_box.id,
                 "qty": 3,
                 "name": self.pkg_big_box.name,
+                "is_unit": False,
                 "contained": [
                     {"id": self.pkg_box.id, "qty": 6, "name": self.pkg_box.name},
                     {"id": self.uom_unit.id, "qty": 20, "name": self.uom_unit.name},
@@ -208,6 +307,7 @@ class TestCalc(SavepointCase):
                 "id": self.pkg_box.id,
                 "qty": 1,
                 "name": self.pkg_box.name,
+                "is_unit": False,
                 "contained": [
                     {"id": self.uom_unit.id, "qty": 30, "name": self.uom_unit.name},
                 ],
@@ -216,6 +316,7 @@ class TestCalc(SavepointCase):
                 "id": self.uom_unit.id,
                 "qty": 25,
                 "name": self.uom_unit.name,
+                "is_unit": True,
                 "contained": None,
             },
         ]

From 06f4cbc06ff8dcb8271481379dfc212a4e7a4839 Mon Sep 17 00:00:00 2001
From: Akim Juillerat <akim.juillerat@camptocamp.com>
Date: Thu, 16 Jul 2020 10:35:53 +0200
Subject: [PATCH 15/38] stock_packaging_calculator: Add hook on packaging
 values

Fix tests
---
 stock_packaging_calculator/models/product.py  | 16 ++++---
 .../tests/test_packaging_calc.py              | 48 +++++++++++++++----
 2 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/stock_packaging_calculator/models/product.py b/stock_packaging_calculator/models/product.py
index 31e8db70b..4d670716f 100644
--- a/stock_packaging_calculator/models/product.py
+++ b/stock_packaging_calculator/models/product.py
@@ -63,6 +63,7 @@ class Product(models.Model):
 
             {contained: [{id: 1, qty: 4, name: "Big box"}]}
         """
+        self.ensure_one()
         return self._product_qty_by_packaging(
             self._ordered_packaging(), prod_qty, with_contained=with_contained,
         )
@@ -100,12 +101,7 @@ class Product(models.Model):
         for pkg in pkg_by_qty:
             qty_per_pkg, qty = self._qty_by_pkg(pkg.qty, qty)
             if qty_per_pkg:
-                value = {
-                    "id": pkg.id,
-                    "qty": qty_per_pkg,
-                    "name": pkg.name,
-                    "is_unit": pkg.is_unit,
-                }
+                value = self._prepare_qty_by_packaging_values(pkg, qty_per_pkg)
                 if with_contained:
                     contained = None
                     if not pkg.is_unit:
@@ -128,3 +124,11 @@ class Product(models.Model):
             qty -= pkg_qty
             qty_per_pkg += 1
         return qty_per_pkg, qty
+
+    def _prepare_qty_by_packaging_values(self, packaging, qty_per_pkg):
+        return {
+            "id": packaging.id,
+            "qty": qty_per_pkg,
+            "name": packaging.name,
+            "is_unit": packaging.is_unit,
+        }
diff --git a/stock_packaging_calculator/tests/test_packaging_calc.py b/stock_packaging_calculator/tests/test_packaging_calc.py
index 19207c592..c7ab405bd 100644
--- a/stock_packaging_calculator/tests/test_packaging_calc.py
+++ b/stock_packaging_calculator/tests/test_packaging_calc.py
@@ -55,7 +55,7 @@ class TestCalc(SavepointCase):
                         "id": self.uom_unit.id,
                         "qty": 50,
                         "name": self.uom_unit.name,
-                        "is_unit": False,
+                        "is_unit": True,
                     },
                 ],
             },
@@ -86,7 +86,7 @@ class TestCalc(SavepointCase):
                         "id": self.uom_unit.id,
                         "qty": 50,
                         "name": self.uom_unit.name,
-                        "is_unit": False,
+                        "is_unit": True,
                     },
                 ],
             },
@@ -202,7 +202,12 @@ class TestCalc(SavepointCase):
     def test_calc_name_get(self):
         """Test custom name getter."""
         expected = [
-            {"id": self.pkg_pallet.id, "qty": 1, "name": "FOO " + self.pkg_pallet.name},
+            {
+                "id": self.pkg_pallet.id,
+                "qty": 1,
+                "name": "FOO " + self.pkg_pallet.name,
+                "is_unit": False,
+            },
             {
                 "id": self.pkg_big_box.id,
                 "qty": 3,
@@ -242,6 +247,7 @@ class TestCalc(SavepointCase):
                         "id": self.pkg_big_box.id,
                         "qty": 10,
                         "name": self.pkg_big_box.name,
+                        "is_unit": False,
                     },
                 ],
             },
@@ -251,7 +257,12 @@ class TestCalc(SavepointCase):
                 "name": self.pkg_big_box.name,
                 "is_unit": False,
                 "contained": [
-                    {"id": self.pkg_box.id, "qty": 4, "name": self.pkg_box.name},
+                    {
+                        "id": self.pkg_box.id,
+                        "qty": 4,
+                        "name": self.pkg_box.name,
+                        "is_unit": False,
+                    },
                 ],
             },
             {
@@ -260,7 +271,12 @@ class TestCalc(SavepointCase):
                 "name": self.pkg_box.name,
                 "is_unit": False,
                 "contained": [
-                    {"id": self.uom_unit.id, "qty": 50, "name": self.uom_unit.name},
+                    {
+                        "id": self.uom_unit.id,
+                        "qty": 50,
+                        "name": self.uom_unit.name,
+                        "is_unit": True,
+                    },
                 ],
             },
             {
@@ -284,6 +300,7 @@ class TestCalc(SavepointCase):
                 "id": self.pkg_pallet.id,
                 "qty": 1,
                 "name": self.pkg_pallet.name,
+                "is_unit": False,
                 "contained": [
                     {
                         "id": self.pkg_big_box.id,
@@ -299,8 +316,18 @@ class TestCalc(SavepointCase):
                 "name": self.pkg_big_box.name,
                 "is_unit": False,
                 "contained": [
-                    {"id": self.pkg_box.id, "qty": 6, "name": self.pkg_box.name},
-                    {"id": self.uom_unit.id, "qty": 20, "name": self.uom_unit.name},
+                    {
+                        "id": self.pkg_box.id,
+                        "qty": 6,
+                        "name": self.pkg_box.name,
+                        "is_unit": False,
+                    },
+                    {
+                        "id": self.uom_unit.id,
+                        "qty": 20,
+                        "name": self.uom_unit.name,
+                        "is_unit": True,
+                    },
                 ],
             },
             {
@@ -309,7 +336,12 @@ class TestCalc(SavepointCase):
                 "name": self.pkg_box.name,
                 "is_unit": False,
                 "contained": [
-                    {"id": self.uom_unit.id, "qty": 30, "name": self.uom_unit.name},
+                    {
+                        "id": self.uom_unit.id,
+                        "qty": 30,
+                        "name": self.uom_unit.name,
+                        "is_unit": True,
+                    },
                 ],
             },
             {

From fee724691375ae6f5690ce8fcdbd52792c850e21 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@users.noreply.github.com>
Date: Fri, 17 Jul 2020 17:20:45 +0200
Subject: [PATCH 16/38] stock_packaging_calculator 13.0.1.5.0

---
 stock_packaging_calculator/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stock_packaging_calculator/__manifest__.py b/stock_packaging_calculator/__manifest__.py
index cfbf256af..d5aa12d87 100644
--- a/stock_packaging_calculator/__manifest__.py
+++ b/stock_packaging_calculator/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Stock packaging calculator",
     "summary": "Compute product quantity to pick by packaging",
-    "version": "13.0.1.4.0",
+    "version": "13.0.1.5.0",
     "development_status": "Alpha",
     "category": "Warehouse Management",
     "website": "https://github.com/OCA/stock-logistics-warehouse",

From 062ddecf59ccef6822d27ff810be3ec4ba11cdfd Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Mon, 3 Aug 2020 10:20:33 +0200
Subject: [PATCH 17/38] packaging_calculator: fix sorting

Make sure unit is always the last element in the list.
---
 stock_packaging_calculator/models/product.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/stock_packaging_calculator/models/product.py b/stock_packaging_calculator/models/product.py
index 4d670716f..89eadf5c5 100644
--- a/stock_packaging_calculator/models/product.py
+++ b/stock_packaging_calculator/models/product.py
@@ -79,12 +79,16 @@ class Product(models.Model):
         """
         custom_filter = self.env.context.get("_packaging_filter", lambda x: x)
         name_getter = self.env.context.get("_packaging_name_getter", lambda x: x.name)
-        packagings = [
-            Packaging(x.id, name_getter(x), x.qty, False)
-            for x in self.packaging_ids.filtered(custom_filter)
-            # Exclude the ones w/ zero qty as they are useless for the math
-            if x.qty
-        ]
+        packagings = sorted(
+            [
+                Packaging(x.id, name_getter(x), x.qty, False)
+                for x in self.packaging_ids.filtered(custom_filter)
+                # Exclude the ones w/ zero qty as they are useless for the math
+                if x.qty
+            ],
+            reverse=True,
+            key=lambda x: x.qty,
+        )
         # Add minimal unit
         packagings.append(
             # NOTE: the ID here could clash w/ one of the packaging's.
@@ -92,7 +96,7 @@ class Product(models.Model):
             # You can use `is_unit` to check this.
             Packaging(self.uom_id.id, self.uom_id.name, self.uom_id.factor, True)
         )
-        return sorted(packagings, reverse=True, key=lambda x: x.qty)
+        return packagings
 
     def _product_qty_by_packaging(self, pkg_by_qty, qty, with_contained=False):
         """Produce a list of dictionaries of packaging info."""

From 90bab81864fc5d1d0337ffdac35eb93bdbc5f8ef Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Mon, 3 Aug 2020 10:30:06 +0200
Subject: [PATCH 18/38] packaging_calculator: allow custom value handler

Use _packaging_values_handler ctx key to pass your own handler
for specific on demand overrides.
---
 stock_packaging_calculator/models/product.py   |  5 ++++-
 .../tests/test_packaging_calc.py               | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/stock_packaging_calculator/models/product.py b/stock_packaging_calculator/models/product.py
index 89eadf5c5..69a85ec09 100644
--- a/stock_packaging_calculator/models/product.py
+++ b/stock_packaging_calculator/models/product.py
@@ -102,10 +102,13 @@ class Product(models.Model):
         """Produce a list of dictionaries of packaging info."""
         # TODO: refactor to handle fractional quantities (eg: 0.5 Kg)
         res = []
+        prepare_values = self.env.context.get(
+            "_packaging_values_handler", self._prepare_qty_by_packaging_values
+        )
         for pkg in pkg_by_qty:
             qty_per_pkg, qty = self._qty_by_pkg(pkg.qty, qty)
             if qty_per_pkg:
-                value = self._prepare_qty_by_packaging_values(pkg, qty_per_pkg)
+                value = prepare_values(pkg, qty_per_pkg)
                 if with_contained:
                     contained = None
                     if not pkg.is_unit:
diff --git a/stock_packaging_calculator/tests/test_packaging_calc.py b/stock_packaging_calculator/tests/test_packaging_calc.py
index c7ab405bd..1bc721086 100644
--- a/stock_packaging_calculator/tests/test_packaging_calc.py
+++ b/stock_packaging_calculator/tests/test_packaging_calc.py
@@ -234,6 +234,24 @@ class TestCalc(SavepointCase):
             expected,
         )
 
+    def test_calc_custom_values(self):
+        """Test custom values handler."""
+        expected = [
+            {"my_qty": 1, "foo": self.pkg_pallet.name},
+            {"my_qty": 3, "foo": self.pkg_big_box.name},
+            {"my_qty": 1, "foo": self.pkg_box.name},
+            {"my_qty": 5, "foo": self.uom_unit.name},
+        ]
+        self.assertEqual(
+            self.product_a.with_context(
+                _packaging_values_handler=lambda pkg, qty_per_pkg: {
+                    "my_qty": qty_per_pkg,
+                    "foo": pkg.name,
+                }
+            ).product_qty_by_packaging(2655),
+            expected,
+        )
+
     def test_calc_sub1(self):
         """Test contained packaging behavior 1."""
         expected = [

From 7f2bb551515ac4de0fb355a56011f6a11f22f6bd Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 11 Aug 2020 13:57:32 +0000
Subject: [PATCH 19/38] stock_packaging_calculator 13.0.1.6.0

---
 stock_packaging_calculator/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stock_packaging_calculator/__manifest__.py b/stock_packaging_calculator/__manifest__.py
index d5aa12d87..d31c5853c 100644
--- a/stock_packaging_calculator/__manifest__.py
+++ b/stock_packaging_calculator/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Stock packaging calculator",
     "summary": "Compute product quantity to pick by packaging",
-    "version": "13.0.1.5.0",
+    "version": "13.0.1.6.0",
     "development_status": "Alpha",
     "category": "Warehouse Management",
     "website": "https://github.com/OCA/stock-logistics-warehouse",

From a989a1e429a63873ede5dcaf8c453d14ae9ab434 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20BEAU?= <sebastien.beau@akretion.com>
Date: Wed, 6 Jan 2021 15:03:10 +0100
Subject: [PATCH 20/38] [IMP] stock_packaging_calculator: black, isort,
 prettier

---
 stock_packaging_calculator/models/product.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/stock_packaging_calculator/models/product.py b/stock_packaging_calculator/models/product.py
index 69a85ec09..a4327076c 100644
--- a/stock_packaging_calculator/models/product.py
+++ b/stock_packaging_calculator/models/product.py
@@ -65,7 +65,9 @@ class Product(models.Model):
         """
         self.ensure_one()
         return self._product_qty_by_packaging(
-            self._ordered_packaging(), prod_qty, with_contained=with_contained,
+            self._ordered_packaging(),
+            prod_qty,
+            with_contained=with_contained,
         )
 
     def _ordered_packaging(self):

From 9c3c1bd108af4e74fc78c0dd48526ae08b45abfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20BEAU?= <sebastien.beau@akretion.com>
Date: Wed, 6 Jan 2021 15:03:10 +0100
Subject: [PATCH 21/38] [MIG] stock_packaging_calculator: Migration to 14.0

---
 stock_packaging_calculator/README.rst           | 10 +++++-----
 stock_packaging_calculator/__manifest__.py      |  2 +-
 .../i18n/stock_packaging_calculator.pot         | 17 ++++++++++++++++-
 .../static/description/index.html               |  6 +++---
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/stock_packaging_calculator/README.rst b/stock_packaging_calculator/README.rst
index d6cc846cd..1a28cd164 100644
--- a/stock_packaging_calculator/README.rst
+++ b/stock_packaging_calculator/README.rst
@@ -14,13 +14,13 @@ Stock packaging calculator
     :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
     :alt: License: LGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github
-    :target: https://github.com/OCA/stock-logistics-warehouse/tree/13.0/stock_packaging_calculator
+    :target: https://github.com/OCA/stock-logistics-warehouse/tree/14.0/stock_packaging_calculator
     :alt: OCA/stock-logistics-warehouse
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-13-0/stock-logistics-warehouse-13-0-stock_packaging_calculator
+    :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-14-0/stock-logistics-warehouse-14-0-stock_packaging_calculator
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/153/13.0
+    :target: https://runbot.odoo-community.org/runbot/153/14.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -91,7 +91,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/stock-logistics-warehouse/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_packaging_calculator%0Aversion:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_packaging_calculator%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -121,6 +121,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/stock-logistics-warehouse <https://github.com/OCA/stock-logistics-warehouse/tree/13.0/stock_packaging_calculator>`_ project on GitHub.
+This module is part of the `OCA/stock-logistics-warehouse <https://github.com/OCA/stock-logistics-warehouse/tree/14.0/stock_packaging_calculator>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/stock_packaging_calculator/__manifest__.py b/stock_packaging_calculator/__manifest__.py
index d31c5853c..856e147c3 100644
--- a/stock_packaging_calculator/__manifest__.py
+++ b/stock_packaging_calculator/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Stock packaging calculator",
     "summary": "Compute product quantity to pick by packaging",
-    "version": "13.0.1.6.0",
+    "version": "14.0.1.0.0",
     "development_status": "Alpha",
     "category": "Warehouse Management",
     "website": "https://github.com/OCA/stock-logistics-warehouse",
diff --git a/stock_packaging_calculator/i18n/stock_packaging_calculator.pot b/stock_packaging_calculator/i18n/stock_packaging_calculator.pot
index 92a274c4a..664b39319 100644
--- a/stock_packaging_calculator/i18n/stock_packaging_calculator.pot
+++ b/stock_packaging_calculator/i18n/stock_packaging_calculator.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 13.0\n"
+"Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -13,6 +13,21 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: stock_packaging_calculator
+#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_product__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: stock_packaging_calculator
+#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_product__id
+msgid "ID"
+msgstr ""
+
+#. module: stock_packaging_calculator
+#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_product____last_update
+msgid "Last Modified on"
+msgstr ""
+
 #. module: stock_packaging_calculator
 #: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_product__packaging_contained_mapping
 msgid "Packaging Contained Mapping"
diff --git a/stock_packaging_calculator/static/description/index.html b/stock_packaging_calculator/static/description/index.html
index ebff58a67..0bfe447f7 100644
--- a/stock_packaging_calculator/static/description/index.html
+++ b/stock_packaging_calculator/static/description/index.html
@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/13.0/stock_packaging_calculator"><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" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-13-0/stock-logistics-warehouse-13-0-stock_packaging_calculator"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/153/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/14.0/stock_packaging_calculator"><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" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-14-0/stock-logistics-warehouse-14-0-stock_packaging_calculator"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/153/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>Basic module providing an helper method to calculate the quantity of product by packaging.</p>
 <div class="admonition important">
 <p class="first admonition-title">Important</p>
@@ -439,7 +439,7 @@ Only for development or testing purpose, do not use in production.
 <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 smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_packaging_calculator%0Aversion:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_packaging_calculator%0Aversion:%2014.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">
@@ -463,7 +463,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/13.0/stock_packaging_calculator">OCA/stock-logistics-warehouse</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/14.0/stock_packaging_calculator">OCA/stock-logistics-warehouse</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

From 1580d8e78fb42e4418edaaa388c6753bf836285c Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 5 Feb 2021 10:01:09 +0000
Subject: [PATCH 22/38] stock_packaging_calculator 14.0.1.0.1

---
 stock_packaging_calculator/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stock_packaging_calculator/__manifest__.py b/stock_packaging_calculator/__manifest__.py
index 856e147c3..f2d7f8685 100644
--- a/stock_packaging_calculator/__manifest__.py
+++ b/stock_packaging_calculator/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Stock packaging calculator",
     "summary": "Compute product quantity to pick by packaging",
-    "version": "14.0.1.0.0",
+    "version": "14.0.1.0.1",
     "development_status": "Alpha",
     "category": "Warehouse Management",
     "website": "https://github.com/OCA/stock-logistics-warehouse",

From 9976cabe5b4e9754116f0ab70ee81b288d705c89 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 11 May 2021 16:09:28 +0200
Subject: [PATCH 23/38] s_packaging_calculator: include barcode

---
 stock_packaging_calculator/models/product.py  |   7 +-
 .../tests/test_packaging_calc.py              | 322 ++++--------------
 stock_packaging_calculator/tests/utils.py     |  24 ++
 3 files changed, 99 insertions(+), 254 deletions(-)
 create mode 100644 stock_packaging_calculator/tests/utils.py

diff --git a/stock_packaging_calculator/models/product.py b/stock_packaging_calculator/models/product.py
index a4327076c..13ae10f3d 100644
--- a/stock_packaging_calculator/models/product.py
+++ b/stock_packaging_calculator/models/product.py
@@ -9,7 +9,7 @@ from odoo.tools import float_compare
 from odoo.addons.base_sparse_field.models.fields import Serialized
 
 # Unify records as we mix up w/ UoM
-Packaging = namedtuple("Packaging", "id name qty is_unit")
+Packaging = namedtuple("Packaging", "id name qty barcode is_unit")
 
 
 class Product(models.Model):
@@ -83,7 +83,7 @@ class Product(models.Model):
         name_getter = self.env.context.get("_packaging_name_getter", lambda x: x.name)
         packagings = sorted(
             [
-                Packaging(x.id, name_getter(x), x.qty, False)
+                Packaging(x.id, name_getter(x), x.qty, x.barcode, False)
                 for x in self.packaging_ids.filtered(custom_filter)
                 # Exclude the ones w/ zero qty as they are useless for the math
                 if x.qty
@@ -96,7 +96,7 @@ class Product(models.Model):
             # NOTE: the ID here could clash w/ one of the packaging's.
             # If you create a mapping based on IDs, keep this in mind.
             # You can use `is_unit` to check this.
-            Packaging(self.uom_id.id, self.uom_id.name, self.uom_id.factor, True)
+            Packaging(self.uom_id.id, self.uom_id.name, self.uom_id.factor, None, True)
         )
         return packagings
 
@@ -140,4 +140,5 @@ class Product(models.Model):
             "qty": qty_per_pkg,
             "name": packaging.name,
             "is_unit": packaging.is_unit,
+            "barcode": packaging.barcode,
         }
diff --git a/stock_packaging_calculator/tests/test_packaging_calc.py b/stock_packaging_calculator/tests/test_packaging_calc.py
index 1bc721086..99470229b 100644
--- a/stock_packaging_calculator/tests/test_packaging_calc.py
+++ b/stock_packaging_calculator/tests/test_packaging_calc.py
@@ -2,11 +2,14 @@
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl)
 from odoo.tests import SavepointCase
 
+from .utils import make_pkg_values
+
 
 class TestCalc(SavepointCase):
 
     at_install = False
     post_install = True
+    maxDiff = None
 
     @classmethod
     def setUpClass(cls):
@@ -21,43 +24,32 @@ class TestCalc(SavepointCase):
             }
         )
         cls.pkg_box = cls.env["product.packaging"].create(
-            {"name": "Box", "product_id": cls.product_a.id, "qty": 50}
+            {"name": "Box", "product_id": cls.product_a.id, "qty": 50, "barcode": "BOX"}
         )
         cls.pkg_big_box = cls.env["product.packaging"].create(
-            {"name": "Big Box", "product_id": cls.product_a.id, "qty": 200}
+            {
+                "name": "Big Box",
+                "product_id": cls.product_a.id,
+                "qty": 200,
+                "barcode": "BIGBOX",
+            }
         )
         cls.pkg_pallet = cls.env["product.packaging"].create(
-            {"name": "Pallet", "product_id": cls.product_a.id, "qty": 2000}
+            {
+                "name": "Pallet",
+                "product_id": cls.product_a.id,
+                "qty": 2000,
+                "barcode": "PALLET",
+            }
         )
 
     def test_contained_mapping(self):
         self.assertEqual(
             self.product_a.packaging_contained_mapping,
             {
-                str(self.pkg_pallet.id): [
-                    {
-                        "id": self.pkg_big_box.id,
-                        "qty": 10,
-                        "name": self.pkg_big_box.name,
-                        "is_unit": False,
-                    },
-                ],
-                str(self.pkg_big_box.id): [
-                    {
-                        "id": self.pkg_box.id,
-                        "qty": 4,
-                        "name": self.pkg_box.name,
-                        "is_unit": False,
-                    },
-                ],
-                str(self.pkg_box.id): [
-                    {
-                        "id": self.uom_unit.id,
-                        "qty": 50,
-                        "name": self.uom_unit.name,
-                        "is_unit": True,
-                    },
-                ],
+                str(self.pkg_pallet.id): [make_pkg_values(self.pkg_big_box, qty=10)],
+                str(self.pkg_big_box.id): [make_pkg_values(self.pkg_box, qty=4)],
+                str(self.pkg_box.id): [make_pkg_values(self.uom_unit, qty=50)],
             },
         )
         # Update pkg qty
@@ -65,132 +57,51 @@ class TestCalc(SavepointCase):
         self.assertEqual(
             self.product_a.packaging_contained_mapping,
             {
-                str(self.pkg_pallet.id): [
-                    {
-                        "id": self.pkg_big_box.id,
-                        "qty": 20,
-                        "name": self.pkg_big_box.name,
-                        "is_unit": False,
-                    },
-                ],
-                str(self.pkg_big_box.id): [
-                    {
-                        "id": self.pkg_box.id,
-                        "qty": 4,
-                        "name": self.pkg_box.name,
-                        "is_unit": False,
-                    },
-                ],
-                str(self.pkg_box.id): [
-                    {
-                        "id": self.uom_unit.id,
-                        "qty": 50,
-                        "name": self.uom_unit.name,
-                        "is_unit": True,
-                    },
-                ],
+                str(self.pkg_pallet.id): [make_pkg_values(self.pkg_big_box, qty=20)],
+                str(self.pkg_big_box.id): [make_pkg_values(self.pkg_box, qty=4)],
+                str(self.pkg_box.id): [make_pkg_values(self.uom_unit, qty=50)],
             },
         )
 
     def test_calc_1(self):
         """Test easy behavior 1."""
         expected = [
-            {
-                "id": self.pkg_pallet.id,
-                "qty": 1,
-                "name": self.pkg_pallet.name,
-                "is_unit": False,
-            },
-            {
-                "id": self.pkg_big_box.id,
-                "qty": 3,
-                "name": self.pkg_big_box.name,
-                "is_unit": False,
-            },
-            {
-                "id": self.pkg_box.id,
-                "qty": 1,
-                "name": self.pkg_box.name,
-                "is_unit": False,
-            },
-            {
-                "id": self.uom_unit.id,
-                "qty": 5,
-                "name": self.uom_unit.name,
-                "is_unit": True,
-            },
+            make_pkg_values(self.pkg_pallet, qty=1),
+            make_pkg_values(self.pkg_big_box, qty=3),
+            make_pkg_values(self.pkg_box, qty=1),
+            make_pkg_values(self.uom_unit, qty=5),
         ]
         self.assertEqual(self.product_a.product_qty_by_packaging(2655), expected)
 
     def test_calc_2(self):
         """Test easy behavior 2."""
         expected = [
-            {
-                "id": self.pkg_big_box.id,
-                "qty": 1,
-                "name": self.pkg_big_box.name,
-                "is_unit": False,
-            },
-            {
-                "id": self.pkg_box.id,
-                "qty": 3,
-                "name": self.pkg_box.name,
-                "is_unit": False,
-            },
+            make_pkg_values(self.pkg_big_box, qty=1),
+            make_pkg_values(self.pkg_box, qty=3),
         ]
         self.assertEqual(self.product_a.product_qty_by_packaging(350), expected)
 
     def test_calc_3(self):
         """Test easy behavior 3."""
         expected = [
-            {
-                "id": self.pkg_box.id,
-                "qty": 1,
-                "name": self.pkg_box.name,
-                "is_unit": False,
-            },
-            {
-                "id": self.uom_unit.id,
-                "qty": 30,
-                "name": self.uom_unit.name,
-                "is_unit": True,
-            },
+            make_pkg_values(self.pkg_box, qty=1),
+            make_pkg_values(self.uom_unit, qty=30),
         ]
         self.assertEqual(self.product_a.product_qty_by_packaging(80), expected)
 
     def test_calc_6(self):
         """Test fractional qty is lost."""
         expected = [
-            {
-                "id": self.pkg_box.id,
-                "qty": 1,
-                "name": self.pkg_box.name,
-                "is_unit": False,
-            },
+            make_pkg_values(self.pkg_box, qty=1),
         ]
         self.assertEqual(self.product_a.product_qty_by_packaging(50.5), expected)
 
     def test_calc_filter(self):
         """Test packaging filter."""
         expected = [
-            {
-                "id": self.pkg_big_box.id,
-                "qty": 13,
-                "name": self.pkg_big_box.name,
-                "is_unit": False,
-            },
-            {
-                "id": self.pkg_box.id,
-                "qty": 1,
-                "name": self.pkg_box.name,
-                "is_unit": False,
-            },
-            {
-                "id": self.uom_unit.id,
-                "qty": 5,
-                "name": self.uom_unit.name,
-                "is_unit": True,
-            },
+            make_pkg_values(self.pkg_big_box, qty=13),
+            make_pkg_values(self.pkg_box, qty=1),
+            make_pkg_values(self.uom_unit, qty=5),
         ]
         self.assertEqual(
             self.product_a.with_context(
@@ -202,30 +113,12 @@ class TestCalc(SavepointCase):
     def test_calc_name_get(self):
         """Test custom name getter."""
         expected = [
-            {
-                "id": self.pkg_pallet.id,
-                "qty": 1,
-                "name": "FOO " + self.pkg_pallet.name,
-                "is_unit": False,
-            },
-            {
-                "id": self.pkg_big_box.id,
-                "qty": 3,
-                "name": "FOO " + self.pkg_big_box.name,
-                "is_unit": False,
-            },
-            {
-                "id": self.pkg_box.id,
-                "qty": 1,
-                "name": "FOO " + self.pkg_box.name,
-                "is_unit": False,
-            },
-            {
-                "id": self.uom_unit.id,
-                "qty": 5,
-                "name": self.uom_unit.name,
-                "is_unit": True,
-            },
+            make_pkg_values(self.pkg_pallet, qty=1, name="FOO " + self.pkg_pallet.name),
+            make_pkg_values(
+                self.pkg_big_box, qty=3, name="FOO " + self.pkg_big_box.name
+            ),
+            make_pkg_values(self.pkg_box, qty=1, name="FOO " + self.pkg_box.name),
+            make_pkg_values(self.uom_unit, qty=5, name=self.uom_unit.name),
         ]
         self.assertEqual(
             self.product_a.with_context(
@@ -255,55 +148,20 @@ class TestCalc(SavepointCase):
     def test_calc_sub1(self):
         """Test contained packaging behavior 1."""
         expected = [
-            {
-                "id": self.pkg_pallet.id,
-                "qty": 1,
-                "name": self.pkg_pallet.name,
-                "is_unit": False,
-                "contained": [
-                    {
-                        "id": self.pkg_big_box.id,
-                        "qty": 10,
-                        "name": self.pkg_big_box.name,
-                        "is_unit": False,
-                    },
-                ],
-            },
-            {
-                "id": self.pkg_big_box.id,
-                "qty": 3,
-                "name": self.pkg_big_box.name,
-                "is_unit": False,
-                "contained": [
-                    {
-                        "id": self.pkg_box.id,
-                        "qty": 4,
-                        "name": self.pkg_box.name,
-                        "is_unit": False,
-                    },
-                ],
-            },
-            {
-                "id": self.pkg_box.id,
-                "qty": 1,
-                "name": self.pkg_box.name,
-                "is_unit": False,
-                "contained": [
-                    {
-                        "id": self.uom_unit.id,
-                        "qty": 50,
-                        "name": self.uom_unit.name,
-                        "is_unit": True,
-                    },
-                ],
-            },
-            {
-                "id": self.uom_unit.id,
-                "qty": 5,
-                "name": self.uom_unit.name,
-                "is_unit": True,
-                "contained": None,
-            },
+            make_pkg_values(
+                self.pkg_pallet,
+                qty=1,
+                contained=[make_pkg_values(self.pkg_big_box, qty=10)],
+            ),
+            make_pkg_values(
+                self.pkg_big_box,
+                qty=3,
+                contained=[make_pkg_values(self.pkg_box, qty=4)],
+            ),
+            make_pkg_values(
+                self.pkg_box, qty=1, contained=[make_pkg_values(self.uom_unit, qty=50)],
+            ),
+            make_pkg_values(self.uom_unit, qty=5, contained=None),
         ]
         self.assertEqual(
             self.product_a.product_qty_by_packaging(2655, with_contained=True),
@@ -311,64 +169,26 @@ class TestCalc(SavepointCase):
         )
 
     def test_calc_sub2(self):
-        """Test contained packaging behavior 1."""
+        """Test contained packaging behavior 2."""
         self.pkg_box.qty = 30
         expected = [
-            {
-                "id": self.pkg_pallet.id,
-                "qty": 1,
-                "name": self.pkg_pallet.name,
-                "is_unit": False,
-                "contained": [
-                    {
-                        "id": self.pkg_big_box.id,
-                        "qty": 10,
-                        "name": self.pkg_big_box.name,
-                        "is_unit": False,
-                    },
+            make_pkg_values(
+                self.pkg_pallet,
+                qty=1,
+                contained=[make_pkg_values(self.pkg_big_box, qty=10)],
+            ),
+            make_pkg_values(
+                self.pkg_big_box,
+                qty=3,
+                contained=[
+                    make_pkg_values(self.pkg_box, qty=6),
+                    make_pkg_values(self.uom_unit, qty=20),
                 ],
-            },
-            {
-                "id": self.pkg_big_box.id,
-                "qty": 3,
-                "name": self.pkg_big_box.name,
-                "is_unit": False,
-                "contained": [
-                    {
-                        "id": self.pkg_box.id,
-                        "qty": 6,
-                        "name": self.pkg_box.name,
-                        "is_unit": False,
-                    },
-                    {
-                        "id": self.uom_unit.id,
-                        "qty": 20,
-                        "name": self.uom_unit.name,
-                        "is_unit": True,
-                    },
-                ],
-            },
-            {
-                "id": self.pkg_box.id,
-                "qty": 1,
-                "name": self.pkg_box.name,
-                "is_unit": False,
-                "contained": [
-                    {
-                        "id": self.uom_unit.id,
-                        "qty": 30,
-                        "name": self.uom_unit.name,
-                        "is_unit": True,
-                    },
-                ],
-            },
-            {
-                "id": self.uom_unit.id,
-                "qty": 25,
-                "name": self.uom_unit.name,
-                "is_unit": True,
-                "contained": None,
-            },
+            ),
+            make_pkg_values(
+                self.pkg_box, qty=1, contained=[make_pkg_values(self.uom_unit, qty=30)],
+            ),
+            make_pkg_values(self.uom_unit, qty=25, contained=None),
         ]
         self.assertEqual(
             self.product_a.product_qty_by_packaging(2655, with_contained=True),
diff --git a/stock_packaging_calculator/tests/utils.py b/stock_packaging_calculator/tests/utils.py
new file mode 100644
index 000000000..cd9e12560
--- /dev/null
+++ b/stock_packaging_calculator/tests/utils.py
@@ -0,0 +1,24 @@
+# Copyright 2021 Camptocamp SA
+# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl)
+
+
+def make_pkg_values(record, **kw):
+    """Helper to generate test values for packaging.
+    """
+    if record._name == "uom.uom":
+        is_unit = True
+        barcode = None
+        qty = record.factor
+    elif record._name == "product.packaging":
+        qty = record.qty
+        is_unit = False
+        barcode = record.barcode
+    values = {
+        "id": record.id,
+        "name": record.name,
+        "qty": qty,
+        "barcode": barcode,
+        "is_unit": is_unit,
+    }
+    values.update(kw)
+    return values

From 20c1fc9099dc694a691796cbf62b1a59cdd04846 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Fri, 28 May 2021 09:03:14 +0200
Subject: [PATCH 24/38] s_packaging_calculator: ease override of packaging name

---
 stock_packaging_calculator/models/product.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/stock_packaging_calculator/models/product.py b/stock_packaging_calculator/models/product.py
index 13ae10f3d..cdf83edf9 100644
--- a/stock_packaging_calculator/models/product.py
+++ b/stock_packaging_calculator/models/product.py
@@ -80,7 +80,9 @@ class Product(models.Model):
         the display name of the packaging.
         """
         custom_filter = self.env.context.get("_packaging_filter", lambda x: x)
-        name_getter = self.env.context.get("_packaging_name_getter", lambda x: x.name)
+        name_getter = self.env.context.get(
+            "_packaging_name_getter", self._packaging_name_getter
+        )
         packagings = sorted(
             [
                 Packaging(x.id, name_getter(x), x.qty, x.barcode, False)
@@ -100,6 +102,9 @@ class Product(models.Model):
         )
         return packagings
 
+    def _packaging_name_getter(self, packaging):
+        return packaging.name
+
     def _product_qty_by_packaging(self, pkg_by_qty, qty, with_contained=False):
         """Produce a list of dictionaries of packaging info."""
         # TODO: refactor to handle fractional quantities (eg: 0.5 Kg)

From d883283b28521ef12a538137f271cff8501bbe26 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Fri, 28 May 2021 09:04:51 +0200
Subject: [PATCH 25/38] s_packaging_calculator: add
 product_qty_by_packaging_as_str

Retrieve quickly packagin bty qty as a string.
---
 stock_packaging_calculator/models/product.py  | 58 +++++++++++++++++++
 stock_packaging_calculator/tests/__init__.py  |  1 +
 stock_packaging_calculator/tests/common.py    | 42 ++++++++++++++
 .../tests/test_packaging_calc.py              | 42 +-------------
 .../tests/test_pkg_qty_str.py                 | 50 ++++++++++++++++
 5 files changed, 153 insertions(+), 40 deletions(-)
 create mode 100644 stock_packaging_calculator/tests/common.py
 create mode 100644 stock_packaging_calculator/tests/test_pkg_qty_str.py

diff --git a/stock_packaging_calculator/models/product.py b/stock_packaging_calculator/models/product.py
index cdf83edf9..026c7971b 100644
--- a/stock_packaging_calculator/models/product.py
+++ b/stock_packaging_calculator/models/product.py
@@ -1,6 +1,8 @@
 # Copyright 2020 Camptocamp SA
+# @author: Simone Orsi <simone.orsi@camptocamp.com>
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl)
 
+import unicodedata
 from collections import namedtuple
 
 from odoo import api, models
@@ -11,6 +13,8 @@ from odoo.addons.base_sparse_field.models.fields import Serialized
 # Unify records as we mix up w/ UoM
 Packaging = namedtuple("Packaging", "id name qty barcode is_unit")
 
+NO_BREAK_SPACE_CHAR = unicodedata.lookup("NO-BREAK SPACE")
+
 
 class Product(models.Model):
     _inherit = "product.product"
@@ -147,3 +151,57 @@ class Product(models.Model):
             "is_unit": packaging.is_unit,
             "barcode": packaging.barcode,
         }
+
+    def product_qty_by_packaging_as_str(self, prod_qty, include_total_units=False):
+        """Return a string representing the qty of each packaging.
+
+        :param prod_qty: the qty of current product to translate to pkg qty
+        :param include_total_units: includes total qty required initially
+        """
+        self.ensure_one()
+        if not prod_qty:
+            return ""
+
+        qty_by_packaging = self.product_qty_by_packaging(prod_qty)
+        if not qty_by_packaging:
+            return ""
+
+        # Exclude unit qty and reuse it later
+        unit_qty = None
+        has_only_units = True
+        _qty_by_packaging = []
+        for pkg_qty in qty_by_packaging:
+            if pkg_qty["is_unit"]:
+                unit_qty = pkg_qty["qty"]
+                continue
+            has_only_units = False
+            _qty_by_packaging.append(pkg_qty)
+        # Browse them all at once
+        records = self.env["product.packaging"].browse(
+            [x["id"] for x in _qty_by_packaging]
+        )
+        _qty_by_packaging_as_str = self.env.context.get(
+            "_qty_by_packaging_as_str", self._qty_by_packaging_as_str
+        )
+        # Collect all strings representations
+        as_string = []
+        for record, info in zip(records, _qty_by_packaging):
+            bit = _qty_by_packaging_as_str(record, info["qty"])
+            if bit:
+                as_string.append(bit)
+        # Restore unit information if any.
+        # Skip it if we get only units in the count.
+        if unit_qty and not has_only_units:
+            as_string.append(f"{unit_qty} {self.uom_id.name}")
+        # We want to avoid line break here as this string
+        # can be used by reports
+        res = f",{NO_BREAK_SPACE_CHAR}".join(as_string)
+        if include_total_units and not has_only_units:
+            res += " " + self._qty_by_packaging_total_units(prod_qty)
+        return res
+
+    def _qty_by_packaging_as_str(self, packaging, qty):
+        return f"{qty} {packaging.name}"
+
+    def _qty_by_packaging_total_units(self, prod_qty):
+        return f"({prod_qty} {self.uom_id.name})"
diff --git a/stock_packaging_calculator/tests/__init__.py b/stock_packaging_calculator/tests/__init__.py
index 04c47e711..441177cdc 100644
--- a/stock_packaging_calculator/tests/__init__.py
+++ b/stock_packaging_calculator/tests/__init__.py
@@ -1 +1,2 @@
 from . import test_packaging_calc
+from . import test_pkg_qty_str
diff --git a/stock_packaging_calculator/tests/common.py b/stock_packaging_calculator/tests/common.py
new file mode 100644
index 000000000..c528958ce
--- /dev/null
+++ b/stock_packaging_calculator/tests/common.py
@@ -0,0 +1,42 @@
+# Copyright 2020 Camptocamp SA
+# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl)
+from odoo.tests import SavepointCase
+
+
+class TestCommon(SavepointCase):
+
+    at_install = False
+    post_install = True
+    maxDiff = None
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True))
+        cls.uom_unit = cls.env.ref("uom.product_uom_unit")
+        cls.product_a = cls.env["product.product"].create(
+            {
+                "name": "Product A",
+                "uom_id": cls.uom_unit.id,
+                "uom_po_id": cls.uom_unit.id,
+            }
+        )
+        cls.pkg_box = cls.env["product.packaging"].create(
+            {"name": "Box", "product_id": cls.product_a.id, "qty": 50, "barcode": "BOX"}
+        )
+        cls.pkg_big_box = cls.env["product.packaging"].create(
+            {
+                "name": "Big Box",
+                "product_id": cls.product_a.id,
+                "qty": 200,
+                "barcode": "BIGBOX",
+            }
+        )
+        cls.pkg_pallet = cls.env["product.packaging"].create(
+            {
+                "name": "Pallet",
+                "product_id": cls.product_a.id,
+                "qty": 2000,
+                "barcode": "PALLET",
+            }
+        )
diff --git a/stock_packaging_calculator/tests/test_packaging_calc.py b/stock_packaging_calculator/tests/test_packaging_calc.py
index 99470229b..c51347e40 100644
--- a/stock_packaging_calculator/tests/test_packaging_calc.py
+++ b/stock_packaging_calculator/tests/test_packaging_calc.py
@@ -1,48 +1,10 @@
 # Copyright 2020 Camptocamp SA
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl)
-from odoo.tests import SavepointCase
-
+from .common import TestCommon
 from .utils import make_pkg_values
 
 
-class TestCalc(SavepointCase):
-
-    at_install = False
-    post_install = True
-    maxDiff = None
-
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True))
-        cls.uom_unit = cls.env.ref("uom.product_uom_unit")
-        cls.product_a = cls.env["product.product"].create(
-            {
-                "name": "Product A",
-                "uom_id": cls.uom_unit.id,
-                "uom_po_id": cls.uom_unit.id,
-            }
-        )
-        cls.pkg_box = cls.env["product.packaging"].create(
-            {"name": "Box", "product_id": cls.product_a.id, "qty": 50, "barcode": "BOX"}
-        )
-        cls.pkg_big_box = cls.env["product.packaging"].create(
-            {
-                "name": "Big Box",
-                "product_id": cls.product_a.id,
-                "qty": 200,
-                "barcode": "BIGBOX",
-            }
-        )
-        cls.pkg_pallet = cls.env["product.packaging"].create(
-            {
-                "name": "Pallet",
-                "product_id": cls.product_a.id,
-                "qty": 2000,
-                "barcode": "PALLET",
-            }
-        )
-
+class TestCalc(TestCommon):
     def test_contained_mapping(self):
         self.assertEqual(
             self.product_a.packaging_contained_mapping,
diff --git a/stock_packaging_calculator/tests/test_pkg_qty_str.py b/stock_packaging_calculator/tests/test_pkg_qty_str.py
new file mode 100644
index 000000000..93998846c
--- /dev/null
+++ b/stock_packaging_calculator/tests/test_pkg_qty_str.py
@@ -0,0 +1,50 @@
+# Copyright 2021 Camptocamp SA
+# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl)
+from .common import TestCommon
+
+
+class TestAsStr(TestCommon):
+    def test_as_str(self):
+        self.assertEqual(self.product_a.product_qty_by_packaging_as_str(10), "")
+        self.assertEqual(self.product_a.product_qty_by_packaging_as_str(100), "2 Box")
+        self.assertEqual(
+            self.product_a.product_qty_by_packaging_as_str(250), "1 Big Box,\xa01 Box"
+        )
+        self.assertEqual(
+            self.product_a.product_qty_by_packaging_as_str(255),
+            "1 Big Box,\xa01 Box,\xa05 Units",
+        )
+
+    def test_as_str_w_units(self):
+        self.assertEqual(
+            self.product_a.product_qty_by_packaging_as_str(
+                10, include_total_units=True
+            ),
+            "",
+        )
+        self.assertEqual(
+            self.product_a.product_qty_by_packaging_as_str(
+                100, include_total_units=True
+            ),
+            "2 Box (100 Units)",
+        )
+        self.assertEqual(
+            self.product_a.product_qty_by_packaging_as_str(
+                250, include_total_units=True
+            ),
+            "1 Big Box,\xa01 Box (250 Units)",
+        )
+        self.assertEqual(
+            self.product_a.product_qty_by_packaging_as_str(
+                255, include_total_units=True
+            ),
+            "1 Big Box,\xa01 Box,\xa05 Units (255 Units)",
+        )
+
+    def test_as_str_custom_name(self):
+        self.assertEqual(
+            self.product_a.with_context(
+                _qty_by_packaging_as_str=lambda pkg, qty: f"{pkg.name} {qty} FOO"
+            ).product_qty_by_packaging_as_str(250),
+            "Big Box 1 FOO,\xa0Box 1 FOO",
+        )

From 9f0984f3545e89289abba3d739f14570b00ad07f Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Fri, 28 May 2021 08:59:14 +0200
Subject: [PATCH 26/38] s_packaging_calculator: add handy mixin

This mixin can be used to provide qty by packaging features
to any model.
---
 stock_packaging_calculator/models/__init__.py |  1 +
 .../models/product_qty_by_packaging_mixin.py  | 48 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 stock_packaging_calculator/models/product_qty_by_packaging_mixin.py

diff --git a/stock_packaging_calculator/models/__init__.py b/stock_packaging_calculator/models/__init__.py
index 9649db77a..fb73bb4d1 100644
--- a/stock_packaging_calculator/models/__init__.py
+++ b/stock_packaging_calculator/models/__init__.py
@@ -1 +1,2 @@
 from . import product
+from . import product_qty_by_packaging_mixin
diff --git a/stock_packaging_calculator/models/product_qty_by_packaging_mixin.py b/stock_packaging_calculator/models/product_qty_by_packaging_mixin.py
new file mode 100644
index 000000000..4721fe862
--- /dev/null
+++ b/stock_packaging_calculator/models/product_qty_by_packaging_mixin.py
@@ -0,0 +1,48 @@
+# Copyright 2021 Camptocamp SA
+# @author: Simone Orsi <simone.orsi@camptocamp.com>
+# @author: Sébastien Alix <sebastien.alix@camptocamp.com>
+# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl)
+from odoo import api, fields, models
+
+
+class ProductQtyByPackagingMixin(models.AbstractModel):
+    """Allow displaying product qty by packaging.
+    """
+
+    _name = "product.qty_by_packaging.mixin"
+    _description = "Product Qty By Packaging (Mixin)"
+
+    _qty_by_pkg__product_field_name = "product_id"
+    _qty_by_pkg__qty_field_name = None
+
+    product_qty_by_packaging_display = fields.Char(
+        compute="_compute_product_qty_by_packaging_display", string="Qty by packaging"
+    )
+
+    def _product_qty_by_packaging_display_depends(self):
+        depends = []
+        if self._qty_by_pkg__product_field_name:
+            depends.append(self._qty_by_pkg__product_field_name)
+        if self._qty_by_pkg__qty_field_name:
+            depends.append(self._qty_by_pkg__qty_field_name)
+        return depends
+
+    @api.depends_context("lang", "qty_by_pkg_total_units")
+    @api.depends(lambda self: self._product_qty_by_packaging_display_depends())
+    def _compute_product_qty_by_packaging_display(self):
+        include_total_units = self.env.context.get("qty_by_pkg_total_units", False)
+        for record in self:
+            value = ""
+            product = record._qty_by_packaging_get_product()
+            if product:
+                value = product.product_qty_by_packaging_as_str(
+                    record._qty_by_packaging_get_qty(),
+                    include_total_units=include_total_units,
+                )
+            record.product_qty_by_packaging_display = value
+
+    def _qty_by_packaging_get_product(self):
+        return self[self._qty_by_pkg__product_field_name]
+
+    def _qty_by_packaging_get_qty(self):
+        return self[self._qty_by_pkg__qty_field_name]

From d9dce661ed70769a5f8c343233d334ca4164bb69 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Thu, 3 Jun 2021 13:03:04 +0200
Subject: [PATCH 27/38] s_packaging_calculator: contained mapping depends on
 lang

Otherwise translations won't be taken into account.
---
 stock_packaging_calculator/models/product.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stock_packaging_calculator/models/product.py b/stock_packaging_calculator/models/product.py
index 026c7971b..57fc4dbdc 100644
--- a/stock_packaging_calculator/models/product.py
+++ b/stock_packaging_calculator/models/product.py
@@ -24,6 +24,7 @@ class Product(models.Model):
         help="Technical field to store contained packaging. ",
     )
 
+    @api.depends_context("lang")
     @api.depends("packaging_ids.qty")
     def _compute_packaging_contained_mapping(self):
         for rec in self:

From 6134dd47fb838500af895919f2515b7090c05723 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Fri, 11 Jun 2021 13:08:24 +0200
Subject: [PATCH 28/38] s_packaging_calculator: include units when units only
 on demand

---
 stock_packaging_calculator/models/product.py  | 11 ++++++++---
 .../models/product_qty_by_packaging_mixin.py  |  4 +++-
 .../tests/test_pkg_qty_str.py                 | 19 +++++++++++++++++--
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/stock_packaging_calculator/models/product.py b/stock_packaging_calculator/models/product.py
index 57fc4dbdc..71d706368 100644
--- a/stock_packaging_calculator/models/product.py
+++ b/stock_packaging_calculator/models/product.py
@@ -153,11 +153,16 @@ class Product(models.Model):
             "barcode": packaging.barcode,
         }
 
-    def product_qty_by_packaging_as_str(self, prod_qty, include_total_units=False):
+    def product_qty_by_packaging_as_str(
+        self, prod_qty, include_total_units=False, only_packaging=False
+    ):
         """Return a string representing the qty of each packaging.
 
         :param prod_qty: the qty of current product to translate to pkg qty
         :param include_total_units: includes total qty required initially
+        :param only_packaging: exclude units if you have only units.
+            IOW: if the qty does not match any packaging and this flag is true
+            you'll get an empty string instead of `N units`.
         """
         self.ensure_one()
         if not prod_qty:
@@ -191,8 +196,8 @@ class Product(models.Model):
             if bit:
                 as_string.append(bit)
         # Restore unit information if any.
-        # Skip it if we get only units in the count.
-        if unit_qty and not has_only_units:
+        include_units = (has_only_units and not only_packaging) or not has_only_units
+        if unit_qty and include_units:
             as_string.append(f"{unit_qty} {self.uom_id.name}")
         # We want to avoid line break here as this string
         # can be used by reports
diff --git a/stock_packaging_calculator/models/product_qty_by_packaging_mixin.py b/stock_packaging_calculator/models/product_qty_by_packaging_mixin.py
index 4721fe862..9065a7b1f 100644
--- a/stock_packaging_calculator/models/product_qty_by_packaging_mixin.py
+++ b/stock_packaging_calculator/models/product_qty_by_packaging_mixin.py
@@ -27,10 +27,11 @@ class ProductQtyByPackagingMixin(models.AbstractModel):
             depends.append(self._qty_by_pkg__qty_field_name)
         return depends
 
-    @api.depends_context("lang", "qty_by_pkg_total_units")
+    @api.depends_context("lang", "qty_by_pkg_total_units", "qty_by_pkg_only_packaging")
     @api.depends(lambda self: self._product_qty_by_packaging_display_depends())
     def _compute_product_qty_by_packaging_display(self):
         include_total_units = self.env.context.get("qty_by_pkg_total_units", False)
+        only_packaging = self.env.context.get("qty_by_pkg_only_packaging", False)
         for record in self:
             value = ""
             product = record._qty_by_packaging_get_product()
@@ -38,6 +39,7 @@ class ProductQtyByPackagingMixin(models.AbstractModel):
                 value = product.product_qty_by_packaging_as_str(
                     record._qty_by_packaging_get_qty(),
                     include_total_units=include_total_units,
+                    only_packaging=only_packaging,
                 )
             record.product_qty_by_packaging_display = value
 
diff --git a/stock_packaging_calculator/tests/test_pkg_qty_str.py b/stock_packaging_calculator/tests/test_pkg_qty_str.py
index 93998846c..7fca487de 100644
--- a/stock_packaging_calculator/tests/test_pkg_qty_str.py
+++ b/stock_packaging_calculator/tests/test_pkg_qty_str.py
@@ -5,7 +5,10 @@ from .common import TestCommon
 
 class TestAsStr(TestCommon):
     def test_as_str(self):
-        self.assertEqual(self.product_a.product_qty_by_packaging_as_str(10), "")
+        self.assertEqual(self.product_a.product_qty_by_packaging_as_str(10), "10 Units")
+        self.assertEqual(
+            self.product_a.product_qty_by_packaging_as_str(10, only_packaging=True), ""
+        )
         self.assertEqual(self.product_a.product_qty_by_packaging_as_str(100), "2 Box")
         self.assertEqual(
             self.product_a.product_qty_by_packaging_as_str(250), "1 Big Box,\xa01 Box"
@@ -14,13 +17,18 @@ class TestAsStr(TestCommon):
             self.product_a.product_qty_by_packaging_as_str(255),
             "1 Big Box,\xa01 Box,\xa05 Units",
         )
+        # only_packaging has no impact if we get not only units
+        self.assertEqual(
+            self.product_a.product_qty_by_packaging_as_str(255, only_packaging=True),
+            "1 Big Box,\xa01 Box,\xa05 Units",
+        )
 
     def test_as_str_w_units(self):
         self.assertEqual(
             self.product_a.product_qty_by_packaging_as_str(
                 10, include_total_units=True
             ),
-            "",
+            "10 Units",
         )
         self.assertEqual(
             self.product_a.product_qty_by_packaging_as_str(
@@ -40,6 +48,13 @@ class TestAsStr(TestCommon):
             ),
             "1 Big Box,\xa01 Box,\xa05 Units (255 Units)",
         )
+        # only_packaging has no impact if we get not only units
+        self.assertEqual(
+            self.product_a.product_qty_by_packaging_as_str(
+                255, include_total_units=True, only_packaging=True
+            ),
+            "1 Big Box,\xa01 Box,\xa05 Units (255 Units)",
+        )
 
     def test_as_str_custom_name(self):
         self.assertEqual(

From 35cfc4c6efba26b13a7b6578fdfd3551c71a6dc6 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Thu, 15 Jul 2021 16:57:16 +0200
Subject: [PATCH 29/38] s_packaging_calculator: improve test util

This way no matter who's changing the behavior of the name getter
we'll get the right name.
---
 .../i18n/stock_packaging_calculator.pot       | 44 -------------------
 stock_packaging_calculator/tests/utils.py     |  5 ++-
 2 files changed, 4 insertions(+), 45 deletions(-)
 delete mode 100644 stock_packaging_calculator/i18n/stock_packaging_calculator.pot

diff --git a/stock_packaging_calculator/i18n/stock_packaging_calculator.pot b/stock_packaging_calculator/i18n/stock_packaging_calculator.pot
deleted file mode 100644
index 664b39319..000000000
--- a/stock_packaging_calculator/i18n/stock_packaging_calculator.pot
+++ /dev/null
@@ -1,44 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# 	* stock_packaging_calculator
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
-"Report-Msgid-Bugs-To: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: stock_packaging_calculator
-#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_product__display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: stock_packaging_calculator
-#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_product__id
-msgid "ID"
-msgstr ""
-
-#. module: stock_packaging_calculator
-#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_product____last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: stock_packaging_calculator
-#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_product__packaging_contained_mapping
-msgid "Packaging Contained Mapping"
-msgstr ""
-
-#. module: stock_packaging_calculator
-#: model:ir.model,name:stock_packaging_calculator.model_product_product
-msgid "Product"
-msgstr ""
-
-#. module: stock_packaging_calculator
-#: model:ir.model.fields,help:stock_packaging_calculator.field_product_product__packaging_contained_mapping
-msgid "Technical field to store contained packaging. "
-msgstr ""
diff --git a/stock_packaging_calculator/tests/utils.py b/stock_packaging_calculator/tests/utils.py
index cd9e12560..8c885894c 100644
--- a/stock_packaging_calculator/tests/utils.py
+++ b/stock_packaging_calculator/tests/utils.py
@@ -5,6 +5,7 @@
 def make_pkg_values(record, **kw):
     """Helper to generate test values for packaging.
     """
+    name = record.name
     if record._name == "uom.uom":
         is_unit = True
         barcode = None
@@ -13,9 +14,11 @@ def make_pkg_values(record, **kw):
         qty = record.qty
         is_unit = False
         barcode = record.barcode
+        if record.product_id:
+            name = record.product_id._packaging_name_getter(record)
     values = {
         "id": record.id,
-        "name": record.name,
+        "name": name,
         "qty": qty,
         "barcode": barcode,
         "is_unit": is_unit,

From 1c99a9b56a2e0765917c1bfdeb32d350aa4a86bb Mon Sep 17 00:00:00 2001
From: nguyen hoang hiep <hiepnh@trobz.com>
Date: Tue, 14 Sep 2021 05:57:42 +0000
Subject: [PATCH 30/38] [IMP] stock_packaging_calculator: black, isort,
 prettier

---
 .../i18n/stock_packaging_calculator.pot       | 57 +++++++++++++++++++
 .../models/product_qty_by_packaging_mixin.py  |  3 +-
 .../tests/test_packaging_calc.py              |  8 ++-
 stock_packaging_calculator/tests/utils.py     |  3 +-
 4 files changed, 65 insertions(+), 6 deletions(-)
 create mode 100644 stock_packaging_calculator/i18n/stock_packaging_calculator.pot

diff --git a/stock_packaging_calculator/i18n/stock_packaging_calculator.pot b/stock_packaging_calculator/i18n/stock_packaging_calculator.pot
new file mode 100644
index 000000000..bb3d494b1
--- /dev/null
+++ b/stock_packaging_calculator/i18n/stock_packaging_calculator.pot
@@ -0,0 +1,57 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* stock_packaging_calculator
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: stock_packaging_calculator
+#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_product__display_name
+#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_qty_by_packaging_mixin__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: stock_packaging_calculator
+#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_product__id
+#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_qty_by_packaging_mixin__id
+msgid "ID"
+msgstr ""
+
+#. module: stock_packaging_calculator
+#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_product____last_update
+#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_qty_by_packaging_mixin____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: stock_packaging_calculator
+#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_product__packaging_contained_mapping
+msgid "Packaging Contained Mapping"
+msgstr ""
+
+#. module: stock_packaging_calculator
+#: model:ir.model,name:stock_packaging_calculator.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: stock_packaging_calculator
+#: model:ir.model,name:stock_packaging_calculator.model_product_qty_by_packaging_mixin
+msgid "Product Qty By Packaging (Mixin)"
+msgstr ""
+
+#. module: stock_packaging_calculator
+#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_qty_by_packaging_mixin__product_qty_by_packaging_display
+msgid "Qty by packaging"
+msgstr ""
+
+#. module: stock_packaging_calculator
+#: model:ir.model.fields,help:stock_packaging_calculator.field_product_product__packaging_contained_mapping
+msgid "Technical field to store contained packaging. "
+msgstr ""
diff --git a/stock_packaging_calculator/models/product_qty_by_packaging_mixin.py b/stock_packaging_calculator/models/product_qty_by_packaging_mixin.py
index 9065a7b1f..693ad561a 100644
--- a/stock_packaging_calculator/models/product_qty_by_packaging_mixin.py
+++ b/stock_packaging_calculator/models/product_qty_by_packaging_mixin.py
@@ -6,8 +6,7 @@ from odoo import api, fields, models
 
 
 class ProductQtyByPackagingMixin(models.AbstractModel):
-    """Allow displaying product qty by packaging.
-    """
+    """Allow displaying product qty by packaging."""
 
     _name = "product.qty_by_packaging.mixin"
     _description = "Product Qty By Packaging (Mixin)"
diff --git a/stock_packaging_calculator/tests/test_packaging_calc.py b/stock_packaging_calculator/tests/test_packaging_calc.py
index c51347e40..3d4bbfa85 100644
--- a/stock_packaging_calculator/tests/test_packaging_calc.py
+++ b/stock_packaging_calculator/tests/test_packaging_calc.py
@@ -121,7 +121,9 @@ class TestCalc(TestCommon):
                 contained=[make_pkg_values(self.pkg_box, qty=4)],
             ),
             make_pkg_values(
-                self.pkg_box, qty=1, contained=[make_pkg_values(self.uom_unit, qty=50)],
+                self.pkg_box,
+                qty=1,
+                contained=[make_pkg_values(self.uom_unit, qty=50)],
             ),
             make_pkg_values(self.uom_unit, qty=5, contained=None),
         ]
@@ -148,7 +150,9 @@ class TestCalc(TestCommon):
                 ],
             ),
             make_pkg_values(
-                self.pkg_box, qty=1, contained=[make_pkg_values(self.uom_unit, qty=30)],
+                self.pkg_box,
+                qty=1,
+                contained=[make_pkg_values(self.uom_unit, qty=30)],
             ),
             make_pkg_values(self.uom_unit, qty=25, contained=None),
         ]
diff --git a/stock_packaging_calculator/tests/utils.py b/stock_packaging_calculator/tests/utils.py
index 8c885894c..26c4b357b 100644
--- a/stock_packaging_calculator/tests/utils.py
+++ b/stock_packaging_calculator/tests/utils.py
@@ -3,8 +3,7 @@
 
 
 def make_pkg_values(record, **kw):
-    """Helper to generate test values for packaging.
-    """
+    """Helper to generate test values for packaging."""
     name = record.name
     if record._name == "uom.uom":
         is_unit = True

From fd86673585c7500e235ef86ac9a61bcbac2f8cb7 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Tue, 21 Sep 2021 06:07:56 +0000
Subject: [PATCH 31/38] stock_packaging_calculator 14.0.1.1.0

---
 stock_packaging_calculator/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stock_packaging_calculator/__manifest__.py b/stock_packaging_calculator/__manifest__.py
index f2d7f8685..711cf3f14 100644
--- a/stock_packaging_calculator/__manifest__.py
+++ b/stock_packaging_calculator/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Stock packaging calculator",
     "summary": "Compute product quantity to pick by packaging",
-    "version": "14.0.1.0.1",
+    "version": "14.0.1.1.0",
     "development_status": "Alpha",
     "category": "Warehouse Management",
     "website": "https://github.com/OCA/stock-logistics-warehouse",

From 64ff32b504d22d1766e201143aab422df88ba3ed Mon Sep 17 00:00:00 2001
From: Christopher Ormaza <chris.ormaza@forgeflow.com>
Date: Mon, 13 Dec 2021 13:14:34 -0500
Subject: [PATCH 32/38] [IMP] stock_packaging_calculator: black, isort,
 prettier

---
 stock_packaging_calculator/models/product.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stock_packaging_calculator/models/product.py b/stock_packaging_calculator/models/product.py
index 71d706368..5f9342424 100644
--- a/stock_packaging_calculator/models/product.py
+++ b/stock_packaging_calculator/models/product.py
@@ -89,12 +89,12 @@ class Product(models.Model):
             "_packaging_name_getter", self._packaging_name_getter
         )
         packagings = sorted(
-            [
+            (
                 Packaging(x.id, name_getter(x), x.qty, x.barcode, False)
                 for x in self.packaging_ids.filtered(custom_filter)
                 # Exclude the ones w/ zero qty as they are useless for the math
                 if x.qty
-            ],
+            ),
             reverse=True,
             key=lambda x: x.qty,
         )

From 7295ebfe392ee2526e64f4385211bdf3dfed8dd1 Mon Sep 17 00:00:00 2001
From: Christopher Ormaza <chris.ormaza@forgeflow.com>
Date: Mon, 13 Dec 2021 13:25:18 -0500
Subject: [PATCH 33/38] [15.0][MIG] stock_packaging_calculator

---
 stock_packaging_calculator/README.rst         | 11 +++++-----
 stock_packaging_calculator/__manifest__.py    |  2 +-
 .../i18n/stock_packaging_calculator.pot       | 20 +------------------
 .../readme/CONTRIBUTORS.rst                   |  1 +
 .../static/description/index.html             |  7 ++++---
 stock_packaging_calculator/tests/common.py    |  4 ++--
 6 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/stock_packaging_calculator/README.rst b/stock_packaging_calculator/README.rst
index 1a28cd164..adf3a79d7 100644
--- a/stock_packaging_calculator/README.rst
+++ b/stock_packaging_calculator/README.rst
@@ -14,13 +14,13 @@ Stock packaging calculator
     :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
     :alt: License: LGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github
-    :target: https://github.com/OCA/stock-logistics-warehouse/tree/14.0/stock_packaging_calculator
+    :target: https://github.com/OCA/stock-logistics-warehouse/tree/15.0/stock_packaging_calculator
     :alt: OCA/stock-logistics-warehouse
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-14-0/stock-logistics-warehouse-14-0-stock_packaging_calculator
+    :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-15-0/stock-logistics-warehouse-15-0-stock_packaging_calculator
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/153/14.0
+    :target: https://runbot.odoo-community.org/runbot/153/15.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -91,7 +91,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/stock-logistics-warehouse/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_packaging_calculator%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_packaging_calculator%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -107,6 +107,7 @@ Contributors
 ~~~~~~~~~~~~
 
 * Simone Orsi <simahawk@gmail.com>
+* Christopher Ormaza <chris.ormaza@forgeflow.com>
 
 Maintainers
 ~~~~~~~~~~~
@@ -121,6 +122,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/stock-logistics-warehouse <https://github.com/OCA/stock-logistics-warehouse/tree/14.0/stock_packaging_calculator>`_ project on GitHub.
+This module is part of the `OCA/stock-logistics-warehouse <https://github.com/OCA/stock-logistics-warehouse/tree/15.0/stock_packaging_calculator>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/stock_packaging_calculator/__manifest__.py b/stock_packaging_calculator/__manifest__.py
index 711cf3f14..63bb0de56 100644
--- a/stock_packaging_calculator/__manifest__.py
+++ b/stock_packaging_calculator/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Stock packaging calculator",
     "summary": "Compute product quantity to pick by packaging",
-    "version": "14.0.1.1.0",
+    "version": "15.0.1.0.0",
     "development_status": "Alpha",
     "category": "Warehouse Management",
     "website": "https://github.com/OCA/stock-logistics-warehouse",
diff --git a/stock_packaging_calculator/i18n/stock_packaging_calculator.pot b/stock_packaging_calculator/i18n/stock_packaging_calculator.pot
index bb3d494b1..3a5552568 100644
--- a/stock_packaging_calculator/i18n/stock_packaging_calculator.pot
+++ b/stock_packaging_calculator/i18n/stock_packaging_calculator.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
+"Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -13,24 +13,6 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: stock_packaging_calculator
-#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_product__display_name
-#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_qty_by_packaging_mixin__display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: stock_packaging_calculator
-#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_product__id
-#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_qty_by_packaging_mixin__id
-msgid "ID"
-msgstr ""
-
-#. module: stock_packaging_calculator
-#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_product____last_update
-#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_qty_by_packaging_mixin____last_update
-msgid "Last Modified on"
-msgstr ""
-
 #. module: stock_packaging_calculator
 #: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_product__packaging_contained_mapping
 msgid "Packaging Contained Mapping"
diff --git a/stock_packaging_calculator/readme/CONTRIBUTORS.rst b/stock_packaging_calculator/readme/CONTRIBUTORS.rst
index f583948be..5daf85c2e 100644
--- a/stock_packaging_calculator/readme/CONTRIBUTORS.rst
+++ b/stock_packaging_calculator/readme/CONTRIBUTORS.rst
@@ -1 +1,2 @@
 * Simone Orsi <simahawk@gmail.com>
+* Christopher Ormaza <chris.ormaza@forgeflow.com>
diff --git a/stock_packaging_calculator/static/description/index.html b/stock_packaging_calculator/static/description/index.html
index 0bfe447f7..0745b2c6d 100644
--- a/stock_packaging_calculator/static/description/index.html
+++ b/stock_packaging_calculator/static/description/index.html
@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/14.0/stock_packaging_calculator"><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" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-14-0/stock-logistics-warehouse-14-0-stock_packaging_calculator"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/153/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/15.0/stock_packaging_calculator"><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" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-15-0/stock-logistics-warehouse-15-0-stock_packaging_calculator"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/153/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>Basic module providing an helper method to calculate the quantity of product by packaging.</p>
 <div class="admonition important">
 <p class="first admonition-title">Important</p>
@@ -439,7 +439,7 @@ Only for development or testing purpose, do not use in production.
 <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 smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_packaging_calculator%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_packaging_calculator%0Aversion:%2015.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">
@@ -454,6 +454,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <h2><a class="toc-backref" href="#id6">Contributors</a></h2>
 <ul class="simple">
 <li>Simone Orsi &lt;<a class="reference external" href="mailto:simahawk&#64;gmail.com">simahawk&#64;gmail.com</a>&gt;</li>
+<li>Christopher Ormaza &lt;<a class="reference external" href="mailto:chris.ormaza&#64;forgeflow.com">chris.ormaza&#64;forgeflow.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
@@ -463,7 +464,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/14.0/stock_packaging_calculator">OCA/stock-logistics-warehouse</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/15.0/stock_packaging_calculator">OCA/stock-logistics-warehouse</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>
diff --git a/stock_packaging_calculator/tests/common.py b/stock_packaging_calculator/tests/common.py
index c528958ce..4aa0579a5 100644
--- a/stock_packaging_calculator/tests/common.py
+++ b/stock_packaging_calculator/tests/common.py
@@ -1,9 +1,9 @@
 # Copyright 2020 Camptocamp SA
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl)
-from odoo.tests import SavepointCase
+from odoo.tests import TransactionCase
 
 
-class TestCommon(SavepointCase):
+class TestCommon(TransactionCase):
 
     at_install = False
     post_install = True

From b7db64a1aba89c91c490b6332f0310b52a771e85 Mon Sep 17 00:00:00 2001
From: Thierry Ducrest <thierry@ducrest.net>
Date: Mon, 10 Oct 2022 14:08:14 +0200
Subject: [PATCH 34/38] [MIG] stock_packaging_calculator: Migration to 16.0

---
 stock_packaging_calculator/README.rst         | 19 +++++++------------
 stock_packaging_calculator/__manifest__.py    |  4 ++--
 .../i18n/stock_packaging_calculator.pot       | 10 +++++-----
 .../static/description/index.html             | 12 +++---------
 4 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/stock_packaging_calculator/README.rst b/stock_packaging_calculator/README.rst
index adf3a79d7..481f22104 100644
--- a/stock_packaging_calculator/README.rst
+++ b/stock_packaging_calculator/README.rst
@@ -7,31 +7,26 @@ Stock packaging calculator
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
-    :alt: Alpha
+    :alt: Beta
 .. |badge2| image:: https://img.shields.io/badge/licence-LGPL--3-blue.png
     :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
     :alt: License: LGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github
-    :target: https://github.com/OCA/stock-logistics-warehouse/tree/15.0/stock_packaging_calculator
+    :target: https://github.com/OCA/stock-logistics-warehouse/tree/16.0/stock_packaging_calculator
     :alt: OCA/stock-logistics-warehouse
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-15-0/stock-logistics-warehouse-15-0-stock_packaging_calculator
+    :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-16-0/stock-logistics-warehouse-16-0-stock_packaging_calculator
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/153/15.0
+    :target: https://runbot.odoo-community.org/runbot/153/16.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
 Basic module providing an helper method to calculate the quantity of product by packaging.
 
-.. IMPORTANT::
-   This is an alpha version, the data model and design can change at any time without warning.
-   Only for development or testing purpose, do not use in production.
-   `More details on development status <https://odoo-community.org/page/development-status>`_
-
 **Table of contents**
 
 .. contents::
@@ -91,7 +86,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/stock-logistics-warehouse/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_packaging_calculator%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_packaging_calculator%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -122,6 +117,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/stock-logistics-warehouse <https://github.com/OCA/stock-logistics-warehouse/tree/15.0/stock_packaging_calculator>`_ project on GitHub.
+This module is part of the `OCA/stock-logistics-warehouse <https://github.com/OCA/stock-logistics-warehouse/tree/16.0/stock_packaging_calculator>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/stock_packaging_calculator/__manifest__.py b/stock_packaging_calculator/__manifest__.py
index 63bb0de56..b7e7dfee9 100644
--- a/stock_packaging_calculator/__manifest__.py
+++ b/stock_packaging_calculator/__manifest__.py
@@ -3,8 +3,8 @@
 {
     "name": "Stock packaging calculator",
     "summary": "Compute product quantity to pick by packaging",
-    "version": "15.0.1.0.0",
-    "development_status": "Alpha",
+    "version": "16.0.1.0.0",
+    "development_status": "Beta",
     "category": "Warehouse Management",
     "website": "https://github.com/OCA/stock-logistics-warehouse",
     "author": "Camptocamp, Odoo Community Association (OCA)",
diff --git a/stock_packaging_calculator/i18n/stock_packaging_calculator.pot b/stock_packaging_calculator/i18n/stock_packaging_calculator.pot
index 3a5552568..a97f6908e 100644
--- a/stock_packaging_calculator/i18n/stock_packaging_calculator.pot
+++ b/stock_packaging_calculator/i18n/stock_packaging_calculator.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 15.0\n"
+"Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -19,13 +19,13 @@ msgid "Packaging Contained Mapping"
 msgstr ""
 
 #. module: stock_packaging_calculator
-#: model:ir.model,name:stock_packaging_calculator.model_product_product
-msgid "Product"
+#: model:ir.model,name:stock_packaging_calculator.model_product_qty_by_packaging_mixin
+msgid "Product Qty By Packaging (Mixin)"
 msgstr ""
 
 #. module: stock_packaging_calculator
-#: model:ir.model,name:stock_packaging_calculator.model_product_qty_by_packaging_mixin
-msgid "Product Qty By Packaging (Mixin)"
+#: model:ir.model,name:stock_packaging_calculator.model_product_product
+msgid "Product Variant"
 msgstr ""
 
 #. module: stock_packaging_calculator
diff --git a/stock_packaging_calculator/static/description/index.html b/stock_packaging_calculator/static/description/index.html
index 0745b2c6d..aa733ea1c 100644
--- a/stock_packaging_calculator/static/description/index.html
+++ b/stock_packaging_calculator/static/description/index.html
@@ -367,14 +367,8 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/15.0/stock_packaging_calculator"><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" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-15-0/stock-logistics-warehouse-15-0-stock_packaging_calculator"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/153/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/16.0/stock_packaging_calculator"><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" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-16-0/stock-logistics-warehouse-16-0-stock_packaging_calculator"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/153/16.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>Basic module providing an helper method to calculate the quantity of product by packaging.</p>
-<div class="admonition important">
-<p class="first admonition-title">Important</p>
-<p class="last">This is an alpha version, the data model and design can change at any time without warning.
-Only for development or testing purpose, do not use in production.
-<a class="reference external" href="https://odoo-community.org/page/development-status">More details on development status</a></p>
-</div>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
@@ -439,7 +433,7 @@ Only for development or testing purpose, do not use in production.
 <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 smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_packaging_calculator%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_packaging_calculator%0Aversion:%2016.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">
@@ -464,7 +458,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/15.0/stock_packaging_calculator">OCA/stock-logistics-warehouse</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/16.0/stock_packaging_calculator">OCA/stock-logistics-warehouse</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

From 174132de0b1ce304bc0df2a71134f92c72365d2b Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 20 Mar 2023 14:34:13 +0000
Subject: [PATCH 35/38] stock_packaging_calculator 16.0.1.0.1

---
 stock_packaging_calculator/README.rst         | 15 ++++---
 stock_packaging_calculator/__manifest__.py    |  2 +-
 .../static/description/index.html             | 42 ++++++++++---------
 3 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/stock_packaging_calculator/README.rst b/stock_packaging_calculator/README.rst
index 481f22104..0668c20a3 100644
--- a/stock_packaging_calculator/README.rst
+++ b/stock_packaging_calculator/README.rst
@@ -2,10 +2,13 @@
 Stock packaging calculator
 ==========================
 
-.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:7f199b0f860e5108a32b20d253fdf4e90e51bd2ba3088e0b48c5465c1274b5a8
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
@@ -19,11 +22,11 @@ Stock packaging calculator
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
     :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-16-0/stock-logistics-warehouse-16-0-stock_packaging_calculator
     :alt: Translate me on Weblate
-.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/153/16.0
-    :alt: Try me on Runbot
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-warehouse&target_branch=16.0
+    :alt: Try me on Runboat
 
-|badge1| |badge2| |badge3| |badge4| |badge5| 
+|badge1| |badge2| |badge3| |badge4| |badge5|
 
 Basic module providing an helper method to calculate the quantity of product by packaging.
 
@@ -85,7 +88,7 @@ Bug Tracker
 
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/stock-logistics-warehouse/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
-If you spotted it first, help us smashing it by providing a detailed and welcomed
+If you spotted it first, help us to smash it by providing a detailed and welcomed
 `feedback <https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_packaging_calculator%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
diff --git a/stock_packaging_calculator/__manifest__.py b/stock_packaging_calculator/__manifest__.py
index b7e7dfee9..929393373 100644
--- a/stock_packaging_calculator/__manifest__.py
+++ b/stock_packaging_calculator/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Stock packaging calculator",
     "summary": "Compute product quantity to pick by packaging",
-    "version": "16.0.1.0.0",
+    "version": "16.0.1.0.1",
     "development_status": "Beta",
     "category": "Warehouse Management",
     "website": "https://github.com/OCA/stock-logistics-warehouse",
diff --git a/stock_packaging_calculator/static/description/index.html b/stock_packaging_calculator/static/description/index.html
index aa733ea1c..39478209a 100644
--- a/stock_packaging_calculator/static/description/index.html
+++ b/stock_packaging_calculator/static/description/index.html
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
 <title>Stock packaging calculator</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
 
-See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
 */
 
@@ -366,25 +366,27 @@ ul.auto-toc {
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:7f199b0f860e5108a32b20d253fdf4e90e51bd2ba3088e0b48c5465c1274b5a8
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/16.0/stock_packaging_calculator"><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" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-16-0/stock-logistics-warehouse-16-0-stock_packaging_calculator"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/153/16.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/stock-logistics-warehouse/tree/16.0/stock_packaging_calculator"><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-16-0/stock-logistics-warehouse-16-0-stock_packaging_calculator"><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=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Basic module providing an helper method to calculate the quantity of product by packaging.</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="id1">Usage</a></li>
-<li><a class="reference internal" href="#known-issues-roadmap" id="id2">Known issues / Roadmap</a></li>
-<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id7">Maintainers</a></li>
+<li><a class="reference internal" href="#usage" id="toc-entry-1">Usage</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">
-<h1><a class="toc-backref" href="#id1">Usage</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
 <p>Imagine you have the following packagings:</p>
 <ul class="simple">
 <li>Pallet: 1000 Units</li>
@@ -421,7 +423,7 @@ ul.auto-toc {
 </blockquote>
 </div>
 <div class="section" id="known-issues-roadmap">
-<h1><a class="toc-backref" href="#id2">Known issues / Roadmap</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-2">Known issues / Roadmap</a></h1>
 <p>TODO</p>
 <ol class="arabic simple">
 <li>Fractional quantities (eg: 0.5 Kg) are lost when counting units</li>
@@ -429,30 +431,30 @@ ul.auto-toc {
 </ol>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id3">Bug Tracker</a></h1>
+<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 smashing it by providing a detailed and welcomed
+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_packaging_calculator%0Aversion:%2016.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">
-<h1><a class="toc-backref" href="#id4">Credits</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#id5">Authors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
 <ul class="simple">
 <li>Camptocamp</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 <ul class="simple">
 <li>Simone Orsi &lt;<a class="reference external" href="mailto:simahawk&#64;gmail.com">simahawk&#64;gmail.com</a>&gt;</li>
 <li>Christopher Ormaza &lt;<a class="reference external" href="mailto:chris.ormaza&#64;forgeflow.com">chris.ormaza&#64;forgeflow.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id7">Maintainers</a></h2>
+<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" /></a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose

From 8abac2a01758b4290ab22d1f7546a2aaed4ceb6f Mon Sep 17 00:00:00 2001
From: mymage <stefano.consolaro@mymage.it>
Date: Fri, 17 Nov 2023 15:32:54 +0000
Subject: [PATCH 36/38] Added translation using Weblate (Italian)

---
 stock_packaging_calculator/i18n/it.po | 42 +++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 stock_packaging_calculator/i18n/it.po

diff --git a/stock_packaging_calculator/i18n/it.po b/stock_packaging_calculator/i18n/it.po
new file mode 100644
index 000000000..56391c665
--- /dev/null
+++ b/stock_packaging_calculator/i18n/it.po
@@ -0,0 +1,42 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* stock_packaging_calculator
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2024-04-19 07:37+0000\n"
+"Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. module: stock_packaging_calculator
+#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_product__packaging_contained_mapping
+msgid "Packaging Contained Mapping"
+msgstr "Mappatura contenuto confezione"
+
+#. module: stock_packaging_calculator
+#: model:ir.model,name:stock_packaging_calculator.model_product_qty_by_packaging_mixin
+msgid "Product Qty By Packaging (Mixin)"
+msgstr "Q.tà prodotto per confezione (mixin)"
+
+#. module: stock_packaging_calculator
+#: model:ir.model,name:stock_packaging_calculator.model_product_product
+msgid "Product Variant"
+msgstr "Variante prodotto"
+
+#. module: stock_packaging_calculator
+#: model:ir.model.fields,field_description:stock_packaging_calculator.field_product_qty_by_packaging_mixin__product_qty_by_packaging_display
+msgid "Qty by packaging"
+msgstr "Q.tà per confezione"
+
+#. module: stock_packaging_calculator
+#: model:ir.model.fields,help:stock_packaging_calculator.field_product_product__packaging_contained_mapping
+msgid "Technical field to store contained packaging. "
+msgstr "Campo tecnico per salvare la confezione contenuta. "

From 71d6610abb06d4e222652eb38a843ca72310ccd0 Mon Sep 17 00:00:00 2001
From: chien <chien@trobz.com>
Date: Mon, 10 Jun 2024 14:51:36 +0700
Subject: [PATCH 37/38] [IMP] stock_packaging_calculator: pre-commit auto fixes

---
 stock_packaging_calculator/README.rst         | 70 ++++++++++---------
 stock_packaging_calculator/pyproject.toml     |  3 +
 .../readme/CONTRIBUTORS.md                    |  2 +
 .../readme/CONTRIBUTORS.rst                   |  2 -
 .../{DESCRIPTION.rst => DESCRIPTION.md}       |  3 +-
 stock_packaging_calculator/readme/ROADMAP.md  |  4 ++
 stock_packaging_calculator/readme/ROADMAP.rst |  4 --
 stock_packaging_calculator/readme/USAGE.md    | 37 ++++++++++
 stock_packaging_calculator/readme/USAGE.rst   | 36 ----------
 .../static/description/index.html             | 22 +++---
 stock_packaging_calculator/tests/common.py    |  1 -
 11 files changed, 96 insertions(+), 88 deletions(-)
 create mode 100644 stock_packaging_calculator/pyproject.toml
 create mode 100644 stock_packaging_calculator/readme/CONTRIBUTORS.md
 delete mode 100644 stock_packaging_calculator/readme/CONTRIBUTORS.rst
 rename stock_packaging_calculator/readme/{DESCRIPTION.rst => DESCRIPTION.md} (70%)
 create mode 100644 stock_packaging_calculator/readme/ROADMAP.md
 delete mode 100644 stock_packaging_calculator/readme/ROADMAP.rst
 create mode 100644 stock_packaging_calculator/readme/USAGE.md
 delete mode 100644 stock_packaging_calculator/readme/USAGE.rst

diff --git a/stock_packaging_calculator/README.rst b/stock_packaging_calculator/README.rst
index 0668c20a3..c635d89ec 100644
--- a/stock_packaging_calculator/README.rst
+++ b/stock_packaging_calculator/README.rst
@@ -17,18 +17,19 @@ Stock packaging calculator
     :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
     :alt: License: LGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github
-    :target: https://github.com/OCA/stock-logistics-warehouse/tree/16.0/stock_packaging_calculator
+    :target: https://github.com/OCA/stock-logistics-warehouse/tree/17.0/stock_packaging_calculator
     :alt: OCA/stock-logistics-warehouse
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-16-0/stock-logistics-warehouse-16-0-stock_packaging_calculator
+    :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-17-0/stock-logistics-warehouse-17-0-stock_packaging_calculator
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-warehouse&target_branch=16.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-warehouse&target_branch=17.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
 
-Basic module providing an helper method to calculate the quantity of product by packaging.
+Basic module providing an helper method to calculate the quantity of
+product by packaging.
 
 **Table of contents**
 
@@ -40,40 +41,41 @@ Usage
 
 Imagine you have the following packagings:
 
-* Pallet: 1000 Units
-* Big box: 500 Units
-* Box: 50 Units
+-  Pallet: 1000 Units
+-  Big box: 500 Units
+-  Box: 50 Units
 
 and you have to pick from your warehouse 2860 Units.
 
 Then you can do:
 
-    .. code-block::
+   ::
 
-        >>> product.product_qty_by_packaging(2860)
+      >>> product.product_qty_by_packaging(2860)
 
-        [
-            {"id": 1, "qty": 2, "name": "Pallet"},
-            {"id": 2, "qty": 1, "name": "Big box"},
-            {"id": 3, "qty": 7, "name": "Box"},
-            {"id": 100, "qty": 10, "name": "Units"},
-        ]
+      [
+          {"id": 1, "qty": 2, "name": "Pallet"},
+          {"id": 2, "qty": 1, "name": "Big box"},
+          {"id": 3, "qty": 7, "name": "Box"},
+          {"id": 100, "qty": 10, "name": "Units"},
+      ]
 
-With this you can show a proper message to warehouse operators to quickly pick the quantity they need.
+With this you can show a proper message to warehouse operators to
+quickly pick the quantity they need.
 
-Optionally you can get contained packaging by passing `with_contained` flag:
+Optionally you can get contained packaging by passing with_contained
+flag:
 
+   ::
 
-    .. code-block::
+      >>> product.product_qty_by_packaging(2860, with_contained=True)
 
-        >>> product.product_qty_by_packaging(2860, with_contained=True)
-
-        [
-            {"id": 1, "qty": 2, "name": "Pallet", "contained": [{"id": 2, "qty": 2, "name": "Big box"}]},
-            {"id": 2, "qty": 1, "name": "Big box", "contained": [{"id": 3, "qty": 10, "name": "Box"}]},
-            {"id": 3, "qty": 7, "name": "Box", "contained": [{"id": 100, "qty": 50, "name": "Units"}]},
-            {"id": 100, "qty": 10, "name": "Units", "contained": []},},
-        ]
+      [
+          {"id": 1, "qty": 2, "name": "Pallet", "contained": [{"id": 2, "qty": 2, "name": "Big box"}]},
+          {"id": 2, "qty": 1, "name": "Big box", "contained": [{"id": 3, "qty": 10, "name": "Box"}]},
+          {"id": 3, "qty": 7, "name": "Box", "contained": [{"id": 100, "qty": 50, "name": "Units"}]},
+          {"id": 100, "qty": 10, "name": "Units", "contained": []},},
+      ]
 
 Known issues / Roadmap
 ======================
@@ -81,7 +83,7 @@ Known issues / Roadmap
 TODO
 
 1. Fractional quantities (eg: 0.5 Kg) are lost when counting units
-2. Maybe rely on `packaging_uom`
+2. Maybe rely on packaging_uom
 
 Bug Tracker
 ===========
@@ -89,7 +91,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/stock-logistics-warehouse/issues>`_.
 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
-`feedback <https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_packaging_calculator%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_packaging_calculator%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -97,18 +99,18 @@ Credits
 =======
 
 Authors
-~~~~~~~
+-------
 
 * Camptocamp
 
 Contributors
-~~~~~~~~~~~~
+------------
 
-* Simone Orsi <simahawk@gmail.com>
-* Christopher Ormaza <chris.ormaza@forgeflow.com>
+-  Simone Orsi <simahawk@gmail.com>
+-  Christopher Ormaza <chris.ormaza@forgeflow.com>
 
 Maintainers
-~~~~~~~~~~~
+-----------
 
 This module is maintained by the OCA.
 
@@ -120,6 +122,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/stock-logistics-warehouse <https://github.com/OCA/stock-logistics-warehouse/tree/16.0/stock_packaging_calculator>`_ project on GitHub.
+This module is part of the `OCA/stock-logistics-warehouse <https://github.com/OCA/stock-logistics-warehouse/tree/17.0/stock_packaging_calculator>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/stock_packaging_calculator/pyproject.toml b/stock_packaging_calculator/pyproject.toml
new file mode 100644
index 000000000..4231d0ccc
--- /dev/null
+++ b/stock_packaging_calculator/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/stock_packaging_calculator/readme/CONTRIBUTORS.md b/stock_packaging_calculator/readme/CONTRIBUTORS.md
new file mode 100644
index 000000000..ed45df4f2
--- /dev/null
+++ b/stock_packaging_calculator/readme/CONTRIBUTORS.md
@@ -0,0 +1,2 @@
+- Simone Orsi \<<simahawk@gmail.com>\>
+- Christopher Ormaza \<<chris.ormaza@forgeflow.com>\>
diff --git a/stock_packaging_calculator/readme/CONTRIBUTORS.rst b/stock_packaging_calculator/readme/CONTRIBUTORS.rst
deleted file mode 100644
index 5daf85c2e..000000000
--- a/stock_packaging_calculator/readme/CONTRIBUTORS.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-* Simone Orsi <simahawk@gmail.com>
-* Christopher Ormaza <chris.ormaza@forgeflow.com>
diff --git a/stock_packaging_calculator/readme/DESCRIPTION.rst b/stock_packaging_calculator/readme/DESCRIPTION.md
similarity index 70%
rename from stock_packaging_calculator/readme/DESCRIPTION.rst
rename to stock_packaging_calculator/readme/DESCRIPTION.md
index 1d6fceb5c..ac5ca22dd 100644
--- a/stock_packaging_calculator/readme/DESCRIPTION.rst
+++ b/stock_packaging_calculator/readme/DESCRIPTION.md
@@ -1 +1,2 @@
-Basic module providing an helper method to calculate the quantity of product by packaging.
+Basic module providing an helper method to calculate the quantity of
+product by packaging.
diff --git a/stock_packaging_calculator/readme/ROADMAP.md b/stock_packaging_calculator/readme/ROADMAP.md
new file mode 100644
index 000000000..c031f1086
--- /dev/null
+++ b/stock_packaging_calculator/readme/ROADMAP.md
@@ -0,0 +1,4 @@
+TODO
+
+1.  Fractional quantities (eg: 0.5 Kg) are lost when counting units
+2.  Maybe rely on packaging_uom
diff --git a/stock_packaging_calculator/readme/ROADMAP.rst b/stock_packaging_calculator/readme/ROADMAP.rst
deleted file mode 100644
index e4881d5e6..000000000
--- a/stock_packaging_calculator/readme/ROADMAP.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-TODO
-
-1. Fractional quantities (eg: 0.5 Kg) are lost when counting units
-2. Maybe rely on `packaging_uom`
diff --git a/stock_packaging_calculator/readme/USAGE.md b/stock_packaging_calculator/readme/USAGE.md
new file mode 100644
index 000000000..b09b9e24b
--- /dev/null
+++ b/stock_packaging_calculator/readme/USAGE.md
@@ -0,0 +1,37 @@
+Imagine you have the following packagings:
+
+- Pallet: 1000 Units
+- Big box: 500 Units
+- Box: 50 Units
+
+and you have to pick from your warehouse 2860 Units.
+
+Then you can do:
+
+> ``` 
+> >>> product.product_qty_by_packaging(2860)
+>
+> [
+>     {"id": 1, "qty": 2, "name": "Pallet"},
+>     {"id": 2, "qty": 1, "name": "Big box"},
+>     {"id": 3, "qty": 7, "name": "Box"},
+>     {"id": 100, "qty": 10, "name": "Units"},
+> ]
+> ```
+
+With this you can show a proper message to warehouse operators to
+quickly pick the quantity they need.
+
+Optionally you can get contained packaging by passing with_contained
+flag:
+
+> ``` 
+> >>> product.product_qty_by_packaging(2860, with_contained=True)
+>
+> [
+>     {"id": 1, "qty": 2, "name": "Pallet", "contained": [{"id": 2, "qty": 2, "name": "Big box"}]},
+>     {"id": 2, "qty": 1, "name": "Big box", "contained": [{"id": 3, "qty": 10, "name": "Box"}]},
+>     {"id": 3, "qty": 7, "name": "Box", "contained": [{"id": 100, "qty": 50, "name": "Units"}]},
+>     {"id": 100, "qty": 10, "name": "Units", "contained": []},},
+> ]
+> ```
diff --git a/stock_packaging_calculator/readme/USAGE.rst b/stock_packaging_calculator/readme/USAGE.rst
deleted file mode 100644
index 73f05a708..000000000
--- a/stock_packaging_calculator/readme/USAGE.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-Imagine you have the following packagings:
-
-* Pallet: 1000 Units
-* Big box: 500 Units
-* Box: 50 Units
-
-and you have to pick from your warehouse 2860 Units.
-
-Then you can do:
-
-    .. code-block::
-
-        >>> product.product_qty_by_packaging(2860)
-
-        [
-            {"id": 1, "qty": 2, "name": "Pallet"},
-            {"id": 2, "qty": 1, "name": "Big box"},
-            {"id": 3, "qty": 7, "name": "Box"},
-            {"id": 100, "qty": 10, "name": "Units"},
-        ]
-
-With this you can show a proper message to warehouse operators to quickly pick the quantity they need.
-
-Optionally you can get contained packaging by passing `with_contained` flag:
-
-
-    .. code-block::
-
-        >>> product.product_qty_by_packaging(2860, with_contained=True)
-
-        [
-            {"id": 1, "qty": 2, "name": "Pallet", "contained": [{"id": 2, "qty": 2, "name": "Big box"}]},
-            {"id": 2, "qty": 1, "name": "Big box", "contained": [{"id": 3, "qty": 10, "name": "Box"}]},
-            {"id": 3, "qty": 7, "name": "Box", "contained": [{"id": 100, "qty": 50, "name": "Units"}]},
-            {"id": 100, "qty": 10, "name": "Units", "contained": []},},
-        ]
diff --git a/stock_packaging_calculator/static/description/index.html b/stock_packaging_calculator/static/description/index.html
index 39478209a..8582a89c6 100644
--- a/stock_packaging_calculator/static/description/index.html
+++ b/stock_packaging_calculator/static/description/index.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -369,8 +368,9 @@ ul.auto-toc {
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:7f199b0f860e5108a32b20d253fdf4e90e51bd2ba3088e0b48c5465c1274b5a8
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/stock-logistics-warehouse/tree/16.0/stock_packaging_calculator"><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-16-0/stock-logistics-warehouse-16-0-stock_packaging_calculator"><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=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
-<p>Basic module providing an helper method to calculate the quantity of product by packaging.</p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/stock-logistics-warehouse/tree/17.0/stock_packaging_calculator"><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-17-0/stock-logistics-warehouse-17-0-stock_packaging_calculator"><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=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>Basic module providing an helper method to calculate the quantity of
+product by packaging.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
@@ -396,7 +396,7 @@ ul.auto-toc {
 <p>and you have to pick from your warehouse 2860 Units.</p>
 <p>Then you can do:</p>
 <blockquote>
-<pre class="code literal-block">
+<pre class="literal-block">
 &gt;&gt;&gt; product.product_qty_by_packaging(2860)
 
 [
@@ -407,10 +407,12 @@ ul.auto-toc {
 ]
 </pre>
 </blockquote>
-<p>With this you can show a proper message to warehouse operators to quickly pick the quantity they need.</p>
-<p>Optionally you can get contained packaging by passing <cite>with_contained</cite> flag:</p>
+<p>With this you can show a proper message to warehouse operators to
+quickly pick the quantity they need.</p>
+<p>Optionally you can get contained packaging by passing with_contained
+flag:</p>
 <blockquote>
-<pre class="code literal-block">
+<pre class="literal-block">
 &gt;&gt;&gt; product.product_qty_by_packaging(2860, with_contained=True)
 
 [
@@ -427,7 +429,7 @@ ul.auto-toc {
 <p>TODO</p>
 <ol class="arabic simple">
 <li>Fractional quantities (eg: 0.5 Kg) are lost when counting units</li>
-<li>Maybe rely on <cite>packaging_uom</cite></li>
+<li>Maybe rely on packaging_uom</li>
 </ol>
 </div>
 <div class="section" id="bug-tracker">
@@ -435,7 +437,7 @@ ul.auto-toc {
 <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_packaging_calculator%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_packaging_calculator%0Aversion:%2017.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">
@@ -460,7 +462,7 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/16.0/stock_packaging_calculator">OCA/stock-logistics-warehouse</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/17.0/stock_packaging_calculator">OCA/stock-logistics-warehouse</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>
diff --git a/stock_packaging_calculator/tests/common.py b/stock_packaging_calculator/tests/common.py
index 4aa0579a5..082084567 100644
--- a/stock_packaging_calculator/tests/common.py
+++ b/stock_packaging_calculator/tests/common.py
@@ -4,7 +4,6 @@ from odoo.tests import TransactionCase
 
 
 class TestCommon(TransactionCase):
-
     at_install = False
     post_install = True
     maxDiff = None

From e30a8a6967c0816e856a715fbd46d01c82e8ef7c Mon Sep 17 00:00:00 2001
From: chien <chien@trobz.com>
Date: Mon, 10 Jun 2024 15:22:42 +0700
Subject: [PATCH 38/38] [MIG] stock_packaging_calculator: Migration to 17.0

---
 stock_packaging_calculator/README.rst         |  4 +-
 stock_packaging_calculator/__manifest__.py    |  2 +-
 stock_packaging_calculator/models/product.py  | 14 ++++-
 .../readme/CONTRIBUTORS.md                    |  1 +
 stock_packaging_calculator/readme/ROADMAP.md  |  4 --
 .../static/description/index.html             |  6 +-
 stock_packaging_calculator/tests/__init__.py  |  1 +
 stock_packaging_calculator/tests/common.py    |  5 +-
 stock_packaging_calculator/tests/models.py    | 11 ++++
 .../tests/test_packaging_calc.py              |  1 +
 .../test_product_qty_by_packaging_mixin.py    | 56 +++++++++++++++++++
 test-requirements.txt                         |  1 +
 12 files changed, 87 insertions(+), 19 deletions(-)
 create mode 100644 stock_packaging_calculator/tests/models.py
 create mode 100644 stock_packaging_calculator/tests/test_product_qty_by_packaging_mixin.py
 create mode 100644 test-requirements.txt

diff --git a/stock_packaging_calculator/README.rst b/stock_packaging_calculator/README.rst
index c635d89ec..2c7b4c5d4 100644
--- a/stock_packaging_calculator/README.rst
+++ b/stock_packaging_calculator/README.rst
@@ -80,10 +80,7 @@ flag:
 Known issues / Roadmap
 ======================
 
-TODO
 
-1. Fractional quantities (eg: 0.5 Kg) are lost when counting units
-2. Maybe rely on packaging_uom
 
 Bug Tracker
 ===========
@@ -108,6 +105,7 @@ Contributors
 
 -  Simone Orsi <simahawk@gmail.com>
 -  Christopher Ormaza <chris.ormaza@forgeflow.com>
+-  Nguyen Minh Chien <chien@trobz.com>
 
 Maintainers
 -----------
diff --git a/stock_packaging_calculator/__manifest__.py b/stock_packaging_calculator/__manifest__.py
index 929393373..95d66c9b3 100644
--- a/stock_packaging_calculator/__manifest__.py
+++ b/stock_packaging_calculator/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Stock packaging calculator",
     "summary": "Compute product quantity to pick by packaging",
-    "version": "16.0.1.0.1",
+    "version": "17.0.1.0.0",
     "development_status": "Beta",
     "category": "Warehouse Management",
     "website": "https://github.com/OCA/stock-logistics-warehouse",
diff --git a/stock_packaging_calculator/models/product.py b/stock_packaging_calculator/models/product.py
index 5f9342424..fb35d7d99 100644
--- a/stock_packaging_calculator/models/product.py
+++ b/stock_packaging_calculator/models/product.py
@@ -6,7 +6,7 @@ import unicodedata
 from collections import namedtuple
 
 from odoo import api, models
-from odoo.tools import float_compare
+from odoo.tools import float_compare, float_is_zero, float_round
 
 from odoo.addons.base_sparse_field.models.fields import Serialized
 
@@ -112,13 +112,21 @@ class Product(models.Model):
 
     def _product_qty_by_packaging(self, pkg_by_qty, qty, with_contained=False):
         """Produce a list of dictionaries of packaging info."""
-        # TODO: refactor to handle fractional quantities (eg: 0.5 Kg)
         res = []
         prepare_values = self.env.context.get(
             "_packaging_values_handler", self._prepare_qty_by_packaging_values
         )
         for pkg in pkg_by_qty:
             qty_per_pkg, qty = self._qty_by_pkg(pkg.qty, qty)
+            # To handle fractional quantities (eg: 0.5 Kg)
+            if pkg.is_unit and not float_is_zero(
+                qty, precision_rounding=self.uom_id.rounding
+            ):
+                # `is_unit` package always be the last package by the sorting
+                # it has the same uom with the product, just sum the quantity
+                qty_per_pkg += float_round(qty, precision_rounding=self.uom_id.rounding)
+                qty = 0
+
             if qty_per_pkg:
                 value = prepare_values(pkg, qty_per_pkg)
                 if with_contained:
@@ -191,7 +199,7 @@ class Product(models.Model):
         )
         # Collect all strings representations
         as_string = []
-        for record, info in zip(records, _qty_by_packaging):
+        for record, info in zip(records, _qty_by_packaging, strict=True):
             bit = _qty_by_packaging_as_str(record, info["qty"])
             if bit:
                 as_string.append(bit)
diff --git a/stock_packaging_calculator/readme/CONTRIBUTORS.md b/stock_packaging_calculator/readme/CONTRIBUTORS.md
index ed45df4f2..d17ea290f 100644
--- a/stock_packaging_calculator/readme/CONTRIBUTORS.md
+++ b/stock_packaging_calculator/readme/CONTRIBUTORS.md
@@ -1,2 +1,3 @@
 - Simone Orsi \<<simahawk@gmail.com>\>
 - Christopher Ormaza \<<chris.ormaza@forgeflow.com>\>
+- Nguyen Minh Chien \<<chien@trobz.com>\>
diff --git a/stock_packaging_calculator/readme/ROADMAP.md b/stock_packaging_calculator/readme/ROADMAP.md
index c031f1086..e69de29bb 100644
--- a/stock_packaging_calculator/readme/ROADMAP.md
+++ b/stock_packaging_calculator/readme/ROADMAP.md
@@ -1,4 +0,0 @@
-TODO
-
-1.  Fractional quantities (eg: 0.5 Kg) are lost when counting units
-2.  Maybe rely on packaging_uom
diff --git a/stock_packaging_calculator/static/description/index.html b/stock_packaging_calculator/static/description/index.html
index 8582a89c6..15484dca7 100644
--- a/stock_packaging_calculator/static/description/index.html
+++ b/stock_packaging_calculator/static/description/index.html
@@ -426,11 +426,6 @@ flag:</p>
 </div>
 <div class="section" id="known-issues-roadmap">
 <h1><a class="toc-backref" href="#toc-entry-2">Known issues / Roadmap</a></h1>
-<p>TODO</p>
-<ol class="arabic simple">
-<li>Fractional quantities (eg: 0.5 Kg) are lost when counting units</li>
-<li>Maybe rely on packaging_uom</li>
-</ol>
 </div>
 <div class="section" id="bug-tracker">
 <h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
@@ -453,6 +448,7 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 <ul class="simple">
 <li>Simone Orsi &lt;<a class="reference external" href="mailto:simahawk&#64;gmail.com">simahawk&#64;gmail.com</a>&gt;</li>
 <li>Christopher Ormaza &lt;<a class="reference external" href="mailto:chris.ormaza&#64;forgeflow.com">chris.ormaza&#64;forgeflow.com</a>&gt;</li>
+<li>Nguyen Minh Chien &lt;<a class="reference external" href="mailto:chien&#64;trobz.com">chien&#64;trobz.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
diff --git a/stock_packaging_calculator/tests/__init__.py b/stock_packaging_calculator/tests/__init__.py
index 441177cdc..05f92dad2 100644
--- a/stock_packaging_calculator/tests/__init__.py
+++ b/stock_packaging_calculator/tests/__init__.py
@@ -1,2 +1,3 @@
 from . import test_packaging_calc
 from . import test_pkg_qty_str
+from . import test_product_qty_by_packaging_mixin
diff --git a/stock_packaging_calculator/tests/common.py b/stock_packaging_calculator/tests/common.py
index 082084567..77390bd11 100644
--- a/stock_packaging_calculator/tests/common.py
+++ b/stock_packaging_calculator/tests/common.py
@@ -1,9 +1,9 @@
 # Copyright 2020 Camptocamp SA
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl)
-from odoo.tests import TransactionCase
+from odoo.addons.base.tests.common import BaseCommon
 
 
-class TestCommon(TransactionCase):
+class TestCommon(BaseCommon):
     at_install = False
     post_install = True
     maxDiff = None
@@ -11,7 +11,6 @@ class TestCommon(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True))
         cls.uom_unit = cls.env.ref("uom.product_uom_unit")
         cls.product_a = cls.env["product.product"].create(
             {
diff --git a/stock_packaging_calculator/tests/models.py b/stock_packaging_calculator/tests/models.py
new file mode 100644
index 000000000..963f3b485
--- /dev/null
+++ b/stock_packaging_calculator/tests/models.py
@@ -0,0 +1,11 @@
+from odoo import fields, models
+
+
+class TestProductQtyByPackagingMixin(models.Model):
+    _name = "test.product.qty_by_packaging.mixin"
+    _description = "Test ProductQtyByPackagingMixin"
+    _inherit = ["product.qty_by_packaging.mixin"]
+    _qty_by_pkg__qty_field_name = "quantity"
+
+    product_id = fields.Many2one("product.product")
+    quantity = fields.Float()
diff --git a/stock_packaging_calculator/tests/test_packaging_calc.py b/stock_packaging_calculator/tests/test_packaging_calc.py
index 3d4bbfa85..6a0ec166b 100644
--- a/stock_packaging_calculator/tests/test_packaging_calc.py
+++ b/stock_packaging_calculator/tests/test_packaging_calc.py
@@ -55,6 +55,7 @@ class TestCalc(TestCommon):
         """Test fractional qty is lost."""
         expected = [
             make_pkg_values(self.pkg_box, qty=1),
+            make_pkg_values(self.uom_unit, qty=0.5),
         ]
         self.assertEqual(self.product_a.product_qty_by_packaging(50.5), expected)
 
diff --git a/stock_packaging_calculator/tests/test_product_qty_by_packaging_mixin.py b/stock_packaging_calculator/tests/test_product_qty_by_packaging_mixin.py
new file mode 100644
index 000000000..909f9b8fb
--- /dev/null
+++ b/stock_packaging_calculator/tests/test_product_qty_by_packaging_mixin.py
@@ -0,0 +1,56 @@
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+from odoo_test_helper import FakeModelLoader
+
+from .common import TestCommon
+
+
+class TestPQPackagingMixin(TestCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        # Load a test model using odoo_test_helper
+        cls.loader = FakeModelLoader(cls.env, cls.__module__)
+        cls.loader.backup_registry()
+        from .models import TestProductQtyByPackagingMixin
+
+        cls.loader.update_registry((TestProductQtyByPackagingMixin,))
+        cls.model = cls.env[TestProductQtyByPackagingMixin._name]
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.loader.restore_registry()
+        return super().tearDownClass()
+
+    def test_1_quantity_packaging(self):
+        record = self.model.create({"product_id": self.product_a.id, "quantity": 10})
+        self.assertEqual(record.product_qty_by_packaging_display, "10 Units")
+        self.assertEqual(
+            record.with_context(
+                qty_by_pkg_only_packaging=True
+            ).product_qty_by_packaging_display,
+            "",
+        )
+        record.quantity = 100
+        self.assertEqual(record.product_qty_by_packaging_display, "2 Box")
+        record.quantity = 250
+        self.assertEqual(record.product_qty_by_packaging_display, "1 Big Box,\xa01 Box")
+        record.quantity = 255
+        self.assertEqual(
+            record.product_qty_by_packaging_display,
+            "1 Big Box,\xa01 Box,\xa05 Units",
+        )
+        # only_packaging has no impact if we get not only units
+        self.assertEqual(
+            record.with_context(
+                qty_by_pkg_only_packaging=True
+            ).product_qty_by_packaging_display,
+            "1 Big Box,\xa01 Box,\xa05 Units",
+        )
+
+    def test_2_fractional_quantity(self):
+        record = self.model.create(
+            {"product_id": self.product_a.id, "quantity": 100.45}
+        )
+        self.assertEqual(
+            record.product_qty_by_packaging_display, "2 Box,\xa00.45 Units"
+        )
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 000000000..66bc2cbae
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1 @@
+odoo_test_helper