Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: incorrectly treating normal payment as advance (#38437)

Browse Source 
fix: treating normal payment as advance
(cherry picked from commit dd39da0b77f73dc9006c036b960b63404cc2c2f5)
This commit is contained in:
ruthra kumar 2023-12-04 10:08:37 +05:30 committed by Mergify
parent b5c89ec3b4
commit 246dd74ba4
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/accounts/doctype/payment_entry/payment_entry.py
View File

@ -106,9 +106,17 @@ class PaymentEntry(AccountsController):
self.set_status() self.set_status()
def set_liability_account(self): def set_liability_account(self):
if not self.book_advance_payments_in_separate_party_account: # Auto setting liability account should only be done during 'draft' status
if self.docstatus > 0:
return return
if not frappe.db.get_value(
"Company", self.company, "book_advance_payments_in_separate_party_account"
):
return
# Important to set this flag for the gl building logic to work properly
self.book_advance_payments_in_separate_party_account = True
account_type = frappe.get_value( account_type = frappe.get_value(
"Account", {"name": self.party_account, "company": self.company}, "account_type" "Account", {"name": self.party_account, "company": self.company}, "account_type"
) )
@ -118,11 +126,13 @@ class PaymentEntry(AccountsController):
): ):
return return
if self.unallocated_amount == 0: if self.references:
for d in self.references: allowed_types = frozenset(["Sales Order", "Purchase Order"])
if d.reference_doctype in ["Sales Order", "Purchase Order"]: reference_types = set([x.reference_doctype for x in self.references])
break
else: # If there are referencers other than `allowed_types`, treat this as a normal payment entry
if reference_types - allowed_types:
self.book_advance_payments_in_separate_party_account = False
return return
liability_account = get_party_account( liability_account = get_party_account(