Merge branch 'develop'

party model patch fix

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '5.0.3'
+__version__ = '5.0.6'

erpnext/accounts/utils.py

@@ -18,11 +18,11 @@ def get_fiscal_year(date=None, fiscal_year=None, label="Date", verbose=1, compan
 
 def get_fiscal_years(transaction_date=None, fiscal_year=None, label="Date", verbose=1, company=None):
 	# if year start date is 2012-04-01, year end date should be 2013-03-31 (hence subdate)
-	cond = ""
+	cond = " ifnull(disabled, 0) = 0"
 	if fiscal_year:
-		cond = "fy.name = %(fiscal_year)s"
+		cond += " and fy.name = %(fiscal_year)s"
 	else:
-		cond = "%(transaction_date)s >= fy.year_start_date and %(transaction_date)s <= fy.year_end_date"
+		cond += " and %(transaction_date)s >= fy.year_start_date and %(transaction_date)s <= fy.year_end_date"
 
 	if company:
 		cond += """ and (not exists(select name from `tabFiscal Year Company` fyc where fyc.parent = fy.name)
@@ -36,7 +36,7 @@ def get_fiscal_years(transaction_date=None, fiscal_year=None, label="Date", verb
 		})
 
 	if not fy:
-		error_msg = _("""{0} {1} not in any Fiscal Year. For more details check {2}.""").format(label, formatdate(transaction_date), "https://erpnext.com/kb/accounts/fiscal-year-error")
+		error_msg = _("""{0} {1} not in any active Fiscal Year. For more details check {2}.""").format(label, formatdate(transaction_date), "https://erpnext.com/kb/accounts/fiscal-year-error")
 		if verbose==1: frappe.msgprint(error_msg)
 		raise FiscalYearError, error_msg
 	return fy

erpnext/hooks.py

@@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd. and Contributors"
 app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "5.0.3"
+app_version = "5.0.6"
 
 error_report_email = "support@erpnext.com"
 

erpnext/patches/v4_2/party_model.py

@@ -96,15 +96,16 @@ def set_party_in_jv_and_gl_entry(receivable_payable_accounts):
 				frappe.db.commit()
 
 def delete_individual_party_account():
-	frappe.db.sql("""delete from `tabAccount` acc 
+	frappe.db.sql("""delete from `tabAccount` 
-		where ifnull(acc.master_type, '') in ('Customer', 'Supplier')
+		where ifnull(master_type, '') in ('Customer', 'Supplier') 
-		and ifnull(acc.master_name, '') != '' 
+			and ifnull(master_name, '') != '' 
-		and not exists(select gle.name from `tabGL Entry` gle where gle.account = acc.name)""")
+			and not exists(select gle.name from `tabGL Entry` gle 
+				where gle.account = tabAccount.name)""")
 		
-	accounts_not_deleted = frappe.db.sql_list("""select name from `tabAccount` acc 
+	accounts_not_deleted = frappe.db.sql_list("""select tabAccount.name from `tabAccount` 
-		where ifnull(acc.master_type, '') in ('Customer', 'Supplier')
+		where ifnull(master_type, '') in ('Customer', 'Supplier')
-		and ifnull(acc.master_name, '') != '' 
+		and ifnull(master_name, '') != '' 
-		and exists(select gle.name from `tabGL Entry` gle where gle.account = acc.name)""")
+		and exists(select gle.name from `tabGL Entry` gle where gle.account = tabAccount.name)""")
 		
 	if accounts_not_deleted:
 		print "Accounts not deleted: " + "\n".join(accounts_not_deleted)

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "5.0.3"
+version = "5.0.6"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()