diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-01-21 12:11:38 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-01-21 12:11:38 +0100 |
| commit | 4ccca49d349412de385256cf3c731eedce8dfb02 (patch) | |
| tree | f6830f9fa377b8a2184863703edf6c9606e1de23 /addons/web | |
| parent | f3e7cd1c0e4982086254fbb8189802b4f4260c7a (diff) | |
| parent | 592f1cd229a7ffd5ca9280cea6c035f0e36db59c (diff) | |
[MERGE] forward port of branch 8.0 up to 592f1cd
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/static/src/js/chrome.js | 9 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 0cafc63d829..7e42441b877 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -600,12 +600,9 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ self.do_notify(_t("Backed"), _t("Database backed up successfully")); }, error: function(error){ - if(error){ - self.display_error({ - title: _t("Backup Database"), - error: 'AccessDenied' - }); - } + if (error && error[1]) { + self.display_error(error[1][0]); + } }, complete: function() { self.unblockUI(); diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 2783b85780c..c87fa98b15c 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2615,6 +2615,9 @@ instance.web.form.FieldFloat = instance.web.form.FieldChar.extend({ // As in GTK client, floats default to 0 value_ = 0; } + if (this.digits !== undefined && this.digits.length === 2) { + value_ = instance.web.round_precision(value_, this.digits[1]); + } this._super.apply(this, [value_]); }, focus: function () { |