From 297c95e29bd0bdf7e8ee6da78c28dff895a2def7 Mon Sep 17 00:00:00 2001 From: ced <> Date: Thu, 9 Aug 2007 06:06:12 +0000 Subject: [PATCH] sale: use the format function for order report bzr revid: ced-9bfd7d46d530148d67f977b489ae79b0105749f2 --- addons/sale/report/order.rml | 262 +---------------------------------- 1 file changed, 1 insertion(+), 261 deletions(-) diff --git a/addons/sale/report/order.rml b/addons/sale/report/order.rml index 5f501789cf2..96e1b37d277 100644 --- a/addons/sale/report/order.rml +++ b/addons/sale/report/order.rml @@ -1,263 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [[ repeatIn(objects,'o') ]] [[ setLang(o.partner_id.lang) ]] - - - - Shipping address : - [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] - [[ o.partner_shipping_id.title or '' ]] [[ o.partner_shipping_id.name ]] - [[ o.partner_shipping_id.street ]] - [[ o.partner_shipping_id.street2 or '' ]] - [[ o.partner_shipping_id.zip or '' ]] [[ o.partner_shipping_id.city or '' ]] - [[ o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name or '' ]] - [[ o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '' ]] - - - - Invoice address : - [[ o.partner_invoice_id.street ]][[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]] - [[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]] [[ o.partner_invoice_id.country_id and (', %s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]] - - - - - - - - [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] - [[ o.partner_order_id.title or '' ]] [[ o.partner_order_id.name ]] - [[ o.partner_order_id.street ]] - [[ o.partner_order_id.street2 or '' ]] - [[ o.partner_order_id.zip or '' ]] [[ o.partner_order_id.city or '' ]] - [[ o.partner_order_id.state_id and o.partner_order_id.state_id.name or '' ]] - [[ o.partner_order_id.country_id and o.partner_order_id.country_id.name or '' ]] - - - - Tel. : [[ o.partner_order_id.phone or removeParentNode('para') ]] - Fax : [[ o.partner_order_id.fax or removeParentNode('para') ]] - VAT : [[ o.partner_id.vat or removeParentNode('para') ]] - - - - - - - [[ o.state<>'draft' and removeParentNode('para') ]] Quotation N° : [[ o.name ]] - [[ o.state=='draft' and removeParentNode('para') ]] Order N° : [[ o.name ]] - - - - Your order reference : [[ o.client_order_ref or '' ]] - Date ordered : [[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]] - Our salesman : [[ o.user_id.name ]] - - - - - - - Product Description - - - Applicable Taxes - - - Qty - - - Disc. - - - Unit Price - - - Net Price - - - -
- [[ repeatIn(o.order_line,'line') ]] - - - - [[ line.name ]] - - - [[ ', '.join(map(lambda x: x.name, line.tax_id))]] - - - [[ '%.2f' % line.product_uos_qty or '%.2f' % line.product_uom_qty ]] [[ line.product_uos and line.product_uos.name or line.product_uom.name ]] - - - [[ (line.discount and str(line.discount)+'%')or '' ]] - - - [[ '%.2f' % line.price_unit ]] - - - [[ '%.2f' % line.price_subtotal ]] - - - - - - - [[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]] - - - [[ l or removeParentNode('table') ]] - - - - - - - - -
- - - - - - - - - Net Total : - - - [[ '%.2f' % o.amount_untaxed ]] [[ o.pricelist_id.currency_id.name ]] - - - - - - - - - - Taxes : - - - [[ '%.2f' % o.amount_tax ]] [[ o.pricelist_id.currency_id.name ]] - - - - - - - - - - TOTAL : - - - [[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]] - - - - - - - - - - [[ o.note or '' ]] [[ setTag('para','xpre') ]] - - - - - [[ 'xpre' and o.partner_id.property_payment_term and o.partner_id.property_payment_term[1] ]] [[ setTag('para','xpre') ]] - - - - - - - - +[[ repeatIn(objects,'o') ]] [[ setLang(o.partner_id.lang) ]]Shipping address :[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]][[ o.partner_shipping_id.title or '' ]] [[ o.partner_shipping_id.name ]][[ o.partner_shipping_id.street ]][[ o.partner_shipping_id.street2 or '' ]][[ o.partner_shipping_id.zip or '' ]] [[ o.partner_shipping_id.city or '' ]][[ o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name or '' ]][[ o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '' ]] Invoice address :[[ o.partner_invoice_id.street ]][[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]][[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]] [[ o.partner_invoice_id.country_id and (', %s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]] [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]][[ o.partner_order_id.title or '' ]] [[ o.partner_order_id.name ]][[ o.partner_order_id.street ]][[ o.partner_order_id.street2 or '' ]][[ o.partner_order_id.zip or '' ]] [[ o.partner_order_id.city or '' ]][[ o.partner_order_id.state_id and o.partner_order_id.state_id.name or '' ]][[ o.partner_order_id.country_id and o.partner_order_id.country_id.name or '' ]] Tel. : [[ o.partner_order_id.phone or removeParentNode('para') ]]Fax : [[ o.partner_order_id.fax or removeParentNode('para') ]]VAT : [[ o.partner_id.vat or removeParentNode('para') ]] [[ o.state<>'draft' and removeParentNode('para') ]] Quotation N° : [[ o.name ]][[ o.state=='draft' and removeParentNode('para') ]] Order N° : [[ o.name ]] Your order reference : [[ o.client_order_ref or '' ]]Date ordered : [[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]]Our salesman : [[ o.user_id.name ]] Product DescriptionApplicable TaxesQtyDisc.Unit PriceNet Price
[[ repeatIn(o.order_line,'line') ]][[ line.name ]][[ ', '.join(map(lambda x: x.name, line.tax_id))]][[ '%.2f' % line.product_uos_qty or '%.2f' % line.product_uom_qty ]] [[ line.product_uos and line.product_uos.name or line.product_uom.name ]][[ (line.discount and str(line.discount)+'%')or '' ]][[ '%.2f' % line.price_unit ]][[ '%.2f' % line.price_subtotal ]][[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]][[ l or removeParentNode('table') ]]
Net Total :[[ '%.2f' % o.amount_untaxed ]] [[ o.pricelist_id.currency_id.name ]] Taxes :[[ '%.2f' % o.amount_tax ]] [[ o.pricelist_id.currency_id.name ]] TOTAL :[[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]] [[ format(o.note or '') ]][[ format((o.partner_id.property_payment_term and o.partner_id.property_payment_term[1]) or '') ]]