Merge pull request #604 from Bloomstack/develop

Merge branch develop into staging

Author: sahil28297

bloomstack_core/bloomstack_core/custom/contract.json

@@ -4,7 +4,6 @@
 from frappe.core.utils import find
 from frappe.desk.form.linked_with import get_linked_docs, get_linked_doctypes
 from frappe.utils import date_diff, get_time, getdate, nowdate, to_timedelta, today
-from frappe.utils.user import get_users_with_role
 
 
 def validate_default_license(doc, method):
@@ -85,3 +84,16 @@ def validate_delivery_window(doc, method):
 				))
 
 			frappe.sendmail(recipients=recipients, subject=subject, message=message)
+
+def get_users_with_role(role):
+	# returns users with the specified role
+	user_list = frappe.get_all("User", fields=["`tabUser`.name"],
+		filters = [
+			["Has Role", "role", "=", role],
+			["User", "name", "not in", ["Guest", "Administrator"]],
+			["User", "enabled", "=", 1]
+		],
+		as_list=1
+	)
+
+	return [user for users in user_list for user in users]

bloomstack_core/hook_events/contract.py

@@ -70,7 +70,6 @@
 doctype_js = {
 	"Batch": "public/js/batch.js",
 	"Compliance Settings": "public/js/compliance_settings.js",
-	"Contract": "public/js/contract.js",
 	"Delivery Note": "public/js/delivery_note.js",
 	"Delivery Trip": "public/js/delivery_trip.js",
 	"Driver": "public/js/driver.js",
@@ -94,13 +93,11 @@
 }
 
 override_doctype_dashboards = {
-	"Contract": "bloomstack_core.hook_events.contract.get_data",
 	"Employee": "bloomstack_core.hook_events.employee.get_data"
 }
 
 # doctype_tree_js = {"doctype" : "public/js/doctype_tree.js"}
 doctype_calendar_js = {
-	"Contract": "public/js/contract_calendar.js",
 	"Work Order": "public/js/work_order_calendar.js"
 }
 
@@ -159,16 +156,6 @@
 	"Compliance Settings": {
 		"validate": "bloomstack_core.hook_events.compliance_settings.sync_bloomtrace"
 	},
-	"Contract": {
-		"validate": "bloomstack_core.hook_events.contract.generate_contract_terms_display",
-		"on_update_after_submit": [
-			"bloomstack_core.hook_events.contract.create_project_against_contract",
-			"bloomstack_core.hook_events.contract.create_order_against_contract"
-		],
-		"on_submit": "bloomstack_core.hook_events.contract.create_event_against_contract",
-		"before_submit": "bloomstack_core.hook_events.contract.set_contract_company",
-		"on_cancel": "bloomstack_core.hook_events.contract.create_event_against_contract"
-	},
 	"Customer": {
 		"validate": [
 			"bloomstack_core.hook_events.customer.update_lead_acc_open_date"