From 245dd434041fa38e77cf7b0ce3ae64d575de94f7 Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Mon, 1 Sep 2008 18:29:02 +0530 Subject: [PATCH] Doing Some changes in sxw and rml of order_new purchase report bzr revid: vinusoft85@gmail.com-20080901125902-9usd2o7eerrhbxgh --- addons/purchase/report/order_new.rml | 122 ++++++++++++--------------- 1 file changed, 54 insertions(+), 68 deletions(-) diff --git a/addons/purchase/report/order_new.rml b/addons/purchase/report/order_new.rml index 4d7274742ef..190cd722bf7 100644 --- a/addons/purchase/report/order_new.rml +++ b/addons/purchase/report/order_new.rml @@ -14,7 +14,7 @@ - + @@ -87,16 +87,6 @@ - - - - - - - - - - @@ -126,20 +116,21 @@ + [[ repeatIn(objects,'o') ]] - + - + - + @@ -148,22 +139,22 @@ [[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]] Shipping address : - [[ o.partner_id.title or '' ]][[ o.partner_id.name ]] - [[ addr.title or '' ]][[ addr.name ]] - [[ addr.street ]] - [[ addr.street2 or '' ]] - [[ addr.zip or '' ]][[ addr.city or '' ]] - [[ addr.state_id and addr.state_id.name or '' ]] - [[ addr.country_id and addr.country_id.name or '' ]] + [[ o.partner_id.title or '' ]][[ o.partner_id.name ]] + [[ addr.title or '' ]][[ addr.name ]] + [[ addr.street ]] + [[ addr.street2 or '' ]] + [[ addr.zip or '' ]][[ addr.city or '' ]] + [[ addr.state_id and addr.state_id.name or '' ]] + [[ addr.country_id and addr.country_id.name or '' ]] - + - + @@ -184,8 +175,8 @@ - - + + Request for Quotation @@ -196,67 +187,60 @@ N° : [[ o.name ]] - - - - Our Order Reference + Our Order Reference - Your Order Reference + Your Order Reference - Date Ordered + Date Ordered - Validated By + Validated By - - - - [[ o.ref or '' ]] + [[ o.ref or '' ]] - [[ o.partner_ref or '' ]] + [[ o.partner_ref or '' ]] - [[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]] + [[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]] - [[ o.validator and o.validator.name or '' ]] + [[ o.validator and o.validator.name or '' ]] - - Product Description + Product Description - Applicable Taxes + Applicable Taxes - Date Requested + Date Requested - Qty + Qty - Unit Price + Unit Price - Net Price + Net Price @@ -265,91 +249,93 @@ - [[ line.product_id and get_product_code(line.product_id.id, o.partner_id.id) or '' ]] - [[ line.name ]] + [[ line.product_id and get_product_code(line.product_id.id, o.partner_id.id) or '' ]] + [[ line.name ]] - [[ ', '.join(map(lambda x: x.name, line.taxes_id)) ]] + [[ ', '.join(map(lambda x: x.name, line.taxes_id)) ]] - [[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]] + [[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]] - [[ '%.2f' % line.product_qty ]][[ line.product_uom.name ]] + [[ '%.2f' % line.product_qty ]][[ line.product_uom.name ]] - [[ '%.2f' % line.price_unit ]] + [[ '%.2f' % line.price_unit ]] - [[ '%.2f' % line.price_subtotal ]] + [[ '%.2f' % line.price_subtotal ]] - [[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]] + [[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]] - [[ l or removeParentNode('table') ]] + [[ l or removeParentNode('table') ]] - + - + - Net Total : + Net Total : - [[ '%.2f' % o.amount_untaxed ]][[ o.pricelist_id.currency_id.name ]] + [[ '%.2f' % o.amount_untaxed ]][[ o.pricelist_id.currency_id.name ]] - + - Taxes : + Taxes : - [[ '%.2f' % o.amount_tax ]][[ o.pricelist_id.currency_id.name ]] + [[ '%.2f' % o.amount_tax ]][[ o.pricelist_id.currency_id.name ]] - + - TOTAL : + TOTAL : - [[ '%.2f' % o.amount_total ]][[ o.pricelist_id.currency_id.name ]] + [[ '%.2f' % o.amount_total ]][[ o.pricelist_id.currency_id.name ]] - + - [[ format(o.notes or '') ]] + [[ format(o.notes or '') ]] - + + +