Merge lp:~camptocamp/openobject-addons/7.0-fix-report_webkit-report-view-20120115 into lp:openobject-addons/7.0

[Yannick Vaucher @ Camptocamp]

Add <group> tags to show boolean labels

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

LGTM

review: Approve (code review, no test)

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Hello,

Ok for me

Regards

Nicolas

review: Approve

[Rifakat Husen (OpenERP) (rha-openerp)]

Yannick,
I think only 1 group block should also give the same result as 2. And if you still keep
2 group block then you can remove separator and use,
<group string="Webkit Template (used if Report File is not found)"> and if you go for this
then you also don't need to add colspan. What do you think?

Thanks

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

As I can remove the colspan and the separator with the second option I'll go it.

[Rifakat Husen (OpenERP) (rha-openerp)]

Looks good. Thanks a lot,
Rifakat

review: Approve

[Martin Trigaux (OpenERP) (mat-openerp)]

Hello,

Thank you for the patch and review. LGTM. Merged into addons 7.0
revno: 9322 [merge]
revision-id: <email address hidden>

review: Approve

=== modified file 'report_webkit/ir_report_view.xml'
--- report_webkit/ir_report_view.xml	2012-11-29 22:26:45 +0000
+++ report_webkit/ir_report_view.xml	2013-06-03 17:33:43 +0000
@@ -7,11 +7,14 @@
             <field name="arch" type="xml">
                 <xpath expr="//page[@string='Security']" position="before" >
                     <page string="Webkit" attrs="{'invisible':[('report_type','!=','webkit')]}">
-                        <field name="webkit_header"/>
-                        <field name="webkit_debug"/>
-                        <field name="precise_mode"/>
-                        <separator string="Webkit Template (used if Report File is not found)" colspan="4"/>
-                        <field name="report_webkit_data" colspan="4" nolabel="1"/>
+                        <group>
+                            <field name="webkit_header"/>
+                            <field name="webkit_debug"/>
+                            <field name="precise_mode"/>
+                        </group>
+                        <group string="Webkit Template (used if Report File is not found)">
+                            <field name="report_webkit_data" nolabel="1"/>
+                        </group>
                     </page>
                 </xpath>
             </field>