Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
patches/patch_list.py
diff --git a/patches/march_2013/p10_set_fiscal_year_for_stock.py b/patches/march_2013/p10_set_fiscal_year_for_stock.py
new file mode 100644
index 0000000..c9d5202
--- /dev/null
+++ b/patches/march_2013/p10_set_fiscal_year_for_stock.py
@@ -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
+
+
\ No newline at end of file
diff --git a/patches/patch_list.py b/patches/patch_list.py
index 00d6572..2ea10cd 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -216,8 +216,12 @@
"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",
+]
\ No newline at end of file