From df09e88e737b0a9cfce600ae4940ea7a4f8ffaa6 Mon Sep 17 00:00:00 2001 From: "Apa (Open ERP)" Date: Thu, 22 Jan 2009 17:14:09 +0530 Subject: [PATCH] modify formatLan function in some report's rmm and sxw bzr revid: apa@tinyerp.com-20090122114409-k1wr76cqvyj91h6w --- addons/purchase/report/order.rml | 14 +++++++------- addons/purchase/report/request_quotation.rml | 2 +- addons/sale/report/order.rml | 16 ++++++++-------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml index d1dd99e1075..e406cff8c05 100644 --- a/addons/purchase/report/order.rml +++ b/addons/purchase/report/order.rml @@ -267,22 +267,22 @@ [[ line.name ]] - [[ formatLang(', '.join(map(lambda x: x.name, line.taxes_id)) or 0.00) ]] + [[ ', '.join(map(lambda x: x.name, line.taxes_id)) ]] [[ formatLang( line.date_planned, date=True) ]] - [[ formatLang(line.product_qty or 0.00) ]] + [[ formatLang(line.product_qty ) ]] [[ line.product_uom.name ]] - [[ formatLang(line.price_unit or 0.00) ]] + [[ formatLang(line.price_unit ) ]] - [[ formatLang(line.price_subtotal or 0.00) ]] + [[ formatLang(line.price_subtotal ) ]] @@ -333,7 +333,7 @@ Net Total : - [[ formatLang(o.amount_untaxed or 0.00) ]] + [[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id.name ]] @@ -349,7 +349,7 @@ Taxes : - [[ formatLang(o.amount_tax or 0.00) ]] + [[ formatLang(o.amount_tax) ]] [[ o.pricelist_id.currency_id.name ]] @@ -365,7 +365,7 @@ Total : - [[ formatLang(o.amount_total or 0.00) ]] + [[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id.name ]] diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml index be6a9bfe1a2..7f3365d3edb 100644 --- a/addons/purchase/report/request_quotation.rml +++ b/addons/purchase/report/request_quotation.rml @@ -136,7 +136,7 @@ [[ formatLang(order_line.date_planned, date = True) ]] - [[ formatLang(order_line.product_qty or 0.00)]] + [[ formatLang(order_line.product_qty )]] [[ (order_line.product_uom and order_line.product_uom.name) or '' ]] diff --git a/addons/sale/report/order.rml b/addons/sale/report/order.rml index 48c448bb0dd..ddfb8530815 100644 --- a/addons/sale/report/order.rml +++ b/addons/sale/report/order.rml @@ -244,22 +244,22 @@ [[ line.name ]] - [[ formatLang(', '.join(map(lambda x: x.name, line.tax_id)) or 0.00) ]] + [[ ', '.join(map(lambda x: x.name, line.tax_id)) ]] - [[ formatLang(line.product_uos and line.product_uos_qty or line.product_uom_qty or 0.00) ]] + [[ formatLang(line.product_uos and line.product_uos_qty or line.product_uom_qty) ]] [[ line.product_uos and line.product_uos.name or line.product_uom.name ]] - [[ formatLang(line.price_unit or 0.00) ]] + [[ formatLang(line.price_unit ) ]] - [[ formatLang(line.discount and str(line.discount) or 0.00) ]] + [[ formatLang(line.discount) ]] - [[ formatLang(line.price_subtotal or 0.00) ]] + [[ formatLang(line.price_subtotal ) ]] @@ -310,7 +310,7 @@ Net Total : - [[ formatLang(o.amount_untaxed or 0.00) ]] + [[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id.name ]] @@ -326,7 +326,7 @@ Taxes : - [[ formatLang(o.amount_tax or 0.00) ]] + [[ formatLang(o.amount_tax ) ]] [[ o.pricelist_id.currency_id.name ]] @@ -342,7 +342,7 @@ Total : - [[ formatLang(o.amount_total or 0.00) ]] + [[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id.name ]]