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

[invitu]

Hello
I started to migrate account_financial_report_webkit to V8 (small changes)
Regards

[Pedro Manuel Baeza (pedro.baeza)]

Hi, thanks for the MP.

Changes done are still compatible with v7?

Regards.

review: Needs Information

[invitu (invitu)]

hello

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

regards

[Pedro Manuel Baeza (pedro.baeza)]

OK, you have my approval then.

Regards.

review: Approve (code review)

[Pedro Manuel Baeza (pedro.baeza)]

This project is now hosted on https://github.com/OCA/account-financial-reporting. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

This is very convenient to do before 8.0 branch creation

review: Needs Resubmitting

Unmerged revisions

87. By invitu on 2014-04-19

[MIG] portability to V8

=== modified file 'account_financial_report_webkit/report/open_invoices.py'
--- account_financial_report_webkit/report/open_invoices.py	2014-03-17 12:09:18 +0000
+++ account_financial_report_webkit/report/open_invoices.py	2014-04-20 00:01:23 +0000
@@ -37,7 +37,7 @@
 
 
 def get_mako_template(obj, *args):
-    template_path = openerp.addons.get_module_resource(*args)
+    template_path = openerp.modules.get_module_resource(*args)
     return Template(filename=template_path, input_encoding='utf-8')
 
 report_helper.WebKitHelper.get_mako_template = get_mako_template

=== modified file 'account_financial_report_webkit/report/webkit_parser_header_fix.py'
--- account_financial_report_webkit/report/webkit_parser_header_fix.py	2014-03-18 14:55:32 +0000
+++ account_financial_report_webkit/report/webkit_parser_header_fix.py	2014-04-20 00:01:23 +0000
@@ -38,6 +38,7 @@
 from openerp.osv.osv import except_osv
 from openerp.tools.translate import _
 from openerp import addons
+from openerp import modules
 from openerp import pooler
 from openerp import tools
 from openerp.addons.report_webkit import webkit_report
@@ -178,7 +179,7 @@
         template =  False
 
         if report_xml.report_file:
-            path = addons.get_module_resource(*report_xml.report_file.split(os.path.sep))
+            path = modules.get_module_resource(*report_xml.report_file.split(os.path.sep))
             if os.path.exists(path):
                 template = file(path).read()
         if not template and report_xml.report_webkit_data: