diff --git a/stock_location_package_restriction/README.rst b/stock_location_package_restriction/README.rst index 94901f670..0f0284d3c 100644 --- a/stock_location_package_restriction/README.rst +++ b/stock_location_package_restriction/README.rst @@ -17,13 +17,13 @@ Stock Location Package Restriction :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github - :target: https://github.com/OCA/stock-logistics-warehouse/tree/14.0/stock_location_package_restriction + :target: https://github.com/OCA/stock-logistics-warehouse/tree/16.0/stock_location_package_restriction :alt: OCA/stock-logistics-warehouse .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-14-0/stock-logistics-warehouse-14-0-stock_location_package_restriction + :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-16-0/stock-logistics-warehouse-16-0-stock_location_package_restriction :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png - :target: https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-warehouse&target_branch=14.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-warehouse&target_branch=16.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -38,17 +38,20 @@ This module adds the option to set restrictions for the packages that can be put Usage ===== -Configure on the location if the contained products must be part of a package -and if you allow multiple package. When the module is installed, by default -there is no restriction on the locations. +Configure on the location the package restriction. The options are: + * False (not set): No restriction, the location can contain products with and + without package + * Forbidden: The location cannot have products part of a package * Mandatory and unique: The location cannot have products not part of a package and you cannot have more than 1 package on the location - * Mandatory and not unique: The location cannot have products not part of a - package and you may have store multiple packages on the location - * Not mandatory: The location can contain products not part of a package + * Mandatory and not unique: The location cannot have products not part of a + package and you may store multiple packages on the location + +When the module is installed, by default there is no restriction on the locations. + Bug Tracker =========== @@ -56,7 +59,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 to smash it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -73,7 +76,7 @@ Contributors ~~~~~~~~~~~~ * Raumschmiede -* Jacques-Etienne Baudoux +* Jacques-Etienne Baudoux (BCIM) * Juan Miguel Sánchez Arce Maintainers @@ -89,6 +92,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/stock-logistics-warehouse `_ project on GitHub. +This module is part of the `OCA/stock-logistics-warehouse `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/stock_location_package_restriction/__init__.py b/stock_location_package_restriction/__init__.py index 0ee8b5073..0650744f6 100644 --- a/stock_location_package_restriction/__init__.py +++ b/stock_location_package_restriction/__init__.py @@ -1,2 +1 @@ from . import models -from . import tests diff --git a/stock_location_package_restriction/__manifest__.py b/stock_location_package_restriction/__manifest__.py index 620f5f324..3d7f6f581 100644 --- a/stock_location_package_restriction/__manifest__.py +++ b/stock_location_package_restriction/__manifest__.py @@ -6,7 +6,7 @@ "name": "Stock Location Package Restriction", "summary": """ Control if the location can contain products in a package""", - "version": "14.0.1.2.1", + "version": "16.0.1.0.0", "category": "Warehouse Management", "author": "Raumschmiede.de, BCIM, Odoo Community Association (OCA)", "maintainters": ["jbaudoux"], diff --git a/stock_location_package_restriction/migrations/14.0.1.1.0/pre-migrate.py b/stock_location_package_restriction/migrations/14.0.1.1.0/pre-migrate.py deleted file mode 100644 index 40e767918..000000000 --- a/stock_location_package_restriction/migrations/14.0.1.1.0/pre-migrate.py +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2023 Camptocamp SA -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) - - -def migrate(cr, installed_version): - if not installed_version: - return - # Replace the norestriction value to null for the package_restriction field - queries = [ - """ - ALTER TABLE stock_location - ALTER COLUMN package_restriction - drop not null; - """, - """ - UPDATE stock_location - SET package_restriction = null - WHERE package_restriction = 'norestriction' - """, - ] - for query in queries: - cr.execute(query) diff --git a/stock_location_package_restriction/models/stock_location.py b/stock_location_package_restriction/models/stock_location.py index cb312cce5..1711f0568 100644 --- a/stock_location_package_restriction/models/stock_location.py +++ b/stock_location_package_restriction/models/stock_location.py @@ -50,7 +50,8 @@ class StockLocation(models.Model): ) def _has_package_restriction_violation_query(self): - self.flush() + self.flush_model() + self.quant_ids.flush_model() query = """ SELECT stock_quant.location_id, (count(distinct(stock_quant.package_id)) > 1)::bool as has_multiple_packages, diff --git a/stock_location_package_restriction/static/description/index.html b/stock_location_package_restriction/static/description/index.html index 8688204de..42191aa43 100644 --- a/stock_location_package_restriction/static/description/index.html +++ b/stock_location_package_restriction/static/description/index.html @@ -1,4 +1,3 @@ - @@ -9,10 +8,11 @@ /* :Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ +:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ :Copyright: This stylesheet has been placed in the public domain. Default cascading style sheet for the HTML output of Docutils. +Despite the name, some widely supported CSS2 features are used. See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to customize this style sheet. @@ -275,7 +275,7 @@ pre.literal-block, pre.doctest-block, pre.math, pre.code { margin-left: 2em ; margin-right: 2em } -pre.code .ln { color: grey; } /* line numbers */ +pre.code .ln { color: gray; } /* line numbers */ pre.code, code { background-color: #eeeeee } pre.code .comment, code .comment { color: #5C6576 } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } @@ -301,7 +301,7 @@ span.option { span.pre { white-space: pre } -span.problematic { +span.problematic, pre.problematic { color: red } span.section-subtitle { @@ -369,7 +369,7 @@ ul.auto-toc { !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:58e74c552f6de90b52c40ae4050660aa90098a8c05856fb239802ff9c0913ccc !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/stock-logistics-warehouse Translate me on Weblate Try me on Runboat

+

Beta License: AGPL-3 OCA/stock-logistics-warehouse Translate me on Weblate Try me on Runboat

This module adds the option to set restrictions for the packages that can be put in a location.

Table of contents

@@ -386,26 +386,27 @@ ul.auto-toc {

Usage

-

Configure on the location if the contained products must be part of a package -and if you allow multiple package. When the module is installed, by default -there is no restriction on the locations.

+

Configure on the location the package restriction.

The options are:

    +
  • False (not set): No restriction, the location can contain products with and +without package
    • +
  • Forbidden: The location cannot have products part of a package
  • Mandatory and unique: The location cannot have products not part of a package and you cannot have more than 1 package on the location
    • -
  • Mandatory and not unique: The location cannot have products not part of a -package and you may have store multiple packages on the location
    • -
  • Not mandatory: The location can contain products not part of a package
    • +
  • Mandatory and not unique: The location cannot have products not part of a +package and you may store multiple packages on the location
+

When the module is installed, by default there is no restriction on the locations.

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 to smash it by providing a detailed and welcomed -feedback.

+feedback.

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

@@ -421,18 +422,20 @@ If you spotted it first, help us to smash it by providing a detailed and welcome

Contributors

Maintainers

This module is maintained by the OCA.

-Odoo Community Association + +Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

-

This module is part of the OCA/stock-logistics-warehouse project on GitHub.

+

This module is part of the OCA/stock-logistics-warehouse project on GitHub.

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

diff --git a/stock_location_package_restriction/tests/common.py b/stock_location_package_restriction/tests/common.py index 3a2c38e83..a4888de99 100644 --- a/stock_location_package_restriction/tests/common.py +++ b/stock_location_package_restriction/tests/common.py @@ -88,7 +88,7 @@ class TestLocationPackageRestrictionCommon(SavepointCase): { "product_id": product.id, "package_id": package and package.id, - "inventory_quantity": qty, + "inventory_quantity_auto_apply": qty, "location_id": location.id, } ) @@ -138,5 +138,5 @@ class TestLocationPackageRestrictionCommon(SavepointCase): def _process_picking(cls, picking): picking.action_assign() for line in picking.move_line_ids: - line.qty_done = line.product_qty + line.qty_done = line.reserved_qty picking.button_validate() diff --git a/stock_location_package_restriction/tests/test_stock_move.py b/stock_location_package_restriction/tests/test_stock_move.py index ce3bfb319..9bc16ff32 100644 --- a/stock_location_package_restriction/tests/test_stock_move.py +++ b/stock_location_package_restriction/tests/test_stock_move.py @@ -161,7 +161,7 @@ class TestStockMove(TestLocationPackageRestrictionCommon): picking.action_assign() # Processing only one move out of two line_to_process = picking.move_line_ids[0] - line_to_process.qty_done = line_to_process.product_qty + line_to_process.qty_done = line_to_process.reserved_qty wizard_action = picking.button_validate() wizard_context = wizard_action.get("context", {}) wizard = (