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

fix: fetch ple with party type employee in AP

Browse Source
This commit is contained in:
Gursheen Anand 2023-07-26 16:42:06 +05:30
parent 2c1943c7e6
commit c47a37c3ab
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
View File

@ -421,6 +421,10 @@ class ReceivablePayableReport(object):
# customer / supplier name
party_details = self.get_party_details(row.party) or {}
row.update(party_details)
if row.voucher_type == "Expense Claim":
row.party_type = "Employee"
else:
row.party_type = self.party_type
if self.filters.get(scrub(self.filters.party_type)):
row.currency = row.account_currency
else:
@ -747,7 +751,10 @@ class ReceivablePayableReport(object):
def prepare_conditions(self):
self.qb_selection_filter = []
party_type_field = scrub(self.party_type)
self.qb_selection_filter.append(self.ple.party_type == self.party_type)
if self.party_type == "Supplier":
self.qb_selection_filter.append(self.ple.party_type.isin([self.party_type, "Employee"]))
else:
self.qb_selection_filter.append(self.ple.party_type == self.party_type)
self.add_common_filters(party_type_field=party_type_field)
@ -901,10 +908,16 @@ class ReceivablePayableReport(object):
self.columns = []
self.add_column("Posting Date", fieldtype="Date")
self.add_column(
label=_(self.party_type),
label="Party Type",
fieldname="party_type",
fieldtype="Data",
width=100,
)
self.add_column(
label="Party",
fieldname="party",
fieldtype="Link",
options=self.party_type,
fieldtype="Dynamic Link",
options="party_type",
width=180,
)
self.add_column(