diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 80508ede44b..c3117e60379 100644 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -88,10 +88,10 @@ class account_balance(report_sxw.rml_parse, common_report_header): } self.sum_debit += account_rec['debit'] self.sum_credit += account_rec['credit'] - if disp_acc == 'bal_movement': + if disp_acc == 'movement': if not currency_obj.is_zero(self.cr, self.uid, currency, res['credit']) or not currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) or not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']): self.result_acc.append(res) - elif disp_acc == 'bal_solde': + elif disp_acc == 'not_zero': if not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']): self.result_acc.append(res) else: diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index 7c9aa13da2e..3d971862bdc 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -233,7 +233,7 @@ [[ get_fiscalyear(data) or '' ]] - [[ (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']] + [[ (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') ]] diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py index 79bcce882ae..eb8e5ee9967 100644 --- a/addons/account/report/account_balance_sheet.py +++ b/addons/account/report/account_balance_sheet.py @@ -143,10 +143,10 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header) self.result_sum_dr += account.balance if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit): self.result_sum_cr += account.balance - if data['form']['display_account'] == 'bal_movement': + if data['form']['display_account'] == 'movement': if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): accounts_temp.append(account_dict) - elif data['form']['display_account'] == 'bal_solde': + elif data['form']['display_account'] == 'not_zero': if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): accounts_temp.append(account_dict) else: diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml index 7fa92e9bcd1..a078b9a6901 100644 --- a/addons/account/report/account_balance_sheet.rml +++ b/addons/account/report/account_balance_sheet.rml @@ -174,7 +174,7 @@ - [[ (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']] + [[ (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_target_move(data) ]] diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml index 96d437d3f00..7e4f9f844a5 100644 --- a/addons/account/report/account_balance_sheet_horizontal.rml +++ b/addons/account/report/account_balance_sheet_horizontal.rml @@ -163,7 +163,7 @@ - [[ (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']] + [[ (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_target_move(data) ]] diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py index a42f6bface8..294c7fa99cf 100644 --- a/addons/account/report/account_general_ledger.py +++ b/addons/account/report/account_general_ledger.py @@ -117,10 +117,10 @@ class general_ledger(report_sxw.rml_parse, common_report_header): num_entry = self.cr.fetchone()[0] or 0 sold_account = self._sum_balance_account(child_account) self.sold_accounts[child_account.id] = sold_account - if self.display_account == 'bal_movement': + if self.display_account == 'movement': if child_account.type != 'view' and num_entry <> 0: res.append(child_account) - elif self.display_account == 'bal_solde': + elif self.display_account == 'not_zero': if child_account.type != 'view' and num_entry <> 0: if not currency_obj.is_zero(self.cr, self.uid, currency, sold_account): res.append(child_account) diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml index 22712af0f8c..ac100c3ecd0 100644 --- a/addons/account/report/account_general_ledger_landscape.rml +++ b/addons/account/report/account_general_ledger_landscape.rml @@ -395,7 +395,7 @@ [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] - [[ (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']] + [[ (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') ]] diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml index ca444bb4eca..6c70bb47310 100644 --- a/addons/account/report/account_profit_horizontal.rml +++ b/addons/account/report/account_profit_horizontal.rml @@ -180,7 +180,7 @@ - [[ (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']] + [[ (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_target_move(data) ]] diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py index 740f7524975..5f5d561a572 100644 --- a/addons/account/report/account_profit_loss.py +++ b/addons/account/report/account_profit_loss.py @@ -113,10 +113,10 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header): self.result_sum_dr += account.debit - account.credit if typ == 'income' and account.type <> 'view' and (account.debit <> account.credit): self.result_sum_cr += account.credit - account.debit - if data['form']['display_account'] == 'bal_movement': + if data['form']['display_account'] == 'movement': if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): accounts_temp.append(account) - elif data['form']['display_account'] == 'bal_solde': + elif data['form']['display_account'] == 'not_zero': if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): accounts_temp.append(account) else: diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml index ca6be309556..d83a39f6757 100644 --- a/addons/account/report/account_profit_loss.rml +++ b/addons/account/report/account_profit_loss.rml @@ -184,7 +184,7 @@ - [[ (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']] + [[ (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_target_move(data) ]] diff --git a/addons/account/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py index 18d3622b16c..873ede3832c 100644 --- a/addons/account/wizard/account_report_balance_sheet.py +++ b/addons/account/wizard/account_report_balance_sheet.py @@ -48,7 +48,7 @@ class account_bs_report(osv.osv_memory): } _defaults={ - 'display_type': True, + 'display_type': False, 'journal_ids': [], 'reserve_account_id': _get_def_reserve_account, } diff --git a/addons/account/wizard/account_report_common_account.py b/addons/account/wizard/account_report_common_account.py index 0040d563bdd..4e0fe2d6c66 100644 --- a/addons/account/wizard/account_report_common_account.py +++ b/addons/account/wizard/account_report_common_account.py @@ -26,13 +26,13 @@ class account_common_account_report(osv.osv_memory): _description = 'Account Common Account Report' _inherit = "account.common.report" _columns = { - 'display_account': fields.selection([('bal_all','All'), ('bal_movement','With movements'), - ('bal_solde','With balance is not equal to 0'), + 'display_account': fields.selection([('all','All'), ('movement','With movements'), + ('not_zero','With balance is not equal to 0'), ],'Display Accounts', required=True), } _defaults = { - 'display_account': 'bal_all', + 'display_account': 'movement', } def pre_print_report(self, cr, uid, ids, data, context=None): diff --git a/addons/account/wizard/account_report_profit_loss.py b/addons/account/wizard/account_report_profit_loss.py index c526550e789..6372539c056 100644 --- a/addons/account/wizard/account_report_profit_loss.py +++ b/addons/account/wizard/account_report_profit_loss.py @@ -33,7 +33,7 @@ class account_pl_report(osv.osv_memory): } _defaults = { - 'display_type': True, + 'display_type': False, 'journal_ids': [], 'target_move': False }