odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] problem with parsing in field monetary 

bzr revid: nicolas.vanhoren@openerp.com-20121009090851-021w63udra7mwa2a
This commit is contained in:
niv-openerp 2012-10-09 11:08:51 +02:00
parent 876073f5ec
commit 2f6ad073ba
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
addons/web/static/src/js/view_form.js
View File

@ -2214,7 +2214,7 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(instance.we
var self = this;
var $input = this.$el.find('input');
$input.change(function() {
self.set({'value': instance.web.parse_value($input.val(), self)});
self.set({'value': self.parse_value($input.val())});
});
this.setupFocus($input);
},
@ -2223,7 +2223,7 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(instance.we
this.render_value();
},
render_value: function() {
var show_value = instance.web.format_value(this.get('value'), this, '');
var show_value = this.format_value(this.get('value'), '');
if (!this.get("effective_readonly")) {
this.$el.find('input').val(show_value);
} else {
@ -2236,7 +2236,7 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(instance.we
is_syntax_valid: function() {
if (!this.get("effective_readonly")) {
try {
var value_ = instance.web.parse_value(this.$el.find('input').val(), this, '');
var value_ = this.parse_value(this.$el.find('input').val(), '');
return true;
} catch(e) {
return false;
@ -2244,6 +2244,12 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(instance.we
}
return true;
},
parse_value: function(val, def) {
return instance.web.parse_value(val, this, def);
},
format_value: function(val, def) {
return instance.web.format_value(val, this, def);
},
is_false: function() {
return this.get('value') === '' || this._super();
},
@ -5021,6 +5027,12 @@ instance.web.form.FieldMonetary = instance.web.form.FieldFloat.extend({
self.set({"currency_info": res});
});
},
parse_value: function(val, def) {
return instance.web.parse_value(val, {type: "float"}, def);
},
format_value: function(val, def) {
return instance.web.format_value(val, {type: "float"}, def);
},
});
/**