From c55c407c566b0e2ae55983588eb4ac26ff693229 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Tue, 7 Sep 2010 15:02:46 +0530 Subject: [PATCH] Accounting / Charts / Chart of Accounts... Select an Account... Print General Ledger * Journal Items are not displayed ? * This report should print the details of all account.move.line. * Missing the company currency on the right of the balance column (don't add a column, put it in the column directly) * Overlap data with header on next page(wirh landscape) * credi,debit,balance alignment is not ok with moveline.(with landscape,with currency) bzr revid: apa@tinyerp.com-20100907093246-e1n8suahpkql0x42 --- .../account/report/account_general_ledger.rml | 40 +++++++++---------- .../account_general_ledger_landscape.rml | 11 +---- 2 files changed, 20 insertions(+), 31 deletions(-) diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml index cc0a7826647..14a3ff8833c 100644 --- a/addons/account/report/account_general_ledger.rml +++ b/addons/account/report/account_general_ledger.rml @@ -141,9 +141,10 @@ - + + @@ -176,9 +177,6 @@ - - - @@ -186,7 +184,7 @@ - + [[ repeatIn(objects, 'a') ]] @@ -242,13 +240,13 @@ [[data['form']['amount_currency'] == False or removeParentNode('blockTable')]] Date - Partner - Ref - Move - Entry Label - Debit([[ company.currency_id.code]]) - Crebit([[ company.currency_id.code]]) - Balance([[ company.currency_id.code]]) + Partner + Ref + Move + Entry Label + Debit([[ company.currency_id.code]]) + Crebit([[ company.currency_id.code]]) + Balance([[ company.currency_id.code]])
@@ -289,17 +287,17 @@ - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] Date - Partner - Ref - Move - Entry Label - Debit([[ company.currency_id.code]]) - Credit([[ company.currency_id.code]]) - Balance([[ company.currency_id.code]]) - Currency + Partner + Ref + Move + Entry Label + Debit([[ company.currency_id.code]]) + Credit([[ company.currency_id.code]]) + Balance([[ company.currency_id.code]]) + Currency
diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml index ab338c43c32..0f6bb0a63f2 100644 --- a/addons/account/report/account_general_ledger_landscape.rml +++ b/addons/account/report/account_general_ledger_landscape.rml @@ -3,9 +3,6 @@ @@ -179,9 +176,6 @@ - - - @@ -189,9 +183,6 @@ - - - [[ repeatIn(objects, 'a') ]] @@ -269,7 +260,7 @@ [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] - + [[ o.code ]] [[ o.name ]]