diff options
Diffstat (limited to 'addons/mrp/wizard')
| -rw-r--r-- | addons/mrp/wizard/mrp_consumption_warning.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/addons/mrp/wizard/mrp_consumption_warning.py b/addons/mrp/wizard/mrp_consumption_warning.py index 022d88dbecf..bae87759f12 100644 --- a/addons/mrp/wizard/mrp_consumption_warning.py +++ b/addons/mrp/wizard/mrp_consumption_warning.py @@ -29,10 +29,12 @@ class MrpConsumptionWarning(models.TransientModel): wizard.consumption = "strict" in consumption_map and "strict" or "warning" in consumption_map and "warning" or "flexible" def action_confirm(self): + action_from_do_finish = False if self.env.context.get('from_workorder'): - if self.env.context.get('active_model') == 'mrp_workorder': - return self.env['mrp.workorder'].browse(self.env.context.get('active_id')).do_finish() - return self.mrp_production_ids.with_context(skip_consumption=True).button_mark_done() + if self.env.context.get('active_model') == 'mrp.workorder': + action_from_do_finish = self.env['mrp.workorder'].browse(self.env.context.get('active_id')).do_finish() + action_from_mark_done = self.mrp_production_ids.with_context(skip_consumption=True).button_mark_done() + return action_from_do_finish or action_from_mark_done def action_cancel(self): if self.env.context.get('from_workorder') and len(self.mrp_production_ids) == 1: |