fix(procurement-tracker): concatenate filter conditions with leading whitespaces (#18440)
diff --git a/erpnext/buying/report/procurement_tracker/procurement_tracker.json b/erpnext/buying/report/procurement_tracker/procurement_tracker.json
index 028736c..7e1b165 100644
--- a/erpnext/buying/report/procurement_tracker/procurement_tracker.json
+++ b/erpnext/buying/report/procurement_tracker/procurement_tracker.json
@@ -7,7 +7,7 @@
"doctype": "Report",
"idx": 0,
"is_standard": "Yes",
- "modified": "2019-03-29 17:18:06.678728",
+ "modified": "2019-07-21 23:24:21.094269",
"modified_by": "Administrator",
"module": "Buying",
"name": "Procurement Tracker",
@@ -16,5 +16,12 @@
"ref_doctype": "Purchase Order",
"report_name": "Procurement Tracker",
"report_type": "Script Report",
- "roles": []
+ "roles": [
+ {
+ "role": "Purchase Manager"
+ },
+ {
+ "role": "Purchase User"
+ }
+ ]
}
\ No newline at end of file
diff --git a/erpnext/buying/report/procurement_tracker/procurement_tracker.py b/erpnext/buying/report/procurement_tracker/procurement_tracker.py
index d3ee447..48295be 100644
--- a/erpnext/buying/report/procurement_tracker/procurement_tracker.py
+++ b/erpnext/buying/report/procurement_tracker/procurement_tracker.py
@@ -150,10 +150,10 @@
"""% (filters.get('cost_center'), filters.get('project'))
if filters.get("from_date"):
- conditions += "AND transaction_date>=%s"% filters.get('from_date')
+ conditions += " AND transaction_date>=%s"% filters.get('from_date')
if filters.get("to_date"):
- conditions += "AND transaction_date<=%s"% filters.get('to_date')
+ conditions += " AND transaction_date<=%s"% filters.get('to_date')
return conditions
def get_data(filters):
diff --git a/erpnext/config/buying.py b/erpnext/config/buying.py
index e0f4be9..f5d8da7 100644
--- a/erpnext/config/buying.py
+++ b/erpnext/config/buying.py
@@ -160,6 +160,13 @@
{
"type": "report",
"is_query_report": True,
+ "name": "Procurement Tracker",
+ "reference_doctype": "Purchase Order",
+ "onboard": 1,
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
"name": "Requested Items To Be Ordered",
"reference_doctype": "Material Request",
"onboard": 1,
@@ -228,5 +235,5 @@
}
]
},
-
+
]