From 402dfd0a53af74e64278ff8746326c024128a2ee Mon Sep 17 00:00:00 2001
From: "Adrien Widart (awt)" <awt@odoo.com>
Date: Fri, 28 Oct 2022 09:06:59 +0000
Subject: [PATCH] [FIX] mrp: check SN uniqueness on WO
When marking a WO as done, if the serial number defined is related to an
unbuilt product, an error will be raised and the user will not be able
to mark the WO as done
To reproduce the issue:
1. Create a BoM for product P with one operation
- P is tracked by SN
2. Produce one P with serial S
3. Unbuild it
4. Create and confirm a second MO with 1 x P
5. Start the WO
6. On tablet view, set the finished lot to S
7. Mark the WO as done
Error: a UserError is raised because "This serial number [...] has
already been produced". However, this serial number has been unbuilt so
the worker should be able to use it again
When marking the WO as done, we check the uniqueness of the defined
serial number. But:
- The check is not accurate enough, hence the above error
- The lot of the WO is a computed/inverse field based on lot of the MO
- Once the WO closed, we can still change the lot of the MO
- When marking the MO as done, a better method checks the SN uniqueness
(does not fail in the above case)
Therefore, the checking on WO side is useless. We should let the MO side
handle this.
Moreover, let's say that there is already one P in stock with serial S2.
On tablet view, if the worker set the lot to S2, there should be a
warning so he can be aware of the situation. This is already the case on
MO side:
https://github.com/odoo/odoo/blob/45e37b2ad7bdcfd9f9f7e1dabbd0a99c9a0b5cdc/addons/mrp/models/mrp_production.py#L694-L705
(This commit is linked to a similar commit OE side, same opw)
OPW-3002424
closes odoo/odoo#104456
Related: odoo/enterprise#33377
Signed-off-by: Tiffany Chang <tic@odoo.com>
---
addons/mrp/i18n/mrp.pot | 6 ++++++
addons/mrp/models/mrp_production.py | 16 ++++++++++++----
addons/mrp/models/mrp_workorder.py | 18 ++++++++----------
3 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index 3b0b060b6571..cf28e088bd74 100644
--- a/addons/mrp/i18n/mrp.pot
+++ b/addons/mrp/i18n/mrp.pot
@@ -3707,6 +3707,12 @@ msgstr ""
msgid "Sequence stock after manufacturing"
msgstr ""
+#. module: mrp
+#: code:addons/mrp/models/mrp_production.py:0
+#, python-format
+msgid "Serial number (%s) has already been produced."
+msgstr ""
+
#. module: mrp
#: model:ir.model.fields.selection,name:mrp.selection__mrp_routing_workcenter__time_mode__manual
msgid "Set duration manually"
diff --git a/addons/mrp/models/mrp_production.py b/addons/mrp/models/mrp_production.py
index 5b17ba3f1630..c3c1b83d7d96 100644
--- a/addons/mrp/models/mrp_production.py
+++ b/addons/mrp/models/mrp_production.py
@@ -693,20 +693,28 @@ class MrpProduction(models.Model):
@api.onchange('lot_producing_id')
def _onchange_lot_producing(self):
- if self.product_id.tracking == 'serial':
+ res = self._can_produce_serial_number()
+ if res is not True:
+ return res
+
+ def _can_produce_serial_number(self, sn=None):
+ self.ensure_one()
+ sn = sn or self.lot_producing_id
+ if self.product_id.tracking == 'serial' and sn:
if self.env['stock.move.line'].search([
- ('lot_id', '=', self.lot_producing_id.id),
+ ('lot_id', '=', sn.id),
('qty_done', '=', 1),
('state', '=', 'done'),
('location_id.usage', '!=', 'production'),
('location_dest_id.usage', '!=', 'production'),
- ], limit=1) or self._is_finished_sn_already_produced(self.lot_producing_id):
+ ], limit=1) or self._is_finished_sn_already_produced(sn):
return {
'warning': {
'title': _('Warning'),
- 'message': _('Existing Serial number (%s). Please correct the serial numbers encoded.') % self.lot_producing_id.name
+ 'message': _('Serial number (%s) has already been produced.') % sn.name,
}
}
+ return True
@api.onchange('bom_id')
def _onchange_workorder_ids(self):
diff --git a/addons/mrp/models/mrp_workorder.py b/addons/mrp/models/mrp_workorder.py
index 06146fc8bb81..44cdd91e62b7 100644
--- a/addons/mrp/models/mrp_workorder.py
+++ b/addons/mrp/models/mrp_workorder.py
@@ -407,6 +407,12 @@ class MrpWorkorder(models.Model):
def _onchange_expected_duration(self):
self.duration_expected = self._get_duration_expected()
+ @api.onchange('finished_lot_id')
+ def _onchange_finished_lot_id(self):
+ res = self.production_id._can_produce_serial_number(sn=self.finished_lot_id)
+ if res is not True:
+ return res
+
def write(self, values):
if 'production_id' in values:
raise UserError(_('You cannot link this work order to another manufacturing order.'))
@@ -847,16 +853,8 @@ class MrpWorkorder(models.Model):
)
def _check_sn_uniqueness(self):
- """ Alert the user if the serial number as already been produced """
- if self.product_tracking == 'serial' and self.finished_lot_id:
- sml = self.env['stock.move.line'].search_count([
- ('lot_id', '=', self.finished_lot_id.id),
- ('location_id.usage', '=', 'production'),
- ('qty_done', '=', 1),
- ('state', '=', 'done')
- ])
- if sml:
- raise UserError(_('This serial number for product %s has already been produced', self.product_id.name))
+ # todo master: remove
+ pass
def _update_qty_producing(self, quantity):
self.ensure_one()
--
GitLab