diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
old mode 100755
new mode 100644
index 9ebbe935ebe..a8d25222d6f
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -114,7 +114,7 @@
-
+
@@ -157,12 +157,12 @@
|
[[ 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 ]]
+ 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.zip or '' ]][[ addr.city or '' ]]
[[ addr.state_id and addr.state_id.name or '' ]]
[[ addr.country_id and addr.country_id.name or '' ]]
|
@@ -178,11 +178,11 @@
- [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]
- [[ o.partner_address_id.title or '' ]] [[ o.partner_address_id.name ]]
+ [[ 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.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 '' ]]
@@ -203,15 +203,15 @@
- [[ (o.state=='draft' or removeParentNode('font')) and 'Request for Quotation' ]] [[ (o.state<>'draft' or removeParentNode('font')) and 'Purchase Order Confirmation' ]] N° [[ o.name ]]
+ [[ (o.state=='draft' or removeParentNode('font')) and 'Request for Quotation' ]][[ (o.state<>'draft' or removeParentNode('font')) and 'Purchase Order Confirmation' ]] N° [[ o.name ]]
-
+
-
+
|
Your Order Reference
|
@@ -223,26 +223,26 @@
-
+
-
- |
- [[ o.partner_ref or '' ]]
|
- [[o.date_order]]
+ [[ o.partner_ref or '' ]]
|
- [[ o.validator and o.validator.name or '' ]]
+ [[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]]
+ |
+
+ [[ o.validator and o.validator.name or '' ]]
|
-
+
Description
@@ -266,28 +266,28 @@
[[ repeatIn(o.order_line,'line') ]]
-
+
|
[[ line.name ]]
|
- [[ ', '.join(map(lambda x: x.name, line.taxes_id)) ]]
+ [[ ', '.join(map(lambda x: x.name, line.taxes_id)) or '0.00' ]]
|
- [[ time.strftime('%m/%d/%Y', time.strptime( line.date_planned, '%Y-%m-%d %H:%M:%S')) ]]
+ [[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d %H:%M:%S')) ]]
|
- [[ line.product_qty ]]
+ [[ line.product_qty or '0.00' ]]
|
[[ line.product_uom.name ]]
|
- [[ line.price_unit ]]
+ [[ line.price_unit or '0.00' ]]
|
- [[ line.price_subtotal ]]
+ [[ line.price_subtotal or '0.00' ]]
|
@@ -338,10 +338,10 @@
Net Total :
|
- [[ o.amount_untaxed ]]
+ [[ o.amount_untaxed or '0.00' ]]
|
- [[ o.pricelist_id.currency_id.name ]]
+ [[ o.pricelist_id.currency_id.name ]]
|
@@ -354,10 +354,10 @@
Taxes :
|
- [[ o.amount_tax ]]
+ [[ o.amount_tax or '0.00' ]]
|
- [[ o.pricelist_id.currency_id.name ]]
+ [[ o.pricelist_id.currency_id.name ]]
|
@@ -370,7 +370,7 @@
Total :
|
- [[ o.amount_total ]]
+ [[ o.amount_total or '0.00' ]]
|
[[ o.pricelist_id.currency_id.name ]]
@@ -391,4 +391,4 @@
-
+
\ No newline at end of file
| | |