From 8dad0e5f55cd5ed9140549af16f5d51bf95261b6 Mon Sep 17 00:00:00 2001 From: ccarly Date: Mon, 12 Jan 2015 20:22:06 -0500 Subject: [PATCH] fixes #36 - v8 account_financial_report_webkit error when print journal --- .../report/print_journal.py | 10 ++++++---- .../report/templates/account_report_print_journal.mako | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) mode change 100644 => 100755 account_financial_report_webkit/report/print_journal.py mode change 100644 => 100755 account_financial_report_webkit/report/templates/account_report_print_journal.mako diff --git a/account_financial_report_webkit/report/print_journal.py b/account_financial_report_webkit/report/print_journal.py old mode 100644 new mode 100755 index 60a4c61f..eae29f35 --- a/account_financial_report_webkit/report/print_journal.py +++ b/account_financial_report_webkit/report/print_journal.py @@ -126,8 +126,9 @@ class PrintJournalWebkit(report_sxw.rml_parse, CommonReportHeaderWebkit): objects = account_journal_period_obj.browse(self.cursor, self.uid, new_ids) # Sort by journal and period - objects.sort(key=lambda a: (a.journal_id.code, a.period_id.date_start)) + objects.sorted(key=lambda a: (a.journal_id.code, a.period_id.date_start)) move_obj = self.pool.get('account.move') + moves = {} for journal_period in objects: domain_arg = [ ('journal_id', '=', journal_period.journal_id.id), @@ -137,11 +138,11 @@ class PrintJournalWebkit(report_sxw.rml_parse, CommonReportHeaderWebkit): domain_arg += [('state', '=', 'posted')] move_ids = move_obj.search(self.cursor, self.uid, domain_arg, order="name") - journal_period.moves = move_obj.browse(self.cursor, self.uid, + moves[journal_period..id] = move_obj.browse(self.cursor, self.uid, move_ids) # Sort account move line by account accountant - for move in journal_period.moves: - move.line_id.sort(key=lambda a: (a.date, a.account_id.code)) + for move in moves[journal_period..id]: + move.line_id.sorted(key=lambda a: (a.date, a.account_id.code)) self.localcontext.update({ 'fiscalyear': fiscalyear, @@ -150,6 +151,7 @@ class PrintJournalWebkit(report_sxw.rml_parse, CommonReportHeaderWebkit): 'start_period': start_period, 'stop_period': stop_period, 'chart_account': chart_account, + 'moves', moves, }) return super(PrintJournalWebkit, self).set_context( diff --git a/account_financial_report_webkit/report/templates/account_report_print_journal.mako b/account_financial_report_webkit/report/templates/account_report_print_journal.mako old mode 100644 new mode 100755 index 58f3c5e6..7fc508f6 --- a/account_financial_report_webkit/report/templates/account_report_print_journal.mako +++ b/account_financial_report_webkit/report/templates/account_report_print_journal.mako @@ -99,7 +99,7 @@ %endif - %for move in journal_period.moves: + %for move in moves[journal_period.id]: <% new_move = True %>