From 676c3c7b428a6bc47a5d74c69c9c084eb095ded2 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Mon, 12 Jul 2010 17:37:38 +0530 Subject: [PATCH] [IMP]:account:improved invoice order report. bzr revid: apa@tinyerp.com-20100712120738-2dxlzl7sit9jk2rv --- addons/account/report/invoice.rml | 379 +++++++++++++++++++----------- 1 file changed, 241 insertions(+), 138 deletions(-) diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml index 6f1cac05102..b14f3d2ed68 100644 --- a/addons/account/report/invoice.rml +++ b/addons/account/report/invoice.rml @@ -127,10 +127,10 @@ - + - + - + - + - - - - - - - - - - - - - - + - + + + + + - - - - - - - + + + + + + + - - - + + @@ -227,25 +213,32 @@ - + + + - [[ repeatIn(objects,'o') ]] - [[ setLang(o.partner_id.lang) ]] + [[ setLang(o.partner_id.lang) ]] - - [[ o.partner_id.name ]] [[ o.partner_id.title or '' ]] + + + + + + [[ 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.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') ]] Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]] VAT : [[ o.partner_id.vat or removeParentNode('para') ]] @@ -255,168 +248,278 @@ 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 == 'proforma2') or removeParentNode('para')) and '' ]] Draft Invoice [[ ((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 '' ]] + Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') 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 ]] - + + + - Document - Invoice Date - Partner Ref. + + Document + + + Invoice Date + + + Partner Ref. + - [[ o.name ]] - [[ formatLang(o.date_invoice,date=True) ]] - [[ o.address_invoice_id.partner_id.ref or '' ]] + + [[ o.name ]] + + + [[ formatLang(o.date_invoice,date=True) ]] + + + [[ o.address_invoice_id.partner_id.ref or '' ]] + - - - + + + + - Description - Taxes - Quantity - Unit Price - Disc.(%) - Price + + Description + + + Taxes + + + Quantity + + + Unit Price + + + Disc.(%) + + + Price +
[[ repeatIn(o.invoice_line,'l') ]] - + - [[ l.name ]] - [[ ', '.join([ lt.description or '' for lt in l.invoice_line_tax_id ]) ]] - [[ formatLang(l.quantity)]] - [[ (l.uos_id and l.uos_id.name) or '' ]] - [[ formatLang(l.price_unit) ]] - [[ formatLang(l.discount) ]] - [[ formatLang(l.price_subtotal) ]] - [[ o.currency_id.code ]] + + [[ l.name ]] + + + [[ ', '.join([ lt.name or '' for lt in l.invoice_line_tax_id ]) ]] + + + [[ formatLang(l.quantity)]] + + + [[ (l.uos_id and l.uos_id.name) or '' ]] + + + [[ formatLang(l.price_unit) ]] + + + [[ formatLang(l.discount) ]] + + + [[ formatLang(l.price_subtotal) ]] + + + [[ o.currency_id.code ]] + - [[ format(l.note) or removeParentNode('tr') ]] - - - - - - - + + [[ format(l.note or '') or removeParentNode('tr') ]] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- + - - + + + + + + + + + + - + - Net Total: - [[ formatLang(o.amount_untaxed) ]] - [[ o.currency_id.code ]] + + Net Total: + + + [[ formatLang(o.amount_untaxed) ]] + + + [[ o.currency_id.code ]] + - + + + + - Taxes: - [[ formatLang(o.amount_tax) ]] - [[ o.currency_id.code ]] + + Taxes: + + + [[ formatLang(o.amount_tax) ]] + + + [[ o.currency_id.code ]] + - + + + + - Total: - [[ formatLang(o.amount_total) ]] - [[ o.currency_id.code ]] + + Total: + + + [[ formatLang(o.amount_total) ]] + + + [[ o.currency_id.code ]] + - + - + - Tax - Base - Amount + + Tax + + + Base + + + Amount + + + + + + + + + + + [[ repeatIn(o.tax_line,'t') ]] + + + + [[ t.name ]] + + + [[ formatLang(t.base) ]] + + + [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]] + - [[ repeatIn(o.tax_line,'t') ]] - - - [[ t.name ]] - [[ formatLang(t.base) ]] - [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]][[ formatLang(t.amount) ]] - - + + + + + - - - - - - - + [[ format(o.comment or '') or removeParentNode('blockTable') ]] - + - - + + [[ format((o.payment_term and o.payment_term.note) or '') or removeParentNode('blockTable') ]] + - - - [[ format(o.comment or removeParentNode('blockTable')) ]] - - - - - - - - [[ format((o.payment_term and o.payment_term.note) or removeParentNode('blockTable')) ]] - - - - - - + Fiscal Position Remark : - [[ format(o.fiscal_position and o.fiscal_position.note or removeParentNode('blockTable')) ]] + [[ format((o.fiscal_position and o.fiscal_position.note) or '') or removeParentNode('blockTable') ]] - - - - - - + + + + +