From c4e9deeea8aa23be001de8308eaf2052a3af1ce2 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Mon, 15 Jul 2013 14:48:14 +0530
Subject: [PATCH 1/2] [minor] [website] hide shopping cart icon if shopping
 cart is not enabled

---
 website/templates/html/outer.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/website/templates/html/outer.html b/website/templates/html/outer.html
index 07ade38a97..bac3515042 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">

From ce3620412982350e5d6b1535e4184bac93fec0e0 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Mon, 15 Jul 2013 14:49:03 +0530
Subject: [PATCH 2/2] [minor] [item] on adding image, add description html if
 it is empty

---
 stock/doctype/item/item.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/stock/doctype/item/item.js b/stock/doctype/item/item.js
index 3d427ad311..b2a1ffe493 100644
--- a/stock/doctype/item/item.js
+++ b/stock/doctype/item/item.js
@@ -193,4 +193,6 @@ cur_frm.cscript.copy_from_item_group = function(doc) {
 
 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