From 30885acf0e45a54bfe6e4b18fc53cb4b07de85f0 Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Fri, 28 May 2021 09:41:04 +0200 Subject: [PATCH] Add stock_packaging_calculator_packaging_type --- .../stock_packaging_calculator_packaging_type | 1 + .../setup.py | 6 +++ .../README.rst | 1 + .../__init__.py | 1 + .../__manifest__.py | 16 ++++++ .../models/__init__.py | 2 + .../models/product.py | 25 +++++++++ .../models/product_qty_by_packaging_mixin.py | 23 +++++++++ .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 3 ++ .../tests/__init__.py | 1 + .../tests/test_packaging_by_qty.py | 51 +++++++++++++++++++ 12 files changed, 131 insertions(+) create mode 120000 setup/stock_packaging_calculator_packaging_type/odoo/addons/stock_packaging_calculator_packaging_type create mode 100644 setup/stock_packaging_calculator_packaging_type/setup.py create mode 100644 stock_packaging_calculator_packaging_type/README.rst create mode 100644 stock_packaging_calculator_packaging_type/__init__.py create mode 100644 stock_packaging_calculator_packaging_type/__manifest__.py create mode 100644 stock_packaging_calculator_packaging_type/models/__init__.py create mode 100644 stock_packaging_calculator_packaging_type/models/product.py create mode 100644 stock_packaging_calculator_packaging_type/models/product_qty_by_packaging_mixin.py create mode 100644 stock_packaging_calculator_packaging_type/readme/CONTRIBUTORS.rst create mode 100644 stock_packaging_calculator_packaging_type/readme/DESCRIPTION.rst create mode 100644 stock_packaging_calculator_packaging_type/tests/__init__.py create mode 100644 stock_packaging_calculator_packaging_type/tests/test_packaging_by_qty.py diff --git a/setup/stock_packaging_calculator_packaging_type/odoo/addons/stock_packaging_calculator_packaging_type b/setup/stock_packaging_calculator_packaging_type/odoo/addons/stock_packaging_calculator_packaging_type new file mode 120000 index 000000000..f1de9f895 --- /dev/null +++ b/setup/stock_packaging_calculator_packaging_type/odoo/addons/stock_packaging_calculator_packaging_type @@ -0,0 +1 @@ +../../../../stock_packaging_calculator_packaging_type \ No newline at end of file diff --git a/setup/stock_packaging_calculator_packaging_type/setup.py b/setup/stock_packaging_calculator_packaging_type/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/stock_packaging_calculator_packaging_type/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/stock_packaging_calculator_packaging_type/README.rst b/stock_packaging_calculator_packaging_type/README.rst new file mode 100644 index 000000000..89bcd6c21 --- /dev/null +++ b/stock_packaging_calculator_packaging_type/README.rst @@ -0,0 +1 @@ +wait for the bot ;) diff --git a/stock_packaging_calculator_packaging_type/__init__.py b/stock_packaging_calculator_packaging_type/__init__.py new file mode 100644 index 000000000..0650744f6 --- /dev/null +++ b/stock_packaging_calculator_packaging_type/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/stock_packaging_calculator_packaging_type/__manifest__.py b/stock_packaging_calculator_packaging_type/__manifest__.py new file mode 100644 index 000000000..464850ea1 --- /dev/null +++ b/stock_packaging_calculator_packaging_type/__manifest__.py @@ -0,0 +1,16 @@ +# Copyright 2021 Camptocamp SA +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl) +{ + "name": "Stock packaging calculator packaging type", + "summary": "Glue module for packaging type", + "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": "LGPL-3", + "application": False, + "installable": True, + "auto_install": True, + "depends": ["stock_packaging_calculator", "product_packaging_type"], +} diff --git a/stock_packaging_calculator_packaging_type/models/__init__.py b/stock_packaging_calculator_packaging_type/models/__init__.py new file mode 100644 index 000000000..fb73bb4d1 --- /dev/null +++ b/stock_packaging_calculator_packaging_type/models/__init__.py @@ -0,0 +1,2 @@ +from . import product +from . import product_qty_by_packaging_mixin diff --git a/stock_packaging_calculator_packaging_type/models/product.py b/stock_packaging_calculator_packaging_type/models/product.py new file mode 100644 index 000000000..d69288cb9 --- /dev/null +++ b/stock_packaging_calculator_packaging_type/models/product.py @@ -0,0 +1,25 @@ +# Copyright 2021 Camptocamp SA +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl) + +from odoo import models + + +class Product(models.Model): + _inherit = "product.product" + + def _packaging_name_getter(self, packaging): + return packaging.packaging_type_id.name + + def _qty_by_packaging_as_str(self, packaging, qty): + # By default use packaging type code + qty_by_packaging_type_fname = self.env.context.get( + "qty_by_packaging_type_fname", "code" + ) + compact_mode = self.env.context.get("qty_by_packaging_type_compact", True) + sep = "" if compact_mode else " " + # Override to use packaging type code + if packaging and packaging.packaging_type_id: + name = packaging.packaging_type_id[qty_by_packaging_type_fname] + return f"{qty}{sep}{name}" + else: + return super()._qty_by_packaging_as_str(packaging, qty) diff --git a/stock_packaging_calculator_packaging_type/models/product_qty_by_packaging_mixin.py b/stock_packaging_calculator_packaging_type/models/product_qty_by_packaging_mixin.py new file mode 100644 index 000000000..262426ed9 --- /dev/null +++ b/stock_packaging_calculator_packaging_type/models/product_qty_by_packaging_mixin.py @@ -0,0 +1,23 @@ +# Copyright 2021 Camptocamp SA +# @author: Simone Orsi +# @author: Sébastien Alix +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl) +from odoo import api, models + + +class ProductQtyByPackagingMixin(models.AbstractModel): + """Allow displaying product qty by packaging. + """ + + _inherit = "product.qty_by_packaging.mixin" + + # Amazing.. unlike `api.depends`, `depends_context` cannot use a lambda + # to delegate lookup. Hence we are forced to override and call super. + @api.depends_context( + "lang", + "qty_by_pkg_total_units", + "qty_by_packaging_type_fname", + "qty_by_packaging_type_compact", + ) + def _compute_product_qty_by_packaging_display(self): + super()._compute_product_qty_by_packaging_display() diff --git a/stock_packaging_calculator_packaging_type/readme/CONTRIBUTORS.rst b/stock_packaging_calculator_packaging_type/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..f1c71bce1 --- /dev/null +++ b/stock_packaging_calculator_packaging_type/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Simone Orsi diff --git a/stock_packaging_calculator_packaging_type/readme/DESCRIPTION.rst b/stock_packaging_calculator_packaging_type/readme/DESCRIPTION.rst new file mode 100644 index 000000000..c4e69a515 --- /dev/null +++ b/stock_packaging_calculator_packaging_type/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +Glue module for `stock_packaging_calculator` and `product_packaging_type`. + +Mainly to use packaging type's code instead of packaging's name. diff --git a/stock_packaging_calculator_packaging_type/tests/__init__.py b/stock_packaging_calculator_packaging_type/tests/__init__.py new file mode 100644 index 000000000..c6b11a17e --- /dev/null +++ b/stock_packaging_calculator_packaging_type/tests/__init__.py @@ -0,0 +1 @@ +from . import test_packaging_by_qty diff --git a/stock_packaging_calculator_packaging_type/tests/test_packaging_by_qty.py b/stock_packaging_calculator_packaging_type/tests/test_packaging_by_qty.py new file mode 100644 index 000000000..e3fc5eba7 --- /dev/null +++ b/stock_packaging_calculator_packaging_type/tests/test_packaging_by_qty.py @@ -0,0 +1,51 @@ +# Copyright 2021 Camptocamp SA +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl) +from odoo.addons.stock_packaging_calculator.tests.common import TestCommon +from odoo.addons.stock_packaging_calculator.tests.utils import make_pkg_values + + +class TestCalc(TestCommon): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.type_retail_box = cls.env["product.packaging.type"].create( + {"name": "Retail Box", "code": "PACK", "sequence": 3} + ) + cls.type_transport_box = cls.env["product.packaging.type"].create( + {"name": "Transport Box", "code": "CASE", "sequence": 4} + ) + cls.type_pallet = cls.env["product.packaging.type"].create( + {"name": "Pallet", "code": "PALLET", "sequence": 5} + ) + cls.pkg_box.packaging_type_id = cls.type_retail_box + cls.pkg_big_box.packaging_type_id = cls.type_transport_box + cls.pkg_pallet.packaging_type_id = cls.type_pallet + + def test_calc_1(self): + expected = [ + make_pkg_values(self.pkg_pallet, qty=1, name=self.type_pallet.name), + make_pkg_values(self.pkg_big_box, qty=3, name=self.type_transport_box.name), + make_pkg_values(self.pkg_box, qty=1, name=self.type_retail_box.name), + make_pkg_values(self.uom_unit, qty=5), + ] + self.assertEqual(self.product_a.product_qty_by_packaging(2655), expected) + + def test_calc_2(self): + expected = [ + make_pkg_values(self.pkg_big_box, qty=1, name=self.type_transport_box.name), + make_pkg_values(self.pkg_box, qty=3, name=self.type_retail_box.name), + ] + self.assertEqual(self.product_a.product_qty_by_packaging(350), expected) + + 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), "2PACK") + self.assertEqual( + self.product_a.product_qty_by_packaging_as_str(250), "1CASE,\xa01PACK" + ) + self.assertEqual( + self.product_a.with_context( + qty_by_packaging_type_fname="name", qty_by_packaging_type_compact=False, + ).product_qty_by_packaging_as_str(250), + "1 Transport Box,\xa01 Retail Box", + )