[MRG] [FIX]account_financial_report_webkit: Open Invoices Report: fix wrong xmlid in report definition, removed useless import of addons in template, hasattr cannot be used on browse object - replaced by 'field' in browse_object

11 years ago · 960e20e2a1
6 changed files with 11 additions and 13 deletions
--- a/account_financial_report_webkit/report/open_invoices.py
+++ b/account_financial_report_webkit/report/open_invoices.py
@ -20,7 +20,6 @@
 ##############################################################################

 from collections import defaultdict
-from report import report_sxw
 from datetime import datetime
 from itertools import groupby
 from operator import itemgetter
@ -30,6 +29,7 @@ from mako.template import Template
 import openerp.addons
 from openerp import pooler
 from openerp.osv import osv
+from openerp.report import report_sxw
 from openerp.tools.translate import _
 from openerp.addons.report_webkit import report_helper
 from .common_partner_reports import CommonPartnersReportHeaderWebkit
--- a/account_financial_report_webkit/report/print_journal.py
+++ b/account_financial_report_webkit/report/print_journal.py
@ -22,9 +22,9 @@
 #
 ##############################################################################

-from report import report_sxw
-from tools.translate import _
-import pooler
+from openerp.report import report_sxw
+from openerp.tools.translate import _
+from openerp import pooler
 from datetime import datetime

 from common_reports import CommonReportHeaderWebkit
--- a/account_financial_report_webkit/report/templates/account_report_open_invoices.mako
+++ b/account_financial_report_webkit/report/templates/account_report_open_invoices.mako
@ -22,7 +22,6 @@
    </head>
    <body>
 
-    <% import addons %>        
    <% template1 = helper.get_mako_template('account_financial_report_webkit','report', 'templates', 'open_invoices_inclusion.mako.html') %>
    <% context.lookup.put_template('open_invoices_inclusion.mako.html', template1) %>
    <% template2 = helper.get_mako_template('account_financial_report_webkit','report', 'templates', 'grouped_by_curr_open_invoices_inclusion.mako.html') %>
@ -74,7 +73,7 @@
            </div>
        </div>
        %for acc in objects:
-            %if hasattr(acc, 'grouped_ledger_lines'):
+            %if 'grouped_ledger_lines' in acc:
               <% fl = formatLang %>
              <%include file="grouped_by_curr_open_invoices_inclusion.mako.html" args="account=acc,formatLang=fl"/>
            %else:
--- a/account_financial_report_webkit/report/webkit_parser_header_fix.py
+++ b/account_financial_report_webkit/report/webkit_parser_header_fix.py
@ -31,8 +31,6 @@ import os
 import subprocess
 import tempfile
 import time
-import pooler
-import tools
 import logging


@ -40,6 +38,8 @@ from mako import exceptions
 from openerp.osv.osv import except_osv
 from openerp.tools.translate import _
 from openerp import addons
+from openerp import pooler
+from openerp import tools
 from openerp.addons.report_webkit import webkit_report
 from openerp.addons.report_webkit.webkit_report import mako_template
 from openerp.addons.report_webkit.report_helper import WebKitHelper
--- a/account_financial_report_webkit/wizard/print_journal.py
+++ b/account_financial_report_webkit/wizard/print_journal.py
@ -22,13 +22,12 @@
 #
 ##############################################################################

-from osv import osv
-from osv import fields
+from openerp.osv import fields, orm
 import time
 from lxml import etree


-class AccountReportPrintJournalWizard(osv.osv_memory):
+class AccountReportPrintJournalWizard(orm.TransientModel):
    """Will launch print journal report and pass requiered args"""

    _inherit = "account.common.account.report"
--- a/account_financial_report_webkit/wizard/trial_balance_wizard.py
+++ b/account_financial_report_webkit/wizard/trial_balance_wizard.py
@ -19,10 +19,10 @@
 #
 ##############################################################################

-from osv import osv
+from openerp.osv import orm


-class AccountTrialBalanceWizard(osv.osv_memory):
+class AccountTrialBalanceWizard(orm.TransientModel):
    """Will launch trial balance report and pass required args"""

    _inherit = "account.common.balance.report"