fix: PE in sales register
This commit is contained in:
parent
341709aa0a
commit
b1818137e7
@ -422,6 +422,7 @@ def get_invoices(filters, additional_query_columns):
|
||||
def get_payments(filters):
|
||||
args = frappe._dict(
|
||||
account="credit_to",
|
||||
account_fieldname="paid_to",
|
||||
party="supplier",
|
||||
party_name="supplier_name",
|
||||
party_account=get_party_account(
|
||||
|
@ -462,6 +462,7 @@ def get_invoices(filters, additional_query_columns):
|
||||
def get_payments(filters):
|
||||
args = frappe._dict(
|
||||
account="debit_to",
|
||||
account_fieldname="paid_from",
|
||||
party="customer",
|
||||
party_name="customer_name",
|
||||
party_account=get_party_account(
|
||||
|
@ -269,7 +269,7 @@ def get_payment_entries(filters, args):
|
||||
ConstantColumn("Payment Entry").as_("doctype"),
|
||||
pe.name,
|
||||
pe.posting_date,
|
||||
pe.paid_to.as_(args.account),
|
||||
pe[args.account_fieldname].as_(args.account),
|
||||
pe.party.as_(args.party),
|
||||
pe.party_name.as_(args.party_name),
|
||||
pe.remarks,
|
||||
@ -279,7 +279,9 @@ def get_payment_entries(filters, args):
|
||||
pe.project,
|
||||
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)
|
||||
)
|
||||
query = get_conditions(filters, query, doctype="Payment Entry", payments=True)
|
||||
|
Loading…
x
Reference in New Issue
Block a user