Merge branch 'develop'

frappe/__init__.py

@@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template
 
-__version__ = '8.0.3'
+__version__ = '8.0.4'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/core/doctype/user/user.js

@@ -84,7 +84,7 @@ frappe.ui.form.on('User', {
 				}
 			}
 			if (!found){
-				frm.add_custom_button("Create User Email", function() {
+				frm.add_custom_button(__("Create User Email"), function() {
 					frm.events.create_user_email(frm)
 				})
 			}

frappe/core/doctype/user/user.json

@@ -1878,7 +1878,7 @@
  "istable": 0, 
  "max_attachments": 5, 
  "menu_index": 0, 
- "modified": "2017-03-14 14:38:25.869060", 
+ "modified": "2017-04-01 14:38:25.869060", 
  "modified_by": "Administrator", 
  "module": "Core", 
  "name": "User", 

frappe/geo/address_and_contact.py

@@ -41,22 +41,6 @@ def load_address_and_contact(doc, key):
 
 	doc.set_onload('contact_list', contact_list)
 
-def set_default_role(doc, method):
-	'''Set customer, supplier, student based on email'''
-	if frappe.flags.setting_role:
-		return
-	contact_name = frappe.get_value('Contact', dict(email_id=doc.email))
-	if contact_name:
-		contact = frappe.get_doc('Contact', contact_name)
-		for link in contact.links:
-			frappe.flags.setting_role = True
-			if link.link_doctype=='Customer':
-				doc.add_roles('Customer')
-			elif link.link_doctype=='Supplier':
-				doc.add_roles('Supplier')
-	elif frappe.get_value('Student', dict(student_email_id=doc.email)):
-		doc.add_roles('Student')
-
 def has_permission(doc, ptype, user):
 	links = get_permitted_and_not_permitted_links(doc.doctype)
 	if not links.get("not_permitted_links"):
@@ -155,7 +139,7 @@ def filter_dynamic_link_doctypes(doctype, txt, searchfield, start, page_len, fil
 
 	filters.pop("parent")
 	filters.update({
-		"dt": ("not in", [doctype[0] for doctype in doctypes]),
+		"dt": ("not in", [d[0] for d in doctypes]),
 		"dt": ("like", txt),
 	})
 

frappe/patches.txt

@@ -15,7 +15,7 @@ frappe.patches.v8_0.drop_in_dialog
 frappe.patches.v8_0.update_published_in_global_search
 execute:frappe.reload_doc('core', 'doctype', 'custom_docperm')
 execute:frappe.reload_doc('core', 'doctype', 'deleted_document')
-execute:frappe.reload_doc('core', 'doctype', 'version') #2016-12-28
+execute:frappe.reload_doc('core', 'doctype', 'version') #2017-04-01
 frappe.patches.v8_0.rename_page_role_to_has_role #2017-03-16
 frappe.patches.v7_2.setup_custom_perms #2017-01-19
 frappe.patches.v8_0.set_user_permission_for_page_and_report #2017-03-20
@@ -173,4 +173,4 @@ frappe.patches.v7_2.update_communications
 frappe.patches.v8_0.deprecate_integration_broker
 frappe.patches.v8_0.setup_email_inbox #2017-03-29
 frappe.patches.v8_0.newsletter_childtable_migrate
-execute:frappe.db.sql("delete from `tabDesktop Icon` where module_name='Communication'")
+execute:frappe.db.sql("delete from `tabDesktop Icon` where module_name='Communication'")

frappe/patches/v7_2/update_communications.py

@@ -6,10 +6,12 @@ def execute():
 		remove Guest None from sender full name
 		setup feedback request trigger's is_manual field
 	"""
-
+	frappe.reload_doc('core', 'doctype', 'dynamic_link')
+	frappe.reload_doc('email', 'doctype', 'contact')
+	
 	frappe.reload_doc("core", "doctype", "feedback_request")
 	frappe.reload_doc("core", "doctype", "communication")
-
+	
 	if frappe.db.has_column('Communication', 'feedback'):
 		frappe.db.sql("""update tabCommunication set content=ifnull(feedback, "feedback details not provided")
 			where communication_type="Feedback" and content is NULL""")