[MERGE] webkit: support for @webkit_header attribute in <report> tags courtesy of...

Also updates the sample invoice report from
report_webkit_sample.

bzr revid: odo@openerp.com-20120214141148-qgm8sky27u9sfqhp

diff --cc addons/report_webkit/convert.py
index 0000000,eb57263..b4d4232
mode 000000,100644..100644
--- /dev/null
--- 2/addons/report_webkit/convert.py
+++ b/addons/report_webkit/convert.py
@@@ -1,0 -1,56 +1,57 @@@
+ # -*- coding: utf-8 -*-
+ ##############################################################################
+ #
+ # Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com)
+ # All Right Reserved
+ #
+ # Author : Nicolas Bessi (Camptocamp)
+ #
+ # WARNING: This program as such is intended to be used by professional
+ # programmers who take the whole responsability of assessing all potential
+ # consequences resulting from its eventual inadequacies and bugs
+ # End users who are looking for a ready-to-use solution with commercial
+ # garantees and support are strongly adviced to contract a Free Software
+ # Service Company
+ #
+ # This program is Free Software; you can redistribute it and/or
+ # modify it under the terms of the GNU General Public License
+ # as published by the Free Software Foundation; either version 2
+ # of the License, or (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ ##############################################################################
+ 
 -from tools import convert
++from openerp.tools import convert
+ 
+ original_xml_import = convert.xml_import
+ 
+ class WebkitXMLImport(original_xml_import):
 -    
++
+     # Override of xml import in order to add webkit_header tag in report tag.
 -    # This was done with agreement of Olivier Dony as the XML api does not offer enought flexibity
 -    # The solution is not meant to be long term solution
++    # As discussed with the R&D Team,  the current XML processing API does
++    # not offer enough flexibity to do it in a cleaner way.
++    # The solution is not meant to be long term solution, but at least
++    # allows chaining of several overrides of the _tag_report method,
++    # and does not require a copy/paste of the original code.
+     def _tag_report(self, cr, rec, data_node=None):
++        report_id = super(WebkitXMLImport, self)._tag_report(cr, rec, data_node)
+         if rec.get('report_type') == 'webkit':
+             header = rec.get('webkit_header')
 -            report_id = super(WebkitXMLImport, self)._tag_report(cr, rec, data_node)
 -            report_obj = self.pool.get('ir.actions.report.xml')
+             if header:
+                 if header in ('False', '0', 'None'):
 -                    report_obj.write(cr, self.uid, report_id, {'webkit_header': False})
++                    webkit_header_id = False
+                 else:
+                     webkit_header_id = self.id_get(cr, header)
 -                    report_obj.write(cr, self.uid, report_id, {'webkit_header': webkit_header_id})
 -                return report_id
 -        else:
 -            return super(WebkitXMLImport, self)._tag_report(cr, rec, data_node)
++                self.pool.get('ir.actions.report.xml').write(cr, self.uid,
++                    report_id, {'webkit_header': webkit_header_id})
++        return report_id
+ 
+ convert.xml_import = WebkitXMLImport