diff --git a/setup/doctype/item_group/item_group.txt b/setup/doctype/item_group/item_group.txt index 653752b8bbc..411869bf209 100644 --- a/setup/doctype/item_group/item_group.txt +++ b/setup/doctype/item_group/item_group.txt @@ -2,9 +2,9 @@ { "owner": "Administrator", "docstatus": 0, - "creation": "2012-12-06 15:57:00", + "creation": "2012-12-07 15:15:28", "modified_by": "Administrator", - "modified": "2012-12-07 14:55:49" + "modified": "2012-12-17 15:00:01" }, { "in_create": 1, @@ -53,7 +53,6 @@ "description": "Check this if you want to show in website", "no_copy": 0, "search_index": 0, - "colour": "White:FFF", "doctype": "DocField", "label": "Show in Website", "fieldname": "show_in_website", @@ -70,13 +69,19 @@ { "description": "Items Featured on the Item Group Page", "depends_on": "show_in_website", - "colour": "White:FFF", "doctype": "DocField", "label": "Featured Items", "fieldname": "featured_items", "fieldtype": "Table", + "hidden": 1, "options": "Featured Item" }, + { + "doctype": "DocField", + "label": "Page Name", + "fieldname": "page_name", + "fieldtype": "Data" + }, { "doctype": "DocField", "fieldname": "cb0", @@ -88,7 +93,6 @@ "doctype": "DocField", "label": "Parent Item Group", "oldfieldname": "parent_item_group", - "trigger": "Client", "fieldname": "parent_item_group", "fieldtype": "Link", "search_index": 0, @@ -99,7 +103,6 @@ "description": "Only leaf nodes are allowed in transaction", "no_copy": 0, "oldfieldtype": "Select", - "colour": "White:FFF", "doctype": "DocField", "label": "Has Child Node", "oldfieldname": "is_group", @@ -151,6 +154,46 @@ "options": "Item Group", "report_hide": 1 }, + { + "amend": 0, + "create": 0, + "doctype": "DocPerm", + "submit": 0, + "write": 0, + "cancel": 0, + "role": "Material Manager", + "permlevel": 1 + }, + { + "amend": 0, + "create": 0, + "doctype": "DocPerm", + "submit": 0, + "write": 0, + "cancel": 0, + "role": "Material Manager", + "permlevel": 0 + }, + { + "amend": 0, + "create": 0, + "doctype": "DocPerm", + "submit": 0, + "write": 0, + "cancel": 0, + "role": "Material User", + "permlevel": 1 + }, + { + "amend": 0, + "create": 0, + "doctype": "DocPerm", + "submit": 0, + "write": 0, + "cancel": 0, + "role": "Material User", + "permlevel": 0 + }, { "create": 1, "doctype": "DocPerm", @@ -166,45 +209,5 @@ "role": "Material Master Manager", "cancel": 1, "permlevel": 0 - }, - { - "amend": 0, - "create": 0, - "doctype": "DocPerm", - "submit": 0, - "write": 0, - "role": "Material Manager", - "cancel": 0, - "permlevel": 1 - }, - { - "amend": 0, - "create": 0, - "doctype": "DocPerm", - "submit": 0, - "write": 0, - "role": "Material Manager", - "cancel": 0, - "permlevel": 0 - }, - { - "amend": 0, - "create": 0, - "doctype": "DocPerm", - "submit": 0, - "write": 0, - "role": "Material User", - "cancel": 0, - "permlevel": 1 - }, - { - "amend": 0, - "create": 0, - "doctype": "DocPerm", - "submit": 0, - "write": 0, - "role": "Material User", - "cancel": 0, - "permlevel": 0 } ] \ No newline at end of file diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt index 1b9bfcac22e..7ab40bd0bc6 100644 --- a/stock/doctype/item/item.txt +++ b/stock/doctype/item/item.txt @@ -2,9 +2,9 @@ { "owner": "Administrator", "docstatus": 0, - "creation": "2012-12-17 14:10:03", + "creation": "2012-12-17 14:56:32", "modified_by": "Administrator", - "modified": "2012-12-17 14:12:10" + "modified": "2012-12-17 15:59:19" }, { "allow_attach": 1, @@ -780,6 +780,44 @@ "fieldtype": "Select", "permlevel": 0 }, + { + "doctype": "DocField", + "fieldname": "cb72", + "fieldtype": "Column Break", + "permlevel": 0 + }, + { + "default": "Show Price in Website (if set)", + "doctype": "DocField", + "label": "Website Price List", + "options": "Price List", + "fieldname": "website_price_list", + "fieldtype": "Link", + "permlevel": 0 + }, + { + "description": "Show \"In Stock\" or \"Not in Stock\" based on stock available in this warehouse.", + "doctype": "DocField", + "label": "Website Warehouse", + "options": "Warehouse", + "fieldname": "website_warehouse", + "fieldtype": "Link", + "permlevel": 0 + }, + { + "doctype": "DocField", + "fieldname": "sb72", + "fieldtype": "Section Break", + "permlevel": 0 + }, + { + "doctype": "DocField", + "label": "Item Website Specifications", + "options": "Item Website Specification", + "fieldname": "item_website_specifications", + "fieldtype": "Table", + "permlevel": 0 + }, { "depends_on": "show_in_website", "doctype": "DocField", @@ -792,7 +830,6 @@ "depends_on": "show_in_website", "doctype": "DocField", "label": "Long Description", - "options": "Markdown", "fieldname": "web_long_description", "fieldtype": "Text Editor", "permlevel": 0 @@ -803,8 +840,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "role": "Material Manager", "cancel": 0, + "role": "Material Manager", "permlevel": 1 }, { @@ -813,8 +850,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "role": "Material Manager", "cancel": 0, + "role": "Material Manager", "permlevel": 0 }, { @@ -823,8 +860,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "role": "Material User", "cancel": 0, + "role": "Material User", "permlevel": 1 }, { @@ -833,8 +870,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "role": "Material User", "cancel": 0, + "role": "Material User", "permlevel": 0 }, { diff --git a/stock/doctype/item_website_specification/item_website_specification.py b/stock/doctype/item_website_specification/item_website_specification.py new file mode 100644 index 00000000000..928aa9ff9f2 --- /dev/null +++ b/stock/doctype/item_website_specification/item_website_specification.py @@ -0,0 +1,8 @@ +# For license information, please see license.txt + +from __future__ import unicode_literals +import webnotes + +class DocType: + def __init__(self, d, dl): + self.doc, self.doclist = d, dl \ No newline at end of file diff --git a/stock/doctype/item_website_specification/item_website_specification.txt b/stock/doctype/item_website_specification/item_website_specification.txt index 8dc188d9c3b..db2bc9f07ff 100644 --- a/stock/doctype/item_website_specification/item_website_specification.txt +++ b/stock/doctype/item_website_specification/item_website_specification.txt @@ -4,7 +4,7 @@ "docstatus": 0, "creation": "2012-12-07 15:42:25", "modified_by": "Administrator", - "modified": "2012-12-07 15:44:18" + "modified": "2012-12-17 15:29:37" }, { "istable": 1, diff --git a/website/templates/css/product_page.css b/website/templates/css/product_page.css index 2708625cf23..bf893caf984 100644 --- a/website/templates/css/product_page.css +++ b/website/templates/css/product_page.css @@ -1,34 +1,9 @@ \ No newline at end of file diff --git a/website/templates/html/product_page.html b/website/templates/html/product_page.html index 646bba95011..709c3ead119 100644 --- a/website/templates/html/product_page.html +++ b/website/templates/html/product_page.html @@ -19,30 +19,36 @@ {% block content %}
-
+

{{ item_name }}



{% if website_image %} - + {% else %}
This is an auto-generated Image {% endif %}

-
- {{ web_description_html }} +

Product Description

+
+ {{ web_long_description or web_short_description }}
+
+ {% if obj.doclist.get({"doctype":"Item Website Specification"}) %} +

Specifications

+ + {% for d in obj.doclist.get( + {"doctype":"Item Website Specification"}) %} + + + + + {% endfor %} +
{{ d.label }}{{ d.description }}
+ {% endif %}
-
-

More Categories

-
-
-

Similar Products

-
-
-
{% endblock %} \ No newline at end of file diff --git a/website/utils.py b/website/utils.py index 0fc5f984e14..198746f20a1 100644 --- a/website/utils.py +++ b/website/utils.py @@ -156,13 +156,14 @@ def get_template_pages(): def get_doc_fields(page_name): doc_type, doc_name = get_source_doc(page_name) - obj = webnotes.get_obj(doc_type, doc_name) + obj = webnotes.get_obj(doc_type, doc_name, with_children=True) if hasattr(obj, 'prepare_template_args'): obj.prepare_template_args() args = obj.doc.fields args['template'] = page_map[doc_type].template + args['obj'] = obj return args