Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/erpnext/buying/doctype/supplier/supplier.txt b/erpnext/buying/doctype/supplier/supplier.txt
index a7a08c3..0834898 100644
--- a/erpnext/buying/doctype/supplier/supplier.txt
+++ b/erpnext/buying/doctype/supplier/supplier.txt
@@ -333,4 +333,4 @@
'oldfieldtype': 'Small Text',
'permlevel': 1
}
-]
\ No newline at end of file
+]
diff --git a/erpnext/projects/doctype/ticket/ticket.py b/erpnext/projects/doctype/ticket/ticket.py
index 0f18b21..baf85e7 100644
--- a/erpnext/projects/doctype/ticket/ticket.py
+++ b/erpnext/projects/doctype/ticket/ticket.py
@@ -9,6 +9,7 @@
from webnotes import session, form, is_testing, msgprint, errprint
sql = webnotes.conn.sql
+set = webnotes.conn.set
# -----------------------------------------------------------------------------------------
@@ -164,4 +165,4 @@
return cstr('true')
def on_cancel(self):
- self.cancel_task()
\ No newline at end of file
+ self.cancel_task()