Merge branch 'master' into stable

cgi-bin/core/doctype/search_criteria/search_criteria.py

@@ -28,7 +28,7 @@ class DocType:
 
 	def validate(self):
 		if sql("select name from `tabSearch Criteria` where criteria_name=%s and name!=%s", (self.doc.criteria_name, self.doc.name)):
-			webnots.msgprint("Criteria Name '%s' already used, please use another name" % self.doc.criteria_name, raise_exception = 1)
+			webnotes.msgprint("Criteria Name '%s' already used, please use another name" % self.doc.criteria_name, raise_exception = 1)
 
 	def on_update(self):
 		self.set_module()
@@ -72,4 +72,4 @@ class DocType:
 		if os.path.exists(os.path.join(path, old_name + extn)):
 			os.system('cp %s %s' % (os.path.join(path, old_name + extn), \
 			os.path.join(get_module_path(self.doc.module), 'search_criteria', scrub(self.doc.name), scrub(self.doc.name) + extn)))
-	
+	

cgi-bin/webnotes/model/doctype.py

@@ -294,6 +294,24 @@ def get_property(dt, property):
 	else:
 		return webnotes.conn.get_value('DocType', dt, property)
 
+def get_field_property(dt, fieldname, property):
+	"""
+		get a field property, override it from property setter if specified
+	"""
+	field = webnotes.conn.sql("""
+		select name, `%s` 
+		from tabDocField 
+		where parent=%s and fieldname=%s""" % (property, '%s', '%s'), (dt, fieldname))
+		
+	prop = webnotes.conn.sql("""
+		select value 
+		from `tabProperty Setter` 
+		where doc_type=%s and doc_name=%s and property=%s""", (dt, field[0][0], property))
+	if prop: 
+		return prop[0][0]
+	else:
+		return field[0][1]
+
 def get(dt):
 	"""
 	Load "DocType" - called by form builder, report buider and from code.py (when there is no cache)

cgi-bin/webnotes/model/import_docs.py

@@ -197,11 +197,13 @@ class CSVImport:
 		return out
 
 	def check_select_link_data(self, r, c, f, d, s = '', l = ''):
+		from webnotes.model.doctype import get_field_property
 		options = ''
 		try:
 			if d and f:
-				dt = sql("select options, label from `tabDocField` where fieldname ='%s' and parent = '%s' " % (f, self.dt_list[0]))
-				dt, lbl = (dt and dt[0][0] and dt[0][0].strip() or None), dt and dt[0][1].strip()
+				dt = get_field_property(self.dt_list[0], f, 'options')
+				lbl = get_field_property(self.dt_list[0], f, 'label')
+				
 				if dt:
 					options = l and dt and [n[0] for n in sql("select name from `tab%s` " % (('link:' in dt and dt[5:]) or dt))] or s and dt.split('\n') or ''
 					if options and d not in options :

cgi-bin/webnotes/utils/nestedset.py

@@ -65,7 +65,11 @@ def update_add_node(doctype, name, parent, parent_field):
 	webnotes.conn.sql("update `tab%s` set rgt = rgt+2 where rgt >= %s" %(doctype,right))
 	webnotes.conn.sql("update `tab%s` set lft = lft+2 where lft >= %s" %(doctype,right))
 	
-	#$ update index of new node
+	# update index of new node
+	if webnotes.conn.sql("select * from `tab%s` where lft=%s or rgt=%s"% (doctype, right, right+1)):
+		webnotes.msgprint("Nested set error. Please send mail to support")
+		raise Exception
+
 	webnotes.conn.sql("update `tab%s` set lft=%s, rgt=%s where name='%s'" % (doctype,right,right+1,name))
 	return right