From 27d7f21553af709272cfb5ff5daecfe87c555408 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Fri, 5 Jun 2015 15:09:37 +0530
Subject: [PATCH 1/2] [fix] pos profile link in Start POS page

---
 erpnext/accounts/page/pos/pos_page.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/erpnext/accounts/page/pos/pos_page.html b/erpnext/accounts/page/pos/pos_page.html
index 98cce009ad..5a4c538f17 100644
--- a/erpnext/accounts/page/pos/pos_page.html
+++ b/erpnext/accounts/page/pos/pos_page.html
@@ -9,7 +9,7 @@
         <button class="btn btn-primary btn-lg">{%=  __("Start") %}</button>
     </p>
 	<p class="pos-setting-message hide">
-        <a class="btn btn-default btn-sm" href="#Form/POS Setting/New POS Setting">
-		{%=  __("Make new POS Setting") %}</a>
+        <a class="btn btn-default btn-sm" href="#Form/POS Profile/New POS Profile">
+		{%=  __("Make new POS Profile") %}</a>
     </p>
 </div>

From 6bf301f53c44692004d30b41ce3b551b0d19f5a3 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Fri, 5 Jun 2015 15:49:25 +0530
Subject: [PATCH 2/2] Show item description in grid view based on 'In List
 View' property

---
 erpnext/templates/form_grid/includes/visible_cols.html | 2 +-
 erpnext/templates/form_grid/item_grid.html             | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/erpnext/templates/form_grid/includes/visible_cols.html b/erpnext/templates/form_grid/includes/visible_cols.html
index 285c1254b6..e9be40ceb2 100644
--- a/erpnext/templates/form_grid/includes/visible_cols.html
+++ b/erpnext/templates/form_grid/includes/visible_cols.html
@@ -1,6 +1,6 @@
 {% $.each(visible_columns || [], function(i, df) { %}
 	{% 	var val = doc.get_formatted(df.fieldname);
-	if(val) { %}
+	if((df.fieldname !== "description") && val) { %}
 		<div class="row">
 			<div class="col-xs-4 text-ellipsis">
 				<strong title="{%= __(df.label) %}">{%= __(df.label) %}:</strong>
diff --git a/erpnext/templates/form_grid/item_grid.html b/erpnext/templates/form_grid/item_grid.html
index 9905f99480..8ea3e7d72a 100644
--- a/erpnext/templates/form_grid/item_grid.html
+++ b/erpnext/templates/form_grid/item_grid.html
@@ -47,6 +47,12 @@
 
 			{% if(doc.item_name != doc.item_code) { %}
 				<br>{%= doc.item_name %}{% } %}
+				
+			{% if((doc.description != doc.item_code != doc.item_name) && 
+				in_list($.map(visible_columns, function(x, i) {return x.fieldname}), "description")) { %}
+				<br>
+				<strong>Description: </strong>
+				{%= doc.get_formatted("description") %}{% } %}
 			{% include "templates/form_grid/includes/visible_cols.html" %}
 		</div>