From 9dd9150d2c6059d911813e89cf85ead8722bac02 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 1 May 2015 16:39:51 +0530 Subject: [PATCH 1/2] 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 25f429a1c5..173f7c761f 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/2] 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 2318588efe..f7b30a9827 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":