[merge]

bzr revid: nicolas.vanhoren@openerp.com-20110727143511-r1xfflh2ferhpxc6
2011-07-27 16:35:11 +02:00
parent cf54b96a62 366f3ea01f
commit d18bf52191
1 changed files with 2 additions and 1 deletions
@@ -770,11 +770,12 @@ openerp.base.form.WidgetLabel = openerp.base.form.Widget.extend({
        if (this.node.tag == 'label' && this.node.attrs.colspan) {
            this.is_field_label = false;
            this.template = "WidgetParagraph";
+            this.colspan = this.node.attrs.colspan;
        } else {
            this.is_field_label = true;
            this.template = "WidgetLabel";
+            this.colspan = 1;
        }
-        this.colspan = 1;
    },
    render: function () {
        if (this['for'] && this.type !== 'label') {