openerp-community team mailing list archive

["Chirag Dodiya\(OpenERP\)" <chiragdd7@xxxxxxxxx>]

Chirag Dodiya(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-1077238-chirag into lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #1077238 in OpenERP Addons: "[trunk/7.0] report webkit - missing checkbox labels"
  https://bugs.launchpad.net/openobject-addons/+bug/1077238

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1077238-chirag/+merge/151198

Hello,

Webkit Report : missing checkbox labels 

the labels are only printed if <group> tags are present.
so put all field 'webkit header', 'webkit footer' checkbox field into inside group.

Thanks

-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1077238-chirag/+merge/151198
Your team OpenERP Community is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-1077238-chirag.

=== modified file 'report_webkit/ir_report_view.xml'
--- report_webkit/ir_report_view.xml	2013-02-25 15:25:07 +0000
+++ report_webkit/ir_report_view.xml	2013-03-01 11:06:21 +0000
@@ -7,6 +7,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//page[@string='Security']" position="before" >
                     <page string="Webkit" attrs="{'invisible':[('report_type','!=','webkit')]}">
+<<<<<<< TREE
                         <group>
                             <field name="webkit_header"/>
                             <field name="webkit_debug"/>
@@ -14,6 +15,15 @@
                             <separator string="Webkit Template (used if Report File is not found)" colspan="4"/>
                             <field name="report_webkit_data" colspan="4" nolabel="1"/>
                         </group>
+=======
+                        <group>
+                        <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>
+>>>>>>> MERGE-SOURCE
                     </page>
                 </xpath>
             </field>