nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 20:59:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Add report link in module view and fix date filter

Browse Source
This commit is contained in:
Deepesh Garg
2020-02-06 12:50:25 +05:30
parent 9d9a3d85d8
commit a4928f6f5b
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/selling/report/territory_wise_sales/territory_wise_sales.py
View File

@@ -94,8 +94,10 @@ def get_data(filters=None):
def get_opportunities(filters):
conditions = ""
if filters.from_date and filters.to_date:
conditions = " WHERE transaction_date between %(from_date)s and %(to_date)s"
if filters.get('transaction_date'):
conditions = " WHERE transaction_date between {0} and {1}".format(
frappe.db.escape(filters['transaction_date'][0]),
frappe.db.escape(filters['transaction_date'][1]))
if filters.company:
if conditions:
@@ -108,7 +110,7 @@ def get_opportunities(filters):
return frappe.db.sql("""
SELECT name, territory, opportunity_amount
FROM `tabOpportunity` {0}
""".format(conditions), filters, as_dict=1) #nosec
""".format(conditions), filters, as_dict=1, debug=1) #nosec
def get_quotations(opportunities):
if not opportunities: