From 79fc62d57b4f630cf0bec116ab163d981e2e8d39 Mon Sep 17 00:00:00 2001 From: Akim Juillerat Date: Thu, 16 Jul 2020 10:45:26 +0200 Subject: [PATCH 01/19] Create module product_total_weight_from_packaging --- .../__init__.py | 1 + .../__manifest__.py | 15 ++++++++ .../models/__init__.py | 1 + .../models/product.py | 34 +++++++++++++++++++ .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 7 ++++ .../tests/__init__.py | 1 + ...est_product_total_weight_from_packaging.py | 30 ++++++++++++++++ 8 files changed, 90 insertions(+) create mode 100644 product_total_weight_from_packaging/__init__.py create mode 100644 product_total_weight_from_packaging/__manifest__.py create mode 100644 product_total_weight_from_packaging/models/__init__.py create mode 100644 product_total_weight_from_packaging/models/product.py create mode 100644 product_total_weight_from_packaging/readme/CONTRIBUTORS.rst create mode 100644 product_total_weight_from_packaging/readme/DESCRIPTION.rst create mode 100644 product_total_weight_from_packaging/tests/__init__.py create mode 100644 product_total_weight_from_packaging/tests/test_product_total_weight_from_packaging.py diff --git a/product_total_weight_from_packaging/__init__.py b/product_total_weight_from_packaging/__init__.py new file mode 100644 index 00000000000..0650744f6bc --- /dev/null +++ b/product_total_weight_from_packaging/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/product_total_weight_from_packaging/__manifest__.py b/product_total_weight_from_packaging/__manifest__.py new file mode 100644 index 00000000000..a337b2d3f15 --- /dev/null +++ b/product_total_weight_from_packaging/__manifest__.py @@ -0,0 +1,15 @@ +# Copyright 2020 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +{ + "name": "Product Total Weight From Packaging", + "summary": "Compute estimated weight based on product's packaging weights", + "version": "13.0.1.3.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": ["stock_packaging_calculator", "product_packaging_dimension"], +} diff --git a/product_total_weight_from_packaging/models/__init__.py b/product_total_weight_from_packaging/models/__init__.py new file mode 100644 index 00000000000..9649db77a15 --- /dev/null +++ b/product_total_weight_from_packaging/models/__init__.py @@ -0,0 +1 @@ +from . import product diff --git a/product_total_weight_from_packaging/models/product.py b/product_total_weight_from_packaging/models/product.py new file mode 100644 index 00000000000..5f709506230 --- /dev/null +++ b/product_total_weight_from_packaging/models/product.py @@ -0,0 +1,34 @@ +# Copyright 2020 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +from odoo import models + + +class ProductProduct(models.Model): + + _inherit = "product.product" + + def get_total_weight_from_packaging(self, qty): + self.ensure_one() + qty_by_packaging_with_weight = self.with_context( + **{ + "_packaging_filter": lambda p: p.max_weight, + "_with_packaging_weight": True, + } + ).product_qty_by_packaging(qty) + total_weight = sum( + [ + pck.get("qty", 0) * pck.get("weight", 0) + for pck in qty_by_packaging_with_weight + ] + ) + return total_weight + + def _prepare_qty_by_packaging_values(self, packaging_tuple, qty_per_pkg): + res = super()._prepare_qty_by_packaging_values(packaging_tuple, qty_per_pkg) + if self.env.context.get("_with_packaging_weight"): + if packaging_tuple.is_unit: + res["weight"] = self.weight + else: + packaging = self.env["product.packaging"].browse(packaging_tuple.id) + res["weight"] = packaging.max_weight + return res diff --git a/product_total_weight_from_packaging/readme/CONTRIBUTORS.rst b/product_total_weight_from_packaging/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000000..e31e2f0c4fc --- /dev/null +++ b/product_total_weight_from_packaging/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Akim Juillerat diff --git a/product_total_weight_from_packaging/readme/DESCRIPTION.rst b/product_total_weight_from_packaging/readme/DESCRIPTION.rst new file mode 100644 index 00000000000..4d11499374b --- /dev/null +++ b/product_total_weight_from_packaging/readme/DESCRIPTION.rst @@ -0,0 +1,7 @@ +This module provides a a function to estimate the weight +of a given quantity of a product, taking into account the product +packaging's weights. + +It uses module `stock_packaging_calculator` to get weight from product packagings +having a weight defined first and fallback on product weight field if no +weight is defined on any of the packagings. diff --git a/product_total_weight_from_packaging/tests/__init__.py b/product_total_weight_from_packaging/tests/__init__.py new file mode 100644 index 00000000000..cc9ee5ced03 --- /dev/null +++ b/product_total_weight_from_packaging/tests/__init__.py @@ -0,0 +1 @@ +from . import test_product_total_weight_from_packaging diff --git a/product_total_weight_from_packaging/tests/test_product_total_weight_from_packaging.py b/product_total_weight_from_packaging/tests/test_product_total_weight_from_packaging.py new file mode 100644 index 00000000000..8550f1097a4 --- /dev/null +++ b/product_total_weight_from_packaging/tests/test_product_total_weight_from_packaging.py @@ -0,0 +1,30 @@ +# Copyright 2020 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +from odoo.tests import SavepointCase + + +class TestProductTotalWeightFromPackaging(SavepointCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True)) + cls.product = cls.env.ref("product.product_product_20") + cls.product.weight = 5 + cls.env["product.packaging"].create( + {"name": "pair", "product_id": cls.product.id, "qty": 2, "max_weight": 12.5} + ) + cls.env["product.packaging"].create( + { + "name": "cardbox", + "product_id": cls.product.id, + "qty": 10, + "max_weight": 55, + } + ) + cls.env["product.packaging"].create( + {"name": "pallet", "product_id": cls.product.id, "qty": 200} + ) + + def test_weight_from_packaging(self): + weight = self.product.get_total_weight_from_packaging(259) + self.assertEqual(weight, 25 * 55 + 4 * 12.5 + 5) From b770b0728c89e7d5f76e15e8ad98164fa447815a Mon Sep 17 00:00:00 2001 From: Akim Juillerat Date: Mon, 17 Aug 2020 16:32:17 +0200 Subject: [PATCH 02/19] Use new values handler --- .../README.rst | 84 ++++ .../product_total_weight_from_packaging.pot | 19 + .../models/product.py | 21 +- .../static/description/index.html | 430 ++++++++++++++++++ 4 files changed, 545 insertions(+), 9 deletions(-) create mode 100644 product_total_weight_from_packaging/README.rst create mode 100644 product_total_weight_from_packaging/i18n/product_total_weight_from_packaging.pot create mode 100644 product_total_weight_from_packaging/static/description/index.html diff --git a/product_total_weight_from_packaging/README.rst b/product_total_weight_from_packaging/README.rst new file mode 100644 index 00000000000..06fbd3eead6 --- /dev/null +++ b/product_total_weight_from_packaging/README.rst @@ -0,0 +1,84 @@ +=================================== +Product Total Weight From Packaging +=================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Fproduct--attribute-lightgray.png?logo=github + :target: https://github.com/OCA/product-attribute/tree/13.0/product_total_weight_from_packaging + :alt: OCA/product-attribute +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/product-attribute-13-0/product-attribute-13-0-product_total_weight_from_packaging + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/135/13.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module provides a a function to estimate the weight +of a given quantity of a product, taking into account the product +packaging's weights. + +It uses module `stock_packaging_calculator` to get weight from product packagings +having a weight defined first and fallback on product weight field if no +weight is defined on any of the packagings. + +.. 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 +~~~~~~~~~~~~ + +* Akim Juillerat + +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/product-attribute `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/product_total_weight_from_packaging/i18n/product_total_weight_from_packaging.pot b/product_total_weight_from_packaging/i18n/product_total_weight_from_packaging.pot new file mode 100644 index 00000000000..ed102322314 --- /dev/null +++ b/product_total_weight_from_packaging/i18n/product_total_weight_from_packaging.pot @@ -0,0 +1,19 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * product_total_weight_from_packaging +# +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: product_total_weight_from_packaging +#: model:ir.model,name:product_total_weight_from_packaging.model_product_product +msgid "Product" +msgstr "" diff --git a/product_total_weight_from_packaging/models/product.py b/product_total_weight_from_packaging/models/product.py index 5f709506230..9799ca3cfc2 100644 --- a/product_total_weight_from_packaging/models/product.py +++ b/product_total_weight_from_packaging/models/product.py @@ -12,7 +12,7 @@ def get_total_weight_from_packaging(self, qty): qty_by_packaging_with_weight = self.with_context( **{ "_packaging_filter": lambda p: p.max_weight, - "_with_packaging_weight": True, + "_packaging_values_handler": self._prepare_qty_by_packaging_values_with_weight, # noqa } ).product_qty_by_packaging(qty) total_weight = sum( @@ -23,12 +23,15 @@ def get_total_weight_from_packaging(self, qty): ) return total_weight - def _prepare_qty_by_packaging_values(self, packaging_tuple, qty_per_pkg): - res = super()._prepare_qty_by_packaging_values(packaging_tuple, qty_per_pkg) - if self.env.context.get("_with_packaging_weight"): - if packaging_tuple.is_unit: - res["weight"] = self.weight - else: - packaging = self.env["product.packaging"].browse(packaging_tuple.id) - res["weight"] = packaging.max_weight + def _prepare_qty_by_packaging_values_with_weight( + self, packaging_tuple, qty_per_pkg + ): + res = { + "qty": qty_per_pkg, + } + if packaging_tuple.is_unit: + res["weight"] = self.weight + else: + packaging = self.env["product.packaging"].browse(packaging_tuple.id) + res["weight"] = packaging.max_weight return res diff --git a/product_total_weight_from_packaging/static/description/index.html b/product_total_weight_from_packaging/static/description/index.html new file mode 100644 index 00000000000..3b92f691fbc --- /dev/null +++ b/product_total_weight_from_packaging/static/description/index.html @@ -0,0 +1,430 @@ + + + + + + +Product Total Weight From Packaging + + + +
+

Product Total Weight From Packaging

+ + +

Alpha License: AGPL-3 OCA/product-attribute Translate me on Weblate Try me on Runbot

+

This module provides a a function to estimate the weight +of a given quantity of a product, taking into account the product +packaging’s weights.

+

It uses module stock_packaging_calculator to get weight from product packagings +having a weight defined first and fallback on product weight field if no +weight is defined on any of the packagings.

+
+

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

+

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

+
+
+
+ + From f334c83ff56010b397c09b7ddf94efa5c50202c7 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 27 Aug 2020 08:34:46 +0000 Subject: [PATCH 03/19] [ADD] icon.png --- .../static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 product_total_weight_from_packaging/static/description/icon.png diff --git a/product_total_weight_from_packaging/static/description/icon.png b/product_total_weight_from_packaging/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 29c7d75d9bc8c83f13451f2098e7963b2fb82231 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 27 Aug 2020 08:34:48 +0000 Subject: [PATCH 04/19] product_total_weight_from_packaging 13.0.1.3.1 --- product_total_weight_from_packaging/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product_total_weight_from_packaging/__manifest__.py b/product_total_weight_from_packaging/__manifest__.py index a337b2d3f15..47c48db23fe 100644 --- a/product_total_weight_from_packaging/__manifest__.py +++ b/product_total_weight_from_packaging/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Product Total Weight From Packaging", "summary": "Compute estimated weight based on product's packaging weights", - "version": "13.0.1.3.0", + "version": "13.0.1.3.1", "development_status": "Alpha", "category": "Warehouse Management", "website": "https://github.com/OCA/stock-logistics-warehouse", From 8d551686838c65b7458d19f54676b340b7071b20 Mon Sep 17 00:00:00 2001 From: claudiagn Date: Wed, 14 Oct 2020 11:23:03 +0000 Subject: [PATCH 05/19] Added translation using Weblate (Spanish) --- .../i18n/es.po | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 product_total_weight_from_packaging/i18n/es.po diff --git a/product_total_weight_from_packaging/i18n/es.po b/product_total_weight_from_packaging/i18n/es.po new file mode 100644 index 00000000000..cfd1eda5dbe --- /dev/null +++ b/product_total_weight_from_packaging/i18n/es.po @@ -0,0 +1,20 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * product_total_weight_from_packaging +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es\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" + +#. module: product_total_weight_from_packaging +#: model:ir.model,name:product_total_weight_from_packaging.model_product_product +msgid "Product" +msgstr "" From b09dab2c0ccd43f3c09a7c264065eca5f4a6ae78 Mon Sep 17 00:00:00 2001 From: claudiagn Date: Wed, 14 Oct 2020 11:24:20 +0000 Subject: [PATCH 06/19] Translated using Weblate (Spanish) Currently translated at 100.0% (1 of 1 strings) Translation: product-attribute-13.0/product-attribute-13.0-product_total_weight_from_packaging Translate-URL: https://translation.odoo-community.org/projects/product-attribute-13-0/product-attribute-13-0-product_total_weight_from_packaging/es/ --- product_total_weight_from_packaging/i18n/es.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/product_total_weight_from_packaging/i18n/es.po b/product_total_weight_from_packaging/i18n/es.po index cfd1eda5dbe..01326afe660 100644 --- a/product_total_weight_from_packaging/i18n/es.po +++ b/product_total_weight_from_packaging/i18n/es.po @@ -6,15 +6,17 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2020-10-14 14:08+0000\n" +"Last-Translator: claudiagn \n" "Language-Team: none\n" "Language: es\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 3.10\n" #. module: product_total_weight_from_packaging #: model:ir.model,name:product_total_weight_from_packaging.model_product_product msgid "Product" -msgstr "" +msgstr "Producto" From 5a9bfa0e8496e5c8f2bc779d041309c54c452ceb Mon Sep 17 00:00:00 2001 From: hparfr Date: Mon, 11 Jan 2021 17:02:26 +0100 Subject: [PATCH 07/19] [IMP] product_total_weight_from_packaging: black, isort, prettier --- product_total_weight_from_packaging/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product_total_weight_from_packaging/__manifest__.py b/product_total_weight_from_packaging/__manifest__.py index 47c48db23fe..06693ab3bf3 100644 --- a/product_total_weight_from_packaging/__manifest__.py +++ b/product_total_weight_from_packaging/__manifest__.py @@ -6,7 +6,7 @@ "version": "13.0.1.3.1", "development_status": "Alpha", "category": "Warehouse Management", - "website": "https://github.com/OCA/stock-logistics-warehouse", + "website": "https://github.com/OCA/product-attribute", "author": "Camptocamp, Odoo Community Association (OCA)", "license": "AGPL-3", "application": False, From 0aa69e7d132564e7d70455ad5bd1d773635f6fb3 Mon Sep 17 00:00:00 2001 From: hparfr Date: Mon, 11 Jan 2021 17:02:26 +0100 Subject: [PATCH 08/19] [MIG] product_total_weight_from_packaging: Migration to 14.0 --- product_total_weight_from_packaging/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product_total_weight_from_packaging/__manifest__.py b/product_total_weight_from_packaging/__manifest__.py index 06693ab3bf3..e6c003cc101 100644 --- a/product_total_weight_from_packaging/__manifest__.py +++ b/product_total_weight_from_packaging/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Product Total Weight From Packaging", "summary": "Compute estimated weight based on product's packaging weights", - "version": "13.0.1.3.1", + "version": "14.0.1.0.0", "development_status": "Alpha", "category": "Warehouse Management", "website": "https://github.com/OCA/product-attribute", From eba3af3c2980763f354ee479ede0e5190e863720 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Sat, 3 Jul 2021 17:58:16 +0000 Subject: [PATCH 09/19] [UPD] Update product_total_weight_from_packaging.pot --- .../product_total_weight_from_packaging.pot | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/product_total_weight_from_packaging/i18n/product_total_weight_from_packaging.pot b/product_total_weight_from_packaging/i18n/product_total_weight_from_packaging.pot index ed102322314..23f3a3693c2 100644 --- a/product_total_weight_from_packaging/i18n/product_total_weight_from_packaging.pot +++ b/product_total_weight_from_packaging/i18n/product_total_weight_from_packaging.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: product_total_weight_from_packaging +#: model:ir.model.fields,field_description:product_total_weight_from_packaging.field_product_product__display_name +msgid "Display Name" +msgstr "" + +#. module: product_total_weight_from_packaging +#: model:ir.model.fields,field_description:product_total_weight_from_packaging.field_product_product__id +msgid "ID" +msgstr "" + +#. module: product_total_weight_from_packaging +#: model:ir.model.fields,field_description:product_total_weight_from_packaging.field_product_product____last_update +msgid "Last Modified on" +msgstr "" + #. module: product_total_weight_from_packaging #: model:ir.model,name:product_total_weight_from_packaging.model_product_product msgid "Product" From 7f53bea22bdf381efa9c7b164cdc3c252d6d3b6b Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Sat, 3 Jul 2021 20:34:06 +0000 Subject: [PATCH 10/19] [UPD] README.rst --- product_total_weight_from_packaging/README.rst | 10 +++++----- .../static/description/index.html | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/product_total_weight_from_packaging/README.rst b/product_total_weight_from_packaging/README.rst index 06fbd3eead6..bdebbda1404 100644 --- a/product_total_weight_from_packaging/README.rst +++ b/product_total_weight_from_packaging/README.rst @@ -14,13 +14,13 @@ Product Total Weight From Packaging :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github - :target: https://github.com/OCA/product-attribute/tree/13.0/product_total_weight_from_packaging + :target: https://github.com/OCA/product-attribute/tree/14.0/product_total_weight_from_packaging :alt: OCA/product-attribute .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/product-attribute-13-0/product-attribute-13-0-product_total_weight_from_packaging + :target: https://translation.odoo-community.org/projects/product-attribute-14-0/product-attribute-14-0-product_total_weight_from_packaging :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/135/13.0 + :target: https://runbot.odoo-community.org/runbot/135/14.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -49,7 +49,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. @@ -79,6 +79,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/product-attribute `_ project on GitHub. +This module is part of the `OCA/product-attribute `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/product_total_weight_from_packaging/static/description/index.html b/product_total_weight_from_packaging/static/description/index.html index 3b92f691fbc..2d80ef4c509 100644 --- a/product_total_weight_from_packaging/static/description/index.html +++ b/product_total_weight_from_packaging/static/description/index.html @@ -367,7 +367,7 @@

Product Total Weight From Packaging

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Alpha License: AGPL-3 OCA/product-attribute Translate me on Weblate Try me on Runbot

+

Alpha License: AGPL-3 OCA/product-attribute Translate me on Weblate Try me on Runbot

This module provides a a function to estimate the weight of a given quantity of a product, taking into account the product packaging’s weights.

@@ -397,7 +397,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.

@@ -421,7 +421,7 @@

Maintainers

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

+

This module is part of the OCA/product-attribute project on GitHub.

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

From d5bf5cf1191fe14c976c7fecbabf0df5245d1a5a Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Fri, 21 Jan 2022 07:16:17 +0100 Subject: [PATCH 11/19] product_total_weight_from_packaging: dev status -> Beta --- product_total_weight_from_packaging/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product_total_weight_from_packaging/__manifest__.py b/product_total_weight_from_packaging/__manifest__.py index e6c003cc101..880df08bf40 100644 --- a/product_total_weight_from_packaging/__manifest__.py +++ b/product_total_weight_from_packaging/__manifest__.py @@ -4,7 +4,7 @@ "name": "Product Total Weight From Packaging", "summary": "Compute estimated weight based on product's packaging weights", "version": "14.0.1.0.0", - "development_status": "Alpha", + "development_status": "Beta", "category": "Warehouse Management", "website": "https://github.com/OCA/product-attribute", "author": "Camptocamp, Odoo Community Association (OCA)", From dee800540e1928d9261fba271b596f566464fc8b Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Fri, 21 Jan 2022 07:16:56 +0100 Subject: [PATCH 12/19] product_total_weight_from_packaging 14.0.1.1.0 --- product_total_weight_from_packaging/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product_total_weight_from_packaging/__manifest__.py b/product_total_weight_from_packaging/__manifest__.py index 880df08bf40..768058c67c7 100644 --- a/product_total_weight_from_packaging/__manifest__.py +++ b/product_total_weight_from_packaging/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Product Total Weight From Packaging", "summary": "Compute estimated weight based on product's packaging weights", - "version": "14.0.1.0.0", + "version": "14.0.1.1.0", "development_status": "Beta", "category": "Warehouse Management", "website": "https://github.com/OCA/product-attribute", From 2aed10d9772d3a69f2ea2c80168edd742617591c Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 21 Jan 2022 06:34:42 +0000 Subject: [PATCH 13/19] [UPD] README.rst --- product_total_weight_from_packaging/README.rst | 9 ++------- .../static/description/index.html | 8 +------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/product_total_weight_from_packaging/README.rst b/product_total_weight_from_packaging/README.rst index bdebbda1404..4b878dec1d3 100644 --- a/product_total_weight_from_packaging/README.rst +++ b/product_total_weight_from_packaging/README.rst @@ -7,9 +7,9 @@ Product Total Weight From Packaging !! 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-AGPL--3-blue.png :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 @@ -33,11 +33,6 @@ It uses module `stock_packaging_calculator` to get weight from product packaging having a weight defined first and fallback on product weight field if no weight is defined on any of the packagings. -.. 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:: diff --git a/product_total_weight_from_packaging/static/description/index.html b/product_total_weight_from_packaging/static/description/index.html index 2d80ef4c509..4a231a98906 100644 --- a/product_total_weight_from_packaging/static/description/index.html +++ b/product_total_weight_from_packaging/static/description/index.html @@ -367,19 +367,13 @@

Product Total Weight From Packaging

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Alpha License: AGPL-3 OCA/product-attribute Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/product-attribute Translate me on Weblate Try me on Runbot

This module provides a a function to estimate the weight of a given quantity of a product, taking into account the product packaging’s weights.

It uses module stock_packaging_calculator to get weight from product packagings having a weight defined first and fallback on product weight field if no weight is defined on any of the packagings.

-
-

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

    From d5ef392989f2c81fcf8fe2d7251ad3703028acbd Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Fri, 21 Jan 2022 07:58:03 +0100 Subject: [PATCH 14/19] product_total_weight_from_packaging: manifest/readme fixes --- product_total_weight_from_packaging/__manifest__.py | 1 - .../readme/DESCRIPTION.rst | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/product_total_weight_from_packaging/__manifest__.py b/product_total_weight_from_packaging/__manifest__.py index 768058c67c7..65677585e73 100644 --- a/product_total_weight_from_packaging/__manifest__.py +++ b/product_total_weight_from_packaging/__manifest__.py @@ -9,7 +9,6 @@ "website": "https://github.com/OCA/product-attribute", "author": "Camptocamp, Odoo Community Association (OCA)", "license": "AGPL-3", - "application": False, "installable": True, "depends": ["stock_packaging_calculator", "product_packaging_dimension"], } diff --git a/product_total_weight_from_packaging/readme/DESCRIPTION.rst b/product_total_weight_from_packaging/readme/DESCRIPTION.rst index 4d11499374b..5e7a5206b69 100644 --- a/product_total_weight_from_packaging/readme/DESCRIPTION.rst +++ b/product_total_weight_from_packaging/readme/DESCRIPTION.rst @@ -1,7 +1,6 @@ -This module provides a a function to estimate the weight -of a given quantity of a product, taking into account the product -packaging's weights. +This module provides a function to estimate the weight of a given quantity of a product, +taking into account the product packaging's weights. -It uses module `stock_packaging_calculator` to get weight from product packagings -having a weight defined first and fallback on product weight field if no -weight is defined on any of the packagings. +It uses the module `stock_packaging_calculator` to get weight from product packagings +having a weight defined first and fallback on product weight field +if no weight is defined on any of the packaging. From 10cd89fc815cf65e231fcddd95d0723ac8863225 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 21 Jan 2022 07:15:50 +0000 Subject: [PATCH 15/19] [UPD] README.rst --- product_total_weight_from_packaging/README.rst | 11 +++++------ .../static/description/index.html | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/product_total_weight_from_packaging/README.rst b/product_total_weight_from_packaging/README.rst index 4b878dec1d3..f60efafac97 100644 --- a/product_total_weight_from_packaging/README.rst +++ b/product_total_weight_from_packaging/README.rst @@ -25,13 +25,12 @@ Product Total Weight From Packaging |badge1| |badge2| |badge3| |badge4| |badge5| -This module provides a a function to estimate the weight -of a given quantity of a product, taking into account the product -packaging's weights. +This module provides a function to estimate the weight of a given quantity of a product, +taking into account the product packaging's weights. -It uses module `stock_packaging_calculator` to get weight from product packagings -having a weight defined first and fallback on product weight field if no -weight is defined on any of the packagings. +It uses the module `stock_packaging_calculator` to get weight from product packagings +having a weight defined first and fallback on product weight field +if no weight is defined on any of the packaging. **Table of contents** diff --git a/product_total_weight_from_packaging/static/description/index.html b/product_total_weight_from_packaging/static/description/index.html index 4a231a98906..ab616d9217b 100644 --- a/product_total_weight_from_packaging/static/description/index.html +++ b/product_total_weight_from_packaging/static/description/index.html @@ -368,12 +368,11 @@

    Product Total Weight From Packaging

    !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

    Beta License: AGPL-3 OCA/product-attribute Translate me on Weblate Try me on Runbot

    -

    This module provides a a function to estimate the weight -of a given quantity of a product, taking into account the product -packaging’s weights.

    -

    It uses module stock_packaging_calculator to get weight from product packagings -having a weight defined first and fallback on product weight field if no -weight is defined on any of the packagings.

    +

    This module provides a function to estimate the weight of a given quantity of a product, +taking into account the product packaging’s weights.

    +

    It uses the module stock_packaging_calculator to get weight from product packagings +having a weight defined first and fallback on product weight field +if no weight is defined on any of the packaging.

    Table of contents

      From bd3d507bc07e51222a1a7597f4df327d68d98ed4 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 21 Jan 2022 07:15:51 +0000 Subject: [PATCH 16/19] product_total_weight_from_packaging 14.0.1.1.1 --- product_total_weight_from_packaging/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product_total_weight_from_packaging/__manifest__.py b/product_total_weight_from_packaging/__manifest__.py index 65677585e73..7c02f752860 100644 --- a/product_total_weight_from_packaging/__manifest__.py +++ b/product_total_weight_from_packaging/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Product Total Weight From Packaging", "summary": "Compute estimated weight based on product's packaging weights", - "version": "14.0.1.1.0", + "version": "14.0.1.1.1", "development_status": "Beta", "category": "Warehouse Management", "website": "https://github.com/OCA/product-attribute", From 663572eb21486db01c445ccccdbc71224b971774 Mon Sep 17 00:00:00 2001 From: hda Date: Wed, 30 Nov 2022 14:40:40 +0100 Subject: [PATCH 17/19] [IMP] product_total_weight_from_packaging: black, isort, prettier --- .../odoo/addons/product_total_weight_from_packaging | 1 + setup/product_total_weight_from_packaging/setup.py | 6 ++++++ 2 files changed, 7 insertions(+) create mode 120000 setup/product_total_weight_from_packaging/odoo/addons/product_total_weight_from_packaging create mode 100644 setup/product_total_weight_from_packaging/setup.py diff --git a/setup/product_total_weight_from_packaging/odoo/addons/product_total_weight_from_packaging b/setup/product_total_weight_from_packaging/odoo/addons/product_total_weight_from_packaging new file mode 120000 index 00000000000..9576bb6deeb --- /dev/null +++ b/setup/product_total_weight_from_packaging/odoo/addons/product_total_weight_from_packaging @@ -0,0 +1 @@ +../../../../product_total_weight_from_packaging \ No newline at end of file diff --git a/setup/product_total_weight_from_packaging/setup.py b/setup/product_total_weight_from_packaging/setup.py new file mode 100644 index 00000000000..28c57bb6403 --- /dev/null +++ b/setup/product_total_weight_from_packaging/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 2cb096a156248e95ba23dd37079b318359fdff3a Mon Sep 17 00:00:00 2001 From: hda Date: Wed, 30 Nov 2022 14:41:40 +0100 Subject: [PATCH 18/19] [MIG] product_total_weight_from_packaging: Migration to 16.0 --- .../__manifest__.py | 2 +- .../i18n/es.po | 22 ------------------- .../product_total_weight_from_packaging.pot | 21 ++++-------------- .../readme/CONTRIBUTORS.rst | 1 + ...est_product_total_weight_from_packaging.py | 4 ++-- test-requirements.txt | 2 ++ 6 files changed, 10 insertions(+), 42 deletions(-) delete mode 100644 product_total_weight_from_packaging/i18n/es.po diff --git a/product_total_weight_from_packaging/__manifest__.py b/product_total_weight_from_packaging/__manifest__.py index 7c02f752860..9f6dd6eae78 100644 --- a/product_total_weight_from_packaging/__manifest__.py +++ b/product_total_weight_from_packaging/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Product Total Weight From Packaging", "summary": "Compute estimated weight based on product's packaging weights", - "version": "14.0.1.1.1", + "version": "16.0.1.0.0", "development_status": "Beta", "category": "Warehouse Management", "website": "https://github.com/OCA/product-attribute", diff --git a/product_total_weight_from_packaging/i18n/es.po b/product_total_weight_from_packaging/i18n/es.po deleted file mode 100644 index 01326afe660..00000000000 --- a/product_total_weight_from_packaging/i18n/es.po +++ /dev/null @@ -1,22 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * product_total_weight_from_packaging -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 13.0\n" -"Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2020-10-14 14:08+0000\n" -"Last-Translator: claudiagn \n" -"Language-Team: none\n" -"Language: es\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 3.10\n" - -#. module: product_total_weight_from_packaging -#: model:ir.model,name:product_total_weight_from_packaging.model_product_product -msgid "Product" -msgstr "Producto" diff --git a/product_total_weight_from_packaging/i18n/product_total_weight_from_packaging.pot b/product_total_weight_from_packaging/i18n/product_total_weight_from_packaging.pot index 23f3a3693c2..cd95c8073b7 100644 --- a/product_total_weight_from_packaging/i18n/product_total_weight_from_packaging.pot +++ b/product_total_weight_from_packaging/i18n/product_total_weight_from_packaging.pot @@ -4,8 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-11-30 15:44+0000\n" +"PO-Revision-Date: 2022-11-30 15:44+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -13,22 +15,7 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" -#. module: product_total_weight_from_packaging -#: model:ir.model.fields,field_description:product_total_weight_from_packaging.field_product_product__display_name -msgid "Display Name" -msgstr "" - -#. module: product_total_weight_from_packaging -#: model:ir.model.fields,field_description:product_total_weight_from_packaging.field_product_product__id -msgid "ID" -msgstr "" - -#. module: product_total_weight_from_packaging -#: model:ir.model.fields,field_description:product_total_weight_from_packaging.field_product_product____last_update -msgid "Last Modified on" -msgstr "" - #. module: product_total_weight_from_packaging #: model:ir.model,name:product_total_weight_from_packaging.model_product_product -msgid "Product" +msgid "Product Variant" msgstr "" diff --git a/product_total_weight_from_packaging/readme/CONTRIBUTORS.rst b/product_total_weight_from_packaging/readme/CONTRIBUTORS.rst index e31e2f0c4fc..d288b67ff7f 100644 --- a/product_total_weight_from_packaging/readme/CONTRIBUTORS.rst +++ b/product_total_weight_from_packaging/readme/CONTRIBUTORS.rst @@ -1 +1,2 @@ * Akim Juillerat +* Hughes Damry diff --git a/product_total_weight_from_packaging/tests/test_product_total_weight_from_packaging.py b/product_total_weight_from_packaging/tests/test_product_total_weight_from_packaging.py index 8550f1097a4..4f16e695ed8 100644 --- a/product_total_weight_from_packaging/tests/test_product_total_weight_from_packaging.py +++ b/product_total_weight_from_packaging/tests/test_product_total_weight_from_packaging.py @@ -1,9 +1,9 @@ # Copyright 2020 Camptocamp SA # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) -from odoo.tests import SavepointCase +from odoo.tests import TransactionCase -class TestProductTotalWeightFromPackaging(SavepointCase): +class TestProductTotalWeightFromPackaging(TransactionCase): @classmethod def setUpClass(cls): super().setUpClass() diff --git a/test-requirements.txt b/test-requirements.txt index 66bc2cbae3f..67639a7e166 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1 +1,3 @@ odoo_test_helper +# https://github.com/OCA/stock-logistics-warehouse/pull/1502 +odoo-addon-stock-packaging-calculator @ git+https://github.com/camptocamp/stock-logistics-warehouse.git@16.0-mig-stock_packaging_calculator#subdirectory=setup/stock_packaging_calculator From 2f7352673c23ab9f70637662441805df2a03310c Mon Sep 17 00:00:00 2001 From: victorvermot Date: Wed, 12 Jul 2023 14:25:54 +0200 Subject: [PATCH 19/19] [FIX]: Updated PR with correct weight --- product_total_weight_from_packaging/models/product.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/product_total_weight_from_packaging/models/product.py b/product_total_weight_from_packaging/models/product.py index 9799ca3cfc2..81a445faa17 100644 --- a/product_total_weight_from_packaging/models/product.py +++ b/product_total_weight_from_packaging/models/product.py @@ -11,7 +11,7 @@ def get_total_weight_from_packaging(self, qty): self.ensure_one() qty_by_packaging_with_weight = self.with_context( **{ - "_packaging_filter": lambda p: p.max_weight, + "_packaging_filter": lambda p: p.weight, "_packaging_values_handler": self._prepare_qty_by_packaging_values_with_weight, # noqa } ).product_qty_by_packaging(qty) @@ -33,5 +33,5 @@ def _prepare_qty_by_packaging_values_with_weight( res["weight"] = self.weight else: packaging = self.env["product.packaging"].browse(packaging_tuple.id) - res["weight"] = packaging.max_weight + res["weight"] = packaging.weight return res