Merge lp:~invitu/account-financial-report/8.0-account_financial_report_webkit into lp:~account-report-core-editor/account-financial-report/7.0

Proposed by invitu
Status: Needs review
Proposed branch: lp:~invitu/account-financial-report/8.0-account_financial_report_webkit
Merge into: lp:~account-report-core-editor/account-financial-report/7.0
Diff against target: 33 lines (+3/-2)
2 files modified
account_financial_report_webkit/report/ (+1/-1)
account_financial_report_webkit/report/ (+2/-1)
To merge this branch: bzr merge lp:~invitu/account-financial-report/8.0-account_financial_report_webkit
Reviewer Review Type Date Requested Status
Pedro Manuel Baeza Needs Resubmitting
Review via email:

Description of the change

I started to migrate account_financial_report_webkit to V8 (small changes)

To post a comment you must log in.
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

Hi, thanks for the MP.

Changes done are still compatible with v7?


review: Needs Information
Revision history for this message
invitu (invitu) wrote :


I just tested it and yes indeed, it still works with V7 :-)


Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

OK, you have my approval then.


review: Approve (code review)
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

This project is now hosted on Please move your proposal there. This guide may help you

This is very convenient to do before 8.0 branch creation

review: Needs Resubmitting

Unmerged revisions

87. By invitu

[MIG] portability to V8

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account_financial_report_webkit/report/'
--- account_financial_report_webkit/report/ 2014-03-17 12:09:18 +0000
+++ account_financial_report_webkit/report/ 2014-04-20 00:01:23 +0000
@@ -37,7 +37,7 @@
39def get_mako_template(obj, *args):39def get_mako_template(obj, *args):
40 template_path = openerp.addons.get_module_resource(*args)40 template_path = openerp.modules.get_module_resource(*args)
41 return Template(filename=template_path, input_encoding='utf-8')41 return Template(filename=template_path, input_encoding='utf-8')
43report_helper.WebKitHelper.get_mako_template = get_mako_template43report_helper.WebKitHelper.get_mako_template = get_mako_template
=== modified file 'account_financial_report_webkit/report/'
--- account_financial_report_webkit/report/ 2014-03-18 14:55:32 +0000
+++ account_financial_report_webkit/report/ 2014-04-20 00:01:23 +0000
@@ -38,6 +38,7 @@
38from openerp.osv.osv import except_osv38from openerp.osv.osv import except_osv
39from import _39from import _
40from openerp import addons40from openerp import addons
41from openerp import modules
41from openerp import pooler42from openerp import pooler
42from openerp import tools43from openerp import tools
43from openerp.addons.report_webkit import webkit_report44from openerp.addons.report_webkit import webkit_report
@@ -178,7 +179,7 @@
178 template = False179 template = False
180 if report_xml.report_file:181 if report_xml.report_file:
181 path = addons.get_module_resource(*report_xml.report_file.split(os.path.sep))182 path = modules.get_module_resource(*report_xml.report_file.split(os.path.sep))
182 if os.path.exists(path):183 if os.path.exists(path):
183 template = file(path).read()184 template = file(path).read()
184 if not template and report_xml.report_webkit_data:185 if not template and report_xml.report_webkit_data:


People subscribed via source and target branches

to status/vote changes: