JF Aubert
047f2e556f
stdout: stderr: 13:41:03.985365 git.c:344 trace: built-in: git cherry-pick 20858c2a8805d9ec08edb98b090badf6c73fc342 error: Cherry-picking is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: cherry-pick failed ---------- status: closes odoo/odoo#79933 Signed-off-by: William Henrotin (whe) <whe@odoo.com>
20 lines
775 B
Python
20 lines
775 B
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
from odoo import models
|
|
|
|
|
|
class MrpConsumptionWarning(models.TransientModel):
|
|
_inherit = 'mrp.consumption.warning'
|
|
|
|
def action_confirm(self):
|
|
if self.mrp_production_ids._get_subcontract_move():
|
|
return self.mrp_production_ids.with_context(skip_consumption=True).subcontracting_record_component()
|
|
return super().action_confirm()
|
|
|
|
def action_cancel(self):
|
|
mo_subcontracted_move = self.mrp_production_ids._get_subcontract_move()
|
|
if mo_subcontracted_move:
|
|
return mo_subcontracted_move.filtered(lambda move: move.state not in ('done', 'cancel'))._action_record_components()
|
|
return super().action_cancel()
|