diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml index 5e9f30cf7b2..08dc6351ebf 100644 --- a/addons/account/account_report.xml +++ b/addons/account/account_report.xml @@ -6,7 +6,7 @@ - + diff --git a/addons/account/report/central_journal.py b/addons/account/report/central_journal.py index c0cba35a350..b8955c4773d 100644 --- a/addons/account/report/central_journal.py +++ b/addons/account/report/central_journal.py @@ -40,9 +40,12 @@ class journal_print(report_sxw.rml_parse, account_journal_common_default): 'lines': self.lines, 'sum_debit': self._sum_debit, 'sum_credit': self._sum_credit, - 'get_filter': self._get_filter -# 'get_start_date': self.get_start_date, -# 'get_end_date': self.get_end_date + 'get_filter': self._get_filter, + 'get_fiscalyear': self._get_fiscalyear, + 'get_account': self._get_account, + 'get_start_period': self.get_start_period, + 'get_end_period': self.get_end_period, + 'get_sortby': self._get_sortby }) def set_context(self, objects, data, ids, report_type=None): # Improve move to common default? diff --git a/addons/account/report/central_journal.rml b/addons/account/report/central_journal.rml index 160a3970c77..e634425fb46 100644 --- a/addons/account/report/central_journal.rml +++ b/addons/account/report/central_journal.rml @@ -3,6 +3,32 @@ @@ -14,20 +40,6 @@ - - - - - - - - - - - - - - @@ -41,7 +53,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -125,23 +196,35 @@ - + - Journal Code - Journal Name + Start Date + End Date + Fiscal Year + Entries Sorted By + Account + Start Period + End Period + Filters By Printing Date - + - [[ o.journal_id.code or '' ]] - [[ o.journal_id.name ]] - [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]] + [[ data['form']['date_from'] ]] + [[ data['form']['date_to'] ]] + [[ get_fiscalyear(data) or removeParentNode('para') ]] + + [[ get_account(data) or removeParentNode('para') ]] + [[ get_start_period(data) or removeParentNode('para') ]] + [[ get_end_period(data) or removeParentNode('para') ]] + [[ data['form']['filter'] ]] + [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]] - + - + Account Num.