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

Merge branch 'develop' into fix-margin-for-filter

Browse Source
This commit is contained in:
Shivam Mishra 2020-08-11 09:11:30 +00:00 committed by GitHub
commit c798c6abbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/party.py
View File

@ -611,7 +611,7 @@ def get_partywise_advanced_payment_amount(party_type, posting_date = None, futur
cond = "posting_date <= '{0}'".format(posting_date) cond = "posting_date <= '{0}'".format(posting_date)
if company: if company:
cond += "and company = '{0}'".format(frappe.db.escape(company)) cond += "and company = {0}".format(frappe.db.escape(company))
data = frappe.db.sql(""" SELECT party, sum({0}) as amount data = frappe.db.sql(""" SELECT party, sum({0}) as amount
FROM `tabGL Entry` FROM `tabGL Entry`

2
erpnext/payroll/doctype/payroll_entry/payroll_entry.py
View File

@ -90,7 +90,7 @@ class PayrollEntry(Document):
cond = '' cond = ''
for f in ['company', 'branch', 'department', 'designation']: for f in ['company', 'branch', 'department', 'designation']:
if self.get(f): if self.get(f):
cond += " and t1." + f + " = '" + self.get(f).replace("'", "\'") + "'" cond += " and t1." + f + " = " + frappe.db.escape(self.get(f))
return cond return cond