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

This commit is contained in:
Rushabh Mehta 2012-12-14 10:27:42 +05:30
commit c248e2769e
4 changed files with 10 additions and 2 deletions

View File

@ -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'""")

View File

@ -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',
},
]

View File

@ -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',

View File

@ -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'])