diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 425941fce88..0616a9b5426 100644 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -54,6 +54,8 @@ class account_balance(report_sxw.rml_parse, common_report_header): 'get_end_period': self.get_end_period , 'get_account': self._get_account, 'get_journal': self._get_journal, + 'get_start_date':self._get_start_date, + 'get_end_date':self._get_end_date, }) self.context = context diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index ee8a0e47d66..940d0e7c5cb 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -164,7 +164,7 @@ - + @@ -241,8 +241,8 @@ End Date - [[ data['form']['date_from'] ]] - [[ data['form']['date_to'] ]] + [[ get_start_date(data) ]] + [[ get_end_date(data) ]] [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] diff --git a/addons/account/report/central_journal.py b/addons/account/report/central_journal.py index 83cfb88e8da..1029872c2ab 100644 --- a/addons/account/report/central_journal.py +++ b/addons/account/report/central_journal.py @@ -46,7 +46,9 @@ class journal_print(report_sxw.rml_parse, common_report_header): 'get_start_period': self.get_start_period, 'get_end_period': self.get_end_period, 'get_sortby': self._get_sortby, - 'sum_currency_amount_account': self._sum_currency_amount_account, + 'sum_currency_amount_account': self._sum_currency_amount_account, + 'get_start_date':self._get_start_date, + 'get_end_date':self._get_end_date, }) 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 7ddc8e7002e..49460408996 100644 --- a/addons/account/report/central_journal.rml +++ b/addons/account/report/central_journal.rml @@ -234,7 +234,7 @@ - + @@ -284,8 +284,8 @@ End Date - [[ data['form']['date_from'] ]] - [[ data['form']['date_to'] ]] + [[ get_start_date(data) ]] + [[ get_end_date(data) ]] [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] @@ -305,7 +305,7 @@ - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] A/C No. Account Name diff --git a/addons/account/report/general_journal.py b/addons/account/report/general_journal.py index d3c793e5fb4..61f38a5d17a 100644 --- a/addons/account/report/general_journal.py +++ b/addons/account/report/general_journal.py @@ -51,6 +51,8 @@ class journal_print(report_sxw.rml_parse, common_report_header): 'sum_currency_amount_account': self._sum_currency_amount_account, 'get_filter': self._get_filter, 'get_journal': self._get_journal, + 'get_start_date':self._get_start_date, + 'get_end_date':self._get_end_date, }) def set_context(self, objects, data, ids, report_type=None): # Improve move to common default? diff --git a/addons/account/report/general_journal.rml b/addons/account/report/general_journal.rml index 2983ad8c575..53d473b9349 100644 --- a/addons/account/report/general_journal.rml +++ b/addons/account/report/general_journal.rml @@ -208,7 +208,7 @@ - + @@ -264,8 +264,8 @@ End Date - [[ data['form']['date_from'] ]] - [[ data['form']['date_to'] ]] + [[ get_start_date(data)]] + [[get_end_date(data) ]] [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py index b232b5f7c59..cd7aa3400cd 100644 --- a/addons/account/report/general_ledger.py +++ b/addons/account/report/general_ledger.py @@ -69,7 +69,9 @@ class general_ledger(rml_parse.rml_parse, common_report_header): 'get_start_period': self.get_start_period, 'get_end_period': self.get_end_period, 'get_filter': self._get_filter, - 'get_sortby': self._get_sortby + 'get_sortby': self._get_sortby, + 'get_start_date':self._get_start_date, + 'get_end_date':self._get_end_date, }) self.context = context diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml index 1084352894d..c856c9ad6e1 100644 --- a/addons/account/report/general_ledger.rml +++ b/addons/account/report/general_ledger.rml @@ -240,8 +240,8 @@ End Date - [[ data['form']['date_from'] ]] - [[ data['form']['date_to'] ]] + [[ get_start_date(data) ]] + [[get_end_date(data) ]] [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml index a35d63b6005..9ab73d52c35 100644 --- a/addons/account/report/general_ledger_landscape.rml +++ b/addons/account/report/general_ledger_landscape.rml @@ -252,8 +252,8 @@ End Date - [[ data['form']['date_from'] ]] - [[ data['form']['date_to'] ]] + [[ get_start_date(data) ]] + [[get_end_date(data) ]] [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]