diff --git a/addons/purchase/report/order_new.rml b/addons/purchase/report/order_new.rml
index 6400e22dd00..4d7274742ef 100644
--- a/addons/purchase/report/order_new.rml
+++ b/addons/purchase/report/order_new.rml
@@ -96,10 +96,7 @@
-
-
-
-
+
@@ -151,13 +148,13 @@
[[ 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 '' ]]
|
@@ -171,19 +168,19 @@
- [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]
- [[ o.partner_address_id.title or '' ]] [[ o.partner_address_id.name ]]
- [[ o.partner_address_id.street ]]
- [[ o.partner_address_id.street2 or '' ]]
- [[ o.partner_address_id.zip or '' ]] [[ o.partner_address_id.city or '' ]]
- [[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]]
- [[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]]
-
+ [[ o.partner_id.title or '' ]][[ o.partner_id.name ]]
+ [[ o.partner_address_id.title or '' ]][[ o.partner_address_id.name ]]
+ [[ o.partner_address_id.street ]]
+ [[ o.partner_address_id.street2 or '' ]]
+ [[ o.partner_address_id.zip or '' ]][[ o.partner_address_id.city or '' ]]
+ [[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]]
+ [[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]]
+
- Tél. : [[ o.partner_address_id.phone or '' ]]
- Fax : [[ o.partner_address_id.fax or '' ]]
- TVA : [[ o.partner_id.vat or '' ]]
+ Tél. : [[ o.partner_address_id.phone or '' ]]
+ Fax : [[ o.partner_address_id.fax or '' ]]
+ TVA :[[ o.partner_id.vat or '' ]]
|
@@ -191,13 +188,16 @@
- Request for Quotation [[ (o.state=='draft' or removeParentNode('font')) and '' ]]
+ Request for Quotation
+ [[ (o.state=='draft' or removeParentNode('font')) and '' ]]
- Order [[ (o.state<>'draft' or removeParentNode('font')) and '' ]]
- N° : [[ o.name ]]
+ Order
+ [[ (o.state<>'draft' or removeParentNode('font')) and '' ]]
+ N° :
+ [[ o.name ]]
-
+
@@ -215,8 +215,8 @@
-
-
+
+
@@ -224,13 +224,13 @@
[[ o.ref or '' ]]
|
- [[ o.partner_ref or '' ]]
+ [[ o.partner_ref or '' ]]
|
[[ 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 '' ]]
|
@@ -269,19 +269,19 @@
[[ 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')) ]]
|
- [[ '%.2f' % line.product_qty ]] [[ line.product_uom.name ]]
+ [[ '%.2f' % line.product_qty ]][[ line.product_uom.name ]]
|
[[ '%.2f' % line.price_unit ]]
|
- [[ '%.2f' % line.price_subtotal ]]
+ [[ '%.2f' % line.price_subtotal ]]
|
@@ -310,7 +310,7 @@
Net Total :
- [[ '%.2f' % o.amount_untaxed ]] [[ o.pricelist_id.currency_id.name ]]
+ [[ '%.2f' % o.amount_untaxed ]][[ o.pricelist_id.currency_id.name ]]
|
@@ -323,7 +323,7 @@
Taxes :
|
- [[ '%.2f' % o.amount_tax ]] [[ o.pricelist_id.currency_id.name ]]
+ [[ '%.2f' % o.amount_tax ]][[ o.pricelist_id.currency_id.name ]]
|
@@ -336,7 +336,7 @@
TOTAL :
|
- [[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]
+ [[ '%.2f' % o.amount_total ]][[ o.pricelist_id.currency_id.name ]]
|
@@ -350,8 +350,6 @@
-
-
-
+