[MERGE] forward port branch 11.0 up to 8fb25e185b

2017-11-28 16:57:58 +01:00
parent f132c8862f 8fb25e185b
commit 29590a61cd
1767 changed files with 322901 additions and 234474 deletions
@@ -652,6 +652,7 @@ var FieldMonetary = InputField.extend({
        var currencyField = this.nodeOptions.currency_field || this.field.currency_field || 'currency_id';
        var currencyID = this.record.data[currencyField] && this.record.data[currencyField].res_id;
        this.currency = session.get_currency(currencyID);
+        this.formatOptions.currency = this.currency; // _formatValue() uses formatOptions
    },
 });