From ee206eee0ab807981351fd7bd98806f46733b769 Mon Sep 17 00:00:00 2001 From: DavidJForgeFlow Date: Thu, 6 Oct 2022 15:28:51 +0200 Subject: [PATCH 1/8] [15.0][ADD] stock_inventory [15.0][IMP] stock_inventory: add product selection and fixup --- stock_inventory/README.rst | 0 stock_inventory/__init__.py | 1 + stock_inventory/__manifest__.py | 20 ++ stock_inventory/models/__init__.py | 3 + stock_inventory/models/stock_inventory.py | 216 ++++++++++++ stock_inventory/models/stock_move_line.py | 7 + stock_inventory/models/stock_quant.py | 36 ++ stock_inventory/readme/CONTRIBUTORS.rst | 4 + stock_inventory/readme/DESCRIPTION.rst | 1 + stock_inventory/readme/USAGE.rst | 9 + stock_inventory/security/ir.model.access.csv | 3 + stock_inventory/tests/__init__.py | 1 + stock_inventory/tests/test_stock_inventory.py | 314 ++++++++++++++++++ stock_inventory/views/stock_inventory.xml | 154 +++++++++ stock_inventory/views/stock_move_line.xml | 29 ++ stock_inventory/views/stock_quant.xml | 16 + 16 files changed, 814 insertions(+) create mode 100644 stock_inventory/README.rst create mode 100644 stock_inventory/__init__.py create mode 100644 stock_inventory/__manifest__.py create mode 100644 stock_inventory/models/__init__.py create mode 100644 stock_inventory/models/stock_inventory.py create mode 100644 stock_inventory/models/stock_move_line.py create mode 100644 stock_inventory/models/stock_quant.py create mode 100644 stock_inventory/readme/CONTRIBUTORS.rst create mode 100644 stock_inventory/readme/DESCRIPTION.rst create mode 100644 stock_inventory/readme/USAGE.rst create mode 100644 stock_inventory/security/ir.model.access.csv create mode 100644 stock_inventory/tests/__init__.py create mode 100644 stock_inventory/tests/test_stock_inventory.py create mode 100644 stock_inventory/views/stock_inventory.xml create mode 100644 stock_inventory/views/stock_move_line.xml create mode 100644 stock_inventory/views/stock_quant.xml diff --git a/stock_inventory/README.rst b/stock_inventory/README.rst new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/stock_inventory/__init__.py b/stock_inventory/__init__.py new file mode 100644 index 000000000000..0650744f6bc6 --- /dev/null +++ b/stock_inventory/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/stock_inventory/__manifest__.py b/stock_inventory/__manifest__.py new file mode 100644 index 000000000000..fc7c70b8abae --- /dev/null +++ b/stock_inventory/__manifest__.py @@ -0,0 +1,20 @@ +{ + "name": "Stock Inventory Adjustment", + "version": "15.0.1.0.0", + "license": "LGPL-3", + "maintainer": ["DavidJForgeFlow"], + "development_status": "Beta", + "category": "Inventory/Inventory", + "summary": "Allows to do an easier follow up of the Inventory Adjustments", + "author": "ForgeFlow, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/stock-logistics-warehouse", + "depends": ["stock"], + "data": [ + "security/ir.model.access.csv", + "views/stock_inventory.xml", + "views/stock_quant.xml", + "views/stock_move_line.xml", + ], + "installable": True, + "application": False, +} diff --git a/stock_inventory/models/__init__.py b/stock_inventory/models/__init__.py new file mode 100644 index 000000000000..09732e334e94 --- /dev/null +++ b/stock_inventory/models/__init__.py @@ -0,0 +1,3 @@ +from . import stock_inventory +from . import stock_quant +from . import stock_move_line diff --git a/stock_inventory/models/stock_inventory.py b/stock_inventory/models/stock_inventory.py new file mode 100644 index 000000000000..cf01a33aa037 --- /dev/null +++ b/stock_inventory/models/stock_inventory.py @@ -0,0 +1,216 @@ +from odoo import _, api, fields, models +from odoo.exceptions import ValidationError +from odoo.osv import expression + + +class InventoryAdjustmentsGroup(models.Model): + _name = "stock.inventory" + _description = "Inventory Adjustment Group" + _order = "date desc, id desc" + + name = fields.Char(required=True, default="Inventory", string="Inventory Reference") + + date = fields.Datetime(default=lambda self: fields.Datetime.now()) + + state = fields.Selection( + [("draft", "Draft"), ("in_progress", "In Progress"), ("done", "Done")], + default="draft", + ) + + owner_id = fields.Many2one( + "res.partner", "Owner", help="This is the owner of the inventory adjustment" + ) + + location_ids = fields.Many2many( + "stock.location", string="Locations", domain="[('usage', '=', 'internal')]" + ) + + product_selection = fields.Selection( + [ + ("all", "All Products"), + ("manual", "Manual Selection"), + ("category", "Product Category"), + ("one", "One Product"), + ("lot", "Lot/Serial Number"), + ], + default="all", + required=True, + ) + + product_ids = fields.Many2many("product.product", string="Products") + + stock_quant_ids = fields.Many2many("stock.quant", string="Inventory Adjustment") + + category_id = fields.Many2one("product.category", string="Product Category") + + lot_ids = fields.Many2many( + "stock.production.lot", + string="Lot/Serial Numbers", + ) + + stock_move_ids = fields.One2many( + "stock.move.line", + "inventory_adjustment_id", + string="Inventory Adjustments Done", + ) + + count_stock_quants = fields.Integer( + compute="_compute_count_stock_quants", string="Adjustments" + ) + + count_stock_quants_string = fields.Char( + compute="_compute_count_stock_quants", string="Adjustments" + ) + + count_stock_moves = fields.Integer( + compute="_compute_count_stock_moves", string="Stock Moves Lines" + ) + + @api.depends("stock_quant_ids") + def _compute_count_stock_quants(self): + self.count_stock_quants = len(self.stock_quant_ids) + count_todo = len( + self.stock_quant_ids.search( + [("id", "in", self.stock_quant_ids.ids), ("to_do", "=", "True")] + ) + ) + self.count_stock_quants_string = "{} / {}".format( + count_todo, self.count_stock_quants + ) + + @api.depends("stock_move_ids") + def _compute_count_stock_moves(self): + sm_ids = self.mapped("stock_move_ids").ids + self.count_stock_moves = len(sm_ids) + + def _get_quants(self, locations): + domain = [] + base_domain = self._get_base_domain(locations) + if self.product_selection == "all": + domain = self._get_domain_all_quants(base_domain) + elif self.product_selection == "manual": + domain = self._get_domain_manual_quants(base_domain) + elif self.product_selection == "one": + domain = self._get_domain_one_quant(base_domain) + elif self.product_selection == "lot": + domain = self._get_domain_lot_quants(base_domain) + elif self.product_selection == "category": + domain = self._get_domain_category_quants(base_domain) + return self.env["stock.quant"].search(domain) + + def _get_base_domain(self, locations): + return [ + "|", + ("location_id", "in", locations.mapped("id")), + ("location_id", "in", locations.child_ids.ids), + ] + + def _get_domain_all_quants(self, base_domain): + return base_domain + + def _get_domain_manual_quants(self, base_domain): + return expression.AND( + [base_domain, [("product_id", "in", self.product_ids.ids)]] + ) + + def _get_domain_one_quant(self, base_domain): + return expression.AND( + [ + base_domain, + [ + ("product_id", "in", self.product_ids.ids), + ], + ] + ) + + def _get_domain_lot_quants(self, base_domain): + return expression.AND( + [ + base_domain, + [ + ("product_id", "in", self.product_ids.ids), + ("lot_id", "in", self.lot_ids.ids), + ], + ] + ) + + def _get_domain_category_quants(self, base_domain): + return expression.AND( + [ + base_domain, + [ + "|", + ("product_id.categ_id", "=", self.category_id.id), + ("product_id.categ_id", "in", self.category_id.child_id.ids), + ], + ] + ) + + def action_state_to_in_progress(self): + active_rec = self.env["stock.inventory"].search( + [ + ("state", "=", "in_progress"), + "|", + ("location_ids", "in", self.location_ids.mapped("id")), + ("location_ids", "in", self.location_ids.child_ids.ids), + ], + limit=1, + ) + if active_rec: + raise ValidationError( + _( + "There's already an Adjustment in Process using one requested Location: %s" + ) + % active_rec.name + ) + self.state = "in_progress" + self.stock_quant_ids = self._get_quants(self.location_ids) + self.stock_quant_ids.update({"to_do": True}) + return + + def action_state_to_done(self): + self.state = "done" + self.stock_quant_ids.update({"to_do": True}) + return + + def action_state_to_draft(self): + self.state = "draft" + self.stock_quant_ids.update({"to_do": True}) + self.stock_quant_ids = None + return + + def action_view_inventory_adjustment(self): + result = self.env["stock.quant"].action_view_inventory() + ia_ids = self.mapped("stock_quant_ids").ids + result["domain"] = [("id", "in", ia_ids)] + result["search_view_id"] = self.env.ref("stock.quant_search_view").id + result["context"]["search_default_to_do"] = 1 + return result + + def action_view_stock_moves(self): + result = self.env["ir.actions.act_window"]._for_xml_id( + "stock_inventory.action_view_stock_move_line_inventory_tree" + ) + sm_ids = self.mapped("stock_move_ids").ids + result["domain"] = [("id", "in", sm_ids)] + result["context"] = [] + return result + + @api.constrains("product_selection", "product_ids") + def _check_one_product_in_product_selection(self): + for rec in self: + if len(rec.product_ids) > 1: + if rec.product_selection == "one": + raise ValidationError( + _( + "When 'Product Selection: One Product' is selected" + " you are only able to add one product." + ) + ) + elif rec.product_selection == "lot": + raise ValidationError( + _( + "When 'Product Selection: Lot Serial Number' is selected" + " you are only able to add one product." + ) + ) diff --git a/stock_inventory/models/stock_move_line.py b/stock_inventory/models/stock_move_line.py new file mode 100644 index 000000000000..9acebd9e526c --- /dev/null +++ b/stock_inventory/models/stock_move_line.py @@ -0,0 +1,7 @@ +from odoo import fields, models + + +class StockMoveLine(models.Model): + _inherit = "stock.move.line" + + inventory_adjustment_id = fields.Many2one("stock.inventory") diff --git a/stock_inventory/models/stock_quant.py b/stock_inventory/models/stock_quant.py new file mode 100644 index 000000000000..b53d7d8a1525 --- /dev/null +++ b/stock_inventory/models/stock_quant.py @@ -0,0 +1,36 @@ +from odoo import fields, models + + +class StockQuant(models.Model): + _inherit = "stock.quant" + + to_do = fields.Boolean(default=True) + + def _apply_inventory(self): + res = super()._apply_inventory() + record_moves = self.env["stock.move.line"] + for rec in self: + adjustment = ( + self.env["stock.inventory"] + .search([("state", "=", "in_progress")]) + .filtered( + lambda x: rec.location_id in x.location_ids + or rec.location_id in x.location_ids.child_ids + ) + ) + moves = record_moves.search( + [ + ("product_id", "=", rec.product_id.id), + ("lot_id", "=", rec.lot_id.id), + ("company_id", "=", rec.company_id.id), + "|", + ("location_id", "=", rec.location_id.id), + ("location_dest_id", "=", rec.location_id.id), + ], + order="create_date asc", + ) + move = moves[len(moves) - 1] + adjustment.stock_move_ids |= move + move.inventory_adjustment_id = adjustment + rec.to_do = False + return res diff --git a/stock_inventory/readme/CONTRIBUTORS.rst b/stock_inventory/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000000..8dd66508f510 --- /dev/null +++ b/stock_inventory/readme/CONTRIBUTORS.rst @@ -0,0 +1,4 @@ +* `ForgeFlow `_: + + * David Jiménez + * Guillem Casassas diff --git a/stock_inventory/readme/DESCRIPTION.rst b/stock_inventory/readme/DESCRIPTION.rst new file mode 100644 index 000000000000..ca91fe8f2dd0 --- /dev/null +++ b/stock_inventory/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module allows to group Inventory Adjustments and have a group traceability (like before Odoo 15.0). diff --git a/stock_inventory/readme/USAGE.rst b/stock_inventory/readme/USAGE.rst new file mode 100644 index 000000000000..fc0e36c07ff9 --- /dev/null +++ b/stock_inventory/readme/USAGE.rst @@ -0,0 +1,9 @@ +Go to Inventory / Operations / Inventory Adjustments. Here you can see the list of Adjustment Grouped. +If you create a new Group, you can choose 2 types of product selection: +- All Products (all products from theselected locations). +- Manual Selection (choose manually each product in location). +- One Product (choose only one product in locations). +- Lot Serial Number (choose one product, any lots and locations). +- Product Category (choose one product category [childs also taken into account]). +When you start the adjustment (only one at a time) clicking on adjustments gets you to the view where adjustments are made. +From the group view, if you click on Stock Moves you can see the movements done (includes the 0 qty moves). diff --git a/stock_inventory/security/ir.model.access.csv b/stock_inventory/security/ir.model.access.csv new file mode 100644 index 000000000000..0dd1ae475bd3 --- /dev/null +++ b/stock_inventory/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_stock_inventory_user,stock.inventory,model_stock_inventory,base.group_user,1,0,0,0 +access_stock_inventory_manager,stock.inventory,model_stock_inventory,base.group_system,1,1,1,1 diff --git a/stock_inventory/tests/__init__.py b/stock_inventory/tests/__init__.py new file mode 100644 index 000000000000..64feb514fcd7 --- /dev/null +++ b/stock_inventory/tests/__init__.py @@ -0,0 +1 @@ +from . import test_stock_inventory diff --git a/stock_inventory/tests/test_stock_inventory.py b/stock_inventory/tests/test_stock_inventory.py new file mode 100644 index 000000000000..b02070a3c00e --- /dev/null +++ b/stock_inventory/tests/test_stock_inventory.py @@ -0,0 +1,314 @@ +# Copyright 2022 ForgeFlow S.L +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from odoo.exceptions import ValidationError +from odoo.tests.common import TransactionCase + + +class TestStockInventory(TransactionCase): + def setUp(self): + super(TestStockInventory, self).setUp() + self.quant_model = self.env["stock.quant"] + self.move_model = self.env["stock.move.line"] + self.inventory_model = self.env["stock.inventory"] + self.location_model = self.env["stock.location"] + self.product_categ = self.env["product.category"].create({"name": "Test Categ"}) + self.product = self.env["product.product"].create( + { + "name": "Product 1 test", + "type": "product", + "tracking": "lot", + } + ) + self.product2 = self.env["product.product"].create( + { + "name": "Product 1 test", + "type": "product", + "categ_id": self.product_categ.id, + } + ) + self.lot_1 = self.env["stock.production.lot"].create( + { + "product_id": self.product.id, + "name": "Lot 1", + "company_id": self.env.company.id, + } + ) + self.lot_2 = self.env["stock.production.lot"].create( + { + "product_id": self.product.id, + "name": "Lot 2", + "company_id": self.env.company.id, + } + ) + self.lot_3 = self.env["stock.production.lot"].create( + { + "product_id": self.product.id, + "name": "Lot 3", + "company_id": self.env.company.id, + } + ) + self.location_src = self.env.ref("stock.stock_location_locations_virtual") + self.location_dst = self.env.ref("stock.stock_location_customers") + + self.location1 = self.location_model.create( + { + "name": "Location 1", + "usage": "internal", + "warehouse_id": self.location_src.id, + } + ) + self.location2 = self.location_model.create( + { + "name": "Location 2", + "usage": "internal", + "location_id": self.location_src.id, + } + ) + self.location3 = self.location_model.create( + { + "name": "Location 3", + "usage": "internal", + "location_id": self.location1.id, + } + ) + self.quant1 = self.quant_model.sudo().create( + { + "product_id": self.product.id, + "lot_id": self.lot_1.id, + "quantity": 100.0, + "location_id": self.location1.id, + } + ) + self.quant2 = self.quant_model.sudo().create( + { + "product_id": self.product.id, + "lot_id": self.lot_2.id, + "quantity": 100.0, + "location_id": self.location2.id, + } + ) + self.quant3 = self.quant_model.sudo().create( + { + "product_id": self.product.id, + "lot_id": self.lot_3.id, + "quantity": 100.0, + "location_id": self.location3.id, + } + ) + self.quant4 = self.quant_model.sudo().create( + { + "product_id": self.product2.id, + "quantity": 100.0, + "location_id": self.location3.id, + } + ) + + def test_01_all_locations(self): + inventory1 = self.inventory_model.create( + { + "name": "Inventory_Test_1", + "product_selection": "all", + "location_ids": [self.location1.id], + } + ) + inventory1.action_state_to_in_progress() + inventory2 = self.inventory_model.create( + { + "name": "Inventory_Test_2", + "product_selection": "all", + "location_ids": [self.location1.id], + } + ) + with self.assertRaises(ValidationError), self.cr.savepoint(): + inventory2.action_state_to_in_progress() + self.assertEqual(inventory1.state, "in_progress") + self.assertEqual( + inventory1.stock_quant_ids.ids, + [self.quant1.id, self.quant3.id, self.quant4.id], + ) + inventory1.action_state_to_draft() + self.assertEqual(inventory1.stock_quant_ids.ids, []) + inventory1.action_state_to_in_progress() + self.assertEqual(inventory1.count_stock_moves, 0) + self.assertEqual(inventory1.count_stock_quants, 3) + self.assertEqual(inventory1.count_stock_quants_string, "3 / 3") + inventory1.action_view_inventory_adjustment() + self.quant1.inventory_quantity = 92 + self.quant1.action_apply_inventory() + inventory1._compute_count_stock_quants() + inventory1.action_view_stock_moves() + self.assertEqual(inventory1.count_stock_moves, 1) + self.assertEqual(inventory1.count_stock_quants, 3) + self.assertEqual(inventory1.count_stock_quants_string, "2 / 3") + self.assertEqual(inventory1.stock_move_ids.qty_done, 8) + self.assertEqual(inventory1.stock_move_ids.product_id.id, self.product.id) + self.assertEqual(inventory1.stock_move_ids.lot_id.id, self.lot_1.id) + self.assertEqual(inventory1.stock_move_ids.location_id.id, self.location1.id) + inventory1.action_state_to_done() + + def test_02_manual_selection(self): + inventory1 = self.inventory_model.create( + { + "name": "Inventory_Test_3", + "product_selection": "manual", + "location_ids": [self.location1.id], + "product_ids": [self.product.id], + } + ) + inventory1.action_state_to_in_progress() + self.assertEqual(inventory1.state, "in_progress") + self.assertEqual( + inventory1.stock_quant_ids.ids, [self.quant1.id, self.quant3.id] + ) + inventory1.action_state_to_draft() + self.assertEqual(inventory1.stock_quant_ids.ids, []) + inventory1.action_state_to_in_progress() + self.assertEqual(inventory1.state, "in_progress") + self.assertEqual(inventory1.count_stock_moves, 0) + self.assertEqual(inventory1.count_stock_quants, 2) + self.assertEqual(inventory1.count_stock_quants_string, "2 / 2") + inventory1.action_view_inventory_adjustment() + self.quant3.inventory_quantity = 74 + self.quant3.action_apply_inventory() + inventory1._compute_count_stock_quants() + inventory1.action_view_stock_moves() + self.assertEqual(inventory1.count_stock_moves, 1) + self.assertEqual(inventory1.count_stock_quants, 2) + self.assertEqual(inventory1.count_stock_quants_string, "1 / 2") + self.assertEqual(inventory1.stock_move_ids.qty_done, 26) + self.assertEqual(inventory1.stock_move_ids.product_id.id, self.product.id) + self.assertEqual(inventory1.stock_move_ids.lot_id.id, self.lot_3.id) + self.assertEqual(inventory1.stock_move_ids.location_id.id, self.location3.id) + self.quant1.inventory_quantity = 65 + self.quant1.action_apply_inventory() + inventory1._compute_count_stock_quants() + self.assertEqual(inventory1.count_stock_moves, 2) + self.assertEqual(inventory1.count_stock_quants, 2) + self.assertEqual(inventory1.count_stock_quants_string, "0 / 2") + inventory1.action_state_to_done() + + def test_03_one_selection(self): + with self.assertRaises(ValidationError), self.cr.savepoint(): + inventory1 = self.inventory_model.create( + { + "name": "Inventory_Test_5", + "product_selection": "one", + "location_ids": [self.location1.id], + "product_ids": [self.product.id, self.product2.id], + } + ) + inventory1 = self.inventory_model.create( + { + "name": "Inventory_Test_5", + "product_selection": "one", + "location_ids": [self.location1.id], + "product_ids": [self.product.id], + } + ) + inventory1.action_state_to_in_progress() + inventory1.product_ids = [self.product.id] + self.assertEqual( + inventory1.stock_quant_ids.ids, [self.quant1.id, self.quant3.id] + ) + inventory1.action_state_to_draft() + self.assertEqual(inventory1.stock_quant_ids.ids, []) + inventory1.action_state_to_in_progress() + self.assertEqual(inventory1.state, "in_progress") + self.assertEqual(inventory1.count_stock_moves, 0) + self.assertEqual(inventory1.count_stock_quants, 2) + self.assertEqual(inventory1.count_stock_quants_string, "2 / 2") + inventory1.action_view_inventory_adjustment() + self.quant3.inventory_quantity = 74 + self.quant3.action_apply_inventory() + inventory1._compute_count_stock_quants() + inventory1.action_view_stock_moves() + self.assertEqual(inventory1.count_stock_moves, 1) + self.assertEqual(inventory1.count_stock_quants, 2) + self.assertEqual(inventory1.count_stock_quants_string, "1 / 2") + self.assertEqual(inventory1.stock_move_ids.qty_done, 26) + self.assertEqual(inventory1.stock_move_ids.product_id.id, self.product.id) + self.assertEqual(inventory1.stock_move_ids.lot_id.id, self.lot_3.id) + self.assertEqual(inventory1.stock_move_ids.location_id.id, self.location3.id) + self.quant1.inventory_quantity = 65 + self.quant1.action_apply_inventory() + inventory1._compute_count_stock_quants() + self.assertEqual(inventory1.count_stock_moves, 2) + self.assertEqual(inventory1.count_stock_quants, 2) + self.assertEqual(inventory1.count_stock_quants_string, "0 / 2") + inventory1.action_state_to_done() + + def test_04_lot_selection(self): + with self.assertRaises(ValidationError), self.cr.savepoint(): + inventory1 = self.inventory_model.create( + { + "name": "Inventory_Test_6", + "product_selection": "lot", + "location_ids": [self.location1.id], + "lot_ids": [self.lot_3.id], + "product_ids": [self.product.id, self.product2.id], + } + ) + inventory1 = self.inventory_model.create( + { + "name": "Inventory_Test_6", + "product_selection": "lot", + "location_ids": [self.location1.id], + "lot_ids": [self.lot_3.id], + "product_ids": [self.product.id], + } + ) + inventory1.product_ids = [self.product.id] + inventory1.action_state_to_in_progress() + self.assertEqual(inventory1.stock_quant_ids.ids, [self.quant3.id]) + inventory1.action_state_to_draft() + self.assertEqual(inventory1.stock_quant_ids.ids, []) + inventory1.action_state_to_in_progress() + self.assertEqual(inventory1.state, "in_progress") + self.assertEqual(inventory1.count_stock_moves, 0) + self.assertEqual(inventory1.count_stock_quants, 1) + self.assertEqual(inventory1.count_stock_quants_string, "1 / 1") + inventory1.action_view_inventory_adjustment() + self.quant3.inventory_quantity = 74 + self.quant3.action_apply_inventory() + inventory1._compute_count_stock_quants() + inventory1.action_view_stock_moves() + self.assertEqual(inventory1.count_stock_moves, 1) + self.assertEqual(inventory1.count_stock_quants, 1) + self.assertEqual(inventory1.count_stock_quants_string, "0 / 1") + self.assertEqual(inventory1.stock_move_ids.qty_done, 26) + self.assertEqual(inventory1.stock_move_ids.product_id.id, self.product.id) + self.assertEqual(inventory1.stock_move_ids.lot_id.id, self.lot_3.id) + self.assertEqual(inventory1.stock_move_ids.location_id.id, self.location3.id) + inventory1.action_state_to_done() + + def test_05_category_selection(self): + inventory1 = self.inventory_model.create( + { + "name": "Inventory_Test_7", + "product_selection": "category", + "location_ids": [self.location3.id], + "category_id": self.product_categ.id, + } + ) + inventory1.action_state_to_in_progress() + self.assertEqual(inventory1.stock_quant_ids.ids, [self.quant4.id]) + inventory1.action_state_to_draft() + self.assertEqual(inventory1.stock_quant_ids.ids, []) + inventory1.action_state_to_in_progress() + self.assertEqual(inventory1.state, "in_progress") + self.assertEqual(inventory1.count_stock_moves, 0) + self.assertEqual(inventory1.count_stock_quants, 1) + self.assertEqual(inventory1.count_stock_quants_string, "1 / 1") + inventory1.action_view_inventory_adjustment() + self.quant4.inventory_quantity = 74 + self.quant4.action_apply_inventory() + inventory1._compute_count_stock_quants() + inventory1.action_view_stock_moves() + self.assertEqual(inventory1.count_stock_moves, 1) + self.assertEqual(inventory1.count_stock_quants, 1) + self.assertEqual(inventory1.count_stock_quants_string, "0 / 1") + self.assertEqual(inventory1.stock_move_ids.qty_done, 26) + self.assertEqual(inventory1.stock_move_ids.product_id.id, self.product2.id) + self.assertEqual(inventory1.stock_move_ids.location_id.id, self.location3.id) + inventory1.action_state_to_done() diff --git a/stock_inventory/views/stock_inventory.xml b/stock_inventory/views/stock_inventory.xml new file mode 100644 index 000000000000..8093595039a4 --- /dev/null +++ b/stock_inventory/views/stock_inventory.xml @@ -0,0 +1,154 @@ + + + + stock.inventory.form.view + stock.inventory + 1000 + +
+
+
+ + +
+ + +
+
+
+ + + + + + + + + + + + + + + +
+ + + + + stock.inventory.tree.view + stock.inventory + 1000 + + + + + + + + + + + Inventory Adjustment Group + stock.inventory + tree,form + + + + + + diff --git a/stock_inventory/views/stock_move_line.xml b/stock_inventory/views/stock_move_line.xml new file mode 100644 index 000000000000..10961216f5e0 --- /dev/null +++ b/stock_inventory/views/stock_move_line.xml @@ -0,0 +1,29 @@ + + + stock.move.line.tree.view.inventory + stock.move.line + 1000 + + + + + + + + + + + + + + + + Stock Move Lines + stock.move.line + tree,form + + + diff --git a/stock_inventory/views/stock_quant.xml b/stock_inventory/views/stock_quant.xml new file mode 100644 index 000000000000..efa28e8875b0 --- /dev/null +++ b/stock_inventory/views/stock_quant.xml @@ -0,0 +1,16 @@ + + + stock.quant.search.not.done + stock.quant + + + + + + + + From 89921e439543a29683f30329edda99d7c3e0326f Mon Sep 17 00:00:00 2001 From: oca-ci Date: Tue, 24 Jan 2023 11:43:21 +0000 Subject: [PATCH 2/8] [UPD] Update stock_inventory.pot --- stock_inventory/i18n/stock_inventory.pot | 233 +++++++++++++++++++++++ 1 file changed, 233 insertions(+) create mode 100644 stock_inventory/i18n/stock_inventory.pot diff --git a/stock_inventory/i18n/stock_inventory.pot b/stock_inventory/i18n/stock_inventory.pot new file mode 100644 index 000000000000..ece8b8a309c2 --- /dev/null +++ b/stock_inventory/i18n/stock_inventory.pot @@ -0,0 +1,233 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_inventory +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 15.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_inventory +#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__count_stock_quants +#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__count_stock_quants_string +msgid "Adjustments" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields.selection,name:stock_inventory.selection__stock_inventory__product_selection__all +msgid "All Products" +msgstr "" + +#. module: stock_inventory +#: model_terms:ir.ui.view,arch_db:stock_inventory.view_inventory_group_form +msgid "Back to Draft" +msgstr "" + +#. module: stock_inventory +#: model_terms:ir.ui.view,arch_db:stock_inventory.view_inventory_group_form +msgid "Begin Adjustments" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__create_uid +msgid "Created by" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__create_date +msgid "Created on" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__date +msgid "Date" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__display_name +msgid "Display Name" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields.selection,name:stock_inventory.selection__stock_inventory__state__done +msgid "Done" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields.selection,name:stock_inventory.selection__stock_inventory__state__draft +msgid "Draft" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__id +msgid "ID" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields.selection,name:stock_inventory.selection__stock_inventory__state__in_progress +msgid "In Progress" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__stock_quant_ids +#: model:ir.model.fields,field_description:stock_inventory.field_stock_move_line__inventory_adjustment_id +msgid "Inventory Adjustment" +msgstr "" + +#. module: stock_inventory +#: model:ir.actions.act_window,name:stock_inventory.action_view_inventory_group_form +#: model:ir.model,name:stock_inventory.model_stock_inventory +msgid "Inventory Adjustment Group" +msgstr "" + +#. module: stock_inventory +#: model:ir.ui.menu,name:stock_inventory.menu_action_inventory_tree +msgid "Inventory Adjustments" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__stock_move_ids +msgid "Inventory Adjustments Done" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__name +msgid "Inventory Reference" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory____last_update +msgid "Last Modified on" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__write_date +msgid "Last Updated on" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__location_ids +#: model_terms:ir.ui.view,arch_db:stock_inventory.view_inventory_group_form +msgid "Locations" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields.selection,name:stock_inventory.selection__stock_inventory__product_selection__lot +msgid "Lot/Serial Number" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__lot_ids +msgid "Lot/Serial Numbers" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields.selection,name:stock_inventory.selection__stock_inventory__product_selection__manual +msgid "Manual Selection" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields.selection,name:stock_inventory.selection__stock_inventory__product_selection__one +msgid "One Product" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__owner_id +msgid "Owner" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__category_id +#: model:ir.model.fields.selection,name:stock_inventory.selection__stock_inventory__product_selection__category +msgid "Product Category" +msgstr "" + +#. module: stock_inventory +#: model:ir.model,name:stock_inventory.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__product_selection +msgid "Product Selection" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__product_ids +msgid "Products" +msgstr "" + +#. module: stock_inventory +#: model:ir.model,name:stock_inventory.model_stock_quant +msgid "Quants" +msgstr "" + +#. module: stock_inventory +#: model_terms:ir.ui.view,arch_db:stock_inventory.view_inventory_group_form +msgid "Set to Done" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__state +msgid "State" +msgstr "" + +#. module: stock_inventory +#: model:ir.actions.act_window,name:stock_inventory.action_view_stock_move_line_inventory_tree +msgid "Stock Move Lines" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields,field_description:stock_inventory.field_stock_inventory__count_stock_moves +msgid "Stock Moves Lines" +msgstr "" + +#. module: stock_inventory +#: code:addons/stock_inventory/models/stock_inventory.py:0 +#, python-format +msgid "" +"There's already an Adjustment in Process using one requested Location: %s" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields,help:stock_inventory.field_stock_inventory__owner_id +msgid "This is the owner of the inventory adjustment" +msgstr "" + +#. module: stock_inventory +#: model:ir.model.fields,field_description:stock_inventory.field_stock_quant__to_do +#: model_terms:ir.ui.view,arch_db:stock_inventory.view_stock_quant_search_not_done +msgid "To Do" +msgstr "" + +#. module: stock_inventory +#: code:addons/stock_inventory/models/stock_inventory.py:0 +#, python-format +msgid "" +"When 'Product Selection: Lot Serial Number' is selected you are only able to" +" add one product." +msgstr "" + +#. module: stock_inventory +#: code:addons/stock_inventory/models/stock_inventory.py:0 +#, python-format +msgid "" +"When 'Product Selection: One Product' is selected you are only able to add " +"one product." +msgstr "" + +#. module: stock_inventory +#: model_terms:ir.ui.view,arch_db:stock_inventory.view_inventory_group_form +msgid "e.g. Annual inventory" +msgstr "" From a820b6e2e1ec2341c2ab510a4bf6ded2ed813a10 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Tue, 24 Jan 2023 11:48:44 +0000 Subject: [PATCH 3/8] [UPD] README.rst --- stock_inventory/README.rst | 89 ++++ stock_inventory/static/description/index.html | 436 ++++++++++++++++++ 2 files changed, 525 insertions(+) create mode 100644 stock_inventory/static/description/index.html diff --git a/stock_inventory/README.rst b/stock_inventory/README.rst index e69de29bb2d1..c70d243e814a 100644 --- a/stock_inventory/README.rst +++ b/stock_inventory/README.rst @@ -0,0 +1,89 @@ +========================== +Stock Inventory Adjustment +========================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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-LGPL--3-blue.png + :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html + :alt: License: LGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github + :target: https://github.com/OCA/stock-logistics-warehouse/tree/15.0/stock_inventory + :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-15-0/stock-logistics-warehouse-15-0-stock_inventory + :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/15.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows to group Inventory Adjustments and have a group traceability (like before Odoo 15.0). + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +Go to Inventory / Operations / Inventory Adjustments. Here you can see the list of Adjustment Grouped. +If you create a new Group, you can choose 2 types of product selection: +- All Products (all products from theselected locations). +- Manual Selection (choose manually each product in location). +- One Product (choose only one product in locations). +- Lot Serial Number (choose one product, any lots and locations). +- Product Category (choose one product category [childs also taken into account]). +When you start the adjustment (only one at a time) clicking on adjustments gets you to the view where adjustments are made. +From the group view, if you click on Stock Moves you can see the movements done (includes the 0 qty moves). + +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 +~~~~~~~~~~~~ + +* `ForgeFlow `_: + + * David Jiménez + * Guillem Casassas + +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_inventory/static/description/index.html b/stock_inventory/static/description/index.html new file mode 100644 index 000000000000..1c3528eba240 --- /dev/null +++ b/stock_inventory/static/description/index.html @@ -0,0 +1,436 @@ + + + + + + +Stock Inventory Adjustment + + + +
+

Stock Inventory Adjustment

+ + +

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

+

This module allows to group Inventory Adjustments and have a group traceability (like before Odoo 15.0).

+

Table of contents

+ +
+

Usage

+

Go to Inventory / Operations / Inventory Adjustments. Here you can see the list of Adjustment Grouped. +If you create a new Group, you can choose 2 types of product selection: +- All Products (all products from theselected locations). +- Manual Selection (choose manually each product in location). +- One Product (choose only one product in locations). +- Lot Serial Number (choose one product, any lots and locations). +- Product Category (choose one product category [childs also taken into account]). +When you start the adjustment (only one at a time) clicking on adjustments gets you to the view where adjustments are made. +From the group view, if you click on Stock Moves you can see the movements done (includes the 0 qty moves).

+
+
+

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

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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

+

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

+

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

+
+
+
+ + From 0aacb98b03ee9d993f38d76ca98379e8d9359db8 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Tue, 24 Jan 2023 11:48:44 +0000 Subject: [PATCH 4/8] [ADD] icon.png --- stock_inventory/static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 stock_inventory/static/description/icon.png diff --git a/stock_inventory/static/description/icon.png b/stock_inventory/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From 67297089a3de10b209e435ad5d55b85aeb94d957 Mon Sep 17 00:00:00 2001 From: AlexPForgeFlow Date: Wed, 20 Sep 2023 17:07:15 +0200 Subject: [PATCH 5/8] [FIX] stock_inventory: fix allowed fields to be written in stock quant to add to_do field --- stock_inventory/models/stock_quant.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stock_inventory/models/stock_quant.py b/stock_inventory/models/stock_quant.py index b53d7d8a1525..49b46c68964c 100644 --- a/stock_inventory/models/stock_quant.py +++ b/stock_inventory/models/stock_quant.py @@ -34,3 +34,6 @@ def _apply_inventory(self): move.inventory_adjustment_id = adjustment rec.to_do = False return res + + def _get_inventory_fields_write(self): + return super()._get_inventory_fields_write() + ["to_do"] From 26f6f4591002168e3b152b848f3e63b0f30d68ae Mon Sep 17 00:00:00 2001 From: AlexPForgeFlow Date: Tue, 19 Sep 2023 09:45:14 +0200 Subject: [PATCH 6/8] [FIX] stock_inventory: fix the case that corresponds to a shared location between several companies (as company_id is a related on quant location) --- stock_inventory/models/stock_quant.py | 9 +++++++-- stock_inventory/tests/test_stock_inventory.py | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/stock_inventory/models/stock_quant.py b/stock_inventory/models/stock_quant.py index 49b46c68964c..bea534f330b6 100644 --- a/stock_inventory/models/stock_quant.py +++ b/stock_inventory/models/stock_quant.py @@ -1,4 +1,4 @@ -from odoo import fields, models +from odoo import _, fields, models class StockQuant(models.Model): @@ -22,13 +22,18 @@ def _apply_inventory(self): [ ("product_id", "=", rec.product_id.id), ("lot_id", "=", rec.lot_id.id), - ("company_id", "=", rec.company_id.id), "|", ("location_id", "=", rec.location_id.id), ("location_dest_id", "=", rec.location_id.id), ], order="create_date asc", + ).filtered( + lambda x: not x.company_id.id + or not rec.company_id.id + or rec.company_id.id == x.company_id.id ) + if len(moves) == 0: + raise ValueError(_("No move lines have been created")) move = moves[len(moves) - 1] adjustment.stock_move_ids |= move move.inventory_adjustment_id = adjustment diff --git a/stock_inventory/tests/test_stock_inventory.py b/stock_inventory/tests/test_stock_inventory.py index b02070a3c00e..67b2a976cc51 100644 --- a/stock_inventory/tests/test_stock_inventory.py +++ b/stock_inventory/tests/test_stock_inventory.py @@ -292,6 +292,8 @@ def test_05_category_selection(self): } ) inventory1.action_state_to_in_progress() + # Remove company_id from stock-quant to test it works as expected + inventory1.stock_quant_ids.write({"company_id": False}) self.assertEqual(inventory1.stock_quant_ids.ids, [self.quant4.id]) inventory1.action_state_to_draft() self.assertEqual(inventory1.stock_quant_ids.ids, []) From 6be4236b59d9ca16fc65e4b7829cd9584fdf3fa3 Mon Sep 17 00:00:00 2001 From: Urvisha-OSI Date: Wed, 22 Mar 2023 16:48:36 +0530 Subject: [PATCH 7/8] [MIG] stock_inventory: Migration to 16.0 --- setup/stock_inventory/odoo/addons/stock_inventory | 1 + setup/stock_inventory/setup.py | 6 ++++++ stock_inventory/README.rst | 15 ++++++++------- stock_inventory/__manifest__.py | 2 +- stock_inventory/models/stock_inventory.py | 2 +- stock_inventory/readme/CONTRIBUTORS.rst | 1 + stock_inventory/static/description/index.html | 9 +++++---- stock_inventory/tests/test_stock_inventory.py | 10 +++++----- 8 files changed, 28 insertions(+), 18 deletions(-) create mode 120000 setup/stock_inventory/odoo/addons/stock_inventory create mode 100644 setup/stock_inventory/setup.py diff --git a/setup/stock_inventory/odoo/addons/stock_inventory b/setup/stock_inventory/odoo/addons/stock_inventory new file mode 120000 index 000000000000..6a46dcae75fe --- /dev/null +++ b/setup/stock_inventory/odoo/addons/stock_inventory @@ -0,0 +1 @@ +../../../../stock_inventory \ No newline at end of file diff --git a/setup/stock_inventory/setup.py b/setup/stock_inventory/setup.py new file mode 100644 index 000000000000..28c57bb64031 --- /dev/null +++ b/setup/stock_inventory/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/stock_inventory/README.rst b/stock_inventory/README.rst index c70d243e814a..c995e239f756 100644 --- a/stock_inventory/README.rst +++ b/stock_inventory/README.rst @@ -14,14 +14,14 @@ Stock Inventory Adjustment :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html :alt: License: LGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github - :target: https://github.com/OCA/stock-logistics-warehouse/tree/15.0/stock_inventory + :target: https://github.com/OCA/stock-logistics-warehouse/tree/16.0/stock_inventory :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-15-0/stock-logistics-warehouse-15-0-stock_inventory + :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-16-0/stock-logistics-warehouse-16-0-stock_inventory :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/15.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/webui/builds.html?repo=OCA/stock-logistics-warehouse&target_branch=16.0 + :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -51,7 +51,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -70,6 +70,7 @@ Contributors * David Jiménez * Guillem Casassas + * Urvisha Desai Maintainers ~~~~~~~~~~~ @@ -84,6 +85,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_inventory/__manifest__.py b/stock_inventory/__manifest__.py index fc7c70b8abae..37e1d041bc22 100644 --- a/stock_inventory/__manifest__.py +++ b/stock_inventory/__manifest__.py @@ -1,6 +1,6 @@ { "name": "Stock Inventory Adjustment", - "version": "15.0.1.0.0", + "version": "16.0.1.0.0", "license": "LGPL-3", "maintainer": ["DavidJForgeFlow"], "development_status": "Beta", diff --git a/stock_inventory/models/stock_inventory.py b/stock_inventory/models/stock_inventory.py index cf01a33aa037..cd29cc0e3f6a 100644 --- a/stock_inventory/models/stock_inventory.py +++ b/stock_inventory/models/stock_inventory.py @@ -44,7 +44,7 @@ class InventoryAdjustmentsGroup(models.Model): category_id = fields.Many2one("product.category", string="Product Category") lot_ids = fields.Many2many( - "stock.production.lot", + "stock.lot", string="Lot/Serial Numbers", ) diff --git a/stock_inventory/readme/CONTRIBUTORS.rst b/stock_inventory/readme/CONTRIBUTORS.rst index 8dd66508f510..81f838605da1 100644 --- a/stock_inventory/readme/CONTRIBUTORS.rst +++ b/stock_inventory/readme/CONTRIBUTORS.rst @@ -2,3 +2,4 @@ * David Jiménez * Guillem Casassas + * Urvisha Desai diff --git a/stock_inventory/static/description/index.html b/stock_inventory/static/description/index.html index 1c3528eba240..d456b0a27037 100644 --- a/stock_inventory/static/description/index.html +++ b/stock_inventory/static/description/index.html @@ -3,7 +3,7 @@ - + Stock Inventory Adjustment