From 3816d3d423a013ffe7c978e3c3cd42efad79bd63 Mon Sep 17 00:00:00 2001 From: "Apa (Open ERP)" Date: Tue, 27 Jan 2009 17:38:49 +0530 Subject: [PATCH] when we have invoice that is proforma or draft, the report invoice should prints proforma. is it ok?==Done bzr revid: apa@tinyerp.com-20090127120849-0a5s6bhjj9zd7zh3 --- addons/account/report/invoice.rml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml index 2d3ec597087..62df090ed59 100644 --- a/addons/account/report/invoice.rml +++ b/addons/account/report/invoice.rml @@ -258,8 +258,8 @@ 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 == 'proforma2') or removeParentNode('para')) and '' ]] + Draft [[ ((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 ]] @@ -560,4 +560,4 @@ - \ No newline at end of file +