From f07b8ad859c9525586441881d43f67815e446d88 Mon Sep 17 00:00:00 2001 From: Akim Juillerat Date: Fri, 8 Nov 2019 10:57:38 +0100 Subject: [PATCH 001/176] [ADD] stock_storage_type --- stock_storage_type/__init__.py | 1 + stock_storage_type/__manifest__.py | 32 +++++++++++++++ stock_storage_type/demo/product_packaging.xml | 20 +++++++++ stock_storage_type/demo/stock_location.xml | 40 ++++++++++++++++++ .../demo/stock_location_storage_type.xml | 9 ++++ .../demo/stock_package_storage_type.xml | 11 +++++ stock_storage_type/models/__init__.py | 4 ++ .../models/product_packaging.py | 12 ++++++ stock_storage_type/models/stock_location.py | 41 +++++++++++++++++++ .../models/stock_location_storage_type.py | 30 ++++++++++++++ .../models/stock_package_storage_type.py | 20 +++++++++ stock_storage_type/readme/CONFIGURATION.rst | 9 ++++ stock_storage_type/readme/CONTRIBUTORS.rst | 1 + stock_storage_type/readme/DESCRIPTION.rst | 16 ++++++++ stock_storage_type/readme/ROADMAP.rst | 3 ++ .../security/ir.model.access.csv | 5 +++ .../views/product_packaging.xml | 25 +++++++++++ stock_storage_type/views/stock_location.xml | 14 +++++++ .../views/stock_location_storage_type.xml | 39 ++++++++++++++++++ .../views/stock_package_storage_type.xml | 39 ++++++++++++++++++ stock_storage_type/views/stock_picking.xml | 13 ++++++ .../views/storage_type_menus.xml | 11 +++++ 22 files changed, 395 insertions(+) create mode 100644 stock_storage_type/__init__.py create mode 100644 stock_storage_type/__manifest__.py create mode 100644 stock_storage_type/demo/product_packaging.xml create mode 100644 stock_storage_type/demo/stock_location.xml create mode 100644 stock_storage_type/demo/stock_location_storage_type.xml create mode 100644 stock_storage_type/demo/stock_package_storage_type.xml create mode 100644 stock_storage_type/models/__init__.py create mode 100644 stock_storage_type/models/product_packaging.py create mode 100644 stock_storage_type/models/stock_location.py create mode 100644 stock_storage_type/models/stock_location_storage_type.py create mode 100644 stock_storage_type/models/stock_package_storage_type.py create mode 100644 stock_storage_type/readme/CONFIGURATION.rst create mode 100644 stock_storage_type/readme/CONTRIBUTORS.rst create mode 100644 stock_storage_type/readme/DESCRIPTION.rst create mode 100644 stock_storage_type/readme/ROADMAP.rst create mode 100644 stock_storage_type/security/ir.model.access.csv create mode 100644 stock_storage_type/views/product_packaging.xml create mode 100644 stock_storage_type/views/stock_location.xml create mode 100644 stock_storage_type/views/stock_location_storage_type.xml create mode 100644 stock_storage_type/views/stock_package_storage_type.xml create mode 100644 stock_storage_type/views/stock_picking.xml create mode 100644 stock_storage_type/views/storage_type_menus.xml diff --git a/stock_storage_type/__init__.py b/stock_storage_type/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/stock_storage_type/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/stock_storage_type/__manifest__.py b/stock_storage_type/__manifest__.py new file mode 100644 index 0000000000..418a7443cc --- /dev/null +++ b/stock_storage_type/__manifest__.py @@ -0,0 +1,32 @@ +# Copyright 2019 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +{ + "name": "Stock Storage Type", + "summary": "Manage packages and locations storage types", + "version": "12.0.1.0.0", + "development_status": "Alpha", + "category": "Warehouse Management", + "website": "https://github.com/OCA/wms", + "author": "Camptocamp, Odoo Community Association (OCA)", + "license": "AGPL-3", + "application": False, + "installable": True, + "depends": [ + "stock", + ], + "data": [ + "security/ir.model.access.csv", + "views/product_packaging.xml", + "views/stock_location.xml", + "views/stock_location_storage_type.xml", + "views/stock_package_storage_type.xml", + "views/stock_picking.xml", + "views/storage_type_menus.xml", + ], + "demo": [ + "demo/stock_location_storage_type.xml", + "demo/stock_package_storage_type.xml", + "demo/product_packaging.xml", + "demo/stock_location.xml", + ], +} diff --git a/stock_storage_type/demo/product_packaging.xml b/stock_storage_type/demo/product_packaging.xml new file mode 100644 index 0000000000..ec6b50a5d0 --- /dev/null +++ b/stock_storage_type/demo/product_packaging.xml @@ -0,0 +1,20 @@ + + + + Single bag + 1 + + + + 4 units cardbox + 4 + + + + + 48 units pallet + 48 + + + + diff --git a/stock_storage_type/demo/stock_location.xml b/stock_storage_type/demo/stock_location.xml new file mode 100644 index 0000000000..cefca928f4 --- /dev/null +++ b/stock_storage_type/demo/stock_location.xml @@ -0,0 +1,40 @@ + + + + Cardboxes storage area + + + + + Bin 1 + + + + Bin 2 + + + + Bin 3 + + + + + Pallets storage area + + + + + Pallets Bin 1 + + + + Pallets Bin 2 + + + + Pallets Bin 3 + + + diff --git a/stock_storage_type/demo/stock_location_storage_type.xml b/stock_storage_type/demo/stock_location_storage_type.xml new file mode 100644 index 0000000000..dec771e658 --- /dev/null +++ b/stock_storage_type/demo/stock_location_storage_type.xml @@ -0,0 +1,9 @@ + + + + Pallets + + + Cardboxes + + diff --git a/stock_storage_type/demo/stock_package_storage_type.xml b/stock_storage_type/demo/stock_package_storage_type.xml new file mode 100644 index 0000000000..9efc5b31cd --- /dev/null +++ b/stock_storage_type/demo/stock_package_storage_type.xml @@ -0,0 +1,11 @@ + + + + Pallets + + + + Cardboxes + + + diff --git a/stock_storage_type/models/__init__.py b/stock_storage_type/models/__init__.py new file mode 100644 index 0000000000..be8aa5069b --- /dev/null +++ b/stock_storage_type/models/__init__.py @@ -0,0 +1,4 @@ +from . import product_packaging +from . import stock_location +from . import stock_location_storage_type +from . import stock_package_storage_type diff --git a/stock_storage_type/models/product_packaging.py b/stock_storage_type/models/product_packaging.py new file mode 100644 index 0000000000..d34733fb81 --- /dev/null +++ b/stock_storage_type/models/product_packaging.py @@ -0,0 +1,12 @@ +# Copyright 2019 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +from odoo import models, fields + + +class ProductPackaging(models.Model): + + _inherit = 'product.packaging' + + stock_package_storage_type_id = fields.Many2one( + 'stock.package.storage.type' + ) diff --git a/stock_storage_type/models/stock_location.py b/stock_storage_type/models/stock_location.py new file mode 100644 index 0000000000..5752d9fc1e --- /dev/null +++ b/stock_storage_type/models/stock_location.py @@ -0,0 +1,41 @@ +# Copyright 2019 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +from odoo import api, models, fields + + +class StockLocation(models.Model): + + _inherit = 'stock.location' + + stock_location_storage_type_ids = fields.Many2many( + 'stock.location.storage.type', + 'stock_location_stock_location_storage_type_rel', + 'stock_location_id', + 'stock_location_storage_type_id', + ) + + allowed_stock_location_storage_type_ids = fields.Many2many( + 'stock.location.storage.type', + 'stock_location_allowed_stock_location_storage_type_rel', + 'stock_location_id', + 'stock_location_storage_type_id', + compute='_compute_allowed_stock_location_storage_type_ids', + store=True, + ) + + @api.depends( + 'stock_location_storage_type_ids', 'location_id', + 'location_id.allowed_stock_location_storage_type_ids' + ) + def _compute_allowed_stock_location_storage_type_ids(self): + for location in self: + if location.stock_location_storage_type_ids: + location.allowed_stock_location_storage_type_ids = [ + (6, 0, location.stock_location_storage_type_ids.ids) + ] + else: + parent = location.location_id + location.allowed_stock_location_storage_type_ids = [ + (6, 0, + parent.allowed_stock_location_storage_type_ids.ids) + ] diff --git a/stock_storage_type/models/stock_location_storage_type.py b/stock_storage_type/models/stock_location_storage_type.py new file mode 100644 index 0000000000..3f40f00e8f --- /dev/null +++ b/stock_storage_type/models/stock_location_storage_type.py @@ -0,0 +1,30 @@ +# Copyright 2019 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +from odoo import models, fields + + +class StockLocationStorageType(models.Model): + + _name = 'stock.location.storage.type' + _description = 'Stock location storage type' + + name = fields.Char(required=True) + location_ids = fields.Many2many( + 'stock.location', + 'stock_location_stock_location_storage_type_rel', + 'stock_location_storage_type_id', + 'stock_location_id', + ) + allowed_location_ids = fields.Many2many( + 'stock.location', + 'stock_location_allowed_stock_location_storage_type_rel', + 'stock_location_storage_type_id', + 'stock_location_id', + readonly=True, + ) + stock_package_storage_type_ids = fields.Many2many( + 'stock.package.storage.type', + 'stock_location_package_storage_type_rel', + 'stock_location_storage_type_id', + 'stock_package_storage_type_id', + ) diff --git a/stock_storage_type/models/stock_package_storage_type.py b/stock_storage_type/models/stock_package_storage_type.py new file mode 100644 index 0000000000..52f67569c6 --- /dev/null +++ b/stock_storage_type/models/stock_package_storage_type.py @@ -0,0 +1,20 @@ +# Copyright 2019 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +from odoo import models, fields + + +class StockPackageStorageType(models.Model): + + _name = 'stock.package.storage.type' + _description = 'Stock package storage type' + + name = fields.Char(required=True) + stock_location_storage_type_ids = fields.Many2many( + 'stock.location.storage.type', + 'stock_location_package_storage_type_rel', + 'stock_package_storage_type_id', + 'stock_location_storage_type_id', + ) + product_packaging_ids = fields.One2many( + 'product.packaging', 'stock_package_storage_type_id', + ) diff --git a/stock_storage_type/readme/CONFIGURATION.rst b/stock_storage_type/readme/CONFIGURATION.rst new file mode 100644 index 0000000000..fe77c89188 --- /dev/null +++ b/stock_storage_type/readme/CONFIGURATION.rst @@ -0,0 +1,9 @@ +Got to "Inventory > Settings > Storage Types", to define Package Storage Types +and Location Storage Types. + +Package Storage Type can be defined on Product Packaging form view from the +product form view. + +Location Storage Type can be added to any stock location and will be computed +automatically as Allowed Locations Storage Types on said stock location's +children location. diff --git a/stock_storage_type/readme/CONTRIBUTORS.rst b/stock_storage_type/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..e31e2f0c4f --- /dev/null +++ b/stock_storage_type/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Akim Juillerat diff --git a/stock_storage_type/readme/DESCRIPTION.rst b/stock_storage_type/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..4af495a29b --- /dev/null +++ b/stock_storage_type/readme/DESCRIPTION.rst @@ -0,0 +1,16 @@ +This module introduces two new models in order to manage stock moves with + packages according to the packaging and stock location properties. + +* Stock package storage type (`stock.package.storage.type`) + + This model is linked to product.packaging and defines the type of storage + related to a specific packaging. + +* Stock location storage type (`stock.location.storage.type`) + + This models is linked to stock.location and defines the types of storage + that are allowed for a specific location. + +Therefore a Stock location storage type can include different Stock package +storage type in order to validate the destination of a move with package into a +stock location. diff --git a/stock_storage_type/readme/ROADMAP.rst b/stock_storage_type/readme/ROADMAP.rst new file mode 100644 index 0000000000..c659ae8a34 --- /dev/null +++ b/stock_storage_type/readme/ROADMAP.rst @@ -0,0 +1,3 @@ +* Move constraints from `stock_putaway_storage_type_strategy` here, to compute + a domain on `location_dest_id` fields from `stock.move.line` and + `stock.package_level` according to storage types. diff --git a/stock_storage_type/security/ir.model.access.csv b/stock_storage_type/security/ir.model.access.csv new file mode 100644 index 0000000000..6162a29d6f --- /dev/null +++ b/stock_storage_type/security/ir.model.access.csv @@ -0,0 +1,5 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_stock_location_storage_type_user,access_stock_location_storage_type_user,model_stock_location_storage_type,base.group_user,1,0,0,0 +access_stock_package_storage_type_user,access_stock_package_storage_type_user,model_stock_package_storage_type,base.group_user,1,0,0,0 +access_stock_location_storage_type_manager,access_stock_location_storage_type_manager,model_stock_location_storage_type,stock.group_adv_location,1,1,1,1 +access_stock_package_storage_type_manager,access_stock_package_storage_type_manager,model_stock_package_storage_type,stock.group_adv_location,1,1,1,1 diff --git a/stock_storage_type/views/product_packaging.xml b/stock_storage_type/views/product_packaging.xml new file mode 100644 index 0000000000..15d7eee89b --- /dev/null +++ b/stock_storage_type/views/product_packaging.xml @@ -0,0 +1,25 @@ + + + + product.packaging.tree.view.inherit + product.packaging + + + + + + + + + product.packaging.form.view.inherit + product.packaging + + + + + + + + + + diff --git a/stock_storage_type/views/stock_location.xml b/stock_storage_type/views/stock_location.xml new file mode 100644 index 0000000000..193a4233c1 --- /dev/null +++ b/stock_storage_type/views/stock_location.xml @@ -0,0 +1,14 @@ + + + + stock.location.form.inherit + stock.location + + + + + + + + + diff --git a/stock_storage_type/views/stock_location_storage_type.xml b/stock_storage_type/views/stock_location_storage_type.xml new file mode 100644 index 0000000000..ade31b3c5c --- /dev/null +++ b/stock_storage_type/views/stock_location_storage_type.xml @@ -0,0 +1,39 @@ + + + + stock.location.storage.type.tree.view + stock.location.storage.type + + + + + + + + + stock.location.storage.type.form.view + stock.location.storage.type + +
+ +
+
+ + + + + + +
+ + + + Location Storage Types + ir.actions.act_window + stock.location.storage.type + form + tree,form + + diff --git a/stock_storage_type/views/stock_package_storage_type.xml b/stock_storage_type/views/stock_package_storage_type.xml new file mode 100644 index 0000000000..52331f699c --- /dev/null +++ b/stock_storage_type/views/stock_package_storage_type.xml @@ -0,0 +1,39 @@ + + + + storage.unit.type.tree.view + stock.package.storage.type + + + + + + + + + storage.unit.type.tree.view + stock.package.storage.type + +
+ +
+
+ + + + + + +
+ + + + Package Storage Types + ir.actions.act_window + stock.package.storage.type + form + tree,form + + diff --git a/stock_storage_type/views/stock_picking.xml b/stock_storage_type/views/stock_picking.xml new file mode 100644 index 0000000000..cc73bfc97d --- /dev/null +++ b/stock_storage_type/views/stock_picking.xml @@ -0,0 +1,13 @@ + + + + stock.picking.form.inherit + stock.picking + + + + + + + + diff --git a/stock_storage_type/views/storage_type_menus.xml b/stock_storage_type/views/storage_type_menus.xml new file mode 100644 index 0000000000..9de9957cae --- /dev/null +++ b/stock_storage_type/views/storage_type_menus.xml @@ -0,0 +1,11 @@ + + + + + + From 4a32065130557d72f4fcd33ed6a6cdeb05de9ed5 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Mon, 25 Nov 2019 13:12:16 +0000 Subject: [PATCH 002/176] [UPD] Update stock_storage_type.pot --- stock_storage_type/README.rst | 100 ++++ .../i18n/stock_storage_type.pot | 129 +++++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 450 ++++++++++++++++++ 4 files changed, 679 insertions(+) create mode 100644 stock_storage_type/README.rst create mode 100644 stock_storage_type/i18n/stock_storage_type.pot create mode 100644 stock_storage_type/static/description/icon.png create mode 100644 stock_storage_type/static/description/index.html diff --git a/stock_storage_type/README.rst b/stock_storage_type/README.rst new file mode 100644 index 0000000000..c372e1710a --- /dev/null +++ b/stock_storage_type/README.rst @@ -0,0 +1,100 @@ +================== +Stock Storage 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-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%2Fwms-lightgray.png?logo=github + :target: https://github.com/OCA/wms/tree/12.0/stock_storage_type + :alt: OCA/wms +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/wms-12-0/wms-12-0-stock_storage_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/285/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module introduces two new models in order to manage stock moves with + packages according to the packaging and stock location properties. + +* Stock package storage type (`stock.package.storage.type`) + + This model is linked to product.packaging and defines the type of storage + related to a specific packaging. + +* Stock location storage type (`stock.location.storage.type`) + + This models is linked to stock.location and defines the types of storage + that are allowed for a specific location. + +Therefore a Stock location storage type can include different Stock package +storage type in order to validate the destination of a move with package into a +stock location. + +.. 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: + +Known issues / Roadmap +====================== + +* Move constraints from `stock_putaway_storage_type_strategy` here, to compute + a domain on `location_dest_id` fields from `stock.move.line` and + `stock.package_level` according to storage types. + +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/wms `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/stock_storage_type/i18n/stock_storage_type.pot b/stock_storage_type/i18n/stock_storage_type.pot new file mode 100644 index 0000000000..abb9191a64 --- /dev/null +++ b/stock_storage_type/i18n/stock_storage_type.pot @@ -0,0 +1,129 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_storage_type +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.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_storage_type +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_location_storage_type__allowed_location_ids +msgid "Allowed Location" +msgstr "" + +#. module: stock_storage_type +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_location__allowed_stock_location_storage_type_ids +msgid "Allowed Stock Location Storage Type" +msgstr "" + +#. module: stock_storage_type +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_location_storage_type__create_uid +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_package_storage_type__create_uid +msgid "Created by" +msgstr "" + +#. module: stock_storage_type +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_location_storage_type__create_date +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_package_storage_type__create_date +msgid "Created on" +msgstr "" + +#. module: stock_storage_type +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_location_storage_type__display_name +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_package_storage_type__display_name +msgid "Display Name" +msgstr "" + +#. module: stock_storage_type +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_location_storage_type__id +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_package_storage_type__id +msgid "ID" +msgstr "" + +#. module: stock_storage_type +#: model:ir.model,name:stock_storage_type.model_stock_location +msgid "Inventory Locations" +msgstr "" + +#. module: stock_storage_type +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_location_storage_type____last_update +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_package_storage_type____last_update +msgid "Last Modified on" +msgstr "" + +#. module: stock_storage_type +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_location_storage_type__write_uid +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_package_storage_type__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: stock_storage_type +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_location_storage_type__write_date +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_package_storage_type__write_date +msgid "Last Updated on" +msgstr "" + +#. module: stock_storage_type +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_location_storage_type__location_ids +msgid "Location" +msgstr "" + +#. module: stock_storage_type +#: model:ir.actions.act_window,name:stock_storage_type.location_storage_type_action +#: model:ir.ui.menu,name:stock_storage_type.menu_location_storage_type_action +msgid "Location Storage Types" +msgstr "" + +#. module: stock_storage_type +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_location_storage_type__name +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_package_storage_type__name +msgid "Name" +msgstr "" + +#. module: stock_storage_type +#: model:ir.actions.act_window,name:stock_storage_type.package_storage_type_action +#: model:ir.ui.menu,name:stock_storage_type.menu_package_storage_type_action +#: model_terms:ir.ui.view,arch_db:stock_storage_type.location_storage_type_form_view +msgid "Package Storage Types" +msgstr "" + +#. module: stock_storage_type +#: model:ir.model,name:stock_storage_type.model_product_packaging +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_package_storage_type__product_packaging_ids +msgid "Product Packaging" +msgstr "" + +#. module: stock_storage_type +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_location__stock_location_storage_type_ids +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_package_storage_type__stock_location_storage_type_ids +msgid "Stock Location Storage Type" +msgstr "" + +#. module: stock_storage_type +#: model:ir.model.fields,field_description:stock_storage_type.field_product_packaging__stock_package_storage_type_id +#: model:ir.model.fields,field_description:stock_storage_type.field_stock_location_storage_type__stock_package_storage_type_ids +msgid "Stock Package Storage Type" +msgstr "" + +#. module: stock_storage_type +#: model:ir.model,name:stock_storage_type.model_stock_location_storage_type +msgid "Stock location storage type" +msgstr "" + +#. module: stock_storage_type +#: model:ir.model,name:stock_storage_type.model_stock_package_storage_type +msgid "Stock package storage type" +msgstr "" + +#. module: stock_storage_type +#: model:ir.ui.menu,name:stock_storage_type.storage_type_menu +msgid "Storage Types" +msgstr "" + diff --git a/stock_storage_type/static/description/icon.png b/stock_storage_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 diff --git a/stock_storage_type/static/description/index.html b/stock_storage_type/static/description/index.html new file mode 100644 index 0000000000..aecdecf8df --- /dev/null +++ b/stock_storage_type/static/description/index.html @@ -0,0 +1,450 @@ + + + + + + +Stock Storage Type + + + +
+

Stock Storage Type

+ + +

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

+
+
This module introduces two new models in order to manage stock moves with
+
packages according to the packaging and stock location properties.
+
+
    +

  • Stock package storage type (stock.package.storage.type)

    +

    This model is linked to product.packaging and defines the type of storage +related to a specific packaging.

    +
    • +

  • Stock location storage type (stock.location.storage.type)

    +

    This models is linked to stock.location and defines the types of storage +that are allowed for a specific location.

    +
    • +
+

Therefore a Stock location storage type can include different Stock package +storage type in order to validate the destination of a move with package into a +stock location.

+
+

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

+ +
+

Known issues / Roadmap

+
    +
  • Move constraints from stock_putaway_storage_type_strategy here, to compute +a domain on location_dest_id fields from stock.move.line and +stock.package_level according to storage types.
    • +
+
+
+

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

+

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

+
+
+
+ + From c2175f642936bf13f6b7ad391e531fe53c2c2b7e Mon Sep 17 00:00:00 2001 From: Akim Juillerat Date: Mon, 25 Nov 2019 17:32:14 +0100 Subject: [PATCH 003/176] Move restrictions from stock_putaway_storage_type_strategy to base module Define max height/max weight restriction fields Dedicated tree view to edit package/location storage type relation Rename fields to drop stock_ prefix --- stock_storage_type/__manifest__.py | 3 +- stock_storage_type/demo/product_packaging.xml | 4 +- stock_storage_type/demo/stock_location.xml | 4 +- .../demo/stock_location_storage_type.xml | 5 +- .../demo/stock_package_storage_type.xml | 8 ++- stock_storage_type/models/__init__.py | 1 + .../models/product_packaging.py | 6 +- stock_storage_type/models/stock_location.py | 40 ++++++----- ...stock_location_package_storage_type_rel.py | 16 +++++ .../models/stock_location_storage_type.py | 71 +++++++++++++++++-- .../models/stock_package_storage_type.py | 14 ++-- stock_storage_type/readme/DESCRIPTION.rst | 4 ++ stock_storage_type/readme/ROADMAP.rst | 6 +- .../security/ir.model.access.csv | 2 + .../views/product_packaging.xml | 4 +- stock_storage_type/views/stock_location.xml | 4 +- ...tock_location_package_storage_type_rel.xml | 19 +++++ .../views/stock_location_storage_type.xml | 17 +++-- .../views/stock_package_storage_type.xml | 8 +-- stock_storage_type/views/stock_picking.xml | 13 ---- .../views/storage_type_menus.xml | 5 +- 21 files changed, 188 insertions(+), 66 deletions(-) create mode 100644 stock_storage_type/models/stock_location_package_storage_type_rel.py create mode 100644 stock_storage_type/views/stock_location_package_storage_type_rel.xml delete mode 100644 stock_storage_type/views/stock_picking.xml diff --git a/stock_storage_type/__manifest__.py b/stock_storage_type/__manifest__.py index 418a7443cc..426a513947 100644 --- a/stock_storage_type/__manifest__.py +++ b/stock_storage_type/__manifest__.py @@ -12,6 +12,7 @@ "application": False, "installable": True, "depends": [ + "base_m2m_custom_field", "stock", ], "data": [ @@ -20,7 +21,7 @@ "views/stock_location.xml", "views/stock_location_storage_type.xml", "views/stock_package_storage_type.xml", - "views/stock_picking.xml", + "views/stock_location_package_storage_type_rel.xml", "views/storage_type_menus.xml", ], "demo": [ diff --git a/stock_storage_type/demo/product_packaging.xml b/stock_storage_type/demo/product_packaging.xml index ec6b50a5d0..cb9289aaf3 100644 --- a/stock_storage_type/demo/product_packaging.xml +++ b/stock_storage_type/demo/product_packaging.xml @@ -9,12 +9,12 @@ 4 units cardbox 4 - + 48 units pallet 48 - + diff --git a/stock_storage_type/demo/stock_location.xml b/stock_storage_type/demo/stock_location.xml index cefca928f4..ab0a1ec444 100644 --- a/stock_storage_type/demo/stock_location.xml +++ b/stock_storage_type/demo/stock_location.xml @@ -4,7 +4,7 @@ Cardboxes storage area - + Bin 1 @@ -23,7 +23,7 @@ Pallets storage area - + Pallets Bin 1 diff --git a/stock_storage_type/demo/stock_location_storage_type.xml b/stock_storage_type/demo/stock_location_storage_type.xml index dec771e658..804e1bdc7f 100644 --- a/stock_storage_type/demo/stock_location_storage_type.xml +++ b/stock_storage_type/demo/stock_location_storage_type.xml @@ -1,7 +1,10 @@ - Pallets + Pallets EUR + + + Pallets UK Cardboxes diff --git a/stock_storage_type/demo/stock_package_storage_type.xml b/stock_storage_type/demo/stock_package_storage_type.xml index 9efc5b31cd..cab13aa453 100644 --- a/stock_storage_type/demo/stock_package_storage_type.xml +++ b/stock_storage_type/demo/stock_package_storage_type.xml @@ -2,10 +2,14 @@ Pallets - + + + + Pallets UK + Cardboxes - + diff --git a/stock_storage_type/models/__init__.py b/stock_storage_type/models/__init__.py index be8aa5069b..7f6429b906 100644 --- a/stock_storage_type/models/__init__.py +++ b/stock_storage_type/models/__init__.py @@ -1,4 +1,5 @@ from . import product_packaging from . import stock_location +from . import stock_location_package_storage_type_rel from . import stock_location_storage_type from . import stock_package_storage_type diff --git a/stock_storage_type/models/product_packaging.py b/stock_storage_type/models/product_packaging.py index d34733fb81..440afd9b46 100644 --- a/stock_storage_type/models/product_packaging.py +++ b/stock_storage_type/models/product_packaging.py @@ -7,6 +7,8 @@ class ProductPackaging(models.Model): _inherit = 'product.packaging' - stock_package_storage_type_id = fields.Many2one( - 'stock.package.storage.type' + package_storage_type_id = fields.Many2one( + 'stock.package.storage.type', + help="The package storage type will be set on stock packages using " + "this product packaging, in order to compute its putaway." ) diff --git a/stock_storage_type/models/stock_location.py b/stock_storage_type/models/stock_location.py index 5752d9fc1e..e52c9c3707 100644 --- a/stock_storage_type/models/stock_location.py +++ b/stock_storage_type/models/stock_location.py @@ -7,35 +7,41 @@ class StockLocation(models.Model): _inherit = 'stock.location' - stock_location_storage_type_ids = fields.Many2many( + location_storage_type_ids = fields.Many2many( 'stock.location.storage.type', - 'stock_location_stock_location_storage_type_rel', - 'stock_location_id', - 'stock_location_storage_type_id', + 'stock_location_location_storage_type_rel', + 'location_id', + 'location_storage_type_id', + help="Location storage types defined here will be applied on all the " + "children locations that do not define their own location " + "storage types." ) - allowed_stock_location_storage_type_ids = fields.Many2many( + allowed_location_storage_type_ids = fields.Many2many( 'stock.location.storage.type', - 'stock_location_allowed_stock_location_storage_type_rel', - 'stock_location_id', - 'stock_location_storage_type_id', - compute='_compute_allowed_stock_location_storage_type_ids', + 'stock_location_allowed_location_storage_type_rel', + 'location_id', + 'location_storage_type_id', + compute='_compute_allowed_location_storage_type_ids', store=True, + help="Locations storage types that this location can accept. (If no " + "location storage types are defined on this specific location, " + "the location storage types of the parent location are applied)." ) @api.depends( - 'stock_location_storage_type_ids', 'location_id', - 'location_id.allowed_stock_location_storage_type_ids' + 'location_storage_type_ids', 'location_id', + 'location_id.allowed_location_storage_type_ids' ) - def _compute_allowed_stock_location_storage_type_ids(self): + def _compute_allowed_location_storage_type_ids(self): for location in self: - if location.stock_location_storage_type_ids: - location.allowed_stock_location_storage_type_ids = [ - (6, 0, location.stock_location_storage_type_ids.ids) + if location.location_storage_type_ids: + location.allowed_location_storage_type_ids = [ + (6, 0, location.location_storage_type_ids.ids) ] else: parent = location.location_id - location.allowed_stock_location_storage_type_ids = [ + location.allowed_location_storage_type_ids = [ (6, 0, - parent.allowed_stock_location_storage_type_ids.ids) + parent.allowed_location_storage_type_ids.ids) ] diff --git a/stock_storage_type/models/stock_location_package_storage_type_rel.py b/stock_storage_type/models/stock_location_package_storage_type_rel.py new file mode 100644 index 0000000000..b31502c890 --- /dev/null +++ b/stock_storage_type/models/stock_location_package_storage_type_rel.py @@ -0,0 +1,16 @@ +# Copyright 2019 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +from odoo import models, fields + + +class StockStorageTypePackageLocationRel(models.Model): + + _name = 'stock.location.package.storage.type.rel' + _description = 'Location Package storage type relation' + + package_storage_type_id = fields.Many2one( + 'stock.package.storage.type', required=True + ) + location_storage_type_id = fields.Many2one( + 'stock.location.storage.type', required=True + ) diff --git a/stock_storage_type/models/stock_location_storage_type.py b/stock_storage_type/models/stock_location_storage_type.py index 3f40f00e8f..07b9221caa 100644 --- a/stock_storage_type/models/stock_location_storage_type.py +++ b/stock_storage_type/models/stock_location_storage_type.py @@ -1,12 +1,13 @@ # Copyright 2019 Camptocamp SA # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) -from odoo import models, fields +from odoo import api, fields, models, _ +from odoo.exceptions import ValidationError class StockLocationStorageType(models.Model): _name = 'stock.location.storage.type' - _description = 'Stock location storage type' + _description = 'Location storage type' name = fields.Char(required=True) location_ids = fields.Many2many( @@ -22,9 +23,69 @@ class StockLocationStorageType(models.Model): 'stock_location_id', readonly=True, ) - stock_package_storage_type_ids = fields.Many2many( + + package_storage_type_ids = fields.Many2manyCustom( 'stock.package.storage.type', 'stock_location_package_storage_type_rel', - 'stock_location_storage_type_id', - 'stock_package_storage_type_id', + 'location_storage_type_id', + 'package_storage_type_id', + create_table=False, + string='Allowed packages storage types', + help="Package storage types that are allowed on locations " + "where this location storage type is defined." + ) + + only_empty = fields.Boolean( + help="If checked, moves to the destination location will only be " + "allowed if there are not any existing quant nor planned move on " + "this location") + do_not_mix_lots = fields.Boolean( + help="If checked, moves to the destination location will only be " + "allowed if the location contains product of the same " + "lot." + ) + do_not_mix_products = fields.Boolean( + help="If checked, moves to the destination location will only be " + "allowed if the location contains the same product." ) + max_height = fields.Float( + string="Max height (mm)", + help="If defined, moves to the destination location will only be " + "allowed if the packaging height is lower than this maximum." + ) + max_weight = fields.Float( + string="Max weight (kg)", + help="If defined, moves to the destination location will only be " + "allowed if the packaging wight is lower than this maximum." + ) + + @api.constrains('only_empty', 'do_not_mix_lots', 'do_not_mix_products') + def _check_empty_mix(self): + for location_storage_type in self: + if ( + location_storage_type.only_empty and ( + location_storage_type.do_not_mix_lots or + location_storage_type.do_not_mix_products + ) + ): + raise ValidationError(_( + "You cannot set 'Do not mix lots' or 'Do not mix products'" + " with 'Only empty' constraint." + )) + + @api.constrains('do_not_mix_lots', 'do_not_mix_products') + def _check_do_not_mix(self): + for location_storage_type in self: + if ( + location_storage_type.do_not_mix_lots and + not location_storage_type.do_not_mix_products + ): + raise ValidationError(_( + "You cannot set 'Do not mix lots' without setting 'Do not" + " mix products' constraint." + )) + + @api.onchange('do_not_mix_products') + def _onchange_do_not_mix_products(self): + if not self.do_not_mix_products: + self.do_not_mix_lots = False diff --git a/stock_storage_type/models/stock_package_storage_type.py b/stock_storage_type/models/stock_package_storage_type.py index 52f67569c6..59988efb72 100644 --- a/stock_storage_type/models/stock_package_storage_type.py +++ b/stock_storage_type/models/stock_package_storage_type.py @@ -6,15 +6,19 @@ class StockPackageStorageType(models.Model): _name = 'stock.package.storage.type' - _description = 'Stock package storage type' + _description = 'Package storage type' name = fields.Char(required=True) - stock_location_storage_type_ids = fields.Many2many( + location_storage_type_ids = fields.Many2manyCustom( 'stock.location.storage.type', 'stock_location_package_storage_type_rel', - 'stock_package_storage_type_id', - 'stock_location_storage_type_id', + 'package_storage_type_id', + 'location_storage_type_id', + create_table=False, + string='Allowed locations storage types', + help="Locations storage types that can accept such a package storage " + "type." ) product_packaging_ids = fields.One2many( - 'product.packaging', 'stock_package_storage_type_id', + 'product.packaging', 'package_storage_type_id', ) diff --git a/stock_storage_type/readme/DESCRIPTION.rst b/stock_storage_type/readme/DESCRIPTION.rst index 4af495a29b..30116532bf 100644 --- a/stock_storage_type/readme/DESCRIPTION.rst +++ b/stock_storage_type/readme/DESCRIPTION.rst @@ -14,3 +14,7 @@ This module introduces two new models in order to manage stock moves with Therefore a Stock location storage type can include different Stock package storage type in order to validate the destination of a move with package into a stock location. +Moreover Stock location storage type can include product, size or lot +restrictions for the stock locations it's defined on, so that a move with +package will only be allowed if it doesn't violate the restrictions defined +(cf stock_location_storage_type_strategy). diff --git a/stock_storage_type/readme/ROADMAP.rst b/stock_storage_type/readme/ROADMAP.rst index c659ae8a34..d88f95a769 100644 --- a/stock_storage_type/readme/ROADMAP.rst +++ b/stock_storage_type/readme/ROADMAP.rst @@ -1,3 +1,3 @@ -* Move constraints from `stock_putaway_storage_type_strategy` here, to compute - a domain on `location_dest_id` fields from `stock.move.line` and - `stock.package_level` according to storage types. +* Use restrictions to compute a domain to be applied on `location_dest_id` + fields from `stock.move.line` and `stock.package_level` according to storage + types. diff --git a/stock_storage_type/security/ir.model.access.csv b/stock_storage_type/security/ir.model.access.csv index 6162a29d6f..98a88a55a6 100644 --- a/stock_storage_type/security/ir.model.access.csv +++ b/stock_storage_type/security/ir.model.access.csv @@ -3,3 +3,5 @@ access_stock_location_storage_type_user,access_stock_location_storage_type_user, access_stock_package_storage_type_user,access_stock_package_storage_type_user,model_stock_package_storage_type,base.group_user,1,0,0,0 access_stock_location_storage_type_manager,access_stock_location_storage_type_manager,model_stock_location_storage_type,stock.group_adv_location,1,1,1,1 access_stock_package_storage_type_manager,access_stock_package_storage_type_manager,model_stock_package_storage_type,stock.group_adv_location,1,1,1,1 +access_stock_location_package_storage_type_rel_user,access_stock_location_package_storage_type_rel_user,model_stock_location_package_storage_type_rel,base.group_user,1,0,0,0 +access_stock_location_package_storage_type_rel_manager,access_stock_location_package_storage_type_rel_manager,model_stock_location_package_storage_type_rel,base.group_user,1,1,1,1 diff --git a/stock_storage_type/views/product_packaging.xml b/stock_storage_type/views/product_packaging.xml index 15d7eee89b..ea5376619e 100644 --- a/stock_storage_type/views/product_packaging.xml +++ b/stock_storage_type/views/product_packaging.xml @@ -6,7 +6,7 @@ - + @@ -17,7 +17,7 @@ - + diff --git a/stock_storage_type/views/stock_location.xml b/stock_storage_type/views/stock_location.xml index 193a4233c1..3d7db9a6cb 100644 --- a/stock_storage_type/views/stock_location.xml +++ b/stock_storage_type/views/stock_location.xml @@ -6,8 +6,8 @@ - - + + diff --git a/stock_storage_type/views/stock_location_package_storage_type_rel.xml b/stock_storage_type/views/stock_location_package_storage_type_rel.xml new file mode 100644 index 0000000000..bba8d82796 --- /dev/null +++ b/stock_storage_type/views/stock_location_package_storage_type_rel.xml @@ -0,0 +1,19 @@ + + + + stock.location.package.storage.type.rel.tree.view + stock.location.package.storage.type.rel + + + + + + + + + Storage Types Mapping + ir.actions.act_window + stock.location.package.storage.type.rel + list + + diff --git a/stock_storage_type/views/stock_location_storage_type.xml b/stock_storage_type/views/stock_location_storage_type.xml index ade31b3c5c..5fee33c7e4 100644 --- a/stock_storage_type/views/stock_location_storage_type.xml +++ b/stock_storage_type/views/stock_location_storage_type.xml @@ -6,7 +6,7 @@ - + @@ -20,9 +20,18 @@ From fd0200fa11f8d16e6d509af18082b1d6f7acdbde Mon Sep 17 00:00:00 2001 From: Denis Roussel Date: Fri, 9 Jun 2023 14:05:41 +0200 Subject: [PATCH 142/176] [IMP] stock_storage_type: Allow to re-apply putaway rules on computed location --- stock_storage_type/README.rst | 29 +++-- stock_storage_type/models/stock_location.py | 40 +++---- .../models/stock_package_level.py | 1 + stock_storage_type/readme/DESCRIPTION.rst | 4 + .../static/description/index.html | 17 ++- .../test_storage_type_putaway_strategy.py | 101 +++++++++++++++++- 6 files changed, 146 insertions(+), 46 deletions(-) diff --git a/stock_storage_type/README.rst b/stock_storage_type/README.rst index 30d0bf70ac..8bf3e1e0d1 100644 --- a/stock_storage_type/README.rst +++ b/stock_storage_type/README.rst @@ -2,10 +2,13 @@ Stock Storage Type ================== -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:b29f8216ef39028cfa13cbb5d9506eee756291d54e3a4284ce1d574d132d32e7 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -14,16 +17,16 @@ Stock Storage Type :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fwms-lightgray.png?logo=github - :target: https://github.com/OCA/wms/tree/14.0/stock_storage_type + :target: https://github.com/OCA/wms/tree/16.0/stock_storage_type :alt: OCA/wms .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/wms-14-0/wms-14-0-stock_storage_type + :target: https://translation.odoo-community.org/projects/wms-16-0/wms-16-0-stock_storage_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/285/14.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/wms&target_branch=16.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| This module introduces two new models in order to manage stock moves with packages according to the packaging and stock location properties. @@ -73,6 +76,10 @@ the "ordered children" strategy, children locations are sorted by first by max height which is a physical constraint to respect, then pack putaway sequence which allow to favor for example some level or corridor, and finally by name. +At the end, if found location is not the same as the original destination location, +the putaway strategies are applied (e.g.: A "none" pack putaway strategy is set on +computed location and a putaway rule exists on that one). + **Table of contents** .. contents:: @@ -113,8 +120,8 @@ 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 `_. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -135,6 +142,8 @@ Contributors * Raphaël Reverdy * Jacques-Etienne Baudoux * Laurent Mignon +* Fernando La Chica - GreenICe +* Denis Roussel Maintainers ~~~~~~~~~~~ @@ -149,6 +158,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/wms `_ project on GitHub. +This module is part of the `OCA/wms `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/stock_storage_type/models/stock_location.py b/stock_storage_type/models/stock_location.py index 23542ba671..1d7840288f 100644 --- a/stock_storage_type/models/stock_location.py +++ b/stock_storage_type/models/stock_location.py @@ -358,7 +358,7 @@ def _putaway_strategy_finalizer( # If package provided, the product is not set (in the get_putaway_strategy() method) product = package.single_product_id or product return self._get_package_type_putaway_strategy( - putaway_location, package, product + putaway_location, package, product, quantity ) def _get_package_type(self, package, product): @@ -379,7 +379,9 @@ def _get_package_type(self, package, product): ) return package_type - def _get_package_type_putaway_strategy(self, putaway_location, package, product): + def _get_package_type_putaway_strategy( + self, putaway_location, package, product, quantity + ): package_type = self._get_package_type(package, product) # exclude_sml_ids are passed into the context during the get_putaway_strategy # call. @@ -419,6 +421,13 @@ def _get_package_type_putaway_strategy(self, putaway_location, package, product) "Applied putaway strategy to location %s" % allowed_location.complete_name ) + # Reapply putaway strategy if particular rules have been put on product level + # Check if the allowed location is not self to avoid recursive computations + if allowed_location != self: + final_location = allowed_location._get_putaway_strategy( + product, quantity, package + ) + return final_location return allowed_location _logger.debug( "Could not find a valid putaway location, fallback to %s" @@ -432,37 +441,12 @@ def get_storage_locations(self, products=None): locations = self.browse() if self.pack_putaway_strategy == "none": locations = self - if products and len(products) == 1: - locations = self._get_product_putaway(products) or self + return locations else: products = products or self.env["product.product"] locations = self._get_sorted_leaf_child_locations(products) return locations - def _get_product_putaway(self, product): - """Returns the direct location where the product has to be put if - found Otherwise returns an empty recordset..""" - self.ensure_one() - putaway_location = self.env["stock.location"] - # Looking for a putaway about the product. - putaway_rules = self.putaway_rule_ids.filtered( - lambda x: x.product_id == product - ) - if putaway_rules: - putaway_location = putaway_rules[0].location_out_id - # If not product putaway found, we're looking with category so. - else: - categ = product.categ_id - while categ: - putaway_rules = self.putaway_rule_ids.filtered( - lambda x: x.category_id == categ - ) - if putaway_rules: - putaway_location = putaway_rules[0].location_out_id - break - categ = categ.parent_id - return putaway_location - def _get_sorted_leaf_locations_orderby(self, products): """Return SQL orderby clause and params for sorting locations diff --git a/stock_storage_type/models/stock_package_level.py b/stock_storage_type/models/stock_package_level.py index 31cec881b1..c7d66d88c1 100644 --- a/stock_storage_type/models/stock_package_level.py +++ b/stock_storage_type/models/stock_package_level.py @@ -95,5 +95,6 @@ def recompute_pack_putaway(self): level.location_dest_id, level.package_id, level.mapped("move_line_ids.product_id"), + 1.0, ) ) diff --git a/stock_storage_type/readme/DESCRIPTION.rst b/stock_storage_type/readme/DESCRIPTION.rst index 8a19b6b11e..bd8d800bb2 100644 --- a/stock_storage_type/readme/DESCRIPTION.rst +++ b/stock_storage_type/readme/DESCRIPTION.rst @@ -45,3 +45,7 @@ For the packs putaway strategy "none", the location is considered as is. For the "ordered children" strategy, children locations are sorted by first by max height which is a physical constraint to respect, then pack putaway sequence which allow to favor for example some level or corridor, and finally by name. + +At the end, if found location is not the same as the original destination location, +the putaway strategies are applied (e.g.: A "none" pack putaway strategy is set on +computed location and a putaway rule exists on that one). diff --git a/stock_storage_type/static/description/index.html b/stock_storage_type/static/description/index.html index 2184f1419e..4f687ee024 100644 --- a/stock_storage_type/static/description/index.html +++ b/stock_storage_type/static/description/index.html @@ -3,7 +3,7 @@ - + Stock Storage Type