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

Conflicts:
	erpnext/projects/doctype/ticket/ticket.py
This commit is contained in:
Nijil Y
2011-12-21 12:34:13 +05:30
80 changed files with 2429 additions and 423 deletions

View File

@@ -10,6 +10,7 @@ from webnotes import session, form, is_testing, msgprint, errprint
sql = webnotes.conn.sql
set = webnotes.conn.set
get_value = webnotes.conn.get_value
# -----------------------------------------------------------------------------------------