diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml index a3db53e9ffe..df7cdcb2c67 100644 --- a/addons/purchase/report/order.rml +++ b/addons/purchase/report/order.rml @@ -57,7 +57,6 @@ - @@ -69,7 +68,6 @@ - @@ -77,7 +75,6 @@ - @@ -130,6 +127,7 @@ + @@ -187,7 +185,7 @@ - [[ o.ref or '' ]] + [[ o.name or '' ]] [[ o.partner_ref or '' ]] @@ -203,11 +201,8 @@ - + - - Product - Description @@ -230,11 +225,8 @@
[[ repeatIn(o.order_line,'line') ]] - + - - [[ line.product_id and get_product_code(line.product_id.id, o.partner_id.id) or '' ]] - [[ line.name ]] @@ -245,23 +237,21 @@ [[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]] - [[ '%.2f' % line.product_qty ]] + [[ line.product_qty ]] [[ line.product_uom.name ]] - [[ '%.2f' % line.price_unit ]] + [[ line.price_unit ]] - [[ '%.2f' % line.price_subtotal ]] + [[ 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') ]] @@ -308,7 +298,7 @@ Net Total : - [[ '%.2f' % o.amount_untaxed ]] + [[ o.amount_untaxed ]] [[ o.pricelist_id.currency_id.name ]] @@ -324,7 +314,7 @@ Taxes : - [[ '%.2f' % o.amount_tax ]] + [[ o.amount_tax ]] [[ o.pricelist_id.currency_id.name ]] @@ -340,7 +330,7 @@ Total : - [[ '%.2f' % o.amount_total ]] + [[ o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]