=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js	2016-01-11 16:29:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js	2016-01-14 13:18:38 +0000
@@ -3583,10 +3583,7 @@
                         fields: store.numericFields,
                         minimum: minimum < 0 ? minimum : 0,
                         label: {
-                            //renderer: Ext.util.Format.numberRenderer(renderer),
-                            renderer: function(v) {
-                                return support.prototype.number.prettyPrint(v);
-                            },
+                            renderer: Ext.util.Format.numberRenderer(renderer),
                             style: {},
                             rotate: {}
                         },

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js	2015-12-04 14:38:50 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js	2016-01-14 13:18:38 +0000
@@ -3631,10 +3631,7 @@
                         fields: store.numericFields,
                         minimum: minimum < 0 ? minimum : 0,
                         label: {
-                            //renderer: Ext.util.Format.numberRenderer(renderer),
-                            renderer: function(v) {
-                                return support.prototype.number.prettyPrint(v);
-                            },
+                            renderer: Ext.util.Format.numberRenderer(renderer),
                             style: {},
                             rotate: {}
                         },

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js	2016-01-11 16:29:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js	2016-01-14 13:18:38 +0000
@@ -783,7 +783,8 @@
 			fieldLabel: 'Range axis decimals',
 			labelStyle: 'color:#333',
 			labelWidth: 125,
-			minValue: 0
+			minValue: 0,
+            maxValue: 20
 		});
 
 		rangeAxisTitle = Ext.create('Ext.form.field.Text', {

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js	2015-12-03 15:52:41 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js	2016-01-14 13:18:38 +0000
@@ -2870,10 +2870,7 @@
                         fields: store.numericFields,
                         minimum: minimum < 0 ? minimum : 0,
                         label: {
-                            //renderer: Ext.util.Format.numberRenderer(renderer),
-                            renderer: function(v) {
-                                return support.prototype.number.prettyPrint(v);
-                            },
+                            renderer: Ext.util.Format.numberRenderer(renderer),
                             style: {},
                             rotate: {}
                         },

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js	2016-01-11 16:29:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js	2016-01-14 13:18:38 +0000
@@ -2821,10 +2821,7 @@
                         fields: store.numericFields,
                         minimum: minimum < 0 ? minimum : 0,
                         label: {
-                            //renderer: Ext.util.Format.numberRenderer(renderer),
-                            renderer: function(v) {
-                                return support.prototype.number.prettyPrint(v);
-                            },
+                            renderer: Ext.util.Format.numberRenderer(renderer),
                             style: {},
                             rotate: {}
                         },

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js	2015-12-03 15:52:41 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js	2016-01-14 13:18:38 +0000
@@ -2870,10 +2870,7 @@
                         fields: store.numericFields,
                         minimum: minimum < 0 ? minimum : 0,
                         label: {
-                            //renderer: Ext.util.Format.numberRenderer(renderer),
-                            renderer: function(v) {
-                                return support.prototype.number.prettyPrint(v);
-                            },
+                            renderer: Ext.util.Format.numberRenderer(renderer),
                             style: {},
                             rotate: {}
                         },

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventchart.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventchart.js	2015-12-04 14:38:50 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventchart.js	2016-01-14 13:18:38 +0000
@@ -3631,10 +3631,7 @@
                         fields: store.numericFields,
                         minimum: minimum < 0 ? minimum : 0,
                         label: {
-                            //renderer: Ext.util.Format.numberRenderer(renderer),
-                            renderer: function(v) {
-                                return support.prototype.number.prettyPrint(v);
-                            },
+                            renderer: Ext.util.Format.numberRenderer(renderer),
                             style: {},
                             rotate: {}
                         },

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js	2015-12-03 15:52:41 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js	2016-01-14 13:18:38 +0000
@@ -2870,10 +2870,7 @@
                         fields: store.numericFields,
                         minimum: minimum < 0 ? minimum : 0,
                         label: {
-                            //renderer: Ext.util.Format.numberRenderer(renderer),
-                            renderer: function(v) {
-                                return support.prototype.number.prettyPrint(v);
-                            },
+                            renderer: Ext.util.Format.numberRenderer(renderer),
                             style: {},
                             rotate: {}
                         },

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js	2015-12-04 14:38:50 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js	2016-01-14 13:18:38 +0000
@@ -3631,10 +3631,7 @@
                         fields: store.numericFields,
                         minimum: minimum < 0 ? minimum : 0,
                         label: {
-                            //renderer: Ext.util.Format.numberRenderer(renderer),
-                            renderer: function(v) {
-                                return support.prototype.number.prettyPrint(v);
-                            },
+                            renderer: Ext.util.Format.numberRenderer(renderer),
                             style: {},
                             rotate: {}
                         },