Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/config/crm.py
View File

@ -117,6 +117,13 @@ def get_data():
"name": "Lead Owner Efficiency", "name": "Lead Owner Efficiency",
"doctype": "Lead", "doctype": "Lead",
"dependencies": ["Lead"] "dependencies": ["Lead"]
},
{
"type": "report",
"is_query_report": True,
"name": "Territory-wise Sales",
"doctype": "Opportunity",
"dependencies": ["Opportunity"]
} }
] ]
}, },

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): def get_opportunities(filters):
conditions = "" conditions = ""
if filters.from_date and filters.to_date: if filters.get('transaction_date'):
conditions = " WHERE transaction_date between %(from_date)s and %(to_date)s" 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 filters.company:
if conditions: if conditions:
@ -108,7 +110,7 @@ def get_opportunities(filters):
return frappe.db.sql(""" return frappe.db.sql("""
SELECT name, territory, opportunity_amount SELECT name, territory, opportunity_amount
FROM `tabOpportunity` {0} FROM `tabOpportunity` {0}
""".format(conditions), filters, as_dict=1) #nosec """.format(conditions), filters, as_dict=1, debug=1) #nosec
def get_quotations(opportunities): def get_quotations(opportunities):
if not opportunities: if not opportunities: