fixed conflict

This commit is contained in:
Nabin Hait 2012-12-13 18:39:08 +05:30
commit d5d54c24b5
3 changed files with 14 additions and 1 deletions

View File

@ -0,0 +1,10 @@
import webnotes
def execute():
for dt in webnotes.conn.sql("""select distinct parent from tabDocField
where fieldname='file_list'"""):
try:
webnotes.conn.sql("""update `tab%s` set file_list =
replace(file_list, "-", "")""" % dt[0])
except Exception, e:
if e.args[0]!=1146: raise e

View File

@ -733,6 +733,10 @@ patch_list = [
'patch_module': 'patches.december_2012',
'patch_file': 'fix_default_print_format',
},
{
'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',