summaryrefslogtreecommitdiff
path: root/addons/web_graph
diff options
context:
space:
mode:
authorDavid Monjoie <dmo@odoo.com>2014-10-21 14:57:52 +0200
committerDavid Monjoie <dmo@odoo.com>2014-10-21 14:57:52 +0200
commitd2147fc92bb808b9adb72e432b84ebcd6d0b0192 (patch)
treed9c15fe54054adb1b22ff4c17859bc5d03313bca /addons/web_graph
parent22c390285f7ec44fb0b67ade35ce6c9f39c71f8e (diff)
[IMP] web_graph: renamed Quantity field into Count to avoid ambiguities
Diffstat (limited to 'addons/web_graph')
-rw-r--r--addons/web_graph/static/src/js/graph_widget.js4
-rw-r--r--addons/web_graph/static/src/js/pivot_table.js2
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/web_graph/static/src/js/graph_widget.js b/addons/web_graph/static/src/js/graph_widget.js
index bf6df084fbc..350cd3ff34a 100644
--- a/addons/web_graph/static/src/js/graph_widget.js
+++ b/addons/web_graph/static/src/js/graph_widget.js
@@ -46,13 +46,13 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
context: self.graph_view.dataset.context
}).then(function (f) {
self.fields = f;
- self.fields.__count = {field:'__count', type: 'integer', string:_t('Quantity')};
+ self.fields.__count = {field:'__count', type: 'integer', string:_t('Count')};
self.important_fields = self.get_search_fields();
self.measure_list = self.get_measures();
self.add_measures_to_options();
self.pivot_options.row_groupby = self.create_field_values(self.pivot_options.row_groupby || []);
self.pivot_options.col_groupby = self.create_field_values(self.pivot_options.col_groupby || []);
- self.pivot_options.measures = self.create_field_values(self.pivot_options.measures || [{field:'__count', type: 'integer', string:'Quantity'}]);
+ self.pivot_options.measures = self.create_field_values(self.pivot_options.measures || [{field:'__count', type: 'integer', string:'Count'}]);
self.pivot = new openerp.web_graph.PivotTable(self.model, self.domain, self.fields, self.pivot_options);
self.pivot.update_data().then(function () {
self.display_data();
diff --git a/addons/web_graph/static/src/js/pivot_table.js b/addons/web_graph/static/src/js/pivot_table.js
index 2d68cb43932..0f10cf82dd6 100644
--- a/addons/web_graph/static/src/js/pivot_table.js
+++ b/addons/web_graph/static/src/js/pivot_table.js
@@ -17,7 +17,7 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({
this.no_data = true;
this.model = model;
this.fields = fields;
- this.fields.__count = {type: 'integer', string:_t('Quantity')};
+ this.fields.__count = {type: 'integer', string:_t('Count')};
this.measures = options.measures || [];
this.rows = { groupby: options.row_groupby, headers: null };
this.cols = { groupby: options.col_groupby, headers: null };