From 7286fd5d9f5924f4aa89120000c01af60a78eee1 Mon Sep 17 00:00:00 2001 From: "Apa (Open ERP)" Date: Thu, 22 Jan 2009 11:06:12 +0530 Subject: [PATCH] remove style like p1,p2... in rml and sxw.(Sale Order) bzr revid: apa@tinyerp.com-20090122053612-86e65zdivp3zugpq --- addons/sale/report/order.rml | 42 ++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/addons/sale/report/order.rml b/addons/sale/report/order.rml index 6ba40118b01..48c448bb0dd 100644 --- a/addons/sale/report/order.rml +++ b/addons/sale/report/order.rml @@ -91,13 +91,6 @@ - - - - - - - @@ -129,8 +122,9 @@ - + + @@ -250,27 +244,27 @@ [[ line.name ]] - [[ ', '.join(map(lambda x: x.name, line.tax_id)) or formatLang(0.00) ]] + [[ formatLang(', '.join(map(lambda x: x.name, line.tax_id)) or 0.00) ]] - [[ line.product_uos and line.product_uos_qty or line.product_uom_qty or formatLang(0.00) ]] + [[ formatLang(line.product_uos and line.product_uos_qty or line.product_uom_qty or 0.00) ]] [[ line.product_uos and line.product_uos.name or line.product_uom.name ]] - [[ line.price_unit or formatLang(0.00) ]] + [[ formatLang(line.price_unit or 0.00) ]] - [[ line.discount and str(line.discount) or formatLang(0.00) ]] + [[ formatLang(line.discount and str(line.discount) or 0.00) ]] - [[ line.price_subtotal or formatLang(0.00) ]] + [[ formatLang(line.price_subtotal or 0.00) ]] - [[ format(line.notes or removeParentNode('tr')) ]] + [[ format(line.notes or removeParentNode('tr')) ]] @@ -313,13 +307,13 @@ - Net Total : + Net Total : - [[ o.amount_untaxed or formatLang(0.00) ]] + [[ formatLang(o.amount_untaxed or 0.00) ]] - [[ o.pricelist_id.currency_id.name ]] + [[ o.pricelist_id.currency_id.name ]] @@ -329,13 +323,13 @@ - Taxes : + Taxes : - [[ o.amount_tax or formatLang(0.00) ]] + [[ formatLang(o.amount_tax or 0.00) ]] - [[ o.pricelist_id.currency_id.name ]] + [[ o.pricelist_id.currency_id.name ]] @@ -345,13 +339,13 @@ - Total : + Total : - [[ o.amount_total or formatLang(0.00) ]] + [[ formatLang(o.amount_total or 0.00) ]] - [[ o.pricelist_id.currency_id.name ]] + [[ o.pricelist_id.currency_id.name ]] @@ -370,7 +364,7 @@ - +