3 files changed, 26 insertions, 1 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index ebb211df452..23d664b9087 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -871,6 +871,16 @@ label.error {
 .openerp table.oe_frame {
     color: #4c4c4c;
 }
+.openerp fieldset.oe_group_box {
+    border: 1px solid #AAAAAA;
+    moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    border-radius: 4px;
+    background: #F9F9F9;
+}
+.openerp fieldset.oe_group_box legend {
+    font-weight: bold;
+}
 .openerp td.oe_form_frame_cell {
     padding: 2px;
     position: relative;
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 53d7eeb60fb..a58c1d86d86 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -916,6 +916,10 @@ openerp.web.form.WidgetFrame = openerp.web.form.Widget.extend({
     }
 });
 
+openerp.web.form.WidgetGroup = openerp.web.form.WidgetFrame.extend({
+    template: 'WidgetGroup',
+}),
+
 openerp.web.form.WidgetNotebook = openerp.web.form.Widget.extend({
     template: 'WidgetNotebook',
     init: function(view, node) {
@@ -3083,7 +3087,7 @@ openerp.web.form.FieldMany2OneReadonly = openerp.web.form.FieldURIReadonly.exten
  */
 openerp.web.form.widgets = new openerp.web.Registry({
     'frame' : 'openerp.web.form.WidgetFrame',
-    'group' : 'openerp.web.form.WidgetFrame',
+    'group' : 'openerp.web.form.WidgetGroup',
     'notebook' : 'openerp.web.form.WidgetNotebook',
     'notebookpage' : 'openerp.web.form.WidgetNotebookPage',
     'separator' : 'openerp.web.form.WidgetSeparator',
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 55a155aaa5f..2dfbf8b2532 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -730,6 +730,17 @@
     </tr>
     </table>
 </t>
+<t t-name="WidgetGroup">
+    <t t-if="widget.string">
+    <fieldset class="oe_group_box">
+        <legend><t t-esc="widget.string"/></legend>
+        <t t-call="WidgetFrame"/>
+    </fieldset>
+    </t>
+    <t t-if="!widget.string">
+        <t t-call="WidgetFrame"/>
+    </t>
+</t>
 <t t-name="WidgetNotebook">
     <ul>
         <li t-foreach="widget.pages" t-as="page">