[IMP] web_graph: renamed Quantity field into Count to avoid ambiguities
authorDavid Monjoie <dmo@odoo.com>
Tue, 21 Oct 2014 12:57:52 +0000 (14:57 +0200)
committerDavid Monjoie <dmo@odoo.com>
Tue, 21 Oct 2014 12:57:52 +0000 (14:57 +0200)
addons/web_graph/static/src/js/graph_widget.js
addons/web_graph/static/src/js/pivot_table.js

index bf6df08..350cd3f 100644 (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();
index 2d68cb4..0f10cf8 100644 (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 };