diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index ff1497824c0..a71cbc198dd 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -144,7 +144,7 @@ - Printing date: [[ formatLang(time.strftime('%Y-%m-%d'), date=True) ]] at [[ time.strftime('%H:%M:%S') ]] + diff --git a/addons/sale/report/order.rml b/addons/sale/report/order.rml index b4f1c4cfdff..e666793266a 100644 --- a/addons/sale/report/order.rml +++ b/addons/sale/report/order.rml @@ -19,7 +19,7 @@ - + @@ -34,8 +34,8 @@ - - + + @@ -45,11 +45,11 @@ - - - - - + + + + + @@ -59,22 +59,22 @@ - - + + - + - - + + - - + + @@ -82,16 +82,18 @@ - - + + + + - - + + - + @@ -119,7 +121,7 @@ -Invoice address : +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 '')) ]] @@ -153,7 +155,7 @@ - + Your Reference @@ -187,10 +189,10 @@ - + -Description +Description Taxes @@ -199,13 +201,13 @@ Quantity -Unit Price +Unit Price Disc. (%) -Price +Price @@ -224,7 +226,7 @@ [[ line.price_unit ]] - [[ (line.discount and str(line.discount)+'%')or '' ]] + [[ (line.discount and str(line.discount))or '' ]] [[ line.price_subtotal ]] @@ -271,7 +273,7 @@ -Total : +Total : [[ o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]