nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: PE in sales register

Browse Source
This commit is contained in:
Gursheen Anand
2023-07-27 10:08:26 +05:30
parent 341709aa0a
commit b1818137e7
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/accounts/report/purchase_register/purchase_register.py
View File

@@ -422,6 +422,7 @@ def get_invoices(filters, additional_query_columns):
def get_payments(filters): def get_payments(filters):
args = frappe._dict( args = frappe._dict(
account="credit_to", account="credit_to",
account_fieldname="paid_to",
party="supplier", party="supplier",
party_name="supplier_name", party_name="supplier_name",
party_account=get_party_account( party_account=get_party_account(

1
erpnext/accounts/report/sales_register/sales_register.py
View File

@@ -462,6 +462,7 @@ def get_invoices(filters, additional_query_columns):
def get_payments(filters): def get_payments(filters):
args = frappe._dict( args = frappe._dict(
account="debit_to", account="debit_to",
account_fieldname="paid_from",
party="customer", party="customer",
party_name="customer_name", party_name="customer_name",
party_account=get_party_account( party_account=get_party_account(

6
erpnext/accounts/report/utils.py
View File

@@ -269,7 +269,7 @@ def get_payment_entries(filters, args):
ConstantColumn("Payment Entry").as_("doctype"), ConstantColumn("Payment Entry").as_("doctype"),
pe.name, pe.name,
pe.posting_date, pe.posting_date,
pe.paid_to.as_(args.account), pe[args.account_fieldname].as_(args.account),
pe.party.as_(args.party), pe.party.as_(args.party),
pe.party_name.as_(args.party_name), pe.party_name.as_(args.party_name),
pe.remarks, pe.remarks,
@@ -279,7 +279,9 @@ def get_payment_entries(filters, args):
pe.project, pe.project,
pe.cost_center, pe.cost_center,
) )
.where((pe.party == filters.get(args.party)) & (pe.paid_to.isin(args.party_account))) .where(
(pe.party == filters.get(args.party)) & (pe[args.account_fieldname].isin(args.party_account))
)
.orderby(pe.posting_date, pe.name, order=Order.desc) .orderby(pe.posting_date, pe.name, order=Order.desc)
) )
query = get_conditions(filters, query, doctype="Payment Entry", payments=True) query = get_conditions(filters, query, doctype="Payment Entry", payments=True)