From 6fbda08583cd7427f3c12aa1b4e9f71aaa8333fe Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 20 Feb 2014 19:01:34 +0530 Subject: [PATCH] fixed sitemap patch --- erpnext/public/images/erpnext-logo-white.svg | 112 ++++++++++++++++++ .../setup/doctype/item_group/item_group.py | 5 + .../setup/doctype/item_group/item_group.txt | 13 +- .../doctype/sales_partner/sales_partner.txt | 13 +- erpnext/stock/doctype/item/item.py | 3 + erpnext/stock/doctype/item/item.txt | 15 ++- 6 files changed, 142 insertions(+), 19 deletions(-) create mode 100644 erpnext/public/images/erpnext-logo-white.svg diff --git a/erpnext/public/images/erpnext-logo-white.svg b/erpnext/public/images/erpnext-logo-white.svg new file mode 100644 index 00000000000..fb72c1743a6 --- /dev/null +++ b/erpnext/public/images/erpnext-logo-white.svg @@ -0,0 +1,112 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/erpnext/setup/doctype/item_group/item_group.py b/erpnext/setup/doctype/item_group/item_group.py index 3c826154f10..ce683672d9a 100644 --- a/erpnext/setup/doctype/item_group/item_group.py +++ b/erpnext/setup/doctype/item_group/item_group.py @@ -11,6 +11,11 @@ class DocType(DocTypeNestedSet): self.doc = doc self.doclist = doclist self.nsm_parent_field = 'parent_item_group' + + def validate(self): + if not self.doc.parent_website_sitemap: + self.doc.parent_website_sitemap = frappe.get_website_sitemap("Item Group", + self.doc.parent_item_group) def on_update(self): DocTypeNestedSet.on_update(self) diff --git a/erpnext/setup/doctype/item_group/item_group.txt b/erpnext/setup/doctype/item_group/item_group.txt index 953d7b84cee..5c3520f290b 100644 --- a/erpnext/setup/doctype/item_group/item_group.txt +++ b/erpnext/setup/doctype/item_group/item_group.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-28 10:35:29", "docstatus": 0, - "modified": "2014-02-05 17:36:23", + "modified": "2014-02-20 18:29:56", "modified_by": "Administrator", "owner": "Administrator" }, @@ -31,6 +31,8 @@ "permlevel": 0 }, { + "cancel": 0, + "delete": 0, "doctype": "DocPerm", "email": 1, "name": "__common__", @@ -190,9 +192,7 @@ }, { "amend": 0, - "cancel": 0, "create": 0, - "delete": 0, "doctype": "DocPerm", "role": "Material Manager", "submit": 0, @@ -200,35 +200,28 @@ }, { "amend": 0, - "cancel": 0, "create": 0, - "delete": 0, "doctype": "DocPerm", "role": "Material User", "submit": 0, "write": 0 }, { - "cancel": 0, "create": 1, - "delete": 1, "doctype": "DocPerm", "role": "Material Master Manager", "submit": 0, "write": 1 }, { - "delete": 0, "doctype": "DocPerm", "role": "Sales User" }, { - "delete": 0, "doctype": "DocPerm", "role": "Purchase User" }, { - "delete": 0, "doctype": "DocPerm", "role": "Accounts User" } diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.txt b/erpnext/setup/doctype/sales_partner/sales_partner.txt index b09b81d5729..2f931a4fb8e 100644 --- a/erpnext/setup/doctype/sales_partner/sales_partner.txt +++ b/erpnext/setup/doctype/sales_partner/sales_partner.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-12 15:34:06", "docstatus": 0, - "modified": "2014-01-20 17:49:25", + "modified": "2014-02-20 18:30:31", "modified_by": "Administrator", "owner": "Administrator" }, @@ -29,6 +29,7 @@ { "amend": 0, "cancel": 0, + "delete": 0, "doctype": "DocPerm", "email": 1, "name": "__common__", @@ -221,23 +222,27 @@ "fieldtype": "Text Editor", "label": "Description" }, + { + "doctype": "DocField", + "fieldname": "parent_website_sitemap", + "fieldtype": "Link", + "label": "Parent Website Sitemap", + "options": "Website Sitemap" + }, { "create": 0, - "delete": 0, "doctype": "DocPerm", "role": "Sales Manager", "write": 0 }, { "create": 0, - "delete": 0, "doctype": "DocPerm", "role": "Sales User", "write": 0 }, { "create": 1, - "delete": 1, "doctype": "DocPerm", "role": "Sales Master Manager", "write": 1 diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py index d1ee4d68377..29822b7e793 100644 --- a/erpnext/stock/doctype/item/item.py +++ b/erpnext/stock/doctype/item/item.py @@ -41,6 +41,9 @@ class DocType(DocListController): self.validate_barcode() self.cant_change() self.validate_item_type_for_reorder() + + if not self.doc.parent_website_sitemap: + self.doc.parent_website_sitemap = frappe.get_website_sitemap("Item Group", self.doc.item_group) if self.doc.name: self.old_page_name = frappe.conn.get_value('Item', self.doc.name, 'page_name') diff --git a/erpnext/stock/doctype/item/item.txt b/erpnext/stock/doctype/item/item.txt index 63af80d56f2..f64e9e28e6b 100644 --- a/erpnext/stock/doctype/item/item.txt +++ b/erpnext/stock/doctype/item/item.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-03 10:45:46", "docstatus": 0, - "modified": "2014-02-19 11:04:00", + "modified": "2014-02-20 18:27:01", "modified_by": "Administrator", "owner": "Administrator" }, @@ -31,6 +31,7 @@ }, { "cancel": 0, + "delete": 0, "doctype": "DocPerm", "email": 1, "name": "__common__", @@ -271,7 +272,7 @@ "doctype": "DocField", "fieldname": "is_asset_item", "fieldtype": "Select", - "label": "Is Fixed Asset Item", + "label": "Is Asset Item", "oldfieldname": "is_asset_item", "oldfieldtype": "Select", "options": "Yes\nNo", @@ -847,9 +848,15 @@ "label": "Website Description", "read_only": 0 }, + { + "doctype": "DocField", + "fieldname": "parent_website_sitemap", + "fieldtype": "Link", + "label": "Parent Website Sitemap", + "options": "Website Sitemap" + }, { "create": 1, - "delete": 1, "doctype": "DocPerm", "import": 1, "role": "Material Master Manager", @@ -858,7 +865,6 @@ { "amend": 0, "create": 0, - "delete": 0, "doctype": "DocPerm", "role": "Material Manager", "write": 0 @@ -866,7 +872,6 @@ { "amend": 0, "create": 0, - "delete": 0, "doctype": "DocPerm", "role": "Material User", "write": 0