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

erpnext/buying/doctype/supplier/supplier.txt

@@ -333,4 +333,4 @@
 		'oldfieldtype': 'Small Text',
 		'permlevel': 1
 	}
-]
+]

erpnext/projects/doctype/ticket/ticket.py

@@ -9,6 +9,7 @@ from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updated
 from webnotes import session, form, is_testing, msgprint, errprint
 
 sql = webnotes.conn.sql
+set = webnotes.conn.set
 
 # -----------------------------------------------------------------------------------------
 
@@ -164,4 +165,4 @@ class DocType:
     return cstr('true')
   
   def on_cancel(self):
-    self.cancel_task()
+    self.cancel_task()