Merge branch 'master' of github.com:webnotes/wnframework

py/webnotes/utils/transfer.py

@@ -188,7 +188,7 @@ class UpdateDocType(UpdateDocumentMerge):
 		UpdateDocumentMerge.__init__(self, in_doclist)
 		self.to_update_doctype = ['DocType', 'DocField']
 		
-	def to_udpate(self, d):
+	def to_update(self, d):
 		if (d.fieldtype not in ['Section Break', 'Column Break', 'HTML']) and (d.fieldname or d.label):
 			return 1
 	

py/webnotes/widgets/auto_master.py

@@ -28,7 +28,6 @@ def get_master_fields(dt):
 	if webnotes.session['data']['auto_masters'].get(dt, None)==None:
 		fl = webnotes.conn.sql("select fieldname from tabDocField where fieldtype='Data' and options='Suggest' and parent=%s", dt)
 		webnotes.session['data']['auto_masters'][dt] = fl
-
 	return webnotes.session['data']['auto_masters'][dt]
 		
 
@@ -50,4 +49,4 @@ def add_to_master(fieldname, value):
 		webnotes.conn.sql("insert into `__%s` (`value`) values (%s)" % (fieldname,'%s'), value)
 	except Exception, e:
 		# primary key
-		pass
+		pass

wnf.py

@@ -159,4 +159,4 @@ def run():
 			run(patch_list = sys.argv[2:], log_exception=0)
 
 if __name__=='__main__':
-	run()
+	run()