Merge branch 'v4.x.x'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '4.25.3'
+__version__ = '4.25.4'

erpnext/accounts/page/accounts_browser/accounts_browser.py

@@ -21,12 +21,13 @@ def get_children():
 	
 	# root
 	if args['parent'] in ("Accounts", "Cost Centers"):
+		select_cond = ", root_type, report_type" if args["parent"]=="Accounts" else ""
 		acc = frappe.db.sql(""" select 
-			name as value, if(group_or_ledger='Group', 1, 0) as expandable, root_type, report_type
+			name as value, if(group_or_ledger='Group', 1, 0) as expandable %s
 			from `tab%s`
 			where ifnull(parent_%s,'') = ''
 			and `company` = %s	and docstatus<2 
-			order by name""" % (ctype, ctype.lower().replace(' ','_'), '%s'),
+			order by name""" % (select_cond, ctype, ctype.lower().replace(' ','_'), '%s'),
 				company, as_dict=1)
 				
 		if args["parent"]=="Accounts":

erpnext/buying/doctype/purchase_common/purchase_common.py

@@ -97,8 +97,8 @@ class PurchaseCommon(BuyingController):
 					frappe.throw(_("{0} must be a Purchased or Sub-Contracted Item in row {1}").format(d.item_code, d.idx))
 
 			items.append(cstr(d.item_code))
-			if items and len(items) != len(set(items)):
-				frappe.msgprint(_("Warning: Same item has been entered multiple times."))
+		if items and len(items) != len(set(items)):
+			frappe.msgprint(_("Warning: Same item has been entered multiple times."))
 			
 
 	def check_for_stopped_status(self, doctype, docname):

erpnext/hooks.py

@@ -5,7 +5,7 @@ app_publisher = "Web Notes 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 = "4.25.3"
+app_version = "4.25.4"
 
 error_report_email = "support@erpnext.com"
 

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = "4.25.3"
+version = "4.25.4"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()