diff --git a/addons/account/views/account_report.xml b/addons/account/views/account_report.xml
index ddf5cb21cb0..36f7eea7ee8 100644
--- a/addons/account/views/account_report.xml
+++ b/addons/account/views/account_report.xml
@@ -11,19 +11,17 @@
file="account.report_invoice"
attachment_use="True"
attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/','')+'.pdf')"
+ print_report_name="(
+ object.type == 'out_invoice' and object.state == 'draft' and 'Draft Invoice' or
+ object.type == 'out_invoice' and object.state in ('open','paid') and 'Invoice - %s' % (object.number) or
+ object.type == 'out_refund' and object.state == 'draft' and 'Credit Note' or
+ object.type == 'out_refund' and 'Credit Note - %s' % (object.number) or
+ object.type == 'in_invoice' and object.state == 'draft' and 'Vendor Bill' or
+ object.type == 'in_invoice' and object.state in ('open','paid') and 'Vendor Bill - %s' % (object.number) or
+ object.type == 'in_refund' and object.state == 'draft' and 'Vendor Credit Note' or
+ object.type == 'in_refund' and 'Vendor Credit Note - %s' % (object.number))"
/>
-
- (object.type == 'out_invoice' and object.state == 'draft' and 'Draft Invoice' or
- object.type == 'out_invoice' and object.state in ('open','paid') and 'Invoice'+'-'+(object.number) or
- object.type == 'out_refund' and object.state == 'draft' and 'Credit Note' or
- object.type == 'out_refund' and 'Credit Note'+'-'+(object.number) or
- object.type == 'in_invoice' and object.state == 'draft' and 'Vendor Bill' or
- object.type == 'in_invoice' and object.state in ('open','paid') and 'Vendor Bill'+'-'+(object.number) or
- object.type == 'in_refund' and object.state == 'draft' and 'Vendor Credit Note' or
- object.type == 'in_refund' and 'Vendor Credit Note'+'-'+(object.number))
-
-
-
- (object.type == 'out_invoice' and object.state == 'draft' and 'Duplicate Invoice' or
- object.type == 'out_invoice' and object.state in ('open','paid') and 'Duplicate Invoice'+'-'+(object.number) or
- object.type == 'out_refund' and object.state == 'draft' and 'Duplicate Credit Note' or
- object.type == 'out_refund' and 'Duplicate Credit Note'+'-'+(object.number) or
- object.type == 'in_invoice' and object.state == 'draft' and 'Duplicate Vendor Bill' or
- object.type == 'in_invoice' and object.state in ('open','paid') and 'Duplicate Vendor Bill'+'-'+(object.number) or
- object.type == 'in_refund' and object.state == 'draft' and 'Duplicate Vendor Credit Note' or
- object.type == 'in_refund' and 'Duplicate Vendor Credit Note'+'-'+(object.number))
-
-
- 'Due Payments'+'-'+(object.name)
-
+ print_report_name="'Due Payments - %s' % (object.name)"
+ />
-
-
-
- 'ISR-' + object.number
-
-
-
-
+ print_report_name="'ISR-%s' % object.number"
+ paperformat="paperformat_euro_no_margin"/>
+
diff --git a/addons/point_of_sale/views/point_of_sale_report.xml b/addons/point_of_sale/views/point_of_sale_report.xml
index d010e7fcfe4..ec7831b814a 100644
--- a/addons/point_of_sale/views/point_of_sale_report.xml
+++ b/addons/point_of_sale/views/point_of_sale_report.xml
@@ -15,7 +15,7 @@
pos.order
qweb-pdf
point_of_sale.report_invoice
- 'Invoice'+'-'+(object.name)
+ 'Invoice - %s' % (object.name)
diff --git a/addons/purchase/report/purchase_reports.xml b/addons/purchase/report/purchase_reports.xml
index 33524f2342c..913a41021ad 100644
--- a/addons/purchase/report/purchase_reports.xml
+++ b/addons/purchase/report/purchase_reports.xml
@@ -1,16 +1,17 @@
+
-
- (object.state in ('draft', 'sent') and 'Request for Quotation'+'-'+(object.name) or 'Purchase Order'+'-'+(object.name))
-
-
- 'Request for Quotation'+'-'+(object.name)
-
+
diff --git a/addons/purchase_requisition/report/purchase_requisition_report.xml b/addons/purchase_requisition/report/purchase_requisition_report.xml
index 0870c38afb0..91b537ad356 100644
--- a/addons/purchase_requisition/report/purchase_requisition_report.xml
+++ b/addons/purchase_requisition/report/purchase_requisition_report.xml
@@ -1,16 +1,12 @@
-
-
-
- 'Tender'+'-'+(object.name)
-
-
+
diff --git a/addons/report_intrastat/report/report_intrastat_report.xml b/addons/report_intrastat/report/report_intrastat_report.xml
index 126c059b109..01d37444b07 100644
--- a/addons/report_intrastat/report/report_intrastat_report.xml
+++ b/addons/report_intrastat/report/report_intrastat_report.xml
@@ -7,15 +7,14 @@
report_type="qweb-pdf"
name="report_intrastat.report_intrastatinvoice"
file="report_intrastat.report_intrastatinvoice"
+ print_report_name="
+ (object.type == 'out_invoice' and object.state == 'draft' and 'Intrastat Invoice' or
+ object.type == 'out_invoice' and object.state in ('open','paid') and 'Intrastat Invoice - %s' % (object.number) or
+ object.type == 'out_refund' and object.state == 'draft' and 'Intrastat Credit Note' or
+ object.type == 'out_refund' and 'Intrastat Credit Note - %s' % (object.number) or
+ object.type == 'in_invoice' and object.state == 'draft' and 'Intrastat Vendor Bill' or
+ object.type == 'in_invoice' and object.state in ('open','paid') and 'Intrastat Vendor Bill - %s' % (object.number) or
+ object.type == 'in_refund' and object.state == 'draft' and 'Intrastat Vendor Credit Note' or
+ object.type == 'in_refund' and 'Intrastat Vendor Credit Note - %s' % (object.number))"
/>
-
- (object.type == 'out_invoice' and object.state == 'draft' and 'Intrastat Invoice' or
- object.type == 'out_invoice' and object.state in ('open','paid') and 'Intrastat Invoice'+'-'+(object.number) or
- object.type == 'out_refund' and object.state == 'draft' and 'Intrastat Credit Note' or
- object.type == 'out_refund' and 'Intrastat Credit Note'+'-'+(object.number) or
- object.type == 'in_invoice' and object.state == 'draft' and 'Intrastat Vendor Bill' or
- object.type == 'in_invoice' and object.state in ('open','paid') and 'Intrastat Vendor Bill'+'-'+(object.number) or
- object.type == 'in_refund' and object.state == 'draft' and 'Intrastat Vendor Credit Note' or
- object.type == 'in_refund' and 'Intrastat Vendor Credit Note'+'-'+(object.number))
-
diff --git a/addons/sale/report/sale_report.xml b/addons/sale/report/sale_report.xml
index 866ec989a05..76012187110 100644
--- a/addons/sale/report/sale_report.xml
+++ b/addons/sale/report/sale_report.xml
@@ -7,11 +7,9 @@
model="sale.order"
report_type="qweb-pdf"
file="sale.report_saleorder"
- name="sale.report_saleorder"
+ name="sale.report_saleorder"
+ print_report_name="(object.state in ('draft', 'sent') and 'Quotation - %s' % (object.name)) or 'Order - %s' % (object.name)"
/>
-
- (object.state in ('draft', 'sent') and 'Quotation'+'-'+(object.name) or 'Order'+'-'+(object.name))
-
-
- 'Pro-Forma'+'-'+(object.name)
-
diff --git a/addons/website_quote/report/sale_order_reports.xml b/addons/website_quote/report/sale_order_reports.xml
index c3c8078545f..ce6877469fd 100644
--- a/addons/website_quote/report/sale_order_reports.xml
+++ b/addons/website_quote/report/sale_order_reports.xml
@@ -8,8 +8,8 @@
file="website_quote.report_quotation"
name="website_quote.report_quote"
menu="False"
+ print_report_name="
+ (object.state in ('draft', 'sent') and 'Quotation - %s' % object.name or
+ 'Order - %s' % (object.name))"
/>
-
- (object.state in ('draft', 'sent') and 'Quotation'+'-'+(object.name) or 'Order'+'-'+(object.name))
-