diff --git a/erpnext/setup/page/setup/setup.html b/erpnext/setup/page/setup/setup.html index 50ef112bbbd..056a28f2f64 100644 --- a/erpnext/setup/page/setup/setup.html +++ b/erpnext/setup/page/setup/setup.html @@ -31,10 +31,6 @@ Amount based Authorization Rules
Restrict submission rights based on amount

-

- Modules Setup
- Show, hide modules -

Data

@@ -84,22 +80,30 @@

Customize ERPNext

-

- Custom Fields
- Add fields to forms -

Customize Forms
Change entry properties (hide fields, make mandatory etc)

- Numbering Series
- Set multiple numbering series for transactions + Custom Fields
+ Add fields to forms +

+

+ Custom Scripts
+ Add custom code to forms

Disable Features
Simplify entry forms by disabling features

+

+ Modules Setup
+ Show, hide modules +

+

+ Numbering Series
+ Set multiple numbering series for transactions +

Branding and Printing

@@ -115,14 +119,16 @@ Print Headings
Add headers for standard print formats

+

Style Settings
Change background fonts etc

- \ No newline at end of file + diff --git a/js/all-app.js b/js/all-app.js index c1b073a7e85..4e47b160a31 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 c6778f8867b..4422c3ed26a 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -1355 \ No newline at end of file +1355