Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Rushabh Mehta 2012-03-22 13:53:34 +05:30
commit 479061df9c
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
erpnext/setup/page/setup/setup.html
View File

@ -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>
</div>

2
js/all-app.js
View File

@ -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
*/

2
version.num
View File

@ -1 +1 @@
1355
1355