Merge branch 'staging' into production

bloomstack_core/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-__version__ = '2.2.4'
+__version__ = '2.3.0'

bloomstack_core/hooks.py

@@ -35,7 +35,6 @@
 	"/assets/bloomstack_core/js/conf.js",
 	"/assets/bloomstack_core/js/query_report.js",
 	"/assets/bloomstack_core/js/banner.js",
-	"/assets/js/address_and_contact.min.js",
 	"/assets/js/bloomstack_desk.js"
 ]
 app_include_css = [
@@ -45,7 +44,6 @@
 	"/assets/bloomstack_core/css/banner.css",
 	"/assets/bloomstack_core/css/desk.css",
 	"/assets/bloomstack_core/css/order_desk.css",
-	"/assets/bloomstack_core/css/address_and_contact.css",
 	"/assets/bloomstack_core/css/contract.css",
 	"/assets/css/reports.min.css"
 ]

bloomstack_core/utils.py

@@ -172,29 +172,3 @@ def create_authorization_request(dt, dn, contact_email, contact_name):
 	new_authorization_request.authorizer_email = contact_email
 	new_authorization_request.authorizer_name = contact_name
 	new_authorization_request.save()
-
-@frappe.whitelist()
-def link_address_or_contact(ref_doctype, ref_name, link_doctype, link_name):
-	doc = frappe.get_doc(ref_doctype, ref_name)
-	doc.append("links", {"link_doctype": link_doctype, "link_name": link_name})
-	doc.save()
-
-
-@frappe.whitelist()
-def unlink_address_or_contact(ref_doctype, ref_name, doctype, name):
-	doc = frappe.get_doc(ref_doctype, ref_name)
-	links = doc.get("links")
-	for data in links:
-		if data.link_doctype == doctype and data.link_name == name:
-			links.remove(data)
-	doc.save()
-
-
-@frappe.whitelist()
-def delete_address_or_contact(ref_doctype, ref_name, doctype, name):
-	doc = frappe.get_doc(ref_doctype, ref_name)
-	links = doc.get("links")
-	if len(links) > 1:
-		unlink_address_or_contact(ref_doctype, ref_name, doctype, name)
-	else:
-		frappe.delete_doc(ref_doctype, ref_name)