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

This commit is contained in:
Rushabh Mehta 2013-03-28 10:35:25 +05:30
commit 46adab70e2
3 changed files with 27 additions and 4 deletions

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")

View File

@ -0,0 +1,18 @@
import webnotes
from accounts.utils import get_fiscal_year, FiscalYearError
def execute():
webnotes.reload_doc("stock", "doctype", "stock_entry")
webnotes.reload_doc("stock", "doctype", "stock_reconciliation")
for doctype in ["Stock Entry", "Stock Reconciliation"]:
for name, posting_date in webnotes.conn.sql("""select name, posting_date from `tab%s`
where ifnull(fiscal_year,'')='' and docstatus=1""" % doctype):
try:
fiscal_year = get_fiscal_year(posting_date, 0)[0]
webnotes.conn.sql("""update `tab%s` set fiscal_year=%s where name=%s""" % \
(doctype, "%s", "%s"), (fiscal_year, name))
except FiscalYearError:
pass

View File

@ -216,7 +216,12 @@ patch_list = [
"patches.march_2013.p06_remove_sales_purchase_return_tool",
"execute:webnotes.bean('Global Defaults').save()",
"patches.march_2013.p07_update_project_in_stock_ledger",
"execute:webnotes.reload_doc('stock', 'doctype', 'item') #2013-03-25",
"execute:webnotes.reload_doc('setup', 'doctype', 'item_group') #2013-03-25",
"execute:webnotes.reload_doc('website', 'doctype', 'blog_post') #2013-03-25",
"execute:webnotes.reload_doc('website', 'doctype', 'web_page') #2013-03-25",
"execute:webnotes.bean('Style Settings').save() #2013-03-25",
"execute:webnotes.conn.set_value('Email Settings', None, 'send_print_in_body_and_attachment', 1)",
"patches.march_2013.p09_unset_user_type_partner",
"patches.march_2013.p10_set_fiscal_year_for_stock",
]