odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] web_graph: renamed Quantity field into Count to avoid ambiguities

This commit is contained in:
David Monjoie 2014-10-21 14:57:52 +02:00
parent 22c390285f
commit d2147fc92b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/web_graph/static/src/js/graph_widget.js
View File

@ -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();

2
addons/web_graph/static/src/js/pivot_table.js
View File

@ -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 };