diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-07-14 18:17:30 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-07-14 18:17:30 +0200 |
| commit | 1fca5e01cbfa0366725b448641d6cd86daa0a23a (patch) | |
| tree | 4c2e7727125f05f155a52e97c25aba5635f412e3 /addons/web/static/src | |
| parent | 6d3cf9c6495ae328aa084b6ede16eff2b3c7a7fd (diff) | |
| parent | 156dee2aec409894d3f638d6b9218bd0a90bd6c7 (diff) | |
[MERGE] forward port branch saas-10 up to 156dee2
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/views/graph_view.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/graph_widget.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/pivot_view.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/addons/web/static/src/js/views/graph_view.js b/addons/web/static/src/js/views/graph_view.js index c8ff16cd0f1..ea9d09636f5 100644 --- a/addons/web/static/src/js/views/graph_view.js +++ b/addons/web/static/src/js/views/graph_view.js @@ -84,7 +84,7 @@ var GraphView = View.extend({ } } }); - this.measures.__count__ = {string: _t("Quantity"), type: "integer"}; + this.measures.__count__ = {string: _t("Count"), type: "integer"}; }, do_search: function (domain, context, group_by) { if (!this.widget) { diff --git a/addons/web/static/src/js/views/graph_widget.js b/addons/web/static/src/js/views/graph_widget.js index 2a8d38c05ec..c488d57f4cc 100644 --- a/addons/web/static/src/js/views/graph_widget.js +++ b/addons/web/static/src/js/views/graph_widget.js @@ -19,7 +19,7 @@ return Widget.extend({ this._super(parent); this.context = options.context; this.fields = options.fields; - this.fields.__count__ = {string: _t("Quantity"), type: "integer"}; + this.fields.__count__ = {string: _t("Count"), type: "integer"}; this.model = new Model(model, {group_by_no_leaf: true}); this.domain = options.domain || []; diff --git a/addons/web/static/src/js/views/pivot_view.js b/addons/web/static/src/js/views/pivot_view.js index c7710b86605..83e75faf9a6 100644 --- a/addons/web/static/src/js/views/pivot_view.js +++ b/addons/web/static/src/js/views/pivot_view.js @@ -179,7 +179,7 @@ var PivotView = View.extend({ } } }); - this.measures.__count__ = {string: _t("Quantity"), type: "integer"}; + this.measures.__count__ = {string: _t("Count"), type: "integer"}; }, do_search: function (domain, context, group_by) { if (!this.ready) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index f2565857de4..73ec56e0ea7 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -561,7 +561,7 @@ <a href="#"><t t-esc="measure[1].string"/></a> </li> <li class="divider"></li> - <li data-field="__count__"><a href="#">Quantity</a></li> + <li data-field="__count__"><a href="#">Count</a></li> </ul> </div> <div class="btn-group btn-group-sm"> @@ -590,7 +590,7 @@ <a href="#"><t t-esc="measure[1].string"/></a> </li> <li class="divider"></li> - <li data-field="__count__"><a href="#">Quantity</a></li> + <li data-field="__count__"><a href="#">Count</a></li> </ul> </div> <div class="btn-group btn-group-sm"> |