From eb17bb8e2a1ccc04fdb0b9f66505fd66c0321bda Mon Sep 17 00:00:00 2001 From: Suherdy Yacob Date: Tue, 21 Apr 2026 12:07:39 +0700 Subject: [PATCH] refactor: consolidate expense lock skip logic in account payment write method --- models/account_payment.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/models/account_payment.py b/models/account_payment.py index fc9cd18..b3eee8b 100644 --- a/models/account_payment.py +++ b/models/account_payment.py @@ -87,11 +87,10 @@ class AccountPayment(models.Model): def write(self, vals): # Propagate bypass flag during writes to avoid locked checks hr_expense_class = self._get_hr_expense_base_class() - if hr_expense_class and self._context.get('skip_expense_lock'): - return super(hr_expense_class, self).write(vals) + if hr_expense_class: + if self._context.get('skip_expense_lock') or any(p.expense_ids and p.state == 'draft' for p in self): + return super(hr_expense_class, self.with_context(skip_expense_lock=True)).write(vals) - if self.expense_ids and self.state == 'draft': - return super(AccountPayment, self.with_context(skip_expense_lock=True)).write(vals) return super().write(vals) def action_cancel(self):