nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-18 14:32:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: correct args for get_advance_payment_entries_for_regional

Browse Source 
(cherry picked from commit df13a4cc2f)
This commit is contained in:
ljain112
2024-12-19 12:04:04 +05:30
committed by Mergify
parent 1a9dfec115
commit 875797e655
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/controllers/accounts_controller.py
View File

@@ -1214,6 +1214,8 @@ class AccountsController(TransactionBase):
def get_advance_entries(self, include_unallocated=True): def get_advance_entries(self, include_unallocated=True):
party_account = [] party_account = []
default_advance_account = None
if self.doctype == "Sales Invoice": if self.doctype == "Sales Invoice":
party_type = "Customer" party_type = "Customer"
party = self.customer party = self.customer
@@ -1229,10 +1231,14 @@ class AccountsController(TransactionBase):
order_doctype = "Purchase Order" order_doctype = "Purchase Order"
party_account.append(self.credit_to) party_account.append(self.credit_to)
party_account.extend( party_accounts = get_party_account(
get_party_account(party_type, party=party, company=self.company, include_advance=True) party_type, party=party, company=self.company, include_advance=True
) )
if party_accounts:
party_account.append(party_accounts[0])
default_advance_account = party_accounts[1] if len(party_accounts) == 2 else None
order_list = list(set(d.get(order_field) for d in self.get("items") if d.get(order_field))) order_list = list(set(d.get(order_field) for d in self.get("items") if d.get(order_field)))
journal_entries = get_advance_journal_entries( journal_entries = get_advance_journal_entries(
@@ -1240,7 +1246,13 @@ class AccountsController(TransactionBase):
) )
payment_entries = get_advance_payment_entries_for_regional( payment_entries = get_advance_payment_entries_for_regional(
party_type, party, party_account, order_doctype, order_list, include_unallocated party_type,
party,
party_account,
order_doctype,
order_list,
default_advance_account,
include_unallocated,
) )
res = journal_entries + payment_entries res = journal_entries + payment_entries