Merge branch 'master' of github.com:webnotes/erpnext

Conflicts:
	patches/patch_list.py
This commit is contained in:
Anand Doshi 2013-03-27 17:36:43 +05:30
commit c1fd51b04a

View File

@ -3,10 +3,10 @@ import webnotes, os, sys
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 @@ def execute():
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")