From 8cf90f18f0a3de7c7039363f3a15e9a31cae9af9 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 24 Jan 2013 14:58:21 +0530 Subject: [PATCH] check item/item group with same name while creating item group/item --- setup/doctype/item_group/item_group.py | 14 +++++++++++--- stock/doctype/item/item.py | 15 ++++++++++----- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/setup/doctype/item_group/item_group.py b/setup/doctype/item_group/item_group.py index 5fc5e917b0..32c5d527c0 100644 --- a/setup/doctype/item_group/item_group.py +++ b/setup/doctype/item_group/item_group.py @@ -24,10 +24,13 @@ class DocType(DocTypeNestedSet): def __init__(self, doc, doclist=[]): self.doc = doc self.doclist = doclist - self.nsm_parent_field = 'parent_item_group'; - + self.nsm_parent_field = 'parent_item_group' + def on_update(self): super(DocType, self).on_update() + + self.validate_name_with_item() + if self.doc.show_in_website: # webpage updates from website.utils import update_page_name @@ -42,7 +45,12 @@ class DocType(DocTypeNestedSet): from website.helpers.product import invalidate_cache_for invalidate_cache_for(self.doc.name) - + + def validate_name_with_item(self): + if webnotes.conn.exists("Item", self.doc.name): + webnotes.msgprint("An item exists with same name (%s), please change the \ + item group name or rename the item" % self.doc.name, raise_exception=1) + def prepare_template_args(self): from website.helpers.product import get_product_list_for_group, \ get_parent_item_groups, get_group_item_count diff --git a/stock/doctype/item/item.py b/stock/doctype/item/item.py index 748f01a759..eab977bc91 100644 --- a/stock/doctype/item/item.py +++ b/stock/doctype/item/item.py @@ -18,9 +18,8 @@ from __future__ import unicode_literals import webnotes from webnotes.utils import cstr, flt -from webnotes.model import db_exists from webnotes.model.doc import addchild -from webnotes.model.wrapper import getlist, copy_doclist +from webnotes.model.wrapper import getlist from webnotes import msgprint sql = webnotes.conn.sql @@ -38,6 +37,8 @@ class DocType: return ret def on_update(self): + self.validate_name_with_item_group() + if self.doc.show_in_website: # webpage updates self.update_website() @@ -62,8 +63,6 @@ class DocType: if flt(d.conversion_factor) != 1: msgprint("Conversion Factor of UOM : %s should be equal to 1. As UOM : %s is Stock UOM of Item: %s." % ( cstr(d.uom), cstr(d.uom), cstr(self.doc.name))) raise Exception - # else set uom_exist as true - uom_exist='true' elif cstr(d.uom) != cstr(self.doc.stock_uom) and flt(d.conversion_factor) == 1: msgprint("Conversion Factor of UOM : %s should not be equal to 1. As UOM : %s is not Stock UOM of Item: %s." % ( cstr(d.uom), cstr(d.uom), cstr(self.doc.name))) raise Exception @@ -75,6 +74,12 @@ class DocType: child.conversion_factor = 1 child.save() + def validate_name_with_item_group(self): + if webnotes.conn.exists("Item Group", self.doc.name): + webnotes.msgprint("An item group exists with same name (%s), \ + please change the item name or rename the item group" % + self.doc.name, raise_exception=1) + def update_website(self): from website.utils import update_page_name if self.doc.name==self.doc.item_name: @@ -179,7 +184,7 @@ class DocType: if self.doc.name: self.old_page_name = webnotes.conn.get_value('Item', self.doc.name, 'page_name') - + def check_non_asset_warehouse(self): if self.doc.is_asset_item == "Yes": existing_qty = sql("select t1.warehouse, t1.actual_qty from tabBin t1, tabWarehouse t2 where t1.item_code=%s and (t2.warehouse_type!='Fixed Asset' or t2.warehouse_type is null) and t1.warehouse=t2.name and t1.actual_qty > 0", self.doc.name)