Merge lp:~numerigraphe-team/report-print-send/7.0-report_webkit_custom_paper_size into lp:~bruno-bottacini/report-print-send/7.0-report_webkit_custom_paper_size

[Lionel Sausin - Initiatives/Numérigraphe]

This branch updates the code reused as white-box from lp:~numerigraphe-team/report-print-send/7.0-report_webkit_custom_paper_size : it was changed upstream to make it compatible with wkhtmltopdf 0.12

[lp:~numerigraphe-team/report-print-send/7.0-report_webkit_custom_paper_size]

13. By Numérigraphe on 2014-06-02

[FIX] missing import

Unmerged revisions

13. By Numérigraphe on 2014-06-02

[FIX] missing import

12. By Numérigraphe on 2014-05-15

[FIX] update white-box reused code (makes it compatible with latest wkhtmltopdf)

=== modified file 'report_webkit_custom_paper_size/__init__.py'
--- report_webkit_custom_paper_size/__init__.py	2014-01-23 16:38:05 +0000
+++ report_webkit_custom_paper_size/__init__.py	2014-06-02 16:26:30 +0000
@@ -7,6 +7,7 @@
 import logging
 import subprocess
 from openerp.tools.translate import _
+from openerp.osv.osv import except_osv
 
 
 _logger = logging.getLogger(__name__)
@@ -33,7 +34,7 @@
                              ),
                             'w'
                         )
-        head_file.write(header)
+        head_file.write(self._sanitize_html(header))
         head_file.close()
         file_to_del.append(head_file.name)
         command.extend(['--header-html', head_file.name])
@@ -44,7 +45,7 @@
                              ),
                             'w'
                         )
-        foot_file.write(footer)
+        foot_file.write(self._sanitize_html(footer))
         foot_file.close()
         file_to_del.append(foot_file.name)
         command.extend(['--footer-html', foot_file.name])
@@ -69,7 +70,7 @@
     for html in html_list :
         html_file = file(os.path.join(tmp_dir, str(time.time()) + str(count) +'.body.html'), 'w')
         count += 1
-        html_file.write(html)
+        html_file.write(self._sanitize_html(html))
         html_file.close()
         file_to_del.append(html_file.name)
         command.append(html_file.name)