Merge branch 'master' into edge

This commit is contained in:
Rushabh Mehta
2013-03-04 17:35:28 +05:30
1280 changed files with 29993 additions and 3849 deletions

View File

@@ -6,6 +6,8 @@
{% include 'html/product_missing_image.html' %}
{% endif %}
</div>
<h4><a href="{{ page_name }}">{{ item_name }}</a></h4>
<p class="help">Item Code: {{ name }}</p>
<div style="height: 100px; overflow: hidden; font-size: 80%;">
<h4 style="margin-bottom: 2px;"><a href="{{ page_name }}">{{ item_name }}</a></h4>
<p class="help">Item Code: {{ name }}</p>
</div>
</div>