diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 8044c425661..b7a61cc885a 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -677,12 +677,18 @@ openerp.base.form.WidgetButton = openerp.base.form.Widget.extend({
openerp.base.form.WidgetLabel = openerp.base.form.Widget.extend({
init: function(view, node) {
- this.is_field_label = true;
this.element_name = 'label_' + node.attrs.name;
this._super(view, node);
- this.template = "WidgetLabel";
+ // TODO fme: support for attrs.align
+ if (this.node.tag == 'label' && this.node.attrs.colspan) {
+ this.is_field_label = false;
+ this.template = "WidgetParagraph";
+ } else {
+ this.is_field_label = true;
+ this.template = "WidgetLabel";
+ }
this.colspan = 1;
},
render: function () {
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index de95a4294e8..9bef00147d3 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -468,6 +468,9 @@
:
+
+
+