From 9dd9150d2c6059d911813e89cf85ead8722bac02 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 1 May 2015 16:39:51 +0530 Subject: [PATCH 1/3] fix for duplicate item --- erpnext/buying/doctype/purchase_common/purchase_common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.py b/erpnext/buying/doctype/purchase_common/purchase_common.py index 25f429a1c54..173f7c761f6 100644 --- a/erpnext/buying/doctype/purchase_common/purchase_common.py +++ b/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): From ba43afc461883774f1a27694b9a87d267dd6f904 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 1 May 2015 16:40:03 +0530 Subject: [PATCH 2/3] fix in chart of cost centers --- erpnext/accounts/page/accounts_browser/accounts_browser.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.py b/erpnext/accounts/page/accounts_browser/accounts_browser.py index 2318588efe3..f7b30a98273 100644 --- a/erpnext/accounts/page/accounts_browser/accounts_browser.py +++ b/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": From ef7d6ae1f560db6b952a42c5272d59530b7df506 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Fri, 1 May 2015 17:12:36 +0600 Subject: [PATCH 3/3] bumped to version 4.25.4 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 2971b7f17dd..54e52d20ca7 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '4.25.3' +__version__ = '4.25.4' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index d1ac22171ef..24fdfb2114d 100644 --- a/erpnext/hooks.py +++ b/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" diff --git a/setup.py b/setup.py index a103bed1c35..6337b78b464 100644 --- a/setup.py +++ b/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()