diff --git a/addons/account/report/account_general_journal.py b/addons/account/report/account_general_journal.py index d5e73fd2d42..ef723bf7960 100644 --- a/addons/account/report/account_general_journal.py +++ b/addons/account/report/account_general_journal.py @@ -117,6 +117,7 @@ class journal_print(report_sxw.rml_parse, common_report_header): return data['form']['amount_currency'] def _sum_debit_period(self, period_id, journal_id=False): + if journal_id: journals = [journal_id] else: diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml index fa5c7d2875e..d22cb9d80cb 100644 --- a/addons/account/report/account_general_journal.rml +++ b/addons/account/report/account_general_journal.rml @@ -309,10 +309,10 @@ - [[ formatLang(sum_debit_period(o.period_id.id, o.journal_id.id)) ]] + [[ formatLang(sum_debit_period(o.id, o.journal_id.id)) ]] - [[ formatLang(sum_credit_period(o.period_id.id, o.journal_id.id)) ]] + [[ formatLang(sum_credit_period(o.id, o.journal_id.id)) ]] [[ formatLang(sum_credit_period(o.id, o.journal_id.id)-sum_debit_period(o.id, o.journal_id.id)) ]] @@ -346,7 +346,7 @@ [[ display_currency(data) == False or removeParentNode('blockTable') ]] - [[ lines(o.id) or removeParentNode('blockTable')]] + [[ repeatIn(lines(o.id),'line')]] [[ line['code'] ]] @@ -365,7 +365,7 @@ [[ display_currency(data) or removeParentNode('blockTable') ]] - [[ lines(o.id) or removeParentNode('blockTable')]] + [[ repeatIn(lines(o.id),'line')]] [[ line['code'] ]] [[ line['name'] ]] [[ formatLang(line['debit'] )]]