diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py index cd7aa3400cd..e43c1253143 100644 --- a/addons/account/report/general_ledger.py +++ b/addons/account/report/general_ledger.py @@ -71,7 +71,7 @@ class general_ledger(rml_parse.rml_parse, common_report_header): 'get_filter': self._get_filter, 'get_sortby': self._get_sortby, 'get_start_date':self._get_start_date, - 'get_end_date':self._get_end_date, + 'get_end_date':self._get_end_date, }) self.context = context @@ -88,7 +88,7 @@ class general_ledger(rml_parse.rml_parse, common_report_header): num_entry = self.cr.fetchone()[0] or 0 sold_account = self._sum_balance_account(child_account,form) self.sold_accounts[child_account.id] = sold_account - if form['display_account'] == 'mouvement': + if form['display_account'] == 'movement': if child_account.type != 'view' and num_entry <> 0 : res.append(child_account) elif form['display_account'] == 'balance': diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml index ffe6348a826..a01698aa9ee 100644 --- a/addons/account/report/general_ledger.rml +++ b/addons/account/report/general_ledger.rml @@ -157,12 +157,12 @@ - + - + @@ -201,7 +201,7 @@ - + @@ -222,10 +222,10 @@ - Chat Account + Chat Account Fiscal Year - Journals - Display Account + Journals + Display Account Filters By [[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]][[ get_filter(data) ]] Entries Sorted By Printing Date @@ -234,28 +234,28 @@ [[ get_account(data) or removeParentNode('para') ]] [[ get_fiscalyear(data) or '' ]] [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] - [[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='mouvement' and 'With movements') or 'With balance is not equal to 0']] + [[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']] [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] Start Date - End Date - + End Date + [[ get_start_date(data) ]] - [[get_end_date(data) ]] + [[get_end_date(data) ]] [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] Start Period - End Period - + End Period + [[ get_start_period(data) or removeParentNode('para') ]] [[ get_end_period(data) or removeParentNode('para') ]] - + [[ get_sortby(data) ]] [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] diff --git a/addons/account/wizard/account_report_general_ledger.py b/addons/account/wizard/account_report_general_ledger.py index 9d81e44bccc..d1ed8115911 100644 --- a/addons/account/wizard/account_report_general_ledger.py +++ b/addons/account/wizard/account_report_general_ledger.py @@ -28,7 +28,7 @@ class account_report_general_ledger(osv.osv_memory): _description = "General Ledger Report" _columns = { - 'display_account': fields.selection([('all','All'), ('mouvement','With movements'), + 'display_account': fields.selection([('all','All'), ('movement','With movements'), ('balance','With balance is not equal to 0'), ],'Display accounts', required=True), 'landscape': fields.boolean("Landscape Mode"),