Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/patches/december_2012/replace_createlocal.py b/patches/december_2012/replace_createlocal.py
new file mode 100644
index 0000000..c6f4bae
--- /dev/null
+++ b/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'""")
\ No newline at end of file
diff --git a/patches/patch_list.py b/patches/patch_list.py
index 645f18c..2e8fc5e 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -737,4 +737,8 @@
'patch_module': 'patches.december_2012',
'patch_file': 'file_list_rename',
},
+ {
+ 'patch_module': 'patches.december_2012',
+ 'patch_file': 'replace_createlocal',
+ },
]
\ No newline at end of file
diff --git a/projects/doctype/task/task_list.js b/projects/doctype/task/task_list.js
index 724505c..5361686 100644
--- a/projects/doctype/task/task_list.js
+++ b/projects/doctype/task/task_list.js
@@ -5,7 +5,6 @@
this.fields = this.fields.concat([
'`tabTask`.subject',
'`tabTask`.project',
- '`tabTask`.modified',
'`tabTask`.status',
'`tabTask`.opening_date',
'`tabTask`.priority',
diff --git a/support/doctype/support_ticket/__init__.py b/support/doctype/support_ticket/__init__.py
index b477b96..a53c76b 100644
--- a/support/doctype/support_ticket/__init__.py
+++ b/support/doctype/support_ticket/__init__.py
@@ -135,7 +135,7 @@
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'])