Nicolas (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-monetary-fix into lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-monetary-fix/+merge/128647
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-monetary-fix/+merge/128647
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-monetary-fix.
=== modified file 'addons/web/static/src/js/formats.js'
--- addons/web/static/src/js/formats.js 2012-09-28 11:35:24 +0000
+++ addons/web/static/src/js/formats.js 2012-10-09 08:48:26 +0000
@@ -118,6 +118,7 @@
return instance.web.insert_thousand_seps(
_.str.sprintf('%d', value));
case 'float':
+ case 'monetary':
var digits = descriptor.digits ? descriptor.digits : [69,2];
digits = typeof digits === "string" ? py.eval(digits) : digits;
var precision = digits[1];
@@ -191,6 +192,7 @@
throw new Error(value + " is not a correct integer");
return tmp;
case 'float':
+ case 'monetary':
var tmp = Number(value);
if (!isNaN(tmp))
return tmp;
=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js 2012-10-08 15:41:41 +0000
+++ addons/web/static/src/js/view_form.js 2012-10-09 08:48:26 +0000
@@ -4993,8 +4993,14 @@
instance.web.form.FieldMonetary = instance.web.form.FieldFloat.extend({
template: "FieldMonetary",
- init: function() {
+ init: function(field_manager, node) {
this._super.apply(this, arguments);
+ try{
+ var temp = py.eval(node.attrs["widget_option"]);
+ this.options.currency_field = temp["monetary_currency"];
+ }catch(err){
+ this.do_warn(_t("please specify widget_option properly"),err);
+ }
this.set({"currency": false});
if (this.options.currency_field) {
this.field_manager.on("field_changed:" + this.options.currency_field, this, function() {
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
