fixed conflict
diff --git a/patches/december_2012/file_list_rename.py b/patches/december_2012/file_list_rename.py
new file mode 100644
index 0000000..52657ac
--- /dev/null
+++ b/patches/december_2012/file_list_rename.py
@@ -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
\ No newline at end of file
diff --git a/patches/patch_list.py b/patches/patch_list.py
index 9e46f91..2e8fc5e 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -735,6 +735,10 @@
},
{
'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',