merge
diff --git a/erpnext/setup/page/setup/setup.html b/erpnext/setup/page/setup/setup.html
index 50ef112..056a28f 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>
@@ -85,21 +81,29 @@
<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>
diff --git a/js/all-app.js b/js/all-app.js
index c1b073a..4e47b16 100644
--- a/js/all-app.js
+++ b/js/all-app.js
@@ -1332,7 +1332,7 @@
/*
* 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 c6778f8..4422c3e 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-1355
\ No newline at end of file
+1355