Merge branch 'master' into staging-fixes

frappe/__init__.py

@@ -17,7 +17,7 @@ from faker import Faker
 from .exceptions import *
 from .utils.jinja import (get_jenv, get_template, render_template, get_email_from_template, get_jloader)
 
-__version__ = '10.1.49'
+__version__ = '10.1.49-beta.1'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/model/base_document.py

@@ -319,7 +319,6 @@ class BaseDocument(object):
 						self.db_insert()
 						return
 
-					frappe.msgprint(_("Duplicate name {0} {1}").format(self.doctype, self.name))
 					raise frappe.DuplicateEntryError(self.doctype, self.name, e)
 
 				elif "Duplicate" in cstr(e.args[1]):

frappe/model/document.py

@@ -458,13 +458,12 @@ class Document(BaseDocument):
 			d._extract_images_from_text_editor()
 			d._sanitize_content()
 			d._save_passwords()
-
-		self.validate_set_only_once()
-
 		if self.is_new():
 			# don't set fields like _assign, _comments for new doc
 			for fieldname in optional_fields:
 				self.set(fieldname, None)
+		else:
+			self.validate_set_only_once()
 
 	def validate_workflow(self):
 		'''Validate if the workflow transition is valid'''
@@ -576,7 +575,7 @@ class Document(BaseDocument):
 		if not df:
 			df = self.meta.get_field(fieldname)
 
-		return df.permlevel in self.get_permlevel_access()
+		return df.permlevel in self.get_permlevel_access(permission_type)
 
 	def get_permissions(self):
 		if self.meta.istable:

frappe/utils/csvutils.py

@@ -147,6 +147,8 @@ def import_doc(d, doctype, overwrite, row_idx, submit=False, ignore_links=False)
 			doc.update(d)
 			if d.get("docstatus") == 1:
 				doc.update_after_submit()
+			elif d.get("docstatus") == 0 and submit:
+				doc.submit()
 			else:
 				doc.save()
 			return 'Updated row (#%d) %s' % (row_idx + 1, getlink(doctype, d['name']))