Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/erpnext/patches/patch.py b/erpnext/patches/patch.py
index 7e8a083..97179ca 100644
--- a/erpnext/patches/patch.py
+++ b/erpnext/patches/patch.py
@@ -5,7 +5,7 @@
#-------------------------------------------
-def execute(patch_no):
+def execute_depricated(patch_no):
import webnotes
from webnotes.modules.module_manager import reload_doc
diff --git a/erpnext/patches/remove_page_break_from_defaults.py b/erpnext/patches/remove_page_break_from_defaults.py
index b565e93..8d842e3 100644
--- a/erpnext/patches/remove_page_break_from_defaults.py
+++ b/erpnext/patches/remove_page_break_from_defaults.py
@@ -1,5 +1,3 @@
def execute():
import webnotes
- webnotes.conn.sql("""\
- DELETE FROM `tabDefaultValue`
- WHERE parent='Control Panel' AND defkey='page_break'""")
+ webnotes.conn.sql("""delete from `tabDefaultValue` where defkey in ('page_break', 'projects', 'packing_details', 'discounts', 'brands', 'item_batch_nos', 'after_sales_installations', 'item_searial_nos', 'item_group_in_details', 'exports', 'imports', 'item_advanced', 'sales_extras', 'more_info', 'quality', 'manufacturing', 'pos', 'item_serial_nos', 'purchase_discounts', 'recurring_invoice') and parent = 'Control Panel'""")