Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v4.x.x'

Browse Source
This commit is contained in:
Pratik Vyas 2015-05-01 16:42:37 +05:30
commit 05f8b6d870
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

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

5
erpnext/accounts/page/accounts_browser/accounts_browser.py
View File

@ -21,12 +21,13 @@ def get_children():
# root # root
if args['parent'] in ("Accounts", "Cost Centers"): if args['parent'] in ("Accounts", "Cost Centers"):
select_cond = ", root_type, report_type" if args["parent"]=="Accounts" else ""
acc = frappe.db.sql(""" select 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` from `tab%s`
where ifnull(parent_%s,'') = '' where ifnull(parent_%s,'') = ''
and `company` = %s and docstatus<2 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) company, as_dict=1)
if args["parent"]=="Accounts": if args["parent"]=="Accounts":

2
erpnext/hooks.py
View File

@ -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_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "4.25.3" app_version = "4.25.4"
error_report_email = "support@erpnext.com" error_report_email = "support@erpnext.com"

2
setup.py
View File

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