From 4ae55ed76e8f49e3000ad4fd92a11cb7551bbfb9 Mon Sep 17 00:00:00 2001 From: "Apa (Open ERP)" Date: Fri, 23 Jan 2009 12:22:04 +0530 Subject: [PATCH] set formatLang in invoice report bzr revid: apa@tinyerp.com-20090123065204-njexmedv55lr5q73 --- addons/account/report/invoice.rml | 103 ++++++++++++++---------------- 1 file changed, 49 insertions(+), 54 deletions(-) diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml index acdebd6eaaa..2d3ec597087 100644 --- a/addons/account/report/invoice.rml +++ b/addons/account/report/invoice.rml @@ -195,7 +195,6 @@ - @@ -242,29 +241,29 @@ - [[ o.partner_id.title or '' ]][[ o.partner_id.name ]] - [[ o.address_invoice_id.title or '' ]][[ o.address_invoice_id.name ]] + [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] + [[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]] [[ o.address_invoice_id.street ]] [[ o.address_invoice_id.street2 or '' ]] - [[ o.address_invoice_id.zip or '' ]][[ o.address_invoice_id.city or '' ]] + [[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]] [[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]] [[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]] - Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]] + Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]] Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]] VAT : [[ o.partner_id.vat or removeParentNode('para') ]] - Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]][[ o.number ]] + Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]] PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma') or removeParentNode('para')) and '' ]] - PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]] + PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]] Canceled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] - Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]][[ o.number ]] - Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]][[ o.number ]] - Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]][[ o.number ]] + Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]] + Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]] + Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]] @@ -287,17 +286,17 @@ [[ o.name ]] - [[ o.date_invoice or '' ]] + [[ formatLang(o.date_invoice,date=True) ]] - [[ o.address_invoice_id.partner_id.ref or '' ]] + [[ o.address_invoice_id.partner_id.ref or '' ]] - + Description @@ -312,7 +311,7 @@ Unit Price - Disc.(%) + Disc. (%) Price @@ -327,22 +326,22 @@ [[ l.name ]] - [[ ', '.join([ lt.description or '' for lt in l.invoice_line_tax_id ]) ]] + [[ ', '.join([lt.name for lt in l.invoice_line_tax_id]) ]] - [[ l.quantity or 0.00 ]] + [[ formatLang(l.quantity)]] [[ (l.uos_id and l.uos_id.name) or '' ]] - [[ l.price_unit or 0.00 ]] + [[ formatLang(l.price_unit) ]] - [[ l.discount and l.discount or 0.00 ]] + [[ formatLang(l.discount) ]] - [[ l.price_subtotal or 0.00 ]] + [[ formatLang(l.price_subtotal) ]] [[ o.currency_id.code ]] @@ -350,7 +349,7 @@ - [[ format(l.note or removeParentNode('tr')) ]] + [[ format(l.note or removeParentNode('tr')) ]] @@ -415,10 +414,10 @@ - Net Total: + Net Total: - [[ o.amount_untaxed or 0.00 ]] + [[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.code ]] @@ -431,10 +430,10 @@ - Taxes: + Taxes: - [[ o.amount_tax or 0.00 ]] + [[ formatLang(o.amount_tax) ]] [[ o.currency_id.code ]] @@ -447,10 +446,10 @@ - Total: + Total: - [[ o.amount_total or 0.00]] + [[ formatLang(o.amount_total) ]] [[ o.currency_id.code ]] @@ -463,9 +462,11 @@ - - - + + + + + Tax @@ -476,39 +477,33 @@ Amount - - - + + + + + + + + + [[ repeatIn(o.tax_line,'t') ]] + + - + [[ t.name ]] - + [[ formatLang(t.base) ]] - + [[ formatLang(t.amount) ]] - - - [[ repeatIn(o.tax_line,'t') ]] - - [[ lt.description and lt.description + ' - ' + t.name or t.name ]] - - - [[ t.base or 0.00 ]] - - - [[ t.amount or 0.00 ]] [[ t.tax_code_id.notprintable and removeParentNode('tr') or '' ]] - - - - + - + @@ -547,7 +542,7 @@ - [[ format(o.comment or removeParentNode('blockTable')) ]] + [[ format(o.comment or removeParentNode('blockTable')) ]] @@ -557,7 +552,7 @@ - [[ format(o.payment_term and o.payment_term.note or removeParentNode('blockTable')) ]] + [[ format((o.payment_term and o.payment_term.note) or removeParentNode('blockTable')) ]] @@ -565,4 +560,4 @@ - + \ No newline at end of file