diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml
index 08423ce8538..6247ca00818 100644
--- a/addons/account/report/invoice.rml
+++ b/addons/account/report/invoice.rml
@@ -195,6 +195,7 @@
+
@@ -203,7 +204,7 @@
-
+
@@ -241,29 +242,29 @@
- [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]
- [[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]
+ [[ o.partner_id.title or '' ]][[ o.partner_id.name ]]
+ [[ o.address_invoice_id.title or '' ]][[ o.address_invoice_id.name ]]
[[ o.address_invoice_id.street ]]
[[ o.address_invoice_id.street2 or '' ]]
- [[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]
+ [[ o.address_invoice_id.zip or '' ]][[ o.address_invoice_id.city or '' ]]
[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]]
[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]
- Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]]
+ Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]]
Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]]
VAT : [[ o.partner_id.vat or removeParentNode('para') ]]
|
- Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]
+ Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]][[ o.number ]]
PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma') or removeParentNode('para')) and '' ]]
- PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]
+ PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]
Canceled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]]
- Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]
- Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]
- Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]
+ Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]][[ o.number ]]
+ Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]][[ o.number ]]
+ Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]][[ o.number ]]
@@ -276,7 +277,7 @@
Invoice Date
- Partner Code
+ Partner Ref.
|
@@ -289,7 +290,7 @@
[[ o.date_invoice ]]
- [[ o.address_invoice_id.partner_id.ref or '' ]]
+ [[ o.address_invoice_id.partner_id.ref or '' ]]
|
@@ -314,7 +315,7 @@
Disc. (%)
- Price
+ Price
|
@@ -326,22 +327,22 @@
[[ l.name ]]
- [[ ', '.join([lt.name for lt in l.invoice_line_tax_id]) ]]
+ [[ ', '.join([lt.name for lt in l.invoice_line_tax_id]) or '0.00' ]]
|
- [[ formatLang(l.quantity) ]]
+ [[ formatLang(l.quantity) or '0.00' ]]
|
[[ (l.uos_id and l.uos_id.name) or '' ]]
|
- [[ formatLang(l.price_unit) ]]
+ [[ formatLang(l.price_unit) or '0.00' ]]
|
- [[ l.discount and formatLang (l.discount) or '' ]]
+ [[ l.discount and formatLang (l.discount) or '0.00' ]]
|
- [[ formatLang(l.price_subtotal) ]]
+ [[ formatLang(l.price_subtotal) or '0.00' ]]
|
[[ o.currency_id.code ]]
@@ -349,7 +350,10 @@
|
- [[ format(l.note or removeParentNode('tr')) ]]
+ [[ format(l.note or removeParentNode('tr')) ]]
+
+
+
|
@@ -389,10 +393,10 @@
|
-
+
-
+
@@ -408,13 +412,13 @@
|
-
+
- Net Total:
+ Net Total:
|
- [[ formatLang(o.amount_untaxed) ]]
+ [[ formatLang(o.amount_untaxed) or '0.00' ]]
|
[[ o.currency_id.code ]]
@@ -424,13 +428,13 @@
-
+
- Taxes:
+ Taxes:
|
- [[ formatLang(o.amount_tax) ]]
+ [[ formatLang(o.amount_tax) or '0.00']]
|
[[ o.currency_id.code ]]
@@ -440,13 +444,13 @@
-
+
- Total:
+ Total:
|
- [[ formatLang(o.amount_total) ]]
+ [[ formatLang(o.amount_total) or '0.00' ]]
|
[[ o.currency_id.code ]]
@@ -459,20 +463,23 @@
- [[ format(o.amount_tax or removeParentNode('blockTable')) ]]
+ [[ format(o.amount_tax or removeParentNode('blockTable')) ]]
- Tax
+ Tax
|
- Base
+ Base
|
- Amount
+ Amount
|
+
+
+
|
@@ -487,7 +494,7 @@
[[ formatLang(t.base) ]]
- [[ formatLang(t.amount) or 0.00 ]]
+ [[ formatLang(t.amount) or 0.00 ]]
|
@@ -534,7 +541,7 @@
- [[ format(o.comment or removeParentNode('blockTable')) ]]
+ [[ format(o.comment or removeParentNode('blockTable')) ]]
|
@@ -544,7 +551,7 @@
- [[ format((o.payment_term and o.payment_term.note) or removeParentNode('blockTable')) ]]
+ [[ format((o.payment_term and o.payment_term.note) or removeParentNode('blockTable')) ]]
|
| | | | |