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

patches/december_2012/replace_createlocal.py

@@ -0,0 +1,5 @@
+def execute():
+	import webnotes
+	webnotes.conn.sql("""update `tabCustom Script` 
+		set script = replace(script, 'createLocal', 'wn.model.make_new_doc_and_get_name') 
+		where script_type='Client'""")

patches/patch_list.py

@@ -737,4 +737,8 @@ patch_list = [
 		'patch_module': 'patches.december_2012',
 		'patch_file': 'file_list_rename',
 	},
+	{
+		'patch_module': 'patches.december_2012',
+		'patch_file': 'replace_createlocal',
+	},
 ]

projects/doctype/task/task_list.js

@@ -5,7 +5,6 @@ wn.doclistviews['Task'] = wn.views.ListView.extend({
 		this.fields = this.fields.concat([
 			'`tabTask`.subject',
 			'`tabTask`.project',
-			'`tabTask`.modified',
 			'`tabTask`.status',
 			'`tabTask`.opening_date',
 			'`tabTask`.priority',

support/doctype/support_ticket/__init__.py

@@ -135,7 +135,7 @@ class SupportMailbox(POP3Mailbox):
 		from webnotes.utils.file_manager import save_file, add_file_list
 		for attachment in attachment_list:
 			fid = save_file(attachment['filename'], attachment['content'], 'Support')
-			status = add_file_list('Support Ticket', doc.name, attachment['filename'], fid)
+			status = add_file_list('Support Ticket', doc.name, fid, fid)
 			if not status:
 				doc.description = doc.description \
 					+ "\nCould not attach: " + cstr(attachment['filename'])