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

[MERGE] from trunk-opw-578475-port-vme 

bzr revid: chm@openerp.com-20121126114509-kan2wpk883ll1uk9
This commit is contained in:
Christophe Matthieu 2012-11-26 12:45:09 +01:00
parent c91f05a202 e272ea66bd
commit 7f9b18dc1d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/web/static/src/js/search.js
View File

@ -1924,7 +1924,8 @@ instance.web.search.ExtendedSearchProposition.Integer = instance.web.search.Exte
},
get_value: function() {
try {
return instance.web.parse_value(this.$el.val(), {'widget': 'integer'});
var val =this.$el.val();
return instance.web.parse_value(val == "" ? 0 : val, {'widget': 'integer'});
} catch (e) {
return "";
}
@ -1948,7 +1949,8 @@ instance.web.search.ExtendedSearchProposition.Float = instance.web.search.Extend
},
get_value: function() {
try {
return instance.web.parse_value(this.$el.val(), {'widget': 'float'});
var val =this.$el.val();
return instance.web.parse_value(val == "" ? 0.0 : val, {'widget': 'float'});
} catch (e) {
return "";
}

4
addons/web/static/src/xml/base.xml
View File

@ -1603,10 +1603,10 @@
<span/>
</t>
<t t-name="SearchView.extended_search.proposition.integer">
<input type="number" class="field_integer" step="1"/>
<input type="number" class="field_integer" value = "0" step="1"/>
</t>
<t t-name="SearchView.extended_search.proposition.float">
<input type="number" class="field_float" step="0.01"/>
<input type="number" class="field_float" value = "0.0" step="0.01"/>
</t>
<t t-name="SearchView.extended_search.proposition.selection">
<select>