Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
patches/patch_list.py
diff --git a/patches/february_2013/p03_material_request.py b/patches/february_2013/p03_material_request.py
index 1a9a433..66b2bf6 100644
--- a/patches/february_2013/p03_material_request.py
+++ b/patches/february_2013/p03_material_request.py
@@ -3,10 +3,10 @@
def execute():
webnotes.reload_doc("core", "doctype", "doctype")
- tables = webnotes.conn.sql_list("sthow tables")
- if not "Material Request Item" in tables:
+ tables = webnotes.conn.sql_list("show tables")
+ if not "tabMaterial Request Item" in tables:
webnotes.rename_doc("DocType", "Purchase Request Item", "Material Request Item", force=True)
- if not "Material Request" in tables:
+ if not "tabMaterial Request" in tables:
webnotes.rename_doc("DocType", "Purchase Request", "Material Request", force=True)
webnotes.reload_doc("buying", "search_criteria", "pending_po_items_to_bill")
webnotes.reload_doc("buying", "search_criteria", "pending_po_items_to_receive")
@@ -22,4 +22,4 @@
os.system("rm -rf app/hr/doctype/holiday_block_list")
os.system("rm -rf app/hr/doctype/holiday_block_list_allow")
os.system("rm -rf app/hr/doctype/holiday_block_list_date")
-
\ No newline at end of file
+