Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[15.0][ADD] stock_inventory #1512

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions setup/stock_inventory/odoo/addons/stock_inventory
6 changes: 6 additions & 0 deletions setup/stock_inventory/setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import setuptools

setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)
Empty file added stock_inventory/README.rst
Empty file.
1 change: 1 addition & 0 deletions stock_inventory/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from . import models
20 changes: 20 additions & 0 deletions stock_inventory/__manifest__.py
Original file line number Diff line number Diff line change
@@ -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,
}
3 changes: 3 additions & 0 deletions stock_inventory/models/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from . import stock_inventory
from . import stock_quant
from . import stock_move_line
216 changes: 216 additions & 0 deletions stock_inventory/models/stock_inventory.py
Original file line number Diff line number Diff line change
@@ -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:

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we extend this? Checking if there are counts with same product or same lots or same locations? Counting two locations at the same time should be possible?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so because you can only do an Adjustment at a time, so repeated counts are "imposible" (unless something magic happens).

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."
)
)
7 changes: 7 additions & 0 deletions stock_inventory/models/stock_move_line.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from odoo import fields, models


class StockMoveLine(models.Model):
_inherit = "stock.move.line"

inventory_adjustment_id = fields.Many2one("stock.inventory")
36 changes: 36 additions & 0 deletions stock_inventory/models/stock_quant.py
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions stock_inventory/readme/CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
* `ForgeFlow <https://www.forgeflow.com>`_:

* David Jiménez <[email protected]>
* Guillem Casassas <[email protected]>
1 change: 1 addition & 0 deletions stock_inventory/readme/DESCRIPTION.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This module allows to group Inventory Adjustments and have a group traceability (like before Odoo 15.0).
9 changes: 9 additions & 0 deletions stock_inventory/readme/USAGE.rst
Original file line number Diff line number Diff line change
@@ -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).
3 changes: 3 additions & 0 deletions stock_inventory/security/ir.model.access.csv
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions stock_inventory/tests/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from . import test_stock_inventory
Loading