From a1d668a6e3363eb7635e9384039a9f186453b902 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 5 Aug 2013 18:14:39 +0530 Subject: [PATCH 1/2] [nested set] [minor] Added validation to test loop in hierarchy --- setup/doctype/customer_group/customer_group.py | 1 + setup/doctype/customer_group/customer_group.txt | 4 ++-- setup/doctype/item_group/item_group.py | 3 ++- setup/doctype/item_group/item_group.txt | 4 ++-- setup/doctype/sales_person/sales_person.py | 4 ++++ setup/doctype/sales_person/sales_person.txt | 4 ++-- setup/doctype/territory/territory.py | 5 ++++- setup/doctype/territory/territory.txt | 4 ++-- 8 files changed, 19 insertions(+), 10 deletions(-) diff --git a/setup/doctype/customer_group/customer_group.py b/setup/doctype/customer_group/customer_group.py index eded5bf63d..0940e1f0b3 100644 --- a/setup/doctype/customer_group/customer_group.py +++ b/setup/doctype/customer_group/customer_group.py @@ -24,6 +24,7 @@ class DocType(DocTypeNestedSet): def on_update(self): self.validate_name_with_customer() super(DocType, self).on_update() + self.validate_one_root() def validate_name_with_customer(self): if webnotes.conn.exists("Customer", self.doc.name): diff --git a/setup/doctype/customer_group/customer_group.txt b/setup/doctype/customer_group/customer_group.txt index 6a1350046e..4f9acc6432 100644 --- a/setup/doctype/customer_group/customer_group.txt +++ b/setup/doctype/customer_group/customer_group.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:23", "docstatus": 0, - "modified": "2013-07-05 14:34:20", + "modified": "2013-08-05 18:12:57", "modified_by": "Administrator", "owner": "Administrator" }, @@ -69,7 +69,7 @@ "oldfieldname": "parent_customer_group", "oldfieldtype": "Link", "options": "Customer Group", - "reqd": 1 + "reqd": 0 }, { "description": "Only leaf nodes are allowed in transaction", diff --git a/setup/doctype/item_group/item_group.py b/setup/doctype/item_group/item_group.py index 132b829fbb..81f6903516 100644 --- a/setup/doctype/item_group/item_group.py +++ b/setup/doctype/item_group/item_group.py @@ -20,7 +20,6 @@ class DocType(DocTypeNestedSet): from website.helpers.product import invalidate_cache_for - if self.doc.show_in_website: from webnotes.webutils import update_page_name # webpage updates @@ -38,6 +37,8 @@ class DocType(DocTypeNestedSet): webnotes.conn.set(self.doc, "page_name", None) + self.validate_one_root() + 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 \ diff --git a/setup/doctype/item_group/item_group.txt b/setup/doctype/item_group/item_group.txt index 6e7edf952b..f573110330 100644 --- a/setup/doctype/item_group/item_group.txt +++ b/setup/doctype/item_group/item_group.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-28 10:35:29", "docstatus": 0, - "modified": "2013-07-23 12:00:14", + "modified": "2013-08-05 17:21:14", "modified_by": "Administrator", "owner": "Administrator" }, @@ -75,7 +75,7 @@ "oldfieldname": "parent_item_group", "oldfieldtype": "Link", "options": "Item Group", - "reqd": 1, + "reqd": 0, "search_index": 0 }, { diff --git a/setup/doctype/sales_person/sales_person.py b/setup/doctype/sales_person/sales_person.py index 355027b762..6161706f5d 100644 --- a/setup/doctype/sales_person/sales_person.py +++ b/setup/doctype/sales_person/sales_person.py @@ -21,6 +21,10 @@ class DocType(DocTypeNestedSet): webnotes.msgprint("Either target qty or target amount is mandatory.") raise Exception + def on_update(self): + super(DocType, self).on_update() + self.validate_one_root() + def get_email_id(self): profile = webnotes.conn.get_value("Employee", self.doc.employee, "user_id") if not profile: diff --git a/setup/doctype/sales_person/sales_person.txt b/setup/doctype/sales_person/sales_person.txt index 56c6397454..77ba6afd4e 100644 --- a/setup/doctype/sales_person/sales_person.txt +++ b/setup/doctype/sales_person/sales_person.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:24", "docstatus": 0, - "modified": "2013-07-10 12:51:58", + "modified": "2013-08-05 18:11:22", "modified_by": "Administrator", "owner": "Administrator" }, @@ -69,7 +69,7 @@ "oldfieldname": "parent_sales_person", "oldfieldtype": "Link", "options": "Sales Person", - "reqd": 1 + "reqd": 0 }, { "doctype": "DocField", diff --git a/setup/doctype/territory/territory.py b/setup/doctype/territory/territory.py index 742b1b40b6..13498fc310 100644 --- a/setup/doctype/territory/territory.py +++ b/setup/doctype/territory/territory.py @@ -20,4 +20,7 @@ class DocType(DocTypeNestedSet): if not flt(d.target_qty) and not flt(d.target_amount): msgprint("Either target qty or target amount is mandatory.") raise Exception - \ No newline at end of file + + def on_update(self): + super(DocType, self).on_update() + self.validate_one_root() diff --git a/setup/doctype/territory/territory.txt b/setup/doctype/territory/territory.txt index bba7e3ead3..b647e7b712 100644 --- a/setup/doctype/territory/territory.txt +++ b/setup/doctype/territory/territory.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:24", "docstatus": 0, - "modified": "2013-07-05 14:58:15", + "modified": "2013-08-05 18:12:29", "modified_by": "Administrator", "owner": "Administrator" }, @@ -71,7 +71,7 @@ "oldfieldname": "parent_territory", "oldfieldtype": "Link", "options": "Territory", - "reqd": 1 + "reqd": 0 }, { "description": "Only leaf nodes are allowed in transaction", From 63f9b079350428a510963afa0960aa7d26582763 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 5 Aug 2013 18:24:49 +0530 Subject: [PATCH 2/2] [minor] [item] Removed Sales Rate #613 --- stock/doctype/item/item.txt | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt index 3e41101413..acaed7ea17 100644 --- a/stock/doctype/item/item.txt +++ b/stock/doctype/item/item.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-03 10:45:46", "docstatus": 0, - "modified": "2013-07-26 16:26:15", + "modified": "2013-08-05 18:23:47", "modified_by": "Administrator", "owner": "Administrator" }, @@ -35,9 +35,7 @@ "parentfield": "permissions", "parenttype": "DocType", "permlevel": 0, - "read": 1, - "report": 1, - "submit": 0 + "read": 1 }, { "doctype": "DocType", @@ -593,17 +591,6 @@ "options": "Cost Center", "read_only": 0 }, - { - "depends_on": "eval:doc.is_sales_item==\"Yes\"", - "doctype": "DocField", - "fieldname": "sales_rate", - "fieldtype": "Float", - "hidden": 1, - "label": "Sales Rate", - "oldfieldname": "sales_rate", - "oldfieldtype": "Currency", - "read_only": 0 - }, { "depends_on": "eval:doc.is_sales_item==\"Yes\"", "doctype": "DocField", @@ -883,7 +870,9 @@ "cancel": 1, "create": 1, "doctype": "DocPerm", + "report": 1, "role": "Material Master Manager", + "submit": 0, "write": 1 }, { @@ -891,7 +880,9 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", + "report": 1, "role": "Material Manager", + "submit": 0, "write": 0 }, { @@ -899,7 +890,21 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", + "report": 1, "role": "Material User", + "submit": 0, "write": 0 + }, + { + "doctype": "DocPerm", + "role": "Sales User" + }, + { + "doctype": "DocPerm", + "role": "Purchase User" + }, + { + "doctype": "DocPerm", + "role": "Accounts User" } ] \ No newline at end of file