fix: Add report link in module view and fix date filter
diff --git a/erpnext/config/crm.py b/erpnext/config/crm.py
index cf10219..09c2a65 100644
--- a/erpnext/config/crm.py
+++ b/erpnext/config/crm.py
@@ -117,6 +117,13 @@
"name": "Lead Owner Efficiency",
"doctype": "Lead",
"dependencies": ["Lead"]
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Territory-wise Sales",
+ "doctype": "Opportunity",
+ "dependencies": ["Opportunity"]
}
]
},
diff --git a/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py b/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py
index 415d078..656ff33 100644
--- a/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py
+++ b/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py
@@ -94,8 +94,10 @@
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 @@
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: