summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2012-11-19 18:01:16 +0100
committerOlivier Dony <odo@openerp.com>2012-11-19 18:01:16 +0100
commita670e79f8e426081141827f8e1fa4e2dbfd050fe (patch)
treece962b554fdfb6c745fb2ca7d0280bc08cbf43ea /addons
parent1a8acb73b39494b726f04fc559e45f27d851d5b6 (diff)
parent9180d9702b11fe0fd6d228037826ccbaa9a31fc5 (diff)
[MERGE] Sync with trunk
bzr revid: odo@openerp.com-20121119170116-x6fusrmmmkquvgfh
Diffstat (limited to 'addons')
-rw-r--r--addons/web/static/src/js/view_form.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index dad622fb7f9..c784b169d12 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1215,7 +1215,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
var doc = $.parseXML('<div class="oe_form">' + xml + '</div>');
$('button', doc).each(function() {
- $(this).attr('data-button-type', $(this).attr('type'));
+ $(this).attr('data-button-type', $(this).attr('type')).attr('type', 'button');
});
xml = instance.web.xml_to_str(doc);
return $(xml);