From a040a802ec605ca7880be8f452282403ab31ce3d Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Fri, 16 Jul 2010 11:20:26 +0530 Subject: [PATCH] [Fix] account: Fix the general_ledger_landscape report bzr revid: sbh@tinyerp.com-20100716055026-nnc2sqqnzntax35j --- .../report/general_ledger_landscape.rml | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml index 0bab8bbba12..34603b863b3 100644 --- a/addons/account/report/general_ledger_landscape.rml +++ b/addons/account/report/general_ledger_landscape.rml @@ -306,10 +306,10 @@ [[ o.code ]] [[ o.name ]] - [[ formatLang(sum_debit_account(o, data['form'])) ]] - [[ formatLang(sum_credit_account(o, data['form'])) ]] - [[ formatLang(sum_solde_account(o, data['form'])) ]] - [[ formatLang(sum_currency_amount_account(o, data['form'])) ]] + [[formatLang(sum_debit_account(o, data['form'])) ]] + [[formatLang(sum_credit_account(o, data['form'])) ]] + [[formatLang(sum_balance_account(o, data['form'])) ]] + [[o.currency_id and formatLang(sum_currency_amount_account(a, data['form']))+o.currency_id.code or '' ]] @@ -325,12 +325,12 @@ - [[ repeatIn(lines(o, data['form']), 'line') ]] [[ formatLang(line['date'],date=True) ]] - [[ line['code'] ]] - [[ line['partner'] ]] - [[ line['ref'] ]] + [[ repeatIn(lines(o, data['form']), 'line') ]] [[ formatLang(line['ldate'],date=True) ]] + [[ line['lcode'] ]] + [[ line['partner_name'] ]] + [[ line['lref'] ]] [[ line['move'] ]] - [[ line['name'] ]] + [[ line['lname'] ]] [[ strip_name(line['line_corresp'],15) ]] [[ formatLang(line['debit']) ]] [[ formatLang(line['credit']) ]] @@ -367,9 +367,9 @@ [[ o.code ]] [[ o.name ]] - [[ formatLang(sum_debit_account(o, data['form']))]] - [[formatLang(sum_credit_account(o, data['form']))]] - [[formatLang(sum_solde_account(o, data['form'])) ]] + [[formatLang(sum_debit_account(o, data['form'])) ]] + [[formatLang(sum_credit_account(o, data['form'])) ]] + [[formatLang(sum_balance_account(o, data['form'])) ]] @@ -384,12 +384,13 @@ - [[ repeatIn(lines(o, data['form']), 'line') ]][[ formatLang(line['date'],date=True) ]] - [[ line['code'] ]] + [[ repeatIn(lines(o, data['form']), 'line') ]][[ line['ldate'] and formatLang(line['date'],date=True) or removeParentNode('tr') ]] + [[ line or removeParentNode('tr') + [[ line['lcode'] ]] [[ line['partner'] ]] - [[ line['ref'] ]] + [[ line['lref'] ]] [[ line['move'] ]] - [[ line['name'] ]] + [[ line['lname'] ]] [[ strip_name(line['line_corresp'],15) ]] [[ formatLang(line['debit']) ]] [[ formatLang(line['credit']) ]]