fix: include Debit To/Credit To account while fetching advance
This commit is contained in:
parent
8e7d47b3a7
commit
3327599c9d
@ -1128,21 +1128,24 @@ class AccountsController(TransactionBase):
|
|||||||
self.append("advances", advance_row)
|
self.append("advances", advance_row)
|
||||||
|
|
||||||
def get_advance_entries(self, include_unallocated=True):
|
def get_advance_entries(self, include_unallocated=True):
|
||||||
|
party_account = []
|
||||||
if self.doctype == "Sales Invoice":
|
if self.doctype == "Sales Invoice":
|
||||||
party_type = "Customer"
|
party_type = "Customer"
|
||||||
party = self.customer
|
party = self.customer
|
||||||
amount_field = "credit_in_account_currency"
|
amount_field = "credit_in_account_currency"
|
||||||
order_field = "sales_order"
|
order_field = "sales_order"
|
||||||
order_doctype = "Sales Order"
|
order_doctype = "Sales Order"
|
||||||
|
party_account.append(self.debit_to)
|
||||||
else:
|
else:
|
||||||
party_type = "Supplier"
|
party_type = "Supplier"
|
||||||
party = self.supplier
|
party = self.supplier
|
||||||
amount_field = "debit_in_account_currency"
|
amount_field = "debit_in_account_currency"
|
||||||
order_field = "purchase_order"
|
order_field = "purchase_order"
|
||||||
order_doctype = "Purchase Order"
|
order_doctype = "Purchase Order"
|
||||||
|
party_account.append(self.credit_to)
|
||||||
|
|
||||||
party_account = get_party_account(
|
party_account.extend(
|
||||||
party_type, party=party, company=self.company, include_advance=True
|
get_party_account(party_type, party=party, company=self.company, include_advance=True)
|
||||||
)
|
)
|
||||||
|
|
||||||
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)))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user