Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/erpnext/patches/jan_mar_2012/website/all.py b/erpnext/patches/jan_mar_2012/website/all.py
index c68e653..1443f36 100644
--- a/erpnext/patches/jan_mar_2012/website/all.py
+++ b/erpnext/patches/jan_mar_2012/website/all.py
@@ -5,6 +5,7 @@
import patches.jan_mar_2012.website.domain_list
import patches.jan_mar_2012.website.file_data_rename
import patches.jan_mar_2012.website.analytics
+import patches.jan_mar_2012.website.allow_product_delete
def execute():
@@ -15,3 +16,4 @@
patches.jan_mar_2012.website.domain_list.execute()
patches.jan_mar_2012.website.file_data_rename.execute()
patches.jan_mar_2012.website.analytics.execute()
+ patches.jan_mar_2012.website.allow_product_delete.execute()
diff --git a/erpnext/patches/jan_mar_2012/website/allow_product_delete.py b/erpnext/patches/jan_mar_2012/website/allow_product_delete.py
new file mode 100644
index 0000000..fbef48f
--- /dev/null
+++ b/erpnext/patches/jan_mar_2012/website/allow_product_delete.py
@@ -0,0 +1,8 @@
+def execute():
+ """
+ Allow deletion of products
+ """
+ import webnotes
+ webnotes.conn.sql("""UPDATE `tabDocPerm` SET cancel=1
+ WHERE parent='Product' AND role='Website Manager'
+ AND permlevel=0""")