Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
diff --git a/stock/doctype/item/item.js b/stock/doctype/item/item.js
index 3d427ad..b2a1ffe 100644
--- a/stock/doctype/item/item.js
+++ b/stock/doctype/item/item.js
@@ -193,4 +193,6 @@
cur_frm.cscript.image = function() {
refresh_field("image_view");
+
+ if(!cur_frm.doc.description_html) cur_frm.cscript.add_image(cur_frm.doc);
}
\ No newline at end of file
diff --git a/website/templates/html/outer.html b/website/templates/html/outer.html
index 07ade38..bac3515 100644
--- a/website/templates/html/outer.html
+++ b/website/templates/html/outer.html
@@ -3,8 +3,10 @@
{% block body %}
<div class="container">
<div class="pull-right" style="margin:4px;" id="user-tools">
+ {% if shopping_cart_enabled -%}
<a href="cart" title="Shopping Cart"><i class="icon-shopping-cart"></i>
<span class="cart-count"></span></a> |
+ {%- endif %}
<a id="login-link" href="login">Login</a>
</div>
<div class="pull-right hide" style="margin:4px;" id="user-tools-post-login">