Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed sitemap patch

Browse Source
This commit is contained in:
Rushabh Mehta 2014-02-20 19:01:34 +05:30
parent cda83bba59
commit 6fbda08583
6 changed files with 142 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
erpnext/public/images/erpnext-logo-white.svg Normal file
View File

@ -0,0 +1,112 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
id="svg2"
version="1.1"
viewBox="0 0 680 820"
preserveAspectRatio="xMidyMid meet"
width="100%"
height="100%">
<defs
id="defs4" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
style="display:inline">
<rect
style="fill:#fff"
id="rect3800"
width="150"
height="150"
x="60.000008"
y="-472.36218"
rx="20"
ry="20"
transform="scale(1,-1)" />
</g>
<g
id="layer2">
<path
transform="scale(1,-1)"
style="display:inline;fill:#fff"
d="m 180,-372.36218 110,0 20,0 0,20 0,110 c 0,11.08 -8.92,20 -20,20 l -110,0 c -11.08,0 -20,-8.92 -20,-20 l 0,-110 c 0,-11.08 8.92,-20 20,-20 z"
id="rect3051"/>
</g>
<g
id="layer3">
<rect
style="display:inline;fill:#fff"
id="rect3840"
width="150"
height="150"
x="260"
y="-272.36218"
rx="20"
ry="20"
transform="scale(1,-1)" />
</g>
<g
id="layer4">
<path
id="path3054"
d="m 490,372.36218 -110,0 -20,0 0,-20 0,-110 c 0,-11.08 8.92,-20 20,-20 l 110,0 c 11.08,0 20,8.92 20,20 l 0,110 c 0,11.08 -8.92,20 -20,20 z"
style="display:inline;fill:#fff" />
</g>
<g
id="layer5">
<rect
style="display:inline;fill:#fff"
id="rect3844"
width="150"
height="150"
x="460"
y="-472.36218"
rx="20"
ry="20"
transform="scale(1,-1)" />
</g>
<g
id="layer6">
<path
style="display:inline;fill:#fff"
d="m 490,422.36218 -110,0 -20,0 0,20 0,110 c 0,11.08 8.92,20 20,20 l 110,0 c 11.08,0 20,-8.92 20,-20 l 0,-110 c 0,-11.08 -8.92,-20 -20,-20 z"
id="path3058" />
</g>
<g
id="layer7">
<rect
style="display:inline;fill:#fff"
id="rect3848"
width="150"
height="150"
x="260"
y="-672.36218"
rx="20"
ry="20"
transform="scale(1,-1)" />
</g>
<g
id="layer8">
<path
id="path3056"
d="m 180,422.36218 110,0 20,0 0,20 0,110 c 0,11.08 -8.92,20 -20,20 l -110,0 c -11.08,0 -20,-8.92 -20,-20 l 0,-110 c 0,-11.08 8.92,-20 20,-20 z"
style="display:inline;fill:#fff" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

5
erpnext/setup/doctype/item_group/item_group.py
View File

@ -12,6 +12,11 @@ class DocType(DocTypeNestedSet):
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)

13
erpnext/setup/doctype/item_group/item_group.txt
View File

@ -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"
}

13
erpnext/setup/doctype/sales_partner/sales_partner.txt
View File

@ -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

3
erpnext/stock/doctype/item/item.py
View File

@ -42,6 +42,9 @@ class DocType(DocListController):
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')

15
erpnext/stock/doctype/item/item.txt
View File

@ -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