From 9ffd15b298f6adfdcc80d33e0b5256bd838798e9 Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Thu, 27 May 2021 13:55:08 +0200 Subject: [PATCH 1/3] [12.0][ADD] stock_account_inventory_discrepancy --- .../README.rst | 85 ++++ .../__init__.py | 1 + .../__manifest__.py | 22 + .../models/__init__.py | 3 + .../models/stock_inventory_line.py | 55 +++ .../models/stock_location.py | 21 + .../models/stock_warehouse.py | 21 + .../readme/CONFIGURE.rst | 4 + .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 5 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 433 ++++++++++++++++++ .../tests/__init__.py | 1 + .../tests/test_inventory_discrepancy.py | 162 +++++++ .../views/stock_inventory_view.xml | 21 + .../views/stock_location_view.xml | 22 + .../views/stock_warehouse_view.xml | 22 + 17 files changed, 879 insertions(+) create mode 100644 stock_account_inventory_discrepancy/README.rst create mode 100644 stock_account_inventory_discrepancy/__init__.py create mode 100644 stock_account_inventory_discrepancy/__manifest__.py create mode 100644 stock_account_inventory_discrepancy/models/__init__.py create mode 100644 stock_account_inventory_discrepancy/models/stock_inventory_line.py create mode 100644 stock_account_inventory_discrepancy/models/stock_location.py create mode 100644 stock_account_inventory_discrepancy/models/stock_warehouse.py create mode 100644 stock_account_inventory_discrepancy/readme/CONFIGURE.rst create mode 100644 stock_account_inventory_discrepancy/readme/CONTRIBUTORS.rst create mode 100644 stock_account_inventory_discrepancy/readme/DESCRIPTION.rst create mode 100644 stock_account_inventory_discrepancy/static/description/icon.png create mode 100644 stock_account_inventory_discrepancy/static/description/index.html create mode 100644 stock_account_inventory_discrepancy/tests/__init__.py create mode 100644 stock_account_inventory_discrepancy/tests/test_inventory_discrepancy.py create mode 100644 stock_account_inventory_discrepancy/views/stock_inventory_view.xml create mode 100644 stock_account_inventory_discrepancy/views/stock_location_view.xml create mode 100644 stock_account_inventory_discrepancy/views/stock_warehouse_view.xml diff --git a/stock_account_inventory_discrepancy/README.rst b/stock_account_inventory_discrepancy/README.rst new file mode 100644 index 000000000..b7420fc79 --- /dev/null +++ b/stock_account_inventory_discrepancy/README.rst @@ -0,0 +1,85 @@ +=================================== +Stock Account Inventory Discrepancy +=================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :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 +.. |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/12.0/stock_account_inventory_discrepancy + :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-12-0/stock-logistics-warehouse-12-0-stock_account_inventory_discrepancy + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/153/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +Extends `stock_inventory_discrepancy` module to also consider cost +discrepancies. In other words, this module adds the capability to show the +cost discrepancy of every line in an inventory adjustment and to block the +inventory adjustment validation (setting it as 'Pending to Approve') when +the discrepancy is greater than an user defined amount threshold. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +#. Go to "Inventory > Warehouse Management" > Warehouses" or to "Inventory > + Warehouse Management" > Locations". +#. Modify the "Maximum Discrepancy Amount Threshold" either in a Warehouse or + in a location. If set to 0.0 in both the threshold is disabled. + +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 +~~~~~~~ + +* ForgeFlow + +Contributors +~~~~~~~~~~~~ + +* Lois Rilo + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +This module is part of the `OCA/stock-logistics-warehouse `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/stock_account_inventory_discrepancy/__init__.py b/stock_account_inventory_discrepancy/__init__.py new file mode 100644 index 000000000..0650744f6 --- /dev/null +++ b/stock_account_inventory_discrepancy/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/stock_account_inventory_discrepancy/__manifest__.py b/stock_account_inventory_discrepancy/__manifest__.py new file mode 100644 index 000000000..b051910e2 --- /dev/null +++ b/stock_account_inventory_discrepancy/__manifest__.py @@ -0,0 +1,22 @@ +# Copyright 2021 ForgeFlow S.L. (https://www.forgeflow.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +{ + "name": "Stock Account Inventory Discrepancy", + "summary": "Adds the capability to show the value discrepancy of every " + "line in an inventory and to block the inventory validation " + "when the discrepancy is over a user defined threshold.", + "version": "12.0.1.0.0", + "author": "ForgeFlow, " + "Odoo Community Association (OCA)", + "website": "https://github.com/OCA/stock-logistics-warehouse", + "category": "Warehouse", + "depends": ["stock_inventory_discrepancy"], + "data": [ + "views/stock_inventory_view.xml", + "views/stock_warehouse_view.xml", + "views/stock_location_view.xml", + ], + "license": "AGPL-3", + "installable": True, + "application": False, +} diff --git a/stock_account_inventory_discrepancy/models/__init__.py b/stock_account_inventory_discrepancy/models/__init__.py new file mode 100644 index 000000000..64c1b86dc --- /dev/null +++ b/stock_account_inventory_discrepancy/models/__init__.py @@ -0,0 +1,3 @@ +from . import stock_inventory_line +from . import stock_warehouse +from . import stock_location diff --git a/stock_account_inventory_discrepancy/models/stock_inventory_line.py b/stock_account_inventory_discrepancy/models/stock_inventory_line.py new file mode 100644 index 000000000..1da4843e8 --- /dev/null +++ b/stock_account_inventory_discrepancy/models/stock_inventory_line.py @@ -0,0 +1,55 @@ +# Copyright 2021 ForgeFlow S.L. (https://www.forgeflow.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo.addons import decimal_precision as dp +from odoo import api, fields, models + + +class StockInventoryLine(models.Model): + _inherit = "stock.inventory.line" + + discrepancy_amount = fields.Monetary( + string="Amount Discrepancy", + compute="_compute_discrepancy_amount", + currency_field="company_currency_id", + help="The difference between the actual qty counted and the " + "theoretical quantity on hand expressed in the cost amount.", + digits=dp.get_precision("Product Unit of Measure"), default=0) + discrepancy_amount_threshold = fields.Monetary( + string="Amount Threshold", + currency_field="company_currency_id", + help="Maximum Discrepancy Amount Threshold", + compute="_compute_discrepancy_amount_threshold") + company_currency_id = fields.Many2one( + string="Company Currency", + comodel_name="res.currency", + related="inventory_id.company_id.currency_id", + readonly=False, + ) + + @api.multi + @api.depends("theoretical_qty", "product_qty") + def _compute_discrepancy_amount(self): + for line in self: + discrepancy_qty = line.product_qty - line.theoretical_qty + cost = line.product_id.standard_price + line.discrepancy_amount = discrepancy_qty * cost + + @api.multi + def _compute_discrepancy_amount_threshold(self): + for line in self: + whs = line.location_id.get_warehouse() + if line.location_id.discrepancy_amount_threshold > 0.0: + line.discrepancy_amount_threshold = line.location_id.\ + discrepancy_amount_threshold + elif whs.discrepancy_amount_threshold > 0.0: + line.discrepancy_amount_threshold = \ + whs.discrepancy_amount_threshold + else: + line.discrepancy_amount_threshold = False + + @api.multi + def _has_over_discrepancy(self): + res = super()._has_over_discrepancy() + return res or abs( + self.discrepancy_amount) > self.discrepancy_amount_threshold > 0 diff --git a/stock_account_inventory_discrepancy/models/stock_location.py b/stock_account_inventory_discrepancy/models/stock_location.py new file mode 100644 index 000000000..dcfa0ab39 --- /dev/null +++ b/stock_account_inventory_discrepancy/models/stock_location.py @@ -0,0 +1,21 @@ +# Copyright 2021 ForgeFlow S.L. (https://www.forgeflow.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo import fields, models + + +class StockLocation(models.Model): + _inherit = "stock.location" + + discrepancy_amount_threshold = fields.Monetary( + string="Maximum Discrepancy Amount Threshold", + currency_field="discrepancy_amount_threshold_currency_id", + help="Maximum Discrepancy Amount allowed for any product when doing " + "an Inventory Adjustment. Thresholds defined in Locations have " + "preference over Warehouse's ones.", + ) + discrepancy_amount_threshold_currency_id = fields.Many2one( + comodel_name="res.currency", + related="company_id.currency_id", + readonly=True, + ) diff --git a/stock_account_inventory_discrepancy/models/stock_warehouse.py b/stock_account_inventory_discrepancy/models/stock_warehouse.py new file mode 100644 index 000000000..afde72ae6 --- /dev/null +++ b/stock_account_inventory_discrepancy/models/stock_warehouse.py @@ -0,0 +1,21 @@ +# Copyright 2021 ForgeFlow S.L. (https://www.forgeflow.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo import fields, models + + +class StockWarehouse(models.Model): + _inherit = "stock.warehouse" + + discrepancy_amount_threshold = fields.Monetary( + string="Maximum Discrepancy Amount Threshold", + currency_field="discrepancy_amount_threshold_currency_id", + help="Maximum Discrepancy Amount allowed for any product when doing " + "an Inventory Adjustment. Threshold defined in involved Location " + "has preference.", + ) + discrepancy_amount_threshold_currency_id = fields.Many2one( + comodel_name="res.currency", + related="company_id.currency_id", + readonly=True, + ) diff --git a/stock_account_inventory_discrepancy/readme/CONFIGURE.rst b/stock_account_inventory_discrepancy/readme/CONFIGURE.rst new file mode 100644 index 000000000..9e2200468 --- /dev/null +++ b/stock_account_inventory_discrepancy/readme/CONFIGURE.rst @@ -0,0 +1,4 @@ +#. Go to "Inventory > Warehouse Management" > Warehouses" or to "Inventory > + Warehouse Management" > Locations". +#. Modify the "Maximum Discrepancy Amount Threshold" either in a Warehouse or + in a location. If set to 0.0 in both the threshold is disabled. diff --git a/stock_account_inventory_discrepancy/readme/CONTRIBUTORS.rst b/stock_account_inventory_discrepancy/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..77dfbe89e --- /dev/null +++ b/stock_account_inventory_discrepancy/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Lois Rilo diff --git a/stock_account_inventory_discrepancy/readme/DESCRIPTION.rst b/stock_account_inventory_discrepancy/readme/DESCRIPTION.rst new file mode 100644 index 000000000..87a98a671 --- /dev/null +++ b/stock_account_inventory_discrepancy/readme/DESCRIPTION.rst @@ -0,0 +1,5 @@ +Extends `stock_inventory_discrepancy` module to also consider cost +discrepancies. In other words, this module adds the capability to show the +cost discrepancy of every line in an inventory adjustment and to block the +inventory adjustment validation (setting it as 'Pending to Approve') when +the discrepancy is greater than an user defined amount threshold. diff --git a/stock_account_inventory_discrepancy/static/description/icon.png b/stock_account_inventory_discrepancy/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_account_inventory_discrepancy/static/description/index.html b/stock_account_inventory_discrepancy/static/description/index.html new file mode 100644 index 000000000..e27837f16 --- /dev/null +++ b/stock_account_inventory_discrepancy/static/description/index.html @@ -0,0 +1,433 @@ + + + + + + +Stock Account Inventory Discrepancy + + + +
+

Stock Account Inventory Discrepancy

+ + +

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

+

Extends stock_inventory_discrepancy module to also consider cost +discrepancies. In other words, this module adds the capability to show the +cost discrepancy of every line in an inventory adjustment and to block the +inventory adjustment validation (setting it as ‘Pending to Approve’) when +the discrepancy is greater than an user defined amount threshold.

+

Table of contents

+ +
+

Configuration

+
    +
  1. Go to “Inventory > Warehouse Management” > Warehouses” or to “Inventory > +Warehouse Management” > Locations”.
    2. +
  2. Modify the “Maximum Discrepancy Amount Threshold” either in a Warehouse or +in a location. If set to 0.0 in both the threshold is disabled.
    3. +
+
+
+

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

+
    +
  • ForgeFlow
    • +
+
+ +
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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

+

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

+

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

+
+
+
+ + diff --git a/stock_account_inventory_discrepancy/tests/__init__.py b/stock_account_inventory_discrepancy/tests/__init__.py new file mode 100644 index 000000000..41e817a8a --- /dev/null +++ b/stock_account_inventory_discrepancy/tests/__init__.py @@ -0,0 +1 @@ +from . import test_inventory_discrepancy diff --git a/stock_account_inventory_discrepancy/tests/test_inventory_discrepancy.py b/stock_account_inventory_discrepancy/tests/test_inventory_discrepancy.py new file mode 100644 index 000000000..de69e32d4 --- /dev/null +++ b/stock_account_inventory_discrepancy/tests/test_inventory_discrepancy.py @@ -0,0 +1,162 @@ +# Copyright 2021 ForgeFlow S.L. (https://www.forgeflow.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo.tests.common import TransactionCase +from odoo.exceptions import UserError + + +class TestInventoryDiscrepancy(TransactionCase): + def setUp(self, *args, **kwargs): + super().setUp(*args, **kwargs) + self.obj_wh = self.env["stock.warehouse"] + self.obj_location = self.env["stock.location"] + self.obj_inventory = self.env["stock.inventory"] + self.obj_product = self.env["product.product"] + self.obj_warehouse = self.env["stock.warehouse"] + self.obj_upd_qty_wizard = self.env["stock.change.product.qty"] + + self.product1 = self.obj_product.create({ + "name": "Test Product 1", + "type": "product", + "default_code": "PROD1", + "standard_price": 110.0, + }) + self.product2 = self.obj_product.create({ + "name": "Test Product 2", + "type": "product", + "default_code": "PROD2", + "standard_price": 150.0, + }) + self.test_loc = self.obj_location.create({ + "name": "Test Location", + "usage": "internal", + "discrepancy_amount_threshold": 100, + }) + self.test_wh = self.obj_warehouse.create({ + "name": "Test WH", + "code": "T", + "discrepancy_amount_threshold": 300, + }) + self.obj_location._parent_store_compute() + + # Create Stock manager able to force validation on inventories. + group_stock_man = self.env.ref("stock.group_stock_manager") + group_inventory_all = self.env.ref( + "stock_inventory_discrepancy." + "group_stock_inventory_validation_always") + self.manager = self.env["res.users"].create({ + "name": "Test Manager", + "login": "manager", + "email": "test.manager@example.com", + "groups_id": [(6, 0, [group_stock_man.id, group_inventory_all.id])] + }) + group_stock_user = self.env.ref("stock.group_stock_user") + self.user = self.env["res.users"].create({ + "name": "Test User", + "login": "user", + "email": "test.user@example.com", + "groups_id": [(6, 0, [group_stock_user.id])] + }) + + starting_inv = self.obj_inventory.create({ + "name": "Starting inventory", + "filter": "product", + "line_ids": [ + (0, 0, { + "product_id": self.product1.id, + "product_uom_id": self.env.ref( + "uom.product_uom_unit").id, + "product_qty": 2.0, + "location_id": self.test_loc.id, + }), + (0, 0, { + "product_id": self.product2.id, + "product_uom_id": self.env.ref( + "uom.product_uom_unit").id, + "product_qty": 4.0, + "location_id": self.test_loc.id, + }), + ], + }) + starting_inv.action_force_done() + + def test_compute_discrepancy(self): + """Tests if the amount discrepancy is correctly computed. + """ + inventory = self.obj_inventory.create({ + "name": "Test Discrepancy Computation", + "location_id": self.test_loc.id, + "filter": "none", + "line_ids": [ + (0, 0, { + "product_id": self.product1.id, + "product_uom_id": self.env.ref( + "uom.product_uom_unit").id, + "product_qty": 3.0, + "location_id": self.test_loc.id, + }), + (0, 0, { + "product_id": self.product2.id, + "product_uom_id": self.env.ref( + "uom.product_uom_unit").id, + "product_qty": 3.0, + "location_id": self.test_loc.id, + }) + ], + }) + self.assertEqual(inventory.line_ids[0].discrepancy_amount, 110.0) + self.assertEqual(inventory.line_ids[1].discrepancy_amount, - 150.0) + + def test_amount_discrepancy_validation(self): + """Tests the workflow with amount threshold.""" + inventory = self.obj_inventory.create({ + "name": "Test Forcing Validation Method", + "location_id": self.test_loc.id, + "filter": "none", + "line_ids": [ + (0, 0, { + "product_id": self.product1.id, + "product_uom_id": self.env.ref( + "uom.product_uom_unit").id, + "product_qty": 3.0, + "location_id": self.test_loc.id, + }), + ], + }) + self.assertEqual(inventory.state, "draft") + self.assertEqual(inventory.line_ids.discrepancy_amount_threshold, 100) + self.assertTrue(inventory.line_ids[0].has_over_discrepancy) + inventory.with_context({"normal_view": True}).action_validate() + self.assertEqual(inventory.over_discrepancy_line_count, 1) + self.assertEqual(inventory.state, "pending") + + def test_warehouse_amount_threshold(self): + """Tests the behaviour if the threshold is set on the WH.""" + inventory = self.obj_inventory.create({ + "name": "Test Threshold Defined in WH", + "location_id": self.test_wh.view_location_id.id, + "filter": "none", + "line_ids": [ + (0, 0, { + "product_id": self.product1.id, + "product_uom_id": self.env.ref( + "uom.product_uom_unit").id, + "product_qty": 3.0, + "location_id": self.test_wh.lot_stock_id.id, + }), + ], + }) + self.assertEqual(inventory.line_ids.discrepancy_amount_threshold, 300) + + def test_update_qty_user_error_amount(self): + """Test if a user error raises when a stock user tries to update the + qty for a product and the correction is a discrepancy over the + threshold.""" + upd_qty = self.obj_upd_qty_wizard.sudo(self.user).create({ + "product_id": self.product1.id, + "product_tmpl_id": self.product1.product_tmpl_id.id, + "new_quantity": 10.0, + "location_id": self.test_loc.id, + }) + with self.assertRaises(UserError): + upd_qty.change_product_qty() diff --git a/stock_account_inventory_discrepancy/views/stock_inventory_view.xml b/stock_account_inventory_discrepancy/views/stock_inventory_view.xml new file mode 100644 index 000000000..af428534f --- /dev/null +++ b/stock_account_inventory_discrepancy/views/stock_inventory_view.xml @@ -0,0 +1,21 @@ + + + + + + + stock.inventory.form - stock_account_inventory_discrepancy + stock.inventory + + + + + + + + + + + diff --git a/stock_account_inventory_discrepancy/views/stock_location_view.xml b/stock_account_inventory_discrepancy/views/stock_location_view.xml new file mode 100644 index 000000000..bd2b58239 --- /dev/null +++ b/stock_account_inventory_discrepancy/views/stock_location_view.xml @@ -0,0 +1,22 @@ + + + + + + + stock.location.form - stock_account_inventory_discrepancy + stock.location + + + + + + + + diff --git a/stock_account_inventory_discrepancy/views/stock_warehouse_view.xml b/stock_account_inventory_discrepancy/views/stock_warehouse_view.xml new file mode 100644 index 000000000..f7124fe1f --- /dev/null +++ b/stock_account_inventory_discrepancy/views/stock_warehouse_view.xml @@ -0,0 +1,22 @@ + + + + + + + stock.warehouse - stock_account_inventory_discrepancy + stock.warehouse + + + + + + + + From 88717bdc087564e34bd0d9ceed492573250ea2b9 Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Fri, 11 Jun 2021 13:29:11 +0200 Subject: [PATCH 2/3] [IMP] : black, isort, prettier --- .../stock_account_inventory_discrepancy | 1 + .../setup.py | 6 + .../__manifest__.py | 7 +- .../models/stock_inventory_line.py | 25 +- .../models/stock_location.py | 8 +- .../models/stock_warehouse.py | 8 +- .../tests/test_inventory_discrepancy.py | 262 ++++++++++-------- .../views/stock_inventory_view.xml | 23 +- .../views/stock_location_view.xml | 20 +- .../views/stock_warehouse_view.xml | 16 +- 10 files changed, 211 insertions(+), 165 deletions(-) create mode 120000 setup/stock_account_inventory_discrepancy/odoo/addons/stock_account_inventory_discrepancy create mode 100644 setup/stock_account_inventory_discrepancy/setup.py diff --git a/setup/stock_account_inventory_discrepancy/odoo/addons/stock_account_inventory_discrepancy b/setup/stock_account_inventory_discrepancy/odoo/addons/stock_account_inventory_discrepancy new file mode 120000 index 000000000..b805695ab --- /dev/null +++ b/setup/stock_account_inventory_discrepancy/odoo/addons/stock_account_inventory_discrepancy @@ -0,0 +1 @@ +../../../../stock_account_inventory_discrepancy \ No newline at end of file diff --git a/setup/stock_account_inventory_discrepancy/setup.py b/setup/stock_account_inventory_discrepancy/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/stock_account_inventory_discrepancy/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/stock_account_inventory_discrepancy/__manifest__.py b/stock_account_inventory_discrepancy/__manifest__.py index b051910e2..d27c89ca3 100644 --- a/stock_account_inventory_discrepancy/__manifest__.py +++ b/stock_account_inventory_discrepancy/__manifest__.py @@ -3,11 +3,10 @@ { "name": "Stock Account Inventory Discrepancy", "summary": "Adds the capability to show the value discrepancy of every " - "line in an inventory and to block the inventory validation " - "when the discrepancy is over a user defined threshold.", + "line in an inventory and to block the inventory validation " + "when the discrepancy is over a user defined threshold.", "version": "12.0.1.0.0", - "author": "ForgeFlow, " - "Odoo Community Association (OCA)", + "author": "ForgeFlow, " "Odoo Community Association (OCA)", "website": "https://github.com/OCA/stock-logistics-warehouse", "category": "Warehouse", "depends": ["stock_inventory_discrepancy"], diff --git a/stock_account_inventory_discrepancy/models/stock_inventory_line.py b/stock_account_inventory_discrepancy/models/stock_inventory_line.py index 1da4843e8..ea4d49563 100644 --- a/stock_account_inventory_discrepancy/models/stock_inventory_line.py +++ b/stock_account_inventory_discrepancy/models/stock_inventory_line.py @@ -1,9 +1,10 @@ # Copyright 2021 ForgeFlow S.L. (https://www.forgeflow.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). -from odoo.addons import decimal_precision as dp from odoo import api, fields, models +from odoo.addons import decimal_precision as dp + class StockInventoryLine(models.Model): _inherit = "stock.inventory.line" @@ -13,13 +14,16 @@ class StockInventoryLine(models.Model): compute="_compute_discrepancy_amount", currency_field="company_currency_id", help="The difference between the actual qty counted and the " - "theoretical quantity on hand expressed in the cost amount.", - digits=dp.get_precision("Product Unit of Measure"), default=0) + "theoretical quantity on hand expressed in the cost amount.", + digits=dp.get_precision("Product Unit of Measure"), + default=0, + ) discrepancy_amount_threshold = fields.Monetary( string="Amount Threshold", currency_field="company_currency_id", help="Maximum Discrepancy Amount Threshold", - compute="_compute_discrepancy_amount_threshold") + compute="_compute_discrepancy_amount_threshold", + ) company_currency_id = fields.Many2one( string="Company Currency", comodel_name="res.currency", @@ -40,16 +44,17 @@ class StockInventoryLine(models.Model): for line in self: whs = line.location_id.get_warehouse() if line.location_id.discrepancy_amount_threshold > 0.0: - line.discrepancy_amount_threshold = line.location_id.\ - discrepancy_amount_threshold + line.discrepancy_amount_threshold = ( + line.location_id.discrepancy_amount_threshold + ) elif whs.discrepancy_amount_threshold > 0.0: - line.discrepancy_amount_threshold = \ - whs.discrepancy_amount_threshold + line.discrepancy_amount_threshold = whs.discrepancy_amount_threshold else: line.discrepancy_amount_threshold = False @api.multi def _has_over_discrepancy(self): res = super()._has_over_discrepancy() - return res or abs( - self.discrepancy_amount) > self.discrepancy_amount_threshold > 0 + return ( + res or abs(self.discrepancy_amount) > self.discrepancy_amount_threshold > 0 + ) diff --git a/stock_account_inventory_discrepancy/models/stock_location.py b/stock_account_inventory_discrepancy/models/stock_location.py index dcfa0ab39..cee529ea4 100644 --- a/stock_account_inventory_discrepancy/models/stock_location.py +++ b/stock_account_inventory_discrepancy/models/stock_location.py @@ -11,11 +11,9 @@ class StockLocation(models.Model): string="Maximum Discrepancy Amount Threshold", currency_field="discrepancy_amount_threshold_currency_id", help="Maximum Discrepancy Amount allowed for any product when doing " - "an Inventory Adjustment. Thresholds defined in Locations have " - "preference over Warehouse's ones.", + "an Inventory Adjustment. Thresholds defined in Locations have " + "preference over Warehouse's ones.", ) discrepancy_amount_threshold_currency_id = fields.Many2one( - comodel_name="res.currency", - related="company_id.currency_id", - readonly=True, + comodel_name="res.currency", related="company_id.currency_id", readonly=True, ) diff --git a/stock_account_inventory_discrepancy/models/stock_warehouse.py b/stock_account_inventory_discrepancy/models/stock_warehouse.py index afde72ae6..e756d8174 100644 --- a/stock_account_inventory_discrepancy/models/stock_warehouse.py +++ b/stock_account_inventory_discrepancy/models/stock_warehouse.py @@ -11,11 +11,9 @@ class StockWarehouse(models.Model): string="Maximum Discrepancy Amount Threshold", currency_field="discrepancy_amount_threshold_currency_id", help="Maximum Discrepancy Amount allowed for any product when doing " - "an Inventory Adjustment. Threshold defined in involved Location " - "has preference.", + "an Inventory Adjustment. Threshold defined in involved Location " + "has preference.", ) discrepancy_amount_threshold_currency_id = fields.Many2one( - comodel_name="res.currency", - related="company_id.currency_id", - readonly=True, + comodel_name="res.currency", related="company_id.currency_id", readonly=True, ) diff --git a/stock_account_inventory_discrepancy/tests/test_inventory_discrepancy.py b/stock_account_inventory_discrepancy/tests/test_inventory_discrepancy.py index de69e32d4..cd94c365c 100644 --- a/stock_account_inventory_discrepancy/tests/test_inventory_discrepancy.py +++ b/stock_account_inventory_discrepancy/tests/test_inventory_discrepancy.py @@ -1,8 +1,8 @@ # Copyright 2021 ForgeFlow S.L. (https://www.forgeflow.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). -from odoo.tests.common import TransactionCase from odoo.exceptions import UserError +from odoo.tests.common import TransactionCase class TestInventoryDiscrepancy(TransactionCase): @@ -15,114 +15,143 @@ class TestInventoryDiscrepancy(TransactionCase): self.obj_warehouse = self.env["stock.warehouse"] self.obj_upd_qty_wizard = self.env["stock.change.product.qty"] - self.product1 = self.obj_product.create({ - "name": "Test Product 1", - "type": "product", - "default_code": "PROD1", - "standard_price": 110.0, - }) - self.product2 = self.obj_product.create({ - "name": "Test Product 2", - "type": "product", - "default_code": "PROD2", - "standard_price": 150.0, - }) - self.test_loc = self.obj_location.create({ - "name": "Test Location", - "usage": "internal", - "discrepancy_amount_threshold": 100, - }) - self.test_wh = self.obj_warehouse.create({ - "name": "Test WH", - "code": "T", - "discrepancy_amount_threshold": 300, - }) + self.product1 = self.obj_product.create( + { + "name": "Test Product 1", + "type": "product", + "default_code": "PROD1", + "standard_price": 110.0, + } + ) + self.product2 = self.obj_product.create( + { + "name": "Test Product 2", + "type": "product", + "default_code": "PROD2", + "standard_price": 150.0, + } + ) + self.test_loc = self.obj_location.create( + { + "name": "Test Location", + "usage": "internal", + "discrepancy_amount_threshold": 100, + } + ) + self.test_wh = self.obj_warehouse.create( + {"name": "Test WH", "code": "T", "discrepancy_amount_threshold": 300,} + ) self.obj_location._parent_store_compute() # Create Stock manager able to force validation on inventories. group_stock_man = self.env.ref("stock.group_stock_manager") group_inventory_all = self.env.ref( - "stock_inventory_discrepancy." - "group_stock_inventory_validation_always") - self.manager = self.env["res.users"].create({ - "name": "Test Manager", - "login": "manager", - "email": "test.manager@example.com", - "groups_id": [(6, 0, [group_stock_man.id, group_inventory_all.id])] - }) + "stock_inventory_discrepancy." "group_stock_inventory_validation_always" + ) + self.manager = self.env["res.users"].create( + { + "name": "Test Manager", + "login": "manager", + "email": "test.manager@example.com", + "groups_id": [(6, 0, [group_stock_man.id, group_inventory_all.id])], + } + ) group_stock_user = self.env.ref("stock.group_stock_user") - self.user = self.env["res.users"].create({ - "name": "Test User", - "login": "user", - "email": "test.user@example.com", - "groups_id": [(6, 0, [group_stock_user.id])] - }) + self.user = self.env["res.users"].create( + { + "name": "Test User", + "login": "user", + "email": "test.user@example.com", + "groups_id": [(6, 0, [group_stock_user.id])], + } + ) - starting_inv = self.obj_inventory.create({ - "name": "Starting inventory", - "filter": "product", - "line_ids": [ - (0, 0, { - "product_id": self.product1.id, - "product_uom_id": self.env.ref( - "uom.product_uom_unit").id, - "product_qty": 2.0, - "location_id": self.test_loc.id, - }), - (0, 0, { - "product_id": self.product2.id, - "product_uom_id": self.env.ref( - "uom.product_uom_unit").id, - "product_qty": 4.0, - "location_id": self.test_loc.id, - }), - ], - }) + starting_inv = self.obj_inventory.create( + { + "name": "Starting inventory", + "filter": "product", + "line_ids": [ + ( + 0, + 0, + { + "product_id": self.product1.id, + "product_uom_id": self.env.ref("uom.product_uom_unit").id, + "product_qty": 2.0, + "location_id": self.test_loc.id, + }, + ), + ( + 0, + 0, + { + "product_id": self.product2.id, + "product_uom_id": self.env.ref("uom.product_uom_unit").id, + "product_qty": 4.0, + "location_id": self.test_loc.id, + }, + ), + ], + } + ) starting_inv.action_force_done() def test_compute_discrepancy(self): """Tests if the amount discrepancy is correctly computed. """ - inventory = self.obj_inventory.create({ - "name": "Test Discrepancy Computation", - "location_id": self.test_loc.id, - "filter": "none", - "line_ids": [ - (0, 0, { - "product_id": self.product1.id, - "product_uom_id": self.env.ref( - "uom.product_uom_unit").id, - "product_qty": 3.0, - "location_id": self.test_loc.id, - }), - (0, 0, { - "product_id": self.product2.id, - "product_uom_id": self.env.ref( - "uom.product_uom_unit").id, - "product_qty": 3.0, - "location_id": self.test_loc.id, - }) - ], - }) + inventory = self.obj_inventory.create( + { + "name": "Test Discrepancy Computation", + "location_id": self.test_loc.id, + "filter": "none", + "line_ids": [ + ( + 0, + 0, + { + "product_id": self.product1.id, + "product_uom_id": self.env.ref("uom.product_uom_unit").id, + "product_qty": 3.0, + "location_id": self.test_loc.id, + }, + ), + ( + 0, + 0, + { + "product_id": self.product2.id, + "product_uom_id": self.env.ref("uom.product_uom_unit").id, + "product_qty": 3.0, + "location_id": self.test_loc.id, + }, + ), + ], + } + ) self.assertEqual(inventory.line_ids[0].discrepancy_amount, 110.0) - self.assertEqual(inventory.line_ids[1].discrepancy_amount, - 150.0) + self.assertEqual(inventory.line_ids[1].discrepancy_amount, -150.0) def test_amount_discrepancy_validation(self): """Tests the workflow with amount threshold.""" - inventory = self.obj_inventory.create({ - "name": "Test Forcing Validation Method", - "location_id": self.test_loc.id, - "filter": "none", - "line_ids": [ - (0, 0, { - "product_id": self.product1.id, - "product_uom_id": self.env.ref( - "uom.product_uom_unit").id, - "product_qty": 3.0, - "location_id": self.test_loc.id, - }), - ], - }) + inventory = self.obj_inventory.create( + { + "name": "Test Forcing Validation Method", + "location_id": self.test_loc.id, + "filter": "none", + "line_ids": [ + ( + 0, + 0, + { + "product_id": self.product1.id, + "product_uom_id": self.env.ref("uom.product_uom_unit").id, + "product_qty": 3.0, + "location_id": self.test_loc.id, + }, + ), + ], + } + ) self.assertEqual(inventory.state, "draft") self.assertEqual(inventory.line_ids.discrepancy_amount_threshold, 100) self.assertTrue(inventory.line_ids[0].has_over_discrepancy) @@ -132,31 +161,38 @@ class TestInventoryDiscrepancy(TransactionCase): def test_warehouse_amount_threshold(self): """Tests the behaviour if the threshold is set on the WH.""" - inventory = self.obj_inventory.create({ - "name": "Test Threshold Defined in WH", - "location_id": self.test_wh.view_location_id.id, - "filter": "none", - "line_ids": [ - (0, 0, { - "product_id": self.product1.id, - "product_uom_id": self.env.ref( - "uom.product_uom_unit").id, - "product_qty": 3.0, - "location_id": self.test_wh.lot_stock_id.id, - }), - ], - }) + inventory = self.obj_inventory.create( + { + "name": "Test Threshold Defined in WH", + "location_id": self.test_wh.view_location_id.id, + "filter": "none", + "line_ids": [ + ( + 0, + 0, + { + "product_id": self.product1.id, + "product_uom_id": self.env.ref("uom.product_uom_unit").id, + "product_qty": 3.0, + "location_id": self.test_wh.lot_stock_id.id, + }, + ), + ], + } + ) self.assertEqual(inventory.line_ids.discrepancy_amount_threshold, 300) def test_update_qty_user_error_amount(self): """Test if a user error raises when a stock user tries to update the qty for a product and the correction is a discrepancy over the threshold.""" - upd_qty = self.obj_upd_qty_wizard.sudo(self.user).create({ - "product_id": self.product1.id, - "product_tmpl_id": self.product1.product_tmpl_id.id, - "new_quantity": 10.0, - "location_id": self.test_loc.id, - }) + upd_qty = self.obj_upd_qty_wizard.sudo(self.user).create( + { + "product_id": self.product1.id, + "product_tmpl_id": self.product1.product_tmpl_id.id, + "new_quantity": 10.0, + "location_id": self.test_loc.id, + } + ) with self.assertRaises(UserError): upd_qty.change_product_qty() diff --git a/stock_account_inventory_discrepancy/views/stock_inventory_view.xml b/stock_account_inventory_discrepancy/views/stock_inventory_view.xml index af428534f..46c1e092c 100644 --- a/stock_account_inventory_discrepancy/views/stock_inventory_view.xml +++ b/stock_account_inventory_discrepancy/views/stock_inventory_view.xml @@ -1,21 +1,22 @@ - + - - - stock.inventory.form - stock_account_inventory_discrepancy + stock.inventory.form - stock_account_inventory_discrepancy stock.inventory - + - - - - + + + + - diff --git a/stock_account_inventory_discrepancy/views/stock_location_view.xml b/stock_account_inventory_discrepancy/views/stock_location_view.xml index bd2b58239..120b391c4 100644 --- a/stock_account_inventory_discrepancy/views/stock_location_view.xml +++ b/stock_account_inventory_discrepancy/views/stock_location_view.xml @@ -1,22 +1,24 @@ - + - - - stock.location.form - stock_account_inventory_discrepancy + stock.location.form - stock_account_inventory_discrepancy stock.location - + - - diff --git a/stock_account_inventory_discrepancy/views/stock_warehouse_view.xml b/stock_account_inventory_discrepancy/views/stock_warehouse_view.xml index f7124fe1f..252bd6cf6 100644 --- a/stock_account_inventory_discrepancy/views/stock_warehouse_view.xml +++ b/stock_account_inventory_discrepancy/views/stock_warehouse_view.xml @@ -1,22 +1,22 @@ - + - - stock.warehouse - stock_account_inventory_discrepancy stock.warehouse - + - - From 590413f391b75bf466fdc9816f15f1f7808d982b Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Fri, 11 Jun 2021 13:29:59 +0200 Subject: [PATCH 3/3] [13.0][MIG] stock_account_inventory_discrepancy --- .../__manifest__.py | 2 +- .../models/__init__.py | 1 + .../models/stock_inventory_line.py | 7 +--- .../models/stock_quant.py | 40 +++++++++++++++++++ .../tests/test_inventory_discrepancy.py | 28 +++++++------ .../views/stock_inventory_view.xml | 15 +++---- .../views/stock_location_view.xml | 6 +-- 7 files changed, 66 insertions(+), 33 deletions(-) create mode 100644 stock_account_inventory_discrepancy/models/stock_quant.py diff --git a/stock_account_inventory_discrepancy/__manifest__.py b/stock_account_inventory_discrepancy/__manifest__.py index d27c89ca3..664fe09e0 100644 --- a/stock_account_inventory_discrepancy/__manifest__.py +++ b/stock_account_inventory_discrepancy/__manifest__.py @@ -5,7 +5,7 @@ "summary": "Adds the capability to show the value discrepancy of every " "line in an inventory and to block the inventory validation " "when the discrepancy is over a user defined threshold.", - "version": "12.0.1.0.0", + "version": "13.0.1.0.0", "author": "ForgeFlow, " "Odoo Community Association (OCA)", "website": "https://github.com/OCA/stock-logistics-warehouse", "category": "Warehouse", diff --git a/stock_account_inventory_discrepancy/models/__init__.py b/stock_account_inventory_discrepancy/models/__init__.py index 64c1b86dc..3e1429b38 100644 --- a/stock_account_inventory_discrepancy/models/__init__.py +++ b/stock_account_inventory_discrepancy/models/__init__.py @@ -1,3 +1,4 @@ from . import stock_inventory_line from . import stock_warehouse from . import stock_location +from . import stock_quant diff --git a/stock_account_inventory_discrepancy/models/stock_inventory_line.py b/stock_account_inventory_discrepancy/models/stock_inventory_line.py index ea4d49563..0674d273e 100644 --- a/stock_account_inventory_discrepancy/models/stock_inventory_line.py +++ b/stock_account_inventory_discrepancy/models/stock_inventory_line.py @@ -3,8 +3,6 @@ from odoo import api, fields, models -from odoo.addons import decimal_precision as dp - class StockInventoryLine(models.Model): _inherit = "stock.inventory.line" @@ -15,7 +13,7 @@ class StockInventoryLine(models.Model): currency_field="company_currency_id", help="The difference between the actual qty counted and the " "theoretical quantity on hand expressed in the cost amount.", - digits=dp.get_precision("Product Unit of Measure"), + digits="Product Unit of Measure", default=0, ) discrepancy_amount_threshold = fields.Monetary( @@ -31,7 +29,6 @@ class StockInventoryLine(models.Model): readonly=False, ) - @api.multi @api.depends("theoretical_qty", "product_qty") def _compute_discrepancy_amount(self): for line in self: @@ -39,7 +36,6 @@ class StockInventoryLine(models.Model): cost = line.product_id.standard_price line.discrepancy_amount = discrepancy_qty * cost - @api.multi def _compute_discrepancy_amount_threshold(self): for line in self: whs = line.location_id.get_warehouse() @@ -52,7 +48,6 @@ class StockInventoryLine(models.Model): else: line.discrepancy_amount_threshold = False - @api.multi def _has_over_discrepancy(self): res = super()._has_over_discrepancy() return ( diff --git a/stock_account_inventory_discrepancy/models/stock_quant.py b/stock_account_inventory_discrepancy/models/stock_quant.py new file mode 100644 index 000000000..186727384 --- /dev/null +++ b/stock_account_inventory_discrepancy/models/stock_quant.py @@ -0,0 +1,40 @@ +# Copyright 2021 ForgeFlow S.L. (https://www.forgeflow.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo import _, models +from odoo.exceptions import UserError + + +class Quant(models.Model): + _inherit = "stock.quant" + + def _has_over_discrepancy(self, qty=None): + self.ensure_one() + whs = self.location_id.get_warehouse() + if self.location_id.discrepancy_amount_threshold > 0.0: + discrepancy_amount_threshold = self.location_id.discrepancy_amount_threshold + elif whs.discrepancy_amount_threshold > 0.0: + discrepancy_amount_threshold = whs.discrepancy_amount_threshold + else: + return False + + discrepancy_qty = qty or self.quantity + cost = self.product_id.standard_price + discrepancy_amount = discrepancy_qty * cost + + return abs(discrepancy_amount) > discrepancy_amount_threshold > 0 + + def _set_inventory_quantity(self): + for rec in self: + variance = self.inventory_quantity - rec.quantity + if rec._has_over_discrepancy(qty=variance) and not self.user_has_groups( + "stock_inventory_discrepancy.group_stock_inventory_validation_always" + ): + raise UserError( + _( + "The Qty Update is over the Discrepancy Threshold.\n " + "Please, contact a user with rights to perform " + "this action." + ) + ) + return super(Quant, self)._set_inventory_quantity() diff --git a/stock_account_inventory_discrepancy/tests/test_inventory_discrepancy.py b/stock_account_inventory_discrepancy/tests/test_inventory_discrepancy.py index cd94c365c..a393af56c 100644 --- a/stock_account_inventory_discrepancy/tests/test_inventory_discrepancy.py +++ b/stock_account_inventory_discrepancy/tests/test_inventory_discrepancy.py @@ -1,7 +1,7 @@ # Copyright 2021 ForgeFlow S.L. (https://www.forgeflow.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). -from odoo.exceptions import UserError +from odoo.exceptions import except_orm from odoo.tests.common import TransactionCase @@ -39,7 +39,7 @@ class TestInventoryDiscrepancy(TransactionCase): } ) self.test_wh = self.obj_warehouse.create( - {"name": "Test WH", "code": "T", "discrepancy_amount_threshold": 300,} + {"name": "Test WH", "code": "T", "discrepancy_amount_threshold": 300} ) self.obj_location._parent_store_compute() @@ -69,7 +69,6 @@ class TestInventoryDiscrepancy(TransactionCase): starting_inv = self.obj_inventory.create( { "name": "Starting inventory", - "filter": "product", "line_ids": [ ( 0, @@ -102,8 +101,7 @@ class TestInventoryDiscrepancy(TransactionCase): inventory = self.obj_inventory.create( { "name": "Test Discrepancy Computation", - "location_id": self.test_loc.id, - "filter": "none", + "location_ids": [(6, 0, self.test_loc.ids)], "line_ids": [ ( 0, @@ -136,8 +134,7 @@ class TestInventoryDiscrepancy(TransactionCase): inventory = self.obj_inventory.create( { "name": "Test Forcing Validation Method", - "location_id": self.test_loc.id, - "filter": "none", + "location_ids": [(6, 0, self.test_loc.ids)], "line_ids": [ ( 0, @@ -153,9 +150,12 @@ class TestInventoryDiscrepancy(TransactionCase): } ) self.assertEqual(inventory.state, "draft") + inventory.action_start() self.assertEqual(inventory.line_ids.discrepancy_amount_threshold, 100) self.assertTrue(inventory.line_ids[0].has_over_discrepancy) - inventory.with_context({"normal_view": True}).action_validate() + inventory.with_user(self.user).with_context( + {"normal_view": True} + ).action_validate() self.assertEqual(inventory.over_discrepancy_line_count, 1) self.assertEqual(inventory.state, "pending") @@ -164,8 +164,7 @@ class TestInventoryDiscrepancy(TransactionCase): inventory = self.obj_inventory.create( { "name": "Test Threshold Defined in WH", - "location_id": self.test_wh.view_location_id.id, - "filter": "none", + "location_ids": [(6, 0, self.test_wh.view_location_id.ids)], "line_ids": [ ( 0, @@ -186,13 +185,16 @@ class TestInventoryDiscrepancy(TransactionCase): """Test if a user error raises when a stock user tries to update the qty for a product and the correction is a discrepancy over the threshold.""" - upd_qty = self.obj_upd_qty_wizard.sudo(self.user).create( + upd_qty = self.obj_upd_qty_wizard.with_user(self.user).create( { "product_id": self.product1.id, "product_tmpl_id": self.product1.product_tmpl_id.id, "new_quantity": 10.0, - "location_id": self.test_loc.id, } ) - with self.assertRaises(UserError): + # Since v13, stock users are not allowed to update product qty + # (AccessError, standard) but if access are modified to allow them, + # they will not be able to surpass the threshold (UserError + # added in this module). + with self.assertRaises(except_orm): upd_qty.change_product_qty() diff --git a/stock_account_inventory_discrepancy/views/stock_inventory_view.xml b/stock_account_inventory_discrepancy/views/stock_inventory_view.xml index 46c1e092c..fde35a414 100644 --- a/stock_account_inventory_discrepancy/views/stock_inventory_view.xml +++ b/stock_account_inventory_discrepancy/views/stock_inventory_view.xml @@ -2,21 +2,18 @@ - + stock.inventory.form - stock_account_inventory_discrepancy - stock.inventory - + >stock.inventory.line.tree2 - stock_account_inventory_discrepancy + stock.inventory.line + - + - + diff --git a/stock_account_inventory_discrepancy/views/stock_location_view.xml b/stock_account_inventory_discrepancy/views/stock_location_view.xml index 120b391c4..5ab008548 100644 --- a/stock_account_inventory_discrepancy/views/stock_location_view.xml +++ b/stock_account_inventory_discrepancy/views/stock_location_view.xml @@ -3,13 +3,11 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> - stock.location.form - stock_account_inventory_discrepancy + Location form - stock_account_inventory_discrepancy stock.location - +