summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSwapnesh Shah <swapneshshah111@gmail.com>2021-05-02 18:33:29 +0000
committerSwapnesh <swapneshshah111@gmail.com>2021-05-03 15:27:38 +0000
commit48c0efcc97e35e00ec5803235a89a2c18e821990 (patch)
treec8a25df0bba163a8405c10183cb7f0ed6d6cc307
parentb9845323fc6383bcbf90599fd062bea3528f97b4 (diff)
[FIX] mrp: do now allow to select cancelled mo
Before this commit, User can select Cancelled MO before selecting Product. but it is already blocking since we already have constrains to not allow ubnuilding Cancelled MO. With this commit, We are always showing Done MO. closes odoo/odoo#70214 Signed-off-by: Rémy Voet <ryv-odoo@users.noreply.github.com>
-rw-r--r--addons/mrp/models/mrp_unbuild.py12
1 files changed, 4 insertions, 8 deletions
diff --git a/addons/mrp/models/mrp_unbuild.py b/addons/mrp/models/mrp_unbuild.py
index 6f2c9dfc4de..95f13ac7fa3 100644
--- a/addons/mrp/models/mrp_unbuild.py
+++ b/addons/mrp/models/mrp_unbuild.py
@@ -4,6 +4,7 @@
from odoo import api, fields, models, _
from odoo.exceptions import AccessError, UserError
from odoo.tools import float_compare
+from odoo.osv import expression
class MrpUnbuild(models.Model):
@@ -76,17 +77,12 @@ class MrpUnbuild(models.Model):
@api.depends('company_id', 'product_id')
def _compute_allowed_mo_ids(self):
for unbuild in self:
- if unbuild.product_id:
- domain = [
+ domain = [
('state', '=', 'done'),
- ('product_id', '=', unbuild.product_id.id),
- ('company_id', '=', unbuild.company_id.id)
- ]
- else:
- domain = [
- ('state', 'in', ['done', 'cancel']),
('company_id', '=', unbuild.company_id.id)
]
+ if unbuild.product_id:
+ domain = expression.AND([domain, [('product_id', '=', unbuild.product_id.id)]])
allowed_mos = self.env['mrp.production'].search_read(domain, ['id'])
if allowed_mos:
unbuild.allowed_mo_ids = [mo['id'] for mo in allowed_mos]