| commit | f7a7cc08d9f081e6f2d8555f65db72db216e6028 | [log] [tgz] |
|---|---|---|
| author | Rucha Mahabal <ruchamahabal2@gmail.com> | Tue Aug 11 10:22:32 2020 +0530 |
| committer | GitHub <noreply@github.com> | Tue Aug 11 10:22:32 2020 +0530 |
| tree | d14a8198a7b4963622fa3814892a393dbff30952 | |
| parent | 8118dd9e62971db02c44183c7574bd730dc18eff [diff] | |
| parent | 372abaa42079481cdb0cc39483b6d1d96ee8a894 [diff] |
Merge branch 'develop' into escape-company-field
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py index 28a6519..6f043a0 100644 --- a/erpnext/accounts/party.py +++ b/erpnext/accounts/party.py
@@ -611,7 +611,7 @@ cond = "posting_date <= '{0}'".format(posting_date) if company: - cond += "and company = '{0}'".format(company) + cond += "and company = '{0}'".format(frappe.db.escape(company)) data = frappe.db.sql(""" SELECT party, sum({0}) as amount FROM `tabGL Entry`