Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Anand Doshi 2011-12-14 20:36:11 +05:30
commit a51aefbced
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/buying/doctype/supplier/supplier.txt
View File

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

3
erpnext/projects/doctype/ticket/ticket.py
View File

@ -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 from webnotes import session, form, is_testing, msgprint, errprint
sql = webnotes.conn.sql sql = webnotes.conn.sql
set = webnotes.conn.set
# ----------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------
@ -164,4 +165,4 @@ class DocType:
return cstr('true') return cstr('true')
def on_cancel(self): def on_cancel(self):
self.cancel_task() self.cancel_task()