Merge branch 'develop' into view-projects-in-customer-portal

erpnext/projects/report/billing_summary.py

@@ -98,9 +98,11 @@ def get_timesheets(filters):
 	record_filters = [
 		["start_date", "<=", filters.to_date],
 		["end_date", ">=", filters.from_date],
-		["docstatus", "=", 1],
 	]
-
+	if not filters.get("include_draft_timesheets"):
+		record_filters.append(["docstatus", "=", 1])
+	else:
+		record_filters.append(["docstatus", "!=", 2])
 	if "employee" in filters:
 		record_filters.append(["employee", "=", filters.employee])
 

erpnext/projects/report/delayed_tasks_summary/delayed_tasks_summary.js

@@ -1,6 +1,6 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
-/* eslint-disable */
+
 
 frappe.query_reports["Delayed Tasks Summary"] = {
 	"filters": [

erpnext/projects/report/employee_billing_summary/employee_billing_summary.js

@@ -1,6 +1,6 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
-/* eslint-disable */
+
 
 frappe.query_reports["Employee Billing Summary"] = {
 	"filters": [
@@ -25,5 +25,10 @@ frappe.query_reports["Employee Billing Summary"] = {
 			default: frappe.datetime.add_days(frappe.datetime.month_start(), -1),
 			reqd: 1
 		},
+		{
+			fieldname:"include_draft_timesheets",
+			label: __("Include Timesheets in Draft Status"),
+			fieldtype: "Check",
+		},
 	]
 }

erpnext/projects/report/project_billing_summary/project_billing_summary.js

@@ -1,6 +1,6 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
-/* eslint-disable */
+
 
 frappe.query_reports["Project Billing Summary"] = {
 	"filters": [
@@ -25,5 +25,10 @@ frappe.query_reports["Project Billing Summary"] = {
 			default: frappe.datetime.add_days(frappe.datetime.month_start(),-1),
 			reqd: 1
 		},
+		{
+			fieldname:"include_draft_timesheets",
+			label: __("Include Timesheets in Draft Status"),
+			fieldtype: "Check",
+		},
 	]
 }

erpnext/projects/report/project_summary/project_summary.js

@@ -1,6 +1,6 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
-/* eslint-disable */
+
 
 frappe.query_reports["Project Summary"] = {
 	"filters": [

erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py

@@ -77,7 +77,7 @@ def get_issued_items_cost():
 		"""select se.project, sum(se_item.amount) as amount
 		from `tabStock Entry` se, `tabStock Entry Detail` se_item
 		where se.name = se_item.parent and se.docstatus = 1 and ifnull(se_item.t_warehouse, '') = ''
-		and ifnull(se.project, '') != '' group by se.project""",
+		and se.project != '' group by se.project""",
 		as_dict=1,
 	)