From 3bbae4b277025683e6957cfdb3f0452e35ebed3d Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Mon, 2 Aug 2010 14:53:22 +0530 Subject: [PATCH] [IMP] remove the journals column on balance sheet,profit and loss acount and rename the filters with filter bzr revid: sbh@tinyerp.com-20100802092322-021edt87gx08krrr --- addons/account/report/account_balance.rml | 10 ++-------- addons/account/report/central_journal.rml | 2 +- addons/account/report/general_journal.rml | 2 +- addons/account/report/general_ledger.rml | 2 +- addons/account/report/general_ledger_landscape.rml | 2 +- addons/account/report/partner_balance.rml | 2 +- addons/account/report/report_balance_sheet.rml | 6 ++---- .../account/report/report_balance_sheet_horizontal.rml | 6 ++---- addons/account/report/report_pl_account.rml | 6 ++---- addons/account/report/report_pl_account_horizontal.rml | 6 ++---- addons/account/report/third_party_ledger.rml | 2 +- addons/account/report/third_party_ledger_other.rml | 2 +- 12 files changed, 17 insertions(+), 31 deletions(-) diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index faaa13adb47..2b83e42b0a0 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -209,21 +209,18 @@ - + Company [[ data['model']=='account.account' or removeParentNode('para') ]] Chart of Account [[ data['model']=='ir.ui.menu' or removeParentNode('para') ]] Fiscal Year - - Journal - Display Account - Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] Printing Date @@ -235,9 +232,6 @@ [[ 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_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/central_journal.rml b/addons/account/report/central_journal.rml index 4c2cef1d090..250ce76ea22 100644 --- a/addons/account/report/central_journal.rml +++ b/addons/account/report/central_journal.rml @@ -248,7 +248,7 @@ Chart of Account [[ data['model']=='ir.ui.menu' or removeParentNode('para') ]] Fiscal Year Journal - Filters By [[get_filter(data)!='No Filter' and get_filter(data) ]] + Filter By [[get_filter(data)!='No Filter' and get_filter(data) ]] Printing Date diff --git a/addons/account/report/general_journal.rml b/addons/account/report/general_journal.rml index 03cd54ab53a..4ead364d7e5 100644 --- a/addons/account/report/general_journal.rml +++ b/addons/account/report/general_journal.rml @@ -228,7 +228,7 @@ Chart of Account [[ data['model']=='ir.ui.menu' or removeParentNode('para') ]] Fiscal Year Journals - Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] Printing Date diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml index d8f4bdb6b29..4a4e183066c 100644 --- a/addons/account/report/general_ledger.rml +++ b/addons/account/report/general_ledger.rml @@ -203,7 +203,7 @@ Fiscal Year Journals Display Account - Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] Entries Sorted By Printing Date diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml index 2ca1209ce58..6905200c8ea 100644 --- a/addons/account/report/general_ledger_landscape.rml +++ b/addons/account/report/general_ledger_landscape.rml @@ -211,7 +211,7 @@ Fiscal Year Journals Display Account - Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] Entries Sorted By Printing Date diff --git a/addons/account/report/partner_balance.rml b/addons/account/report/partner_balance.rml index 70722dd1384..8dd6335747c 100644 --- a/addons/account/report/partner_balance.rml +++ b/addons/account/report/partner_balance.rml @@ -194,7 +194,7 @@ Chat Account Fiscal Year Journals - Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] Partners Printing Date diff --git a/addons/account/report/report_balance_sheet.rml b/addons/account/report/report_balance_sheet.rml index e58ad0efc5a..90c774d3e28 100644 --- a/addons/account/report/report_balance_sheet.rml +++ b/addons/account/report/report_balance_sheet.rml @@ -182,19 +182,17 @@ - + Chart of Account Fiscal Year - Journals - Filters By [[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]] + Filter By [[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]] Display Account Printing Date [[ get_account(data) or removeParentNode('para') ]] [[ get_fiscalyear(data) or '' ]] - [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] [[ 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_horizontal.rml b/addons/account/report/report_balance_sheet_horizontal.rml index a2731c9b608..04f5a2b783c 100644 --- a/addons/account/report/report_balance_sheet_horizontal.rml +++ b/addons/account/report/report_balance_sheet_horizontal.rml @@ -190,19 +190,17 @@ [[ get_data(data) or removeParentNode('para') ]] - + Chart of Account Fiscal Year - Journals - Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] Display Account Printing Date [[ get_account(data) or removeParentNode('para') ]] [[ get_fiscalyear(data) or '' ]] - [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] [[ 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_pl_account.rml b/addons/account/report/report_pl_account.rml index b23e6e100fa..284ca7da035 100644 --- a/addons/account/report/report_pl_account.rml +++ b/addons/account/report/report_pl_account.rml @@ -207,19 +207,17 @@ - + Chart of Account Fiscal Year - Journals - Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] Display Account Printing Date [[ get_account(data) or removeParentNode('para') ]] [[ get_fiscalyear(data) or '' ]] - [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] [[ 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_pl_account_horizontal.rml b/addons/account/report/report_pl_account_horizontal.rml index d1719efdc7d..7ba1b1fb7e2 100644 --- a/addons/account/report/report_pl_account_horizontal.rml +++ b/addons/account/report/report_pl_account_horizontal.rml @@ -205,19 +205,17 @@ [[ get_data(data) or removeParentNode('para')]] - + Chart of Account Fiscal Year - Journals - Filters By [[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]] + Filter By [[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]] Display Account Printing Date [[ get_account(data) or removeParentNode('para') ]] [[ get_fiscalyear(data) or '' ]] - [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] [[ 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/third_party_ledger.rml b/addons/account/report/third_party_ledger.rml index 9bfd033db5b..1eddd325d26 100644 --- a/addons/account/report/third_party_ledger.rml +++ b/addons/account/report/third_party_ledger.rml @@ -190,7 +190,7 @@ Chart of Account Fiscal Year Journal - Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] Partner's Printing Date diff --git a/addons/account/report/third_party_ledger_other.rml b/addons/account/report/third_party_ledger_other.rml index dd5713d717d..7d42d26ad1b 100644 --- a/addons/account/report/third_party_ledger_other.rml +++ b/addons/account/report/third_party_ledger_other.rml @@ -342,7 +342,7 @@ Journal - Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] Partner's