From 902687091c4f1e11b1677a897a2f05af253836f6 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@iwebnotes.com>
Date: Thu, 22 Mar 2012 13:24:41 +0530
Subject: [PATCH 1/2] fix in search

---
 css/all-app.css | 2 +-
 css/all-web.css | 2 +-
 js/all-app.js   | 2 +-
 version.num     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/css/all-app.css b/css/all-app.css
index 6ef5847ca4..cb9940bfdb 100644
--- a/css/all-app.css
+++ b/css/all-app.css
@@ -3479,7 +3479,7 @@ span, div, td, input, textarea, button, select {
 }
 
 body {
-	background: url(../lib/images/ui/redbeech.jpg) repeat;
+	background: url(../images/redbeech.jpg) repeat;
 }
 
 .small {
diff --git a/css/all-web.css b/css/all-web.css
index a6c3429180..6a75d12c2a 100644
--- a/css/all-web.css
+++ b/css/all-web.css
@@ -1619,7 +1619,7 @@ span, div, td, input, textarea, button, select {
 }
 
 body {
-	background: url(../lib/images/ui/redbeech.jpg) repeat;
+	background: url(../images/redbeech.jpg) repeat;
 }
 
 .small {
diff --git a/js/all-app.js b/js/all-app.js
index 3eda674be9..5aaca817c1 100644
--- a/js/all-app.js
+++ b/js/all-app.js
@@ -1332,7 +1332,7 @@ wn.ui.toolbar.NewDialog=wn.ui.toolbar.SelectorDialog.extend({init:function(){thi
 /*
  *	lib/js/wn/ui/toolbar/search.js
  */
-wn.ui.toolbar.Search=wn.ui.toolbar.SelectorDialog.extend({init:function(){this._super({title:"Search",execute:function(val){selector.set_search(val);selector.show();},});this.set_values(profile.can_read.join(',').split(','));makeselector();}});
+wn.ui.toolbar.Search=wn.ui.toolbar.SelectorDialog.extend({init:function(){this._super({title:"Search",execute:function(val){selector.set_search(val);selector.show();},});this.set_values(profile.can_search.join(',').split(','));makeselector();}});
 /*
  *	lib/js/wn/ui/toolbar/report.js
  */
diff --git a/version.num b/version.num
index 97dc468497..5b2b555c51 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-1339
+1340
\ No newline at end of file

From 8463870a4fa048e612cf616fc04f4c9608d16e17 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@iwebnotes.com>
Date: Thu, 22 Mar 2012 13:39:23 +0530
Subject: [PATCH 2/2] Added Custom Scripts in setup page

---
 erpnext/setup/page/setup/setup.html | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/erpnext/setup/page/setup/setup.html b/erpnext/setup/page/setup/setup.html
index 50ef112bbb..056a28f2f6 100644
--- a/erpnext/setup/page/setup/setup.html
+++ b/erpnext/setup/page/setup/setup.html
@@ -31,10 +31,6 @@
 			<b><a href="#!List/Authorization Rule">Amount based Authorization Rules</a></b><br>
 			<span class="help">Restrict submission rights based on amount</span>
 		</p>
-		<p>
-			<b><a href="#!modules_setup">Modules Setup</a></b><br>
-			<span class="help">Show, hide modules</span>
-		</p>
 	</div>
 	<div class="setup-column">
 		<h3>Data</h3>
@@ -84,22 +80,30 @@
 	</div>
 	<div class="setup-column">
 		<h3>Customize ERPNext</h3>
-		<p>
-			<b><a href="#!List/Custom Field">Custom Fields</a></b><br>
-			<span class="help">Add fields to forms</span>
-		</p>
 		<p>
 			<b><a href="#!Form/DocLayer/DocLayer">Customize Forms</a></b><br>
 			<span class="help">Change entry properties (hide fields, make mandatory etc)</span>
 		</p>
 		<p>
-			<b><a href="#!Form/Naming Series/Naming Series">Numbering Series</a></b><br>
-			<span class="help">Set multiple numbering series for transactions</span>
+			<b><a href="#!List/Custom Field">Custom Fields</a></b><br>
+			<span class="help">Add fields to forms</span>
+		</p>
+		<p>
+			<b><a href="#!List/Custom Script">Custom Scripts</a></b><br>
+			<span class="help">Add custom code to forms</span>
 		</p>
 		<p>
 			<b><a href="#!Form/Features Setup/Features Setup">Disable Features</a></b><br>
 			<span class="help">Simplify entry forms by disabling features</span>
 		</p>
+		<p>
+			<b><a href="#!modules_setup">Modules Setup</a></b><br>
+			<span class="help">Show, hide modules</span>
+		</p>
+		<p>
+			<b><a href="#!Form/Naming Series/Naming Series">Numbering Series</a></b><br>
+			<span class="help">Set multiple numbering series for transactions</span>
+		</p>
 	</div>
 	<div class="setup-column">
 		<h3>Branding and Printing</h3>
@@ -115,14 +119,16 @@
 			<b><a href="#!List/Print Heading">Print Headings</a></b><br>
 			<span class="help">Add headers for standard print formats</span>
 		</p>
+		<!--
 		<p>
 			<b><a href="#!Form/Personalize/Personalize">Home Banner</a></b><br>
 			<span class="help">Add a home page banner</span>
 		</p>
+		-->
 		<p>
 			<b><a href="#!Form/Style Settings/Style Settings">Style Settings</a></b><br>
 			<span class="help">Change background fonts etc</span>
 		</p>
 	</div>
 	<div style="clear: both"></div>
-</div>
\ No newline at end of file
+</div>