Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
diff --git a/erpnext/patches/may_2012/__init__.py b/erpnext/patches/may_2012/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/patches/may_2012/__init__.py
diff --git a/erpnext/patches/may_2012/cleanup_property_setter.py b/erpnext/patches/may_2012/cleanup_property_setter.py
new file mode 100644
index 0000000..f4e3ef8
--- /dev/null
+++ b/erpnext/patches/may_2012/cleanup_property_setter.py
@@ -0,0 +1,5 @@
+def execute():
+ import webnotes
+ webnotes.conn.sql("delete from `tabProperty Setter` where property in ('width', 'previous_field')")
+
+ webnotes.conn.sql("delete from `tabSingles` where field = 'footer_font_color' and doctype = 'Style Settings'")
diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py
index 8002078..e491b4c 100644
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -312,5 +312,10 @@
'patch_file': 'repost_stock_for_posting_time',
'description': 'repost stock for posting time 00:00:seconds'
},
+ {
+ 'patch_module': 'patches.may_2012',
+ 'patch_file': 'cleanup_property_setter',
+ 'description': 'cleanup_property_setter'
+ },
]