From b75c0617a4b6114d1b8a026f129588ddc1932097 Mon Sep 17 00:00:00 2001 From: Sebastien LANGE Date: Fri, 13 Sep 2013 12:48:50 -1000 Subject: [PATCH] [FIX] PEP8 and change get company_id --- .../report/print_journal.py | 12 +++++++----- .../wizard/print_journal.py | 9 ++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/account_financial_report_webkit/report/print_journal.py b/account_financial_report_webkit/report/print_journal.py index 948417e6..71d386de 100644 --- a/account_financial_report_webkit/report/print_journal.py +++ b/account_financial_report_webkit/report/print_journal.py @@ -30,6 +30,7 @@ from datetime import datetime from common_reports import CommonReportHeaderWebkit from webkit_parser_header_fix import HeaderFooterTextWebKitParser + class PrintJournalWebkit(report_sxw.rml_parse, CommonReportHeaderWebkit): def __init__(self, cursor, uid, name, context): @@ -37,7 +38,10 @@ class PrintJournalWebkit(report_sxw.rml_parse, CommonReportHeaderWebkit): self.pool = pooler.get_pool(self.cr.dbname) self.cursor = self.cr - company = self.pool.get('res.users').browse(self.cr, uid, uid, context=context).company_id + company_obj = self.pool.get('res.company') + + company_id = company_obj._company_default_get(self.cr, uid, 'res.users', context=context) + company = company_obj.browse(self.cr, uid, company_id, context=context) header_report_name = ' - '.join((_('JOURNALS'), company.name, company.currency_id.name)) footer_date_time = self.formatLang(str(datetime.today()), date_time=True) @@ -45,7 +49,7 @@ class PrintJournalWebkit(report_sxw.rml_parse, CommonReportHeaderWebkit): self.localcontext.update({ 'cr': cursor, 'uid': uid, - 'report_name':_('Journals'), + 'report_name': _('Journals'), 'display_account_raw': self._get_display_account_raw, 'filter_form': self._get_filter, 'target_move': self._get_target_move, @@ -83,7 +87,7 @@ class PrintJournalWebkit(report_sxw.rml_parse, CommonReportHeaderWebkit): chart_account = self._get_chart_account_id_br(data) account_period_obj = self.pool.get('account.period') - domain= [('journal_id', 'in', journal_ids)] + domain = [('journal_id', 'in', journal_ids)] if main_filter == 'filter_no': domain += [ ('date', '>=', self.get_first_fiscalyear_period(fiscalyear).date_start), @@ -135,8 +139,6 @@ class PrintJournalWebkit(report_sxw.rml_parse, CommonReportHeaderWebkit): return super(PrintJournalWebkit, self).set_context(objects, data, new_ids, report_type=report_type) - - HeaderFooterTextWebKitParser('report.account.account_report_print_journal_webkit', 'account.journal.period', 'addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako', diff --git a/account_financial_report_webkit/wizard/print_journal.py b/account_financial_report_webkit/wizard/print_journal.py index b1c86aa2..191d1daf 100644 --- a/account_financial_report_webkit/wizard/print_journal.py +++ b/account_financial_report_webkit/wizard/print_journal.py @@ -31,7 +31,6 @@ from lxml import etree class AccountReportPrintJournalWizard(osv.osv_memory): """Will launch print journal report and pass requiered args""" - _inherit = "account.common.account.report" _name = "print.journal.webkit" _description = "Journals Report" @@ -71,7 +70,7 @@ class AccountReportPrintJournalWizard(osv.osv_memory): def onchange_filter(self, cr, uid, ids, filter='filter_no', fiscalyear_id=False, context=None): res = {} if filter == 'filter_no': - res['value'] = {'period_from': False, 'period_to': False, 'date_from': False ,'date_to': False} + res['value'] = {'period_from': False, 'period_to': False, 'date_from': False, 'date_to': False} if filter == 'filter_date': if fiscalyear_id: fyear = self.pool.get('account.fiscalyear').browse(cr, uid, fiscalyear_id, context=context) @@ -99,7 +98,7 @@ class AccountReportPrintJournalWizard(osv.osv_memory): AND COALESCE(p.special, FALSE) = FALSE ORDER BY p.date_stop DESC LIMIT 1) AS period_stop''', (fiscalyear_id, fiscalyear_id)) - periods = [i[0] for i in cr.fetchall()] + periods = [i[0] for i in cr.fetchall()] if periods: start_period = end_period = periods[0] if len(periods) > 1: @@ -118,9 +117,9 @@ class AccountReportPrintJournalWizard(osv.osv_memory): doc = etree.XML(res['arch']) if context.get('sale_purchase_only'): - domain ="[('type', 'in', ('sale','purchase','sale_refund','purchase_refund'))]" + domain = "[('type', 'in', ('sale','purchase','sale_refund','purchase_refund'))]" else: - domain ="[('type', 'not in', ('sale','purchase','sale_refund','purchase_refund'))]" + domain = "[('type', 'not in', ('sale','purchase','sale_refund','purchase_refund'))]" nodes = doc.xpath("//field[@name='journal_ids']") for node in nodes: node.set('domain', domain)