diff options
| author | nicolas.bessi@camptocamp.com <> | 2011-03-22 14:40:40 +0100 |
|---|---|---|
| committer | nicolas.bessi@camptocamp.com <> | 2011-03-22 14:40:40 +0100 |
| commit | 4ed6eeeba6809207de8f63e2f4c0fe33bf7e0b9a (patch) | |
| tree | 6b79940cf63904561e776e25a0a636666494d9dc | |
| parent | ab2ef137529aa24cbbc55c2949974527a81e3703 (diff) | |
[FIX] utf8 debug + minial bin version
bzr revid: nicolas.bessi@camptocamp.com-20110322134040-co8s0zyt87t6ymwc
| -rw-r--r-- | addons/report_webkit/data.xml | 2 | ||||
| -rw-r--r-- | addons/report_webkit/webkit_report.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/addons/report_webkit/data.xml b/addons/report_webkit/data.xml index a841631faaa..62a76697ea5 100644 --- a/addons/report_webkit/data.xml +++ b/addons/report_webkit/data.xml @@ -75,7 +75,7 @@ <tr> <td>Mail: ${company.partner_id.address and company.partner_id.address[0].email or ''|entity}<br/></td> </tr> - </table> ${_debug or ''} </body> + </table> ${_debug or ''|n} </body> </html>]]> </field> <field eval="55.0" name="margin_top"/> diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py index 0157343074d..268364fc399 100644 --- a/addons/report_webkit/webkit_report.py +++ b/addons/report_webkit/webkit_report.py @@ -77,7 +77,8 @@ class WebKitParser(report_sxw): _('Please install executable on your system'+ ' (sudo apt-get install wkhtmltopdf) or download it from here:'+ ' http://code.google.com/p/wkhtmltopdf/downloads/list and set the'+ - ' path to the executable on the Company form.') + ' path to the executable on the Company form.'+ + 'Minimal version is 0.9.9') ) if os.path.isabs(path) : if (os.path.exists(path) and os.access(path, os.X_OK)\ @@ -339,7 +340,7 @@ class WebKitParser(report_sxw): time=time, helper=helper, css=css, - _debug=html, + _debug=html.decode(), formatLang=self.formatLang, setLang=self.setLang, _=self.translate_call, |