summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/views
diff options
context:
space:
mode:
authorChristophe Matthieu <chm@odoo.com>2017-02-23 10:14:57 +0100
committerAaron Bohy <aab@odoo.com>2017-04-11 19:44:38 +0200
commit173896b62d2c2d3c4acc6be75c3396b29887e4fb (patch)
tree09ea86ccb845313e07adbd21c01e7cad1853c85f /addons/web/static/src/js/views
parentc9f747dad646b48d3dc9fed799df046180526531 (diff)
[REF] web: remove format.js
use 'web.field_utils' instead of 'web.formats'
Diffstat (limited to 'addons/web/static/src/js/views')
-rw-r--r--addons/web/static/src/js/views/graph/graph_renderer.js8
-rw-r--r--addons/web/static/src/js/views/kanban/kanban_record.js2
2 files changed, 3 insertions, 7 deletions
diff --git a/addons/web/static/src/js/views/graph/graph_renderer.js b/addons/web/static/src/js/views/graph/graph_renderer.js
index e5fe00cc473..64d6c3fd6a3 100644
--- a/addons/web/static/src/js/views/graph/graph_renderer.js
+++ b/addons/web/static/src/js/views/graph/graph_renderer.js
@@ -12,7 +12,7 @@ odoo.define('web.GraphRenderer', function (require) {
var AbstractRenderer = require('web.AbstractRenderer');
var config = require('web.config');
var core = require('web.core');
-var formats = require('web.formats');
+var field_utils = require('web.field_utils');
var _t = core._t;
var qweb = core.qweb;
@@ -175,8 +175,7 @@ return AbstractRenderer.extend({
});
chart.yAxis.tickFormat(function (d) {
var measure_field = self.state.fields[self.measure];
- return formats.format_value(d, {
- type: 'float',
+ return field_utils.format_float(d, {
digits: measure_field && measure_field.digits || [69, 2],
});
});
@@ -320,8 +319,7 @@ return AbstractRenderer.extend({
chart.xAxis.tickValues(tickValues)
.tickFormat(tickFormat);
chart.yAxis.tickFormat(function (d) {
- return formats.format_value(d, {
- type : 'float',
+ return field_utils.format_float(d, {
digits : self.state.fields[self.state.measure] && self.state.fields[self.state.measure].digits || [69, 2],
});
});
diff --git a/addons/web/static/src/js/views/kanban/kanban_record.js b/addons/web/static/src/js/views/kanban/kanban_record.js
index 18b72ae3d3e..0f385380f7a 100644
--- a/addons/web/static/src/js/views/kanban/kanban_record.js
+++ b/addons/web/static/src/js/views/kanban/kanban_record.js
@@ -5,7 +5,6 @@ var core = require('web.core');
var Domain = require('web.Domain');
var field_registry = require('web.field_registry');
var field_utils = require('web.field_utils');
-var formats = require('web.formats');
var framework = require('web.framework');
var session = require('web.session');
var time = require('web.time');
@@ -74,7 +73,6 @@ var KanbanRecord = Widget.extend({
widget: this,
read_only_mode: this.read_only_mode,
user_context: session.user_context,
- formats: formats,
};
for (var p in this) {
if (_.str.startsWith(p, 'kanban_')) {