From 497778b69a8148f863e97b26d19b06d1f665d2ab Mon Sep 17 00:00:00 2001 From: "Giacomello Nathan (ngi)" Date: Fri, 2 Oct 2020 11:30:31 +0000 Subject: [PATCH] [FIX] Expense: Cancel activity for manager if expense is reset to draft If we submit an expense to the manager, a next activity is created for him. If we reset to draft, it is not cancelled. So if we resubmit expense, a second next activity is created for the manager. This commit will cancel created activities when we put the expense in draft Task id: 2350168 closes odoo/odoo#60107 X-original-commit: 107ac15687befccf59527730cc776d5ad68cac44 Signed-off-by: Yannick Tivisse (yti) --- addons/hr_expense/models/hr_expense.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_expense/models/hr_expense.py b/addons/hr_expense/models/hr_expense.py index f5acb949107..56a1cccb331 100644 --- a/addons/hr_expense/models/hr_expense.py +++ b/addons/hr_expense/models/hr_expense.py @@ -1004,7 +1004,7 @@ class HrExpenseSheet(models.Model): 'hr_expense.mail_act_expense_approval', user_id=expense_report.sudo()._get_responsible_for_approval().id or self.env.user.id) self.filtered(lambda hol: hol.state == 'approve').activity_feedback(['hr_expense.mail_act_expense_approval']) - self.filtered(lambda hol: hol.state == 'cancel').activity_unlink(['hr_expense.mail_act_expense_approval']) + self.filtered(lambda hol: hol.state in ('draft', 'cancel')).activity_unlink(['hr_expense.mail_act_expense_approval']) def action_register_payment(self): ''' Open the account.payment.register wizard to pay the selected journal entries.