diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 4646abbc780..4a00d45bf9e 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1389,14 +1389,6 @@
white-space: nowrap;
padding-right: 8px;
}
-.openerp .oe_form .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(odd),
-.openerp .oe_form .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell_label {
- border-right: 1px solid #dddddd;
-}
-.openerp .oe_form .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(even),
-.openerp .oe_form .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:not(.oe_form_group_cell_label):not(:first-child) {
- padding-left: 8px;
-}
.openerp .oe_form textarea {
resize: vertical;
}
@@ -1583,6 +1575,9 @@
border-bottom-color: transparent;
cursor: default;
}
+.openerp .oe_form_notebook_page {
+ padding: 0;
+}
.openerp .ui-tabs-hide {
display: none;
}
@@ -1627,6 +1622,19 @@
font-size: 20px;
font-weight: bold;
}
+.openerp .oe_form .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(odd),
+.openerp .oe_form .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell_label {
+ border-right: 1px solid #dddddd;
+}
+.openerp .oe_form .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(odd) label,
+.openerp .oe_form .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell_label label {
+ display: block;
+ min-width: 120px;
+}
+.openerp .oe_form .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(even),
+.openerp .oe_form .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:not(:first-child) {
+ padding-left: 8px;
+}
.openerp .oe_listview_nocontent > img {
float: left;
margin-right: 1.5em;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 673230865e1..46bcf1cb332 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1145,12 +1145,6 @@ $colour4: #8a89ba
.oe_form_label_help[for], .oe_form_label[for]
white-space: nowrap
padding-right: 8px
- .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(odd),
- .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell_label
- border-right: 1px solid #ddd
- .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(even),
- .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:not(.oe_form_group_cell_label):not(:first-child)
- padding-left: 8px
// }}}
// FormView.fields {{{
.oe_form
@@ -1323,6 +1317,8 @@ $colour4: #8a89ba
border: 1px solid #ddd
border-bottom-color: transparent
cursor: default
+ .oe_form_notebook_page
+ padding: 0
.ui-tabs-hide
display: none
@@ -1372,6 +1368,15 @@ $colour4: #8a89ba
.oe_form_title, .oe_form_title input
font-size: 20px
font-weight: bold
+ .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(odd),
+ .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell_label
+ border-right: 1px solid #ddd
+ label
+ display: block
+ min-width: 120px
+ .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(even),
+ .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:not(:first-child)
+ padding-left: 8px
// }}}
// ListView {{{
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index af333bd2eeb..3ce3fd3ae9c 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -986,13 +986,18 @@ instance.web.form.FormRenderingEngine = instance.web.Class.extend({
return $tag;
}
},
- process_sheet: function() {
- this.process_form.apply(this, arguments);
+ process_sheet: function($sheet, layout) {
+ var $new_sheet = this.render_element('FormRenderingSheet', layout, $sheet.getAttributes());
+ this.handle_common_properties($new_sheet, $sheet);
+ var $dst = (layout === 'auto') ? $new_sheet.find('group:first') : $new_sheet.find('.oe_form_sheet');
+ $sheet.children().appendTo($dst);
+ $sheet.before($new_sheet).remove();
+ this.process($new_sheet, layout);
},
process_form: function($form, layout) {
var $new_form = this.render_element('FormRenderingForm', layout, $form.getAttributes());
+ this.handle_common_properties($new_form, $form);
var $dst = (layout === 'auto') ? $new_form.find('group:first') : $new_form;
- $new_form.attr("modifiers", $form.attr("modifiers"));
$form.children().appendTo($dst);
if ($form[0] === this.$form[0]) {
// If root element, replace it
@@ -1000,7 +1005,7 @@ instance.web.form.FormRenderingEngine = instance.web.Class.extend({
} else {
$form.before($new_form).remove();
}
- this.process($new_form);
+ this.process($new_form, layout);
},
preprocess_field: function($field) {
var self = this;
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 15eef62c64b..624abcf10ca 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -790,10 +790,11 @@
+