From f2198af1e8724af006b1b39038efac3922c55a0d Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Fri, 28 May 2021 09:41:04 +0200 Subject: [PATCH 1/8] Add stock_packaging_calculator_packaging_type --- .../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 +++++++++++++++++++ 10 files changed, 124 insertions(+) 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/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", + ) From bf1b142a1df6ae8dd66672c33716f4498726d916 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 11 Jun 2021 09:25:05 +0000 Subject: [PATCH 2/8] [UPD] README.rst --- .../README.rst | 81 +++- .../static/description/index.html | 426 ++++++++++++++++++ 2 files changed, 506 insertions(+), 1 deletion(-) create mode 100644 stock_packaging_calculator_packaging_type/static/description/index.html diff --git a/stock_packaging_calculator_packaging_type/README.rst b/stock_packaging_calculator_packaging_type/README.rst index 89bcd6c21..dd09b5c07 100644 --- a/stock_packaging_calculator_packaging_type/README.rst +++ b/stock_packaging_calculator_packaging_type/README.rst @@ -1 +1,80 @@ -wait for the bot ;) +========================================= +Stock packaging calculator packaging type +========================================= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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-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_packaging_type + :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_packaging_type + :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| + +Glue module for `stock_packaging_calculator` and `product_packaging_type`. + +Mainly to use packaging type's code instead of packaging's name. + +.. 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 `_ + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub 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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Camptocamp + +Contributors +~~~~~~~~~~~~ + +* Simone Orsi + +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 `_ 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_packaging_type/static/description/index.html b/stock_packaging_calculator_packaging_type/static/description/index.html new file mode 100644 index 000000000..8be289618 --- /dev/null +++ b/stock_packaging_calculator_packaging_type/static/description/index.html @@ -0,0 +1,426 @@ + + + + + + +Stock packaging calculator packaging type + + + +
+

Stock packaging calculator packaging type

+ + +

Alpha License: LGPL-3 OCA/stock-logistics-warehouse Translate me on Weblate Try me on Runbot

+

Glue module for stock_packaging_calculator and product_packaging_type.

+

Mainly to use packaging type’s code instead of packaging’s name.

+
+

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

+
+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub 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.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Camptocamp
    • +
+
+ +
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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 project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + From 34ea8e8bd1ea6e19fec7e75e51629360653d6661 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 11 Jun 2021 09:25:06 +0000 Subject: [PATCH 3/8] [ADD] icon.png --- .../static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 stock_packaging_calculator_packaging_type/static/description/icon.png diff --git a/stock_packaging_calculator_packaging_type/static/description/icon.png b/stock_packaging_calculator_packaging_type/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From 5b5c9c43ed74ce3ddaa9ccc4d3a0db0acd6207b6 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Fri, 11 Jun 2021 09:56:06 +0000 Subject: [PATCH 4/8] [UPD] Update stock_packaging_calculator_packaging_type.pot --- ...ck_packaging_calculator_packaging_type.pot | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 stock_packaging_calculator_packaging_type/i18n/stock_packaging_calculator_packaging_type.pot diff --git a/stock_packaging_calculator_packaging_type/i18n/stock_packaging_calculator_packaging_type.pot b/stock_packaging_calculator_packaging_type/i18n/stock_packaging_calculator_packaging_type.pot new file mode 100644 index 000000000..500a4c555 --- /dev/null +++ b/stock_packaging_calculator_packaging_type/i18n/stock_packaging_calculator_packaging_type.pot @@ -0,0 +1,24 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_packaging_calculator_packaging_type +# +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_packaging_type +#: model:ir.model,name:stock_packaging_calculator_packaging_type.model_product_product +msgid "Product" +msgstr "" + +#. module: stock_packaging_calculator_packaging_type +#: model:ir.model,name:stock_packaging_calculator_packaging_type.model_product_qty_by_packaging_mixin +msgid "Product Qty By Packaging (Mixin)" +msgstr "" From af83305b6609cb02e4a667b5b4e5ff9c9ac3a708 Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Fri, 11 Jun 2021 13:08:24 +0200 Subject: [PATCH 5/8] s_packaging_calculator: include units when units only on demand --- .../tests/test_packaging_by_qty.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index e3fc5eba7..d2b342bf3 100644 --- a/stock_packaging_calculator_packaging_type/tests/test_packaging_by_qty.py +++ b/stock_packaging_calculator_packaging_type/tests/test_packaging_by_qty.py @@ -38,7 +38,7 @@ class TestCalc(TestCommon): 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(10), "10 Units") 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" From 6a572a3b10ef37b916096da93ba47d716adeb36e Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 5 Jul 2021 07:55:40 +0000 Subject: [PATCH 6/8] stock_packaging_calculator_packaging_type 13.0.1.1.0 --- stock_packaging_calculator_packaging_type/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock_packaging_calculator_packaging_type/__manifest__.py b/stock_packaging_calculator_packaging_type/__manifest__.py index 464850ea1..247f885ca 100644 --- a/stock_packaging_calculator_packaging_type/__manifest__.py +++ b/stock_packaging_calculator_packaging_type/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Stock packaging calculator packaging type", "summary": "Glue module for packaging type", - "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 8a375456e7d012fd59d50ae6f47daa3e429a56a7 Mon Sep 17 00:00:00 2001 From: nguyen hoang hiep Date: Tue, 14 Sep 2021 09:52:58 +0000 Subject: [PATCH 7/8] [IMP] stock_packaging_calculator_packaging_type: black, isort, prettier --- .../odoo/addons/stock_packaging_calculator_packaging_type | 1 + setup/stock_packaging_calculator_packaging_type/setup.py | 6 ++++++ .../models/product_qty_by_packaging_mixin.py | 3 +-- .../tests/test_packaging_by_qty.py | 3 ++- 4 files changed, 10 insertions(+), 3 deletions(-) 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 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/models/product_qty_by_packaging_mixin.py b/stock_packaging_calculator_packaging_type/models/product_qty_by_packaging_mixin.py index 262426ed9..4008717aa 100644 --- 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 @@ -6,8 +6,7 @@ from odoo import api, models class ProductQtyByPackagingMixin(models.AbstractModel): - """Allow displaying product qty by packaging. - """ + """Allow displaying product qty by packaging.""" _inherit = "product.qty_by_packaging.mixin" 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 index d2b342bf3..c3a11990b 100644 --- a/stock_packaging_calculator_packaging_type/tests/test_packaging_by_qty.py +++ b/stock_packaging_calculator_packaging_type/tests/test_packaging_by_qty.py @@ -45,7 +45,8 @@ class TestCalc(TestCommon): ) self.assertEqual( self.product_a.with_context( - qty_by_packaging_type_fname="name", qty_by_packaging_type_compact=False, + 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", ) From 7914fda3ff22c792e14653052683d998eaca2e85 Mon Sep 17 00:00:00 2001 From: nguyen hoang hiep Date: Tue, 14 Sep 2021 09:59:11 +0000 Subject: [PATCH 8/8] [MIG] 14 stock_packaging_calculator_packaging_type --- .../README.rst | 17 +++++++++---- .../__manifest__.py | 2 +- .../readme/CONTRIBUTORS.rst | 2 ++ .../readme/CREDITS.rst | 1 + .../static/description/index.html | 25 ++++++++++++++----- 5 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 stock_packaging_calculator_packaging_type/readme/CREDITS.rst diff --git a/stock_packaging_calculator_packaging_type/README.rst b/stock_packaging_calculator_packaging_type/README.rst index dd09b5c07..c725579da 100644 --- a/stock_packaging_calculator_packaging_type/README.rst +++ b/stock_packaging_calculator_packaging_type/README.rst @@ -14,13 +14,13 @@ Stock packaging calculator packaging type :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_packaging_type + :target: https://github.com/OCA/stock-logistics-warehouse/tree/14.0/stock_packaging_calculator_packaging_type :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_packaging_type + :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-14-0/stock-logistics-warehouse-14-0-stock_packaging_calculator_packaging_type :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| @@ -45,7 +45,7 @@ Bug Tracker Bugs are tracked on `GitHub 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -61,6 +61,13 @@ Contributors ~~~~~~~~~~~~ * Simone Orsi +* `Trobz `_: + * Nguyen Hoang Hiep + +Other credits +~~~~~~~~~~~~~ + +The migration of this module from 13.0 to 14.0 was financially supported by Camptocamp Maintainers ~~~~~~~~~~~ @@ -75,6 +82,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 `_ project on GitHub. +This module is part of the `OCA/stock-logistics-warehouse `_ 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_packaging_type/__manifest__.py b/stock_packaging_calculator_packaging_type/__manifest__.py index 247f885ca..a53fee1b3 100644 --- a/stock_packaging_calculator_packaging_type/__manifest__.py +++ b/stock_packaging_calculator_packaging_type/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Stock packaging calculator packaging type", "summary": "Glue module for packaging type", - "version": "13.0.1.1.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_packaging_type/readme/CONTRIBUTORS.rst b/stock_packaging_calculator_packaging_type/readme/CONTRIBUTORS.rst index f1c71bce1..85e36b884 100644 --- a/stock_packaging_calculator_packaging_type/readme/CONTRIBUTORS.rst +++ b/stock_packaging_calculator_packaging_type/readme/CONTRIBUTORS.rst @@ -1 +1,3 @@ * Simone Orsi +* `Trobz `_: + * Nguyen Hoang Hiep diff --git a/stock_packaging_calculator_packaging_type/readme/CREDITS.rst b/stock_packaging_calculator_packaging_type/readme/CREDITS.rst new file mode 100644 index 000000000..f37ebe757 --- /dev/null +++ b/stock_packaging_calculator_packaging_type/readme/CREDITS.rst @@ -0,0 +1 @@ +The migration of this module from 13.0 to 14.0 was financially supported by Camptocamp diff --git a/stock_packaging_calculator_packaging_type/static/description/index.html b/stock_packaging_calculator_packaging_type/static/description/index.html index 8be289618..87d3e1c00 100644 --- a/stock_packaging_calculator_packaging_type/static/description/index.html +++ b/stock_packaging_calculator_packaging_type/static/description/index.html @@ -3,7 +3,7 @@ - + Stock packaging calculator packaging type