diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 0616a9b5426..bcb2a71a211 100644 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -125,7 +125,7 @@ class account_balance(report_sxw.rml_parse, common_report_header): if r['id'] == account['parent_id'][0]: res['level'] = r['level'] + 1 break - if form['display_account'] == 'bal_mouvement': + if form['display_account'] == 'bal_movement': if res['credit'] > 0 or res['debit'] > 0 or res['balance'] > 0 : result_acc.append(res) elif form['display_account'] == 'bal_solde': diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml index 43ba5910273..0e276683e6c 100644 --- a/addons/account/report/general_ledger_landscape.rml +++ b/addons/account/report/general_ledger_landscape.rml @@ -243,7 +243,7 @@ [[ get_account(data) or removeParentNode('para') ]] [[ get_fiscalyear(data) or '' ]] [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] - [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_mouvement' and 'With movements') or 'With balance is not equal to 0']] + [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_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') ]] diff --git a/addons/account/report/report_balance_sheet.rml b/addons/account/report/report_balance_sheet.rml index 4f79272ae01..ab04f36cd84 100644 --- a/addons/account/report/report_balance_sheet.rml +++ b/addons/account/report/report_balance_sheet.rml @@ -229,7 +229,7 @@ - [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_mouvement' and 'With movements') or 'With balance is not equal to 0']] + [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']] [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] diff --git a/addons/account/report/report_balance_sheet_horizontal.rml b/addons/account/report/report_balance_sheet_horizontal.rml index 56fefe30302..36af364b430 100644 --- a/addons/account/report/report_balance_sheet_horizontal.rml +++ b/addons/account/report/report_balance_sheet_horizontal.rml @@ -233,7 +233,7 @@ - [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_mouvement' and 'With movements') or 'With balance is not equal to 0']] + [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']] [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] diff --git a/addons/account/report/report_bs.py b/addons/account/report/report_bs.py index c514d7ac99a..0ee39af203c 100644 --- a/addons/account/report/report_bs.py +++ b/addons/account/report/report_bs.py @@ -146,7 +146,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header): self.result_sum_dr += abs(account.debit - account.credit) if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit): self.result_sum_cr += abs(account.debit - account.credit) - if data['form']['display_account'] == 'bal_mouvement': + if data['form']['display_account'] == 'bal_movement': if account.credit > 0 or account.debit > 0 or account.balance > 0 : accounts_temp.append(account_dict) elif data['form']['display_account'] == 'bal_solde': diff --git a/addons/account/report/report_pl.py b/addons/account/report/report_pl.py index 024fd1c83e3..f139d7438aa 100644 --- a/addons/account/report/report_pl.py +++ b/addons/account/report/report_pl.py @@ -119,7 +119,7 @@ class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header): self.result_sum_dr += abs(account.debit - account.credit) if typ == 'income' and account.type <> 'view' and (account.debit <> account.credit): self.result_sum_cr += abs(account.debit - account.credit) - if data['form']['display_account'] == 'bal_mouvement': + if data['form']['display_account'] == 'bal_movement': if account.credit > 0 or account.debit > 0 or account.balance > 0 : accounts_temp.append(account) elif data['form']['display_account'] == 'bal_solde': diff --git a/addons/account/report/report_pl_account.rml b/addons/account/report/report_pl_account.rml index 90b0eb892a7..95fe2bee1c1 100644 --- a/addons/account/report/report_pl_account.rml +++ b/addons/account/report/report_pl_account.rml @@ -241,7 +241,7 @@ - [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_mouvement' and 'With movements') or 'With balance is not equal to 0']] + [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']] [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] diff --git a/addons/account/report/report_pl_account_horizontal.rml b/addons/account/report/report_pl_account_horizontal.rml index db76fdd912f..24d1e8c55e5 100644 --- a/addons/account/report/report_pl_account_horizontal.rml +++ b/addons/account/report/report_pl_account_horizontal.rml @@ -245,7 +245,7 @@ - [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_mouvement' and 'With movements') or 'With balance is not equal to 0']] + [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']] [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] diff --git a/addons/account/wizard/account_general_ledger_report.py b/addons/account/wizard/account_general_ledger_report.py index 0783747a290..e319a21c482 100644 --- a/addons/account/wizard/account_general_ledger_report.py +++ b/addons/account/wizard/account_general_ledger_report.py @@ -40,7 +40,7 @@ class account_general_ledger_report(osv.osv_memory): 'periods': fields.many2many('account.period', 'ledger_period_rel', 'ledger_id', 'period_id', 'Periods', help='All periods if empty' ), 'sortbydate': fields.selection([('sort_date','Date'), ('sort_mvt','Movement')],"Sort by:"), - 'display_account': fields.selection([('bal_all','All'), ('bal_mouvement','With movements'), + 'display_account': fields.selection([('bal_all','All'), ('bal_movement','With movements'), ('bal_solde','With balance is not equal to 0'), ],'Display accounts', required=True), diff --git a/addons/account/wizard/account_report_account_balance.py b/addons/account/wizard/account_report_account_balance.py index 7021557c747..2d54538555a 100644 --- a/addons/account/wizard/account_report_account_balance.py +++ b/addons/account/wizard/account_report_account_balance.py @@ -27,7 +27,7 @@ class account_balance_report(osv.osv_memory): _name = 'account.balance.report' _description = 'Account Balance Report' _columns = { - 'display_account': fields.selection([('bal_all','All'), ('bal_mouvement','With movements'), + 'display_account': fields.selection([('bal_all','All'), ('bal_movement','With movements'), ('bal_solde','With balance is not equal to 0'), ],'Display accounts', required=True), } diff --git a/addons/account/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py index 8dd1680a756..f95d8935761 100644 --- a/addons/account/wizard/account_report_balance_sheet.py +++ b/addons/account/wizard/account_report_balance_sheet.py @@ -31,7 +31,7 @@ class account_bs_report(osv.osv_memory): _description = 'Account Balance Sheet Report' _columns = { - 'display_account': fields.selection([('bal_all','All'), ('bal_mouvement','With movements'), + 'display_account': fields.selection([('bal_all','All'), ('bal_movement','With movements'), ('bal_solde','With balance is not equal to 0'), ],'Display accounts', required=True), 'display_type': fields.boolean("Landscape Mode"), diff --git a/addons/account/wizard/account_report_profit_loss.py b/addons/account/wizard/account_report_profit_loss.py index 40c44e694e7..8698ace93b1 100644 --- a/addons/account/wizard/account_report_profit_loss.py +++ b/addons/account/wizard/account_report_profit_loss.py @@ -31,7 +31,7 @@ class account_pl_report(osv.osv_memory): _description = "Account Profit And Loss Report" _columns = { # 'company_id': fields.many2one('res.company', 'Company', required=True), - 'display_account': fields.selection([('bal_all','All'), ('bal_mouvement','With movements'), + 'display_account': fields.selection([('bal_all','All'), ('bal_movement','With movements'), ('bal_solde','With balance is not equal to 0'), ],'Display accounts', required=True), 'display_type': fields.boolean("Landscape Mode"),