Merge branch 'develop'

config.json

@@ -1,6 +1,6 @@
 {
  "base_template": "lib/website/templates/base.html", 
- "framework_version": "3.9.2", 
+ "framework_version": "3.9.3", 
  "modules": {
   "Calendar": {
    "color": "#2980b9", 

webnotes/utils/email_lib/receive.py

@@ -52,7 +52,10 @@ class IncomingMail:
 		else:
 			# assume that the encoding is utf-8
 			self.subject = self.subject.decode("utf-8")
-
+			
+		if not self.subject:
+			self.subject = "No Subject"
+			
 	def set_content_and_type(self):
 		self.content, self.content_type = '[Blank Email]', 'text/plain'
 		if self.text_content:

webnotes/utils/nestedset.py

@@ -189,7 +189,7 @@ class DocTypeNestedSet(object):
 		self.doc.fields[self.nsm_parent_field] = ""
 		update_nsm(self)
 		
-	def before_rename(self, newdn, olddn, merge=False, group_fname="is_group"):
+	def before_rename(self, olddn, newdn, merge=False, group_fname="is_group"):
 		if merge:
 			is_group = webnotes.conn.get_value(self.doc.doctype, newdn, group_fname)
 			if self.doc.fields[group_fname] != is_group: