From 6c644dd5d212cadbe94d5c32dbe4e1cbab003199 Mon Sep 17 00:00:00 2001 From: Karm Soni Date: Thu, 14 Aug 2025 16:34:14 +0530 Subject: [PATCH] refactor: combine the return conditions --- erpnext/accounts/doctype/dunning/dunning.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/erpnext/accounts/doctype/dunning/dunning.py b/erpnext/accounts/doctype/dunning/dunning.py index 379c7e96e66..5166190e4a5 100644 --- a/erpnext/accounts/doctype/dunning/dunning.py +++ b/erpnext/accounts/doctype/dunning/dunning.py @@ -208,21 +208,12 @@ def resolve_dunning_for_credit_note(doc, state): Check if dunning should be resolved when a credit note is issued against a Sales Invoice. Only process if update_outstanding_for_self is False (credit note is being applied against the original invoice). """ - if not doc.is_return or doc.get("update_outstanding_for_self"): + if not doc.is_return or doc.get("update_outstanding_for_self") or not doc.get("return_against"): return - if not doc.get("return_against"): - return + state = "Resolved" if doc.docstatus == 2 else "Unresolved" - original_invoice = doc.return_against - if doc.docstatus == 1: - state = "Unresolved" - elif doc.docstatus == 2: - state = "Resolved" - else: - return - - dunnings = get_linked_dunnings_as_per_state(original_invoice, state) + dunnings = get_linked_dunnings_as_per_state(doc.return_against, state) for dunning in dunnings: resolve = True