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

fix: SQL condition

Browse Source
This commit is contained in:
Deepesh Garg
2020-02-26 16:09:58 +05:30
parent 6f35a63f2d
commit f3674ccc6c
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
View File

@@ -39,6 +39,11 @@ class BankReconciliation(Document):
order by t1.posting_date ASC, t1.name DESC order by t1.posting_date ASC, t1.name DESC
""", {"condition":condition, "account": self.account, "from": self.from_date, "to": self.to_date}, as_dict=1) """, {"condition":condition, "account": self.account, "from": self.from_date, "to": self.to_date}, as_dict=1)
condition = ''
if self.bank_account:
condition += 'and bank_account = %(bank_account)s'
payment_entries = frappe.db.sql(""" payment_entries = frappe.db.sql("""
select select
"Payment Entry" as payment_document, name as payment_entry, "Payment Entry" as payment_document, name as payment_entry,
@@ -51,10 +56,10 @@ class BankReconciliation(Document):
where where
(paid_from=%(account)s or paid_to=%(account)s) and docstatus=1 (paid_from=%(account)s or paid_to=%(account)s) and docstatus=1
and posting_date >= %(from)s and posting_date <= %(to)s and posting_date >= %(from)s and posting_date <= %(to)s
and bank_account = %(bank_account)s {condition}
order by order by
posting_date ASC, name DESC posting_date ASC, name DESC
""", {"account": self.account, "from":self.from_date, """.format(condition=condition), {"account": self.account, "from":self.from_date,
"to": self.to_date, "bank_account": self.bank_account}, as_dict=1) "to": self.to_date, "bank_account": self.bank_account}, as_dict=1)
pos_entries = [] pos_entries = []