From 6be2c77e72bc6d01ca105484d40e5af55d9c8e78 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Thu, 15 Jul 2010 17:22:03 +0530 Subject: [PATCH] [IMP] dispay accounts with good sequence bzr revid: mra@mra-laptop-20100715115203-4n8a3fk26yl212dm --- addons/account/wizard/account_bs_report.py | 7 +++---- addons/account/wizard/account_general_ledger_report.py | 7 ++++--- addons/account/wizard/account_pl_report.py | 7 +++---- addons/account/wizard/account_report_general_ledger.py | 4 +++- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/addons/account/wizard/account_bs_report.py b/addons/account/wizard/account_bs_report.py index 11da6678074..8dd1680a756 100644 --- a/addons/account/wizard/account_bs_report.py +++ b/addons/account/wizard/account_bs_report.py @@ -31,10 +31,9 @@ class account_bs_report(osv.osv_memory): _description = 'Account Balance Sheet Report' _columns = { - 'display_account': fields.selection([('bal_movement','With movements'), - ('bal_solde','With balance is not equal to 0'), - ('bal_all','All'), - ],'Display accounts'), + 'display_account': fields.selection([('bal_all','All'), ('bal_mouvement','With movements'), + ('bal_solde','With balance is not equal to 0'), + ],'Display accounts', required=True), 'display_type': fields.boolean("Landscape Mode"), 'reserve_account_id': fields.many2one('account.account', 'Reserve & Surplus Account',required = True, help='This Account is used for trasfering Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report', domain = [('type','=','payable')]), diff --git a/addons/account/wizard/account_general_ledger_report.py b/addons/account/wizard/account_general_ledger_report.py index 5529f4d6b9a..0783747a290 100644 --- a/addons/account/wizard/account_general_ledger_report.py +++ b/addons/account/wizard/account_general_ledger_report.py @@ -40,9 +40,10 @@ 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_mouvement','With movements'), - ('bal_all','All'), - ('bal_solde','With balance is not equal to 0')],"Display accounts"), + 'display_account': fields.selection([('bal_all','All'), ('bal_mouvement','With movements'), + ('bal_solde','With balance is not equal to 0'), + ],'Display accounts', required=True), + 'landscape': fields.boolean("Landscape Mode"), 'soldeinit': fields.boolean("Include initial balances"), 'amount_currency': fields.boolean("With Currency"), diff --git a/addons/account/wizard/account_pl_report.py b/addons/account/wizard/account_pl_report.py index 4387590806b..40c44e694e7 100644 --- a/addons/account/wizard/account_pl_report.py +++ b/addons/account/wizard/account_pl_report.py @@ -31,10 +31,9 @@ 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_movement','With movements'), - ('bal_solde','With balance is not equal to 0'), - ('bal_all','All'), - ],'Display accounts'), + 'display_account': fields.selection([('bal_all','All'), ('bal_mouvement','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_general_ledger.py b/addons/account/wizard/account_report_general_ledger.py index 1e0687b62ce..c36e8548e4c 100644 --- a/addons/account/wizard/account_report_general_ledger.py +++ b/addons/account/wizard/account_report_general_ledger.py @@ -28,7 +28,9 @@ class account_report_general_ledger(osv.osv_memory): _description = "General Ledger Report" _columns = { - 'display_account': fields.selection([('bal_mouvement','With movements'), ('bal_all','All'), ('bal_solde','With balance is not equal to 0')],"Display accounts", required=True), + 'display_account': fields.selection([('bal_all','All'), ('bal_mouvement','With movements'), + ('bal_solde','With balance is not equal to 0'), + ],'Display accounts', required=True), 'landscape': fields.boolean("Landscape Mode"), 'soldeinit': fields.boolean("Include initial balances"), 'amount_currency': fields.boolean("With Currency"),