From 508a68598cfd71c168ac1dbe5c6be84f5326e323 Mon Sep 17 00:00:00 2001 From: ced <> Date: Wed, 29 Aug 2007 14:19:33 +0000 Subject: [PATCH] Improve invoice report bzr revid: ced-32e5170f57564ebb5b84d14259d50ea25f131668 --- addons/account/report/invoice.rml | 2 +- addons/custom/corporate_rml_header.rml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml index c0f59b19534..d2d768e6897 100644 --- a/addons/account/report/invoice.rml +++ b/addons/account/report/invoice.rml @@ -1,3 +1,3 @@ -[[ repeatIn(objects,'o') ]][[ setLang(o.partner_id.lang) ]] [[ 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') ]] Invoice [[ (o.type=='out_invoice' or removeParentNode('font')) and '' ]]Refund [[ (o.type=='out_refund' or removeParentNode('font')) and '' ]]Supplier Refund [[ (o.type=='in_refund' or removeParentNode('font')) and '' ]]Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('font')) and '' ]][[ o.number ]] Document:[[o.name]]Invoice Date: [[o.date_invoice]]Customer Ref: [[ o.address_invoice_id.partner_id.ref or '/' ]] DescriptionTaxesQuantityUnit PriceDisc. (%)Price
[[repeatIn(o.invoice_line,'l') ]][[ l.name ]][[ ', '.join([lt.name for lt in l.invoice_line_tax_id]) ]][[ '%.2f' % l.quantity ]] [[l.uos_id and l.uos_id.name or '' ]][[ '%.2f' % l.price_unit ]][[ l.discount and '%.2f' % (l.discount) or '' ]] [[ '%.2f' %l.price_subtotal ]] [[o.currency_id.code ]][[ repeatIn((l.note and l.note.splitlines()) or [], 'note') ]][[ note or removeParentNode('table') ]]
TaxBaseAmount[[ repeatIn(o.tax_line,'t') ]] [[ t.name ]][[ '%.2f' % t.base ]][[ '%.2f' % t.amount]]Total (excl. taxes):[[ '%.2f' % o.amount_untaxed ]] [[o.currency_id.code ]]Taxes:[[ '%.2f' % o.amount_tax ]] [[o.currency_id.code ]]Total (incl. taxes):[[ '%.2f' % o.amount_total ]] [[o.currency_id.code ]] [[ format(o.comment or '') ]] [[ format((o.payment_term and o.payment_term.note) or '') ]] +[[ repeatIn(objects,'o') ]][[ setLang(o.partner_id.lang) ]] [[ 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') ]] Invoice [[ (o.type=='out_invoice' or removeParentNode('font')) and '' ]]Refund [[ (o.type=='out_refund' or removeParentNode('font')) and '' ]]Supplier Refund [[ (o.type=='in_refund' or removeParentNode('font')) and '' ]]Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('font')) and '' ]][[ o.number ]] Document:[[o.name]]Invoice Date: [[o.date_invoice]]Customer Ref: [[ o.address_invoice_id.partner_id.ref or '/' ]] DescriptionTaxesQuantityUnit PriceDisc. (%)Price
[[repeatIn(o.invoice_line,'l') ]][[ l.name ]][[ ', '.join([lt.name for lt in l.invoice_line_tax_id]) ]][[ '%.2f' % l.quantity ]] [[l.uos_id and l.uos_id.name or '' ]][[ '%.2f' % l.price_unit ]][[ l.discount and '%.2f' % (l.discount) or '' ]] [[ '%.2f' %l.price_subtotal ]] [[o.currency_id.code ]][[ repeatIn((l.note and l.note.splitlines()) or [], 'note') ]][[ note or removeParentNode('table') ]]
TaxBaseAmount[[ repeatIn(o.tax_line,'t') ]][[ t.name ]][[ '%.2f' % t.base ]][[ '%.2f' % t.amount]]Total (excl. taxes):[[ '%.2f' % o.amount_untaxed ]] [[o.currency_id.code ]]Taxes:[[ '%.2f' % o.amount_tax ]] [[o.currency_id.code ]]Total (incl. taxes):[[ '%.2f' % o.amount_total ]] [[o.currency_id.code ]] [[ format(o.comment or '') ]] [[ format((o.payment_term and o.payment_term.note) or '') ]] diff --git a/addons/custom/corporate_rml_header.rml b/addons/custom/corporate_rml_header.rml index fead5ab1cb1..08b178cbdb1 100644 --- a/addons/custom/corporate_rml_header.rml +++ b/addons/custom/corporate_rml_header.rml @@ -4,10 +4,10 @@ - - - [[ company.partner_id.name ]] + + 1cm 27.7cm 20cm 27.7cm + [[ company.partner_id.name ]] [[ company.rml_header1 ]]