Merge branch 'develop'

frappe/__version__.py

 from __future__ import unicode_literals
-__version__ = "5.1.0"
+__version__ = "5.1.1"

frappe/app.py

@@ -70,6 +70,7 @@ def application(request):
 
 	except Exception, e:
 		http_status_code = getattr(e, "http_status_code", 500)
+		#print frappe.get_traceback()
 
 		if (http_status_code==500
 			and isinstance(e, MySQLdb.OperationalError)

frappe/auth.py

@@ -82,8 +82,13 @@ class LoginManager:
 		if frappe.local.form_dict.get('cmd')=='login' or frappe.local.request.path=="/api/method/login":
 			self.login()
 		else:
-			self.make_session(resume=True)
-			self.set_user_info(resume=True)
+			try:
+				self.make_session(resume=True)
+				self.set_user_info(resume=True)
+			except AttributeError:
+				self.user = "Guest"
+				self.make_session()
+				self.set_user_info()
 
 	def login(self):
 		# clear cache
@@ -104,7 +109,8 @@ class LoginManager:
 
 		self.info = frappe.db.get_value("User", self.user,
 			["user_type", "first_name", "last_name", "user_image"], as_dict=1)
-		self.full_name = " ".join(filter(None, [self.info.first_name, self.info.last_name]))
+		self.full_name = " ".join(filter(None, [self.info.first_name,
+			self.info.last_name]))
 		self.user_type = self.info.user_type
 
 		if self.info.user_type=="Website User":

frappe/change_log/v5/v5_1_1.md

+- Ability to **Share with Everyone** (except Guest) using **Share With**

frappe/core/doctype/docshare/docshare.json

@@ -26,7 +26,7 @@
    "print_hide": 0, 
    "read_only": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0
   }, 
@@ -129,6 +129,13 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0
+  }, 
+  {
+   "fieldname": "everyone", 
+   "fieldtype": "Check", 
+   "label": "Everyone", 
+   "permlevel": 0, 
+   "precision": ""
   }
  ], 
  "hide_heading": 0, 
@@ -138,7 +145,7 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-02-12 11:30:52.968078", 
+ "modified": "2015-07-17 07:02:10.632582", 
  "modified_by": "Administrator", 
  "module": "Core", 
  "name": "DocShare", 

frappe/core/doctype/docshare/docshare.py

@@ -11,6 +11,7 @@ class DocShare(Document):
 	no_feed_on_delete = True
 
 	def validate(self):
+		self.validate_user()
 		self.check_share_permission()
 		self.cascade_permissions_downwards()
 		self.get_doc().run_method("validate_share", self)
@@ -26,6 +27,12 @@ class DocShare(Document):
 			self._doc = frappe.get_doc(self.share_doctype, self.share_name)
 		return self._doc
 
+	def validate_user(self):
+		if self.everyone:
+			self.user = None
+		elif not self.user:
+			frappe.throw(_("User is mandatory for Share"), frappe.MandatoryError)
+
 	def check_share_permission(self):
 		if (not self.flags.ignore_share_permission and
 			not frappe.has_permission(self.share_doctype, "share", self.get_doc())):

frappe/core/doctype/docshare/test_docshare.py

@@ -78,3 +78,15 @@ class TestDocShare(unittest.TestCase):
 		frappe.set_user(self.user)
 		self.assertFalse(self.event.has_permission("share"))
 
+	def test_share_with_everyone(self):
+		self.assertTrue(self.event.name not in frappe.share.get_shared("Event", self.user))
+
+		frappe.share.set_permission("Event", self.event.name, None, "read", everyone=1)
+		self.assertTrue(self.event.name in frappe.share.get_shared("Event", self.user))
+		self.assertTrue(self.event.name in frappe.share.get_shared("Event", "test1@example.com"))
+		self.assertTrue(self.event.name not in frappe.share.get_shared("Event", "Guest"))
+
+		frappe.share.set_permission("Event", self.event.name, None, "read", value=0, everyone=1)
+		self.assertTrue(self.event.name not in frappe.share.get_shared("Event", self.user))
+		self.assertTrue(self.event.name not in frappe.share.get_shared("Event", "test1@example.com"))
+		self.assertTrue(self.event.name not in frappe.share.get_shared("Event", "Guest"))

frappe/desk/form/load.py

@@ -89,7 +89,7 @@ def get_docinfo(doc=None, doctype=None, name=None):
 		"assignments": get_assignments(doc.doctype, doc.name),
 		"permissions": get_doc_permissions(doc),
 		"shared": frappe.share.get_users(doc.doctype, doc.name,
-			fields=["user", "read", "write", "share"])
+			fields=["user", "read", "write", "share", "everyone"])
 	}
 
 def get_user_permissions(meta):

frappe/email/doctype/email_account/email_account.json

@@ -388,6 +388,7 @@
   {
    "allow_on_submit": 0, 
    "depends_on": "enable_auto_reply", 
+   "description": "ProTip: Add <code>Reference: {{ reference_doctype }} {{ reference_name }}</code> to send document reference", 
    "fieldname": "auto_reply_message", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -428,7 +429,7 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-06-11 00:16:24.026081", 
+ "modified": "2015-07-16 10:11:06.466258", 
  "modified_by": "Administrator", 
  "module": "Email", 
  "name": "Email Account", 

frappe/email/doctype/email_account/email_account.py

@@ -5,8 +5,9 @@ from __future__ import unicode_literals
 import frappe
 from frappe import _
 from frappe.model.document import Document
-from frappe.utils import validate_email_add, cint, get_datetime, DATE_FORMAT, strip
+from frappe.utils import validate_email_add, cint, get_datetime, DATE_FORMAT, strip, comma_or
 from frappe.utils.user import is_system_user
+from frappe.utils.jinja import render_template
 from frappe.email.smtp import SMTPServer
 from frappe.email.receive import POP3Server, Email
 from poplib import error_proto
@@ -54,6 +55,11 @@ class EmailAccount(Document):
 			for e in self.get_unreplied_notification_emails():
 				validate_email_add(e, True)
 
+		if self.enable_incoming and self.append_to:
+			valid_doctypes = [d[0] for d in get_append_to()]
+			if self.append_to not in valid_doctypes:
+				frappe.throw(_("Append To can be one of {0}").format(comma_or(valid_doctypes)))
+
 	def on_update(self):
 		"""Check there is only one default of each type."""
 		self.there_must_be_only_one_default()
@@ -182,10 +188,11 @@ class EmailAccount(Document):
 				sender_field = None
 
 		if in_reply_to:
-			if "@" in in_reply_to:
+			if "@{0}".format(frappe.local.site) in in_reply_to:
 
 				# reply to a communication sent from the system
-				in_reply_to = in_reply_to.split("@", 1)[0]
+				in_reply_to, domain = in_reply_to.split("@", 1)
+
 				if frappe.db.exists("Communication", in_reply_to):
 					parent = frappe.get_doc("Communication", in_reply_to)
 
@@ -241,6 +248,7 @@ class EmailAccount(Document):
 				else:
 					parent = None
 
+			# NOTE if parent isn't found and there's no subject match, it is likely that it is a new conversation thread and hence is_first = True
 			communication.is_first = True
 
 		if parent:
@@ -249,14 +257,14 @@ class EmailAccount(Document):
 
 	def send_auto_reply(self, communication, email):
 		"""Send auto reply if set."""
-		if self.auto_reply_message:
+		if self.enable_auto_reply:
 			communication.set_incoming_outgoing_accounts()
 
 			frappe.sendmail(recipients = [email.from_email],
 				sender = self.email_id,
 				reply_to = communication.incoming_email_account,
 				subject = _("Re: ") + communication.subject,
-				content = self.auto_reply_message or \
+				content = render_template(self.auto_reply_message or "", communication.as_dict()) or \
 					 frappe.get_template("templates/emails/auto_reply.html").render(communication.as_dict()),
 				reference_doctype = communication.reference_doctype,
 				reference_name = communication.reference_name,
@@ -275,7 +283,7 @@ class EmailAccount(Document):
 		frappe.db.sql("update `tabCommunication` set email_account='' where email_account=%s", self.name)
 
 @frappe.whitelist()
-def get_append_to(doctype, txt, searchfield, start, page_len, filters):
+def get_append_to(doctype=None, txt=None, searchfield=None, start=None, page_len=None, filters=None):
 	if not txt: txt = ""
 	return [[d] for d in frappe.get_hooks("email_append_to") if txt in d]
 

frappe/hooks.py

@@ -4,7 +4,7 @@ app_title = "Frappe Framework"
 app_publisher = "Frappe Technologies Pvt. Ltd."
 app_description = "Full Stack Web Application Framework in Python"
 app_icon = "octicon octicon-circuit-board"
-app_version = "5.1.0"
+app_version = "5.1.1"
 app_color = "orange"
 
 app_email = "support@frappe.io"

frappe/model/base_document.py

@@ -261,7 +261,7 @@ class BaseDocument(object):
 					return
 				type, value, traceback = sys.exc_info()
 				frappe.msgprint(_("Duplicate name {0} {1}").format(self.doctype, self.name))
-				raise frappe.NameError, (self.doctype, self.name, e), traceback
+				raise frappe.DuplicateEntryError, (self.doctype, self.name, e), traceback
 			else:
 				raise
 

frappe/model/db_query.py

@@ -270,7 +270,6 @@ class DatabaseQuery(object):
 		"""add match conditions if applicable"""
 		self.match_filters = []
 		self.match_conditions = []
-
 		only_if_shared = False
 
 		if not self.tables: self.extract_tables()
@@ -295,10 +294,6 @@ class DatabaseQuery(object):
 				self.add_user_permissions(user_permissions,
 					user_permission_doctypes=role_permissions.get("user_permission_doctypes").get("read"))
 
-				# share is an OR condition, if there is a role permission
-				if not only_if_shared and self.shared:
-					self.match_conditions.append(self.get_share_condition())
-
 		if as_condition:
 			conditions = ""
 			if self.match_conditions:
@@ -309,6 +304,14 @@ class DatabaseQuery(object):
 			if doctype_conditions:
 				conditions += (' and ' + doctype_conditions) if conditions else doctype_conditions
 
+			# share is an OR condition, if there is a role permission
+			if not only_if_shared and self.shared:
+				if conditions:
+					conditions =  "({conditions}) or ({shared_condition})".format(
+						conditions=conditions, shared_condition=self.get_share_condition())
+				else:
+					conditions = "{shared_condition}".format(shared_condition=self.get_share_condition())
+
 			return conditions
 
 		else:

frappe/model/utils.py

-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt
-
-from __future__ import unicode_literals
-import frappe, json
-from frappe import _
-"""
-Model utilities, unclassified functions
-"""
-
-def set_default(doc, key):
-	"""Set is_default property of given doc and unset all others filtered by given key."""
-	if not doc.is_default:
-		frappe.db.set(doc, "is_default", 1)
-
-	frappe.db.sql("""update `tab%s` set `is_default`=0
-		where `%s`=%s and name!=%s""" % (doc.doctype, key, "%s", "%s"),
-		(doc.get(key), doc.name))

frappe/model/utils/rename_field.py

@@ -5,6 +5,7 @@ from __future__ import unicode_literals
 
 import frappe
 import json
+from frappe.model import no_value_fields
 
 def rename_field(doctype, old_fieldname, new_fieldname):
 	"""This functions assumes that doctype is already synced"""

frappe/patches/v4_0/rename_profile_to_user.py

 from __future__ import unicode_literals
 import frappe
 
-from frappe.model.utils import rename_field
+from frappe.model.utils.rename_field import rename_field
 from frappe.model.meta import get_table_columns
 
 def execute():

frappe/patches/v4_0/rename_sitemap_to_route.py

 from __future__ import unicode_literals
 import frappe
 
-from frappe.model.utils import rename_field
+from frappe.model.utils.rename_field import rename_field
 
 def execute():
 	tables = frappe.db.sql_list("show tables")

frappe/patches/v5_0/rename_table_fieldnames.py

@@ -2,7 +2,7 @@
 # License: GNU General Public License v3. See license.txt
 
 import frappe
-from frappe.model.utils import rename_field
+from frappe.model.utils.rename_field import rename_field
 from frappe.modules import scrub, get_doctype_module
 
 rename_map = {

frappe/permissions.py

@@ -40,15 +40,16 @@ def has_permission(doctype, ptype="read", doc=None, verbose=False, user=None):
 
 	def false_if_not_shared():
 		if ptype in ("read", "write", "share", "email", "print"):
-			shared = frappe.share.get_shared(doctype, user, 
-				["read" if ptype in ("email", "print") else ptype])
 			if doc:
 				doc_name = doc if isinstance(doc, basestring) else doc.name
+				shared = frappe.share.get_shared(doctype, user,
+					["read" if ptype in ("email", "print") else ptype])
+
 				if doc_name in shared:
 					if verbose: print "Shared"
 					if ptype in ("read", "write", "share") or meta.permissions[0].get(ptype):
 						return True
-					
+
 			else:
 				if verbose: print "Has a shared document"
 				return True

frappe/public/css/avatar.css

@@ -12,6 +12,7 @@
 }
 .avatar-empty {
   border: 1px dashed #d1d8dd;
+  border-radius: 4px;
 }
 .avatar-small {
   margin-right: 5px;