diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index e63ab030380..64f448cbfba 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -13,7 +13,7 @@ - [[ time.strftime("%m-%d-%y %H:%M", time.localtime()) ]] + [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]] Page diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml index 66bee0571e7..9e782e5bce3 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -24,7 +24,7 @@ - [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]] + [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]] Page diff --git a/addons/account/report/account_tax_code.rml b/addons/account/report/account_tax_code.rml index 2a4a6bbe292..72bbf56c9e9 100644 --- a/addons/account/report/account_tax_code.rml +++ b/addons/account/report/account_tax_code.rml @@ -16,7 +16,7 @@ - [[ time.strftime("%m-%d-%Y %H:%M", time.localtime()) ]] + [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]] Page diff --git a/addons/account/report/aged_trial_balance.rml b/addons/account/report/aged_trial_balance.rml index d3658c684c4..e566cb4a26d 100644 --- a/addons/account/report/aged_trial_balance.rml +++ b/addons/account/report/aged_trial_balance.rml @@ -21,7 +21,7 @@ - [[ time.strftime('%Y-%m-%d %H:%M', time.localtime()) ]] + [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]] Page diff --git a/addons/account/report/general_journal.py b/addons/account/report/general_journal.py index b61e09c9031..9aa8b45aa10 100644 --- a/addons/account/report/general_journal.py +++ b/addons/account/report/general_journal.py @@ -123,7 +123,7 @@ class journal_print(report_sxw.rml_parse): return 0.0 self.cr.execute('select sum(credit) from account_move_line where period_id in (' + self.period_ids + ') and journal_id in (' + self.journal_ids + ') and state<>\'draft\'') return self.cr.fetchone()[0] or 0.0 -report_sxw.report_sxw('report.account.general.journal', 'account.journal.period', 'addons/account/report/general_journal.rml',parser=journal_print, header=False) +report_sxw.report_sxw('report.account.general.journal', 'account.journal.period', 'addons/account/report/general_journal.rml',parser=journal_print) report_sxw.report_sxw('report.account.general.journal.wiz', 'account.journal.period', 'addons/account/report/wizard_general_journal.rml',parser=journal_print, header=False) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/general_journal.rml b/addons/account/report/general_journal.rml index 365967e47e5..5a9ccff4213 100644 --- a/addons/account/report/general_journal.rml +++ b/addons/account/report/general_journal.rml @@ -93,18 +93,20 @@ - + - - [[ company.name ]] - - General Journal - [[ company.currency_id.name ]] + General Journal + + + + + diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml index c2a5fc7828b..09c071f4d6e 100644 --- a/addons/account/report/general_ledger.rml +++ b/addons/account/report/general_ledger.rml @@ -20,7 +20,7 @@ - [[ time.strftime("%d-%m-%Y %H:%M", time.localtime()) ]] + [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]] Page diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml index 51593eacf05..c7f955516bb 100644 --- a/addons/account/report/general_ledger_landscape.rml +++ b/addons/account/report/general_ledger_landscape.rml @@ -20,7 +20,7 @@ - [[ time.strftime("%d-%m-%Y %H:%M", time.localtime()) ]] + [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]] Page diff --git a/addons/account/report/partner_balance.rml b/addons/account/report/partner_balance.rml index 55947fa5654..a096b5a2412 100644 --- a/addons/account/report/partner_balance.rml +++ b/addons/account/report/partner_balance.rml @@ -24,7 +24,7 @@ - [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]] + [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]] Page diff --git a/addons/account/report/tax_report.rml b/addons/account/report/tax_report.rml index aa2f25bc85f..1f17874129a 100644 --- a/addons/account/report/tax_report.rml +++ b/addons/account/report/tax_report.rml @@ -20,7 +20,7 @@ - [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]] + [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]] Page diff --git a/addons/account/report/third_party_ledger.rml b/addons/account/report/third_party_ledger.rml index d4cfd537bd8..91a9b67d7ca 100644 --- a/addons/account/report/third_party_ledger.rml +++ b/addons/account/report/third_party_ledger.rml @@ -24,7 +24,7 @@ - [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]] + [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]] Page