From 2e12a6686bc509333e3c647a66c2b0dc44747cd4 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 25 Feb 2013 16:16:30 +0100 Subject: [PATCH 1/5] Added sample for webkit bzr revid: nicolas.vanhoren@openerp.com-20130225151630-5x8c43i535o99uh4 --- addons/report_webkit/__openerp__.py | 3 +++ .../report_webkit/report/webkit_report_demo.mako | 14 ++++++++++++++ .../report_webkit/report/webkit_report_demo.xml | 15 +++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 addons/report_webkit/report/webkit_report_demo.mako create mode 100644 addons/report_webkit/report/webkit_report_demo.xml diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py index 5b88cb78eb4..d1640ab2f30 100644 --- a/addons/report_webkit/__openerp__.py +++ b/addons/report_webkit/__openerp__.py @@ -89,6 +89,9 @@ TODO: 'header_view.xml', 'ir_report_view.xml', ], + 'demo': [ + "report/webkit_report_demo.xml", + ], 'installable': True, 'auto_install': False, 'images': ['images/companies_webkit.jpeg','images/header_html.jpeg','images/header_img.jpeg'], diff --git a/addons/report_webkit/report/webkit_report_demo.mako b/addons/report_webkit/report/webkit_report_demo.mako new file mode 100644 index 00000000000..4c6be78e93a --- /dev/null +++ b/addons/report_webkit/report/webkit_report_demo.mako @@ -0,0 +1,14 @@ + + + + + + +

List of reports:

+ + + \ No newline at end of file diff --git a/addons/report_webkit/report/webkit_report_demo.xml b/addons/report_webkit/report/webkit_report_demo.xml new file mode 100644 index 00000000000..975f5137aad --- /dev/null +++ b/addons/report_webkit/report/webkit_report_demo.xml @@ -0,0 +1,15 @@ + + + + + + + + From e21b0a1a33e147347e17bc5b801b817e3e2f7c1e Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 25 Feb 2013 16:25:07 +0100 Subject: [PATCH 2/5] Corrected report view bzr revid: nicolas.vanhoren@openerp.com-20130225152507-onhr6y8asfkqapvl --- addons/report_webkit/ir_report_view.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/addons/report_webkit/ir_report_view.xml b/addons/report_webkit/ir_report_view.xml index e9f9ebd2234..1709b360c1d 100644 --- a/addons/report_webkit/ir_report_view.xml +++ b/addons/report_webkit/ir_report_view.xml @@ -7,11 +7,13 @@ - - - - - + + + + + + + From 1d502dff1aec0f8de2f83ff320334d1c0f4d5d30 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 25 Feb 2013 16:51:39 +0100 Subject: [PATCH 3/5] Better sample. bzr revid: nicolas.vanhoren@openerp.com-20130225155139-491mjrm12eppavqp --- addons/report_webkit/report/webkit_report_demo.mako | 3 +++ addons/report_webkit/report/webkit_report_demo.xml | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/report_webkit/report/webkit_report_demo.mako b/addons/report_webkit/report/webkit_report_demo.mako index 4c6be78e93a..1729fe4217e 100644 --- a/addons/report_webkit/report/webkit_report_demo.mako +++ b/addons/report_webkit/report/webkit_report_demo.mako @@ -10,5 +10,8 @@
  • ${report.name}
    • % endfor + +

    If this report does not contain headers, it is because you have a badly compiled wkhtmltopdf. Consider installing + the static version distributed on the official web site: https://code.google.com/p/wkhtmltopdf/.

    \ No newline at end of file diff --git a/addons/report_webkit/report/webkit_report_demo.xml b/addons/report_webkit/report/webkit_report_demo.xml index 975f5137aad..120c11e9ecd 100644 --- a/addons/report_webkit/report/webkit_report_demo.xml +++ b/addons/report_webkit/report/webkit_report_demo.xml @@ -7,9 +7,7 @@ model="ir.actions.report.xml" name="webkit.ir.actions.report.xml" file="report_webkit/report/webkit_report_demo.mako" - webkit_header="report_webkit.ir_header_webkit_basesample0" - report_type="webkit" - auto="False"/> + report_type="webkit"/> From 2277598f1c4250176a22ff777aade05f9d5d89b7 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 25 Feb 2013 17:06:50 +0100 Subject: [PATCH 4/5] Added helper for company logo bzr revid: nicolas.vanhoren@openerp.com-20130225160650-o4llg0bg7xxt7dnp --- addons/report_webkit/data.xml | 2 +- addons/report_webkit/report_helper.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/addons/report_webkit/data.xml b/addons/report_webkit/data.xml index fb58c9fb1ac..5c111fb07ec 100644 --- a/addons/report_webkit/data.xml +++ b/addons/report_webkit/data.xml @@ -55,7 +55,7 @@ - + diff --git a/addons/report_webkit/report_helper.py b/addons/report_webkit/report_helper.py index f1df1e786e3..bc2eb9397ec 100644 --- a/addons/report_webkit/report_helper.py +++ b/addons/report_webkit/report_helper.py @@ -39,6 +39,7 @@ class WebKitHelper(object): self.uid = uid self.pool = pooler.get_pool(self.cursor.dbname) self.report_id = report_id + self.context = context def embed_image(self, type, img, width=0, height=0) : "Transform a DB image into an embedded HTML image" @@ -79,6 +80,13 @@ class WebKitHelper(object): """Return HTML embedded logo by name""" img, type = self.get_logo_by_name(name) return self.embed_image(type, img, width, height) + + def embed_company_logo(self, width=0, height=0): + cr, uid, context = self.cursor, self.uid, self.context + my_user = self.pool.get('res.users').browse(cr, uid, uid, context=context) + logo = my_user.company_id.logo_web + return self.embed_image("png", logo, width, height) + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 5f60359b59a248f5c7133cde9e3fd66e80f2f233 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 25 Feb 2013 17:21:59 +0100 Subject: [PATCH 5/5] Solve a bug that appear in the runbot with js tests (??) bzr revid: nicolas.vanhoren@openerp.com-20130225162159-qhmiet8a22m983rg --- addons/report_webkit/ir_report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/report_webkit/ir_report.py b/addons/report_webkit/ir_report.py index a4f0784f093..8b8f99b8ebf 100644 --- a/addons/report_webkit/ir_report.py +++ b/addons/report_webkit/ir_report.py @@ -45,7 +45,7 @@ def register_report(name, model, tmpl_path, parser=rml_parse): return if hasattr(service, 'parser'): parser = service.parser - del openerp.report.interface.report_int[name] + del openerp.report.interface.report_int._reports[name] WebKitParser(name, model, tmpl_path, parser=parser)
    ${helper.embed_logo_by_name('camptocamp_logo')|n}${helper.embed_company_logo()|n}