Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/setup/doctype/item_group/item_group.txt b/setup/doctype/item_group/item_group.txt
index d9c6ffe..a8da12c 100644
--- a/setup/doctype/item_group/item_group.txt
+++ b/setup/doctype/item_group/item_group.txt
@@ -1,8 +1,8 @@
[
{
- "creation": "2013-01-23 20:00:16",
+ "creation": "2013-03-28 10:35:29",
"docstatus": 0,
- "modified": "2013-03-20 15:09:28",
+ "modified": "2013-04-01 12:06:52",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -124,6 +124,7 @@
"label": "Description"
},
{
+ "depends_on": "show_in_website",
"doctype": "DocField",
"fieldname": "item_website_specifications",
"fieldtype": "Table",
@@ -182,20 +183,6 @@
"print_hide": 1
},
{
- "cancel": 1,
- "create": 1,
- "doctype": "DocPerm",
- "role": "System Manager",
- "write": 1
- },
- {
- "cancel": 1,
- "create": 1,
- "doctype": "DocPerm",
- "role": "Material Master Manager",
- "write": 1
- },
- {
"amend": 0,
"cancel": 0,
"create": 0,
@@ -210,5 +197,19 @@
"doctype": "DocPerm",
"role": "Material User",
"write": 0
+ },
+ {
+ "cancel": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "role": "System Manager",
+ "write": 1
+ },
+ {
+ "cancel": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "role": "Material Master Manager",
+ "write": 1
}
]
\ No newline at end of file
diff --git a/website/templates/html/product_in_list.html b/website/templates/html/product_in_list.html
index 97de596..bc62607 100644
--- a/website/templates/html/product_in_list.html
+++ b/website/templates/html/product_in_list.html
@@ -1,10 +1,12 @@
<div class="span3">
<div style="height: 120px; overflow: hidden;">
- {% if website_image %}
+ <a href="{{ page_name }}">
+ {%- if website_image -%}
<img class="product-image" style="width: 80%; margin: auto;" src="{{ website_image }}">
- {% else %}
+ {%- else -%}
{% include 'html/product_missing_image.html' %}
- {% endif %}
+ {%- endif -%}
+ </a>
</div>
<div style="height: 100px; overflow: hidden; font-size: 80%;">
<h4 style="margin-bottom: 2px;"><a href="{{ page_name }}">{{ item_name }}</a></h4>