diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-07-24 18:10:32 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-07-24 18:10:32 +0200 |
| commit | ba202dbe632463707c95e4a2ed5dc410ce5f6875 (patch) | |
| tree | e4ad22713d14c0261d77fd5a946c1f9a178ecd5f /addons/web/static/src | |
| parent | f999cbb5cccceab6e323d676bccbe2b7f4909d3f (diff) | |
| parent | 3c521f6d05c57f79bc4fb9fef0f2a19765d9b4fa (diff) | |
[MERGE] forward port branch saas-11.2 up to 3c521f6d05c
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/chrome/action_manager_act_window.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/fields/basic_fields.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/less/form_view_extra.less | 10 |
3 files changed, 6 insertions, 8 deletions
diff --git a/addons/web/static/src/js/chrome/action_manager_act_window.js b/addons/web/static/src/js/chrome/action_manager_act_window.js index e040096f60b..eee8ffc9e92 100644 --- a/addons/web/static/src/js/chrome/action_manager_act_window.js +++ b/addons/web/static/src/js/chrome/action_manager_act_window.js @@ -704,7 +704,7 @@ ActionManager.include({ var env = ev.data.env; var context = new Context(env.context, actionData.context || {}); var recordID = env.currentID || null; // pyeval handles null value, not undefined - var def; + var def = $.Deferred(); // determine the action to execute according to the actionData if (actionData.special) { diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js index dfa779544e2..96209ee71ff 100644 --- a/addons/web/static/src/js/fields/basic_fields.js +++ b/addons/web/static/src/js/fields/basic_fields.js @@ -1835,7 +1835,7 @@ var StatInfo = AbstractField.extend({ */ _render: function () { var options = { - value: this.value || 0, + value: this._formatValue(this.value || 0), }; if (! this.attrs.nolabel) { if (this.nodeOptions.label_field && this.recordData[this.nodeOptions.label_field]) { diff --git a/addons/web/static/src/less/form_view_extra.less b/addons/web/static/src/less/form_view_extra.less index 95da6a2b35b..61967ea96fe 100644 --- a/addons/web/static/src/less/form_view_extra.less +++ b/addons/web/static/src/less/form_view_extra.less @@ -72,18 +72,16 @@ max-width: 70%; line-height: 1.2; - .o_stat_value { + > .o_stat_value, > .o_stat_text { .o-text-overflow(block); + } + + .o_stat_value { font-weight: 700; color: @odoo-brand-primary; } .o_stat_text { - .o-text-overflow(block); font-size: small; - - .o_stat_value { - display: inline; - } } } > span { |