diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-10-23 13:08:44 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-10-23 13:08:44 +0200 |
| commit | 562272d9a09219379fa4f87b24ae8e2bdb4c4717 (patch) | |
| tree | ae2c49b459d36ec5c0b174ac6987cdc3816d7536 /addons/web_graph/static/src/js | |
| parent | d5235f73264fb3c25a795be2b8d1b04fe4c36af8 (diff) | |
| parent | c89d1a0c185fc3c7e431b977a4ce2faadf582fb1 (diff) | |
[MERGE] forward port of branch saas-3 up to c89d1a0
Diffstat (limited to 'addons/web_graph/static/src/js')
| -rw-r--r-- | addons/web_graph/static/src/js/graph_widget.js | 4 | ||||
| -rw-r--r-- | addons/web_graph/static/src/js/pivot_table.js | 2 |
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 97a5ad66d4e..a08ee529a67 100644 --- a/addons/web_graph/static/src/js/graph_widget.js +++ b/addons/web_graph/static/src/js/graph_widget.js @@ -56,13 +56,13 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({ return this.model.call('fields_get', []).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.groupby_fields = self.get_groupby_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 a46203faff5..a99bae1756f 100644 --- a/addons/web_graph/static/src/js/pivot_table.js +++ b/addons/web_graph/static/src/js/pivot_table.js @@ -18,7 +18,7 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({ this.updating = false; 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 }; |