From 8b3988b79f73f0a62bd0c349cff5f4eb6c93689d Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Tue, 30 Sep 2008 14:17:43 +0530 Subject: [PATCH] Invoice:(Rana Vinay):-Solved Reduce size between each line: whennotes are written, there is so much space between the note and the detail of product that comes after check column titles of invoices, it s not using the same style like for sale order check it for: the array of taxes, and details array. General Ledger : Small changes(apa-tiny) bzr revid: patelamit2003@gmail.com-20080930084743-fu43g13gke8z2i3v --- addons/account/report/general_ledger.rml | 342 +++++++---------------- addons/account/report/invoice.rml | 12 +- 2 files changed, 104 insertions(+), 250 deletions(-) diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml index da82c739c0d..c7d8228a527 100755 --- a/addons/account/report/general_ledger.rml +++ b/addons/account/report/general_ledger.rml @@ -33,20 +33,18 @@ - + - + - - @@ -54,7 +52,6 @@ - @@ -91,247 +88,110 @@ - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] - - - Date - - - Partner - - - Ref - - - Mvt - - - Entry Label - - - Debit - - - Crebit - - - Balance - - - - [[ repeatIn(objects, 'a') ]] - [[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - - - - - - - [[ o.code ]] [[ o.name ]] - - - [[ sum_debit_account(o, data['form']) or '0.0' ]] - - - [[sum_credit_account(o, data['form']) or '0.0' ]] - - - [[sum_solde_account(o, data['form']) or '0.0' ]] - - - - - - - - [[ data['form']['soldeinit'] == True or removeParentNode('tr') ]] - - - - - - Balance Initial - - - - - - - - - - - - [[ o.init_debit or '0.0' ]] - - - [[ o.init_credit or '0.0' ]] - - - [[ (o.init_debit - o.init_credit) or '0.0' ]] - - - - [[ repeatIn(lines(o, data['form']), 'line') ]] - - [[ line['date'] ]] - - - - [[ line['partner'] ]] - - - [[ line['ref'] ]] - - - [[ line['move'] ]] - - - [[ line['name'] ]] - - - [[ line['debit'] and line['debit'] or '0.0' ]] - - - [[ line['credit'] and line['credit'] or '0.0' ]] - - - [[ line['progress'] and line['progress'] or '0.0' ]] - - - - - - - - - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] - - - Date - - - Partner - - - Ref - - - Mvt - - - Entry Label - - - Debit - - - Crebit - - - Balance - - - Currency - + +
+ + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + + Date + Partner + Ref + Mvt + Entry Label + Debit + Crebit + Balance - [[ repeatIn(objects, 'a') ]] - [[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - - - - - - - [[ o.code ]] [[ o.name ]] - - - [[ sum_debit_account(o, data['form']) or '0.0' ]] - - - [[ sum_credit_account(o, data['form']) or '0.0' ]] - - - [[ sum_solde_account(o, data['form']) or '0.0' ]] - - - [[ sum_currency_amount_account(o, data['form']) or '0.0' ]] - - - - - - [[ data['form']['soldeinit'] == True or removeParentNode('tr') ]] - - - - - - Balance Initial - - - - - - - - - - - - [[ o.init_debit or '0.0' ]] - - - [[ o.init_credit or '0.0' ]] - - - [[ (o.init_debit - o.init_credit) or '0.0' ]] - - - - - + [[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] + + + + + [[ o.code ]] [[ o.name ]] + + [[ sum_debit_account(o, data['form']) or '0.0' ]] + [[sum_credit_account(o, data['form']) or '0.0' ]] + [[sum_solde_account(o, data['form']) or '0.0' ]] + + + [[ data['form']['soldeinit'] == True or removeParentNode('tr') ]] + Balance Initial + + [[ o.init_debit or '0.0' ]] + [[ o.init_credit or '0.0' ]] + [[ (o.init_debit - o.init_credit) or '0.0' ]] + + + - [[ repeatIn(lines(o, data['form']), 'line') ]] - - [[ line['date'] ]] - - - [[ line['partner'] ]] - - - [[ line['ref'] ]] - - - [[ line['move'] ]] - - - [[ line['name'] ]] - - - [[ line['debit'] and line['debit'] or '0.0' ]] - - - [[ line['credit'] and line['credit'] or '0.0' ]] - - - [[ line['progress'] and line['progress'] or '0.0' ]] - - - [[ line['amount_currency'] or '0.0' ]] [[ line['currency_code'] ]] - - - + + [[ repeatIn(lines(o, data['form']), 'line') ]] + [[ line['date'] ]] + [[ line['partner'] ]] + [[ line['ref'] ]] + [[ line['move'] ]] + [[ line['name'] ]] + [[ line['debit'] and line['debit'] or '0.0' ]] + [[ line['credit'] and line['credit'] or '0.0' ]] + [[ line['progress'] and line['progress'] or '0.0' ]] - - + +
+ + + + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + + Date + Partner + Ref + Mvt + Entry Label + Debit + Crebit + Balance + Currency - - + [[ repeatIn(objects, 'a') ]] + [[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] + + + + + [[ o.code ]] [[ o.name ]] + + [[ sum_debit_account(o, data['form']) or '0.0' ]] + [[sum_credit_account(o, data['form']) or '0.0' ]] + [[sum_solde_account(o, data['form']) or '0.0' ]] + [[ sum_currency_amount_account(o, data['form']) or '0.0' ]] + + + [[ data['form']['soldeinit'] == True or removeParentNode('tr') ]] + Balance Initial + + [[ o.init_debit or '0.0' ]] + [[ o.init_credit or '0.0' ]] + [[ (o.init_debit - o.init_credit) or '0.0' ]] + + + + + + + [[ repeatIn(lines(o, data['form']), 'line') ]] + [[ line['date'] ]] + [[ line['partner'] ]] + [[ line['ref'] ]] + [[ line['move'] ]] + [[ line['name'] ]] + [[ line['debit'] and line['debit'] or '0.0' ]] + [[ line['credit'] and line['credit'] or '0.0' ]] + [[ line['progress'] and line['progress'] or '0.0' ]] + [[ line['amount_currency'] or '0.0' ]] [[ line['currency_code'] ]] + + + - - - diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml index 7b82cb44bd9..37b6872dece 100644 --- a/addons/account/report/invoice.rml +++ b/addons/account/report/invoice.rml @@ -350,9 +350,6 @@ [[ format(l.note or removeParentNode('tr')) ]] - - - @@ -466,19 +463,16 @@ - Tax + Tax - Base + Base - Amount + Amount - - -