From 4c5d48359e0cdc2fda16c0d9ae21bb48cddb8dad Mon Sep 17 00:00:00 2001 From: Mateu Griful Date: Wed, 6 Oct 2021 12:54:40 +0200 Subject: [PATCH 1/4] [14.0][ADD] rma_filter_lot: add filter --- rma_filter_lot/__init__.py | 4 +++ rma_filter_lot/__manifest__.py | 17 +++++++++ rma_filter_lot/models/__init__.py | 1 + rma_filter_lot/models/rma_order_line.py | 47 +++++++++++++++++++++++++ rma_filter_lot/readme/CONTRIBUTORS.rst | 2 ++ rma_filter_lot/readme/DESCRIPTION.rst | 2 ++ rma_filter_lot/views/rma_order_view.xml | 13 +++++++ 7 files changed, 86 insertions(+) create mode 100644 rma_filter_lot/__init__.py create mode 100644 rma_filter_lot/__manifest__.py create mode 100644 rma_filter_lot/models/__init__.py create mode 100644 rma_filter_lot/models/rma_order_line.py create mode 100644 rma_filter_lot/readme/CONTRIBUTORS.rst create mode 100644 rma_filter_lot/readme/DESCRIPTION.rst create mode 100644 rma_filter_lot/views/rma_order_view.xml diff --git a/rma_filter_lot/__init__.py b/rma_filter_lot/__init__.py new file mode 100644 index 00000000..e6d259b1 --- /dev/null +++ b/rma_filter_lot/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2021 ForgeFlow S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html) + +from . import models diff --git a/rma_filter_lot/__manifest__.py b/rma_filter_lot/__manifest__.py new file mode 100644 index 00000000..3773e24d --- /dev/null +++ b/rma_filter_lot/__manifest__.py @@ -0,0 +1,17 @@ +# Copyright 2021 ForgeFlow S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html) + +{ + "name": "RMA Filter Lot", + "version": "14.0.1.0.0", + "license": "LGPL-3", + "category": "RMA", + "summary": "Filter RMA lots", + "author": "ForgeFlow", + "website": "https://github.com/ForgeFlow/stock-rma", + "depends": ["rma"], + "data": [ + "views/rma_order_view.xml", + ], + "installable": True, +} diff --git a/rma_filter_lot/models/__init__.py b/rma_filter_lot/models/__init__.py new file mode 100644 index 00000000..0ec42a97 --- /dev/null +++ b/rma_filter_lot/models/__init__.py @@ -0,0 +1 @@ +from . import rma_order_line diff --git a/rma_filter_lot/models/rma_order_line.py b/rma_filter_lot/models/rma_order_line.py new file mode 100644 index 00000000..f54dd0c8 --- /dev/null +++ b/rma_filter_lot/models/rma_order_line.py @@ -0,0 +1,47 @@ +# Copyright 2021 ForgeFlow S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html) + +from odoo import api, fields, models +from odoo.tools import float_compare + + +class RmaOrderLine(models.Model): + _inherit = "rma.order.line" + + lot_id = fields.Many2one( + comodel_name="stock.production.lot", + domain="[('id', 'in', valid_lots_ids)]", + ) + valid_lots_ids = fields.One2many( + comodel_name="stock.production.lot", + compute="_compute_domain_lot_ids", + ) + + @api.depends("product_id") + def _compute_domain_lot_ids(self): + for rec in self: + lots = rec.env["stock.production.lot"].search( + [("product_id", "=", rec.product_id.id)] + ) + if ( + lots + and rec.type == "customer" + and rec.product_id + and rec.product_id.tracking != "none" + ): + valid_ids = self.env["stock.production.lot"] + for quant in rec.product_id.stock_quant_ids: + if ( + float_compare(quant.available_quantity, 0.0, precision_digits=2) + > 0 + and quant.location_id.usage == "customer" + and quant.lot_id + ): + valid_ids |= quant.lot_id + if valid_ids: + lots = valid_ids + rec.valid_lots_ids = lots + + def _onchange_product_id(self): + super()._onchange_product_id() + return {"domain": {"lot_id": [("id", "in", self.valid_lots_ids)]}} diff --git a/rma_filter_lot/readme/CONTRIBUTORS.rst b/rma_filter_lot/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..087dd292 --- /dev/null +++ b/rma_filter_lot/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ +* Mateu Griful +* Lois Rilo diff --git a/rma_filter_lot/readme/DESCRIPTION.rst b/rma_filter_lot/readme/DESCRIPTION.rst new file mode 100644 index 00000000..c6c49173 --- /dev/null +++ b/rma_filter_lot/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module filters the lots in the rma by searching if there are units of the selected product in any customer +location in order to ease the search. diff --git a/rma_filter_lot/views/rma_order_view.xml b/rma_filter_lot/views/rma_order_view.xml new file mode 100644 index 00000000..fef36976 --- /dev/null +++ b/rma_filter_lot/views/rma_order_view.xml @@ -0,0 +1,13 @@ + + + + rma.order.line.form + rma.order.line + + + + + + + + From 614b6cc4fa07a75df52de29988a6e74362bff29b Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Fri, 8 Oct 2021 11:05:07 +0200 Subject: [PATCH 2/4] [IMP] rma_filter_lot: onchange returned by domain should use ids * rename field to `valid_lot_ids`. * add small readme --- rma_filter_lot/README.rst | 37 +++++++++++++++++++++++++ rma_filter_lot/models/rma_order_line.py | 10 +++---- rma_filter_lot/views/rma_order_view.xml | 2 +- 3 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 rma_filter_lot/README.rst diff --git a/rma_filter_lot/README.rst b/rma_filter_lot/README.rst new file mode 100644 index 00000000..e36debc6 --- /dev/null +++ b/rma_filter_lot/README.rst @@ -0,0 +1,37 @@ +============== +RMA Filter Lot +============== + +Filter RMA lots in customer RMA to only allow lots sent to customer. + +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 S.L. + +Contributors +~~~~~~~~~~~~ + +* Mateu Griful +* Lois Rilo + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the ForgeFlow. + +This module is part of the `ForgeFlow/stock-rma `_ project on GitHub. + diff --git a/rma_filter_lot/models/rma_order_line.py b/rma_filter_lot/models/rma_order_line.py index f54dd0c8..d3283271 100644 --- a/rma_filter_lot/models/rma_order_line.py +++ b/rma_filter_lot/models/rma_order_line.py @@ -9,10 +9,9 @@ class RmaOrderLine(models.Model): _inherit = "rma.order.line" lot_id = fields.Many2one( - comodel_name="stock.production.lot", - domain="[('id', 'in', valid_lots_ids)]", + domain="[('id', 'in', valid_lot_ids)]", ) - valid_lots_ids = fields.One2many( + valid_lot_ids = fields.One2many( comodel_name="stock.production.lot", compute="_compute_domain_lot_ids", ) @@ -40,8 +39,9 @@ class RmaOrderLine(models.Model): valid_ids |= quant.lot_id if valid_ids: lots = valid_ids - rec.valid_lots_ids = lots + rec.valid_lot_ids = lots def _onchange_product_id(self): super()._onchange_product_id() - return {"domain": {"lot_id": [("id", "in", self.valid_lots_ids)]}} + # Override domain added in base `rma` module. + return {"domain": {"lot_id": [("id", "in", self.valid_lot_ids.ids)]}} diff --git a/rma_filter_lot/views/rma_order_view.xml b/rma_filter_lot/views/rma_order_view.xml index fef36976..cef3c835 100644 --- a/rma_filter_lot/views/rma_order_view.xml +++ b/rma_filter_lot/views/rma_order_view.xml @@ -6,7 +6,7 @@ - + From 402572cbebb1942a916098a4e01154672f189d9c Mon Sep 17 00:00:00 2001 From: Jasmin Solanki Date: Mon, 10 Jan 2022 13:22:54 +0530 Subject: [PATCH 3/4] [IMP] rma_filter_lot: black, isort, prettier --- setup/rma_filter_lot/odoo/addons/rma_filter_lot | 1 + setup/rma_filter_lot/setup.py | 6 ++++++ 2 files changed, 7 insertions(+) create mode 120000 setup/rma_filter_lot/odoo/addons/rma_filter_lot create mode 100644 setup/rma_filter_lot/setup.py diff --git a/setup/rma_filter_lot/odoo/addons/rma_filter_lot b/setup/rma_filter_lot/odoo/addons/rma_filter_lot new file mode 120000 index 00000000..7e5b7be6 --- /dev/null +++ b/setup/rma_filter_lot/odoo/addons/rma_filter_lot @@ -0,0 +1 @@ +../../../../rma_filter_lot \ No newline at end of file diff --git a/setup/rma_filter_lot/setup.py b/setup/rma_filter_lot/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/rma_filter_lot/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From cdb69d1fb640ac0dc8c236ec79509187b4992ced Mon Sep 17 00:00:00 2001 From: Jasmin Solanki Date: Mon, 10 Jan 2022 13:23:11 +0530 Subject: [PATCH 4/4] [MIG] rma_filter_lot: Migration to 15.0 --- rma_filter_lot/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rma_filter_lot/__manifest__.py b/rma_filter_lot/__manifest__.py index 3773e24d..c7366a60 100644 --- a/rma_filter_lot/__manifest__.py +++ b/rma_filter_lot/__manifest__.py @@ -3,7 +3,7 @@ { "name": "RMA Filter Lot", - "version": "14.0.1.0.0", + "version": "15.0.1.0.0", "license": "LGPL-3", "category": "RMA", "summary": "Filter RMA lots",