diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index e245314448ade0180eb930e562fea30a1b0e6981..f2bd9b1c8e89d38dfcb35e804250c0600ffc3da2 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -28,7 +28,7 @@
<record id="account_payment_term_15days" model="account.payment.term">
<field name="name">15 Days</field>
<field name="note">Payment terms: 15 Days</field>
- <field name="line_ids" eval="[(0, 0, {'value': 'balance', 'value_amount': 0.0, 'sequence': 500, 'days': 15, 'option': 'day_after_invoice_date'})]"/>
+ <field name="line_ids" eval="[(5, 0), (0, 0, {'value': 'balance', 'value_amount': 0.0, 'sequence': 500, 'days': 15, 'option': 'day_after_invoice_date'})]"/>
</record>
<record forcecreate="True" id="decimal_payment" model="decimal.precision">
@@ -39,7 +39,7 @@
<record id="account_payment_term_net" model="account.payment.term">
<field name="name">30 Net Days</field>
<field name="note">Payment terms: 30 Net Days</field>
- <field name="line_ids" eval="[(0, 0, {'value': 'balance', 'value_amount': 0.0, 'sequence': 500, 'days': 30, 'option': 'day_after_invoice_date'})]"/>
+ <field name="line_ids" eval="[(5, 0), (0, 0, {'value': 'balance', 'value_amount': 0.0, 'sequence': 500, 'days': 30, 'option': 'day_after_invoice_date'})]"/>
</record>
<!--
diff --git a/addons/account/views/account_report.xml b/addons/account/views/account_report.xml
index ddf5cb21cb02a14d145c89f72418ae594300b842..36f7eea7ee858da98ac8a068c3c67fea62aed4a9 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))"
/>
- <record id="account_invoices" model="ir.actions.report">
- <field name="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'+'-'+(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))</field>
- </record>
-
<report
id="account_invoice_action_report_duplicate"
model="account.invoice"
@@ -32,17 +30,16 @@
name="account.account_invoice_report_duplicate_main"
file="account.report_invoice_duplicate"
attachment_use="False"
+ print_report_name="(
+ 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 - %s' % (object.number) or
+ object.type == 'out_refund' and object.state == 'draft' and 'Duplicate Credit Note' or
+ object.type == 'out_refund' and 'Duplicate Credit Note - %s' % (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 - %s' % (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 - %s' % (object.number))"
/>
- <record id="account_invoice_action_report_duplicate" model="ir.actions.report">
- <field name="print_report_name">(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))</field>
- </record>
<report
id="action_report_print_overdue"
@@ -51,10 +48,8 @@
string="Due Payments"
name="account.report_overdue"
file="account.report_overdue"
- />
- <record id="action_report_print_overdue" model="ir.actions.report">
- <field name="print_report_name">'Due Payments'+'-'+(object.name)</field>
- </record>
+ print_report_name="'Due Payments - %s' % (object.name)"
+ />
<report
id="action_report_general_ledger"
diff --git a/addons/event/report/event_event_reports.xml b/addons/event/report/event_event_reports.xml
index 341d69702c23fc05c3095b7c92844c12cac87b77..46f79952493ed3da0faef05ef8ee2e879b74ed3d 100644
--- a/addons/event/report/event_event_reports.xml
+++ b/addons/event/report/event_event_reports.xml
@@ -24,10 +24,9 @@
report_type="qweb-pdf"
name="event.event_registration_report_template_badge"
file="event.event_registration_report_template_badge"
- paperformat="event.paperformat_euro_lowmargin"/>
- <record id="report_event_registration_badge" model="ir.actions.report">
- <field name="print_report_name">'Registration Event'+'-'+(object.name)</field>
- </record>
+ paperformat="event.paperformat_euro_lowmargin"
+ print_report_name="'Registration Event - %s' % (object.name).replace('/','')"
+ />
<report
id="report_event_event_badge"
diff --git a/addons/hr_attendance/report/hr_employee_badge.xml b/addons/hr_attendance/report/hr_employee_badge.xml
index d022b0829ba235c9041c183cb044acff14d6075a..0961d0b178b2031b8c990ef56df4c5e2a741a1b5 100644
--- a/addons/hr_attendance/report/hr_employee_badge.xml
+++ b/addons/hr_attendance/report/hr_employee_badge.xml
@@ -6,10 +6,9 @@
model="hr.employee"
report_type="qweb-pdf"
name="hr_attendance.print_employee_badge"
- file="hr_attendance.print_employee_badge"/>
- <record id="hr_employee_print_badge" model="ir.actions.report">
- <field name="print_report_name">'Print Badge'+'-'+(object.name)</field>
- </record>
+ file="hr_attendance.print_employee_badge"
+ print_report_name="'Print Badge - %s' % (object.name).replace('/', '')"
+ />
<template id="print_employee_badge">
<t t-call="web.basic_layout">
diff --git a/addons/hr_expense/report/report_expense_sheet.xml b/addons/hr_expense/report/report_expense_sheet.xml
index aef3e1c2c77656ad501bc9b6c1cb2d19d769aa2a..ecbe3241ba2ad112385ff020663f1e222b402e70 100644
--- a/addons/hr_expense/report/report_expense_sheet.xml
+++ b/addons/hr_expense/report/report_expense_sheet.xml
@@ -105,9 +105,7 @@
report_type="qweb-pdf"
name="hr_expense.report_expense_sheet"
file="hr_expense.report_expense_sheet"
+ print_report_name="'Expenses - %s - %s' % (object.employee_id.name, (object.name).replace('/', ''))"
/>
- <record id="action_report_hr_expense_sheet" model="ir.actions.report">
- <field name="print_report_name">'Expenses'+'-'+(object.employee_id.name)+'-'+(object.name)</field>
- </record>
</odoo>
\ No newline at end of file
diff --git a/addons/hr_payroll/views/hr_payroll_report.xml b/addons/hr_payroll/views/hr_payroll_report.xml
index 6b1e8a94637cdeb7046d684ca0c370046ebda5a4..e9c4ac11ccf4ecb4072b3887167397d23502181d 100644
--- a/addons/hr_payroll/views/hr_payroll_report.xml
+++ b/addons/hr_payroll/views/hr_payroll_report.xml
@@ -16,10 +16,9 @@
report_type="qweb-pdf"
name="hr_payroll.report_payslip"
file="hr_payroll.report_payslip"
+ print_report_name="'Payslip - %s' % (object.employee_id.name)"
/>
- <record id="action_report_payslip" model="ir.actions.report">
- <field name="print_report_name">(object.employee_id.name)+'-'+'Payslip'</field>
- </record>
+
<report
id="payslip_details_report"
model="hr.payslip"
@@ -27,8 +26,6 @@
report_type="qweb-pdf"
name="hr_payroll.report_payslipdetails"
file="hr_payroll.report_payslipdetails"
+ print_report_name="'Payslip Details - %s' % (object.employee_id.name)"
/>
- <record id="payslip_details_report" model="ir.actions.report">
- <field name="print_report_name">(object.name)</field>
- </record>
</odoo>
diff --git a/addons/l10n_ch/report/isr_report.xml b/addons/l10n_ch/report/isr_report.xml
index afd0d6015bc76cdb2135f7336c27c5a1785942f9..a64167b565e9567df472e9d81d297d4982627aa7 100644
--- a/addons/l10n_ch/report/isr_report.xml
+++ b/addons/l10n_ch/report/isr_report.xml
@@ -25,17 +25,11 @@
attachment_use="True"
attachment="'ISR-' + object.number + '.pdf'"
menu="False"
- />
-
- <record id="l10n_ch_isr_report" model ="ir.actions.report">
- <field name="print_report_name">
- 'ISR-' + object.number
- <!--No additional condition on invoice state or type as this
- report is only available to be printed for out invoices after
- 'draft' state, if the fields required by the ISR have been set.-->
- </field>
- <field name="paperformat_id" ref="paperformat_euro_no_margin"/>
- </record>
+ print_report_name="'ISR-%s' % object.number"
+ paperformat="paperformat_euro_no_margin"/>
+ <!--No additional condition in report name on invoice state or type as this
+ report is only available to be printed for out invoices after
+ 'draft' state, if the fields required by the ISR have been set.-->
<template id="assets_common" name="l10n_ch_isr_report" inherit_id="web.assets_common">
<xpath expr="." position="inside">
diff --git a/addons/mrp/report/mrp_report_views_main.xml b/addons/mrp/report/mrp_report_views_main.xml
index 86dfc67ecba76bcc67375d031cc47311459d4abe..a54a5209a1f14cfb1f1797520cf1c8fb5b121f2e 100644
--- a/addons/mrp/report/mrp_report_views_main.xml
+++ b/addons/mrp/report/mrp_report_views_main.xml
@@ -8,10 +8,8 @@
name="mrp.report_mrpbomstructure"
file="mrp.report.mrp_bom_templates"
report_type="qweb-pdf"
+ print_report_name="'BOM - %s' % (object.product_id.name or object.product_tmpl_id.name or '')"
/>
- <record id="action_report_bom_structure" model="ir.actions.report">
- <field name="print_report_name">'BOM'+'-'+(object.product_id.name or object.product_tmpl_id.name)</field>
- </record>
<report
string="Production Order"
@@ -20,10 +18,8 @@
name="mrp.report_mrporder"
file="mrp.report.mrp_production_templates"
report_type="qweb-pdf"
+ print_report_name="'Production Order - %s' % object.name"
/>
- <record id="action_report_production_order" model="ir.actions.report">
- <field name="print_report_name">'Production Order'+'-'+(object.name)</field>
- </record>
<report
string="BOM Cost"
@@ -32,9 +28,7 @@
name="mrp_bom_cost"
file="mrp_bom_cost"
report_type="qweb-html"
+ print_report_name="'BOM Cost - %s' % (object.product_id.name or object.product_tmpl_id.name or '')"
/>
- <record id="action_report_bom_price" model="ir.actions.report">
- <field name="print_report_name">'BOM Cost'+'-'+(object.product_id.name or object.product_tmpl_id.name)</field>
- </record>
</data>
</odoo>
diff --git a/addons/mrp_repair/report/mrp_repair_reports.xml b/addons/mrp_repair/report/mrp_repair_reports.xml
index 3cc755f5b73e80b135289d2719df83b85ff53812..ca9c966538c0a7e51c9b2dd2a843f2fb8df509d0 100644
--- a/addons/mrp_repair/report/mrp_repair_reports.xml
+++ b/addons/mrp_repair/report/mrp_repair_reports.xml
@@ -8,9 +8,9 @@
name="mrp_repair.report_mrprepairorder2"
file="mrp_repair.report_mrprepairorder"
report_type="qweb-pdf"
+ print_report_name="(
+ object.state == 'draft' and 'Repair Quotation - %s' % (object.name) or
+ 'Repair Order - %s' % (object.name))"
/>
- <record id="action_report_mrp_repair_order" model="ir.actions.report">
- <field name="print_report_name">(object.state == 'draft' and 'Repair Quotation'+'-'+(object.name) or 'Repair Order'+'-'+(object.name))</field>
- </record>
</data>
</odoo>
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 d010e7fcfe47b93df5c7f15122d9659053edba06..ec7831b814a9664b779ccdd5487a1b00a2e718d8 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 @@
<field name="model">pos.order</field>
<field name="report_type">qweb-pdf</field>
<field name="report_name">point_of_sale.report_invoice</field>
- <field name="print_report_name">'Invoice'+'-'+(object.name)</field>
+ <field name="print_report_name">'Invoice - %s' % (object.name)</field>
</record>
<record id="sale_details_report" model="ir.actions.report">
diff --git a/addons/product/report/product_reports.xml b/addons/product/report/product_reports.xml
index 0e48f95aa27151d7ff89c612b2d25ac2250f142a..cf75e9513ee8384064beb3a526a75559cf659912 100644
--- a/addons/product/report/product_reports.xml
+++ b/addons/product/report/product_reports.xml
@@ -7,10 +7,9 @@
model="product.product"
report_type="qweb-pdf"
name="product.report_productlabel"
- file="product.report_productlabel"/>
- <record id="report_product_label" model="ir.actions.report">
- <field name="print_report_name">'Products Labels'+'-'+(object.name)</field>
- </record>
+ file="product.report_productlabel"
+ print_report_name="'Products Labels - %s' % (object.name)"
+ />
<report
id="report_product_template_label"
@@ -18,10 +17,9 @@
model="product.template"
report_type="qweb-pdf"
name="product.report_producttemplatelabel"
- file="product.report_producttemplatelabel"/>
- <record id="report_product_template_label" model="ir.actions.report">
- <field name="print_report_name">'Products Labels'+'-'+(object.name)</field>
- </record>
+ file="product.report_producttemplatelabel"
+ print_report_name="'Products Labels - %s' % (object.name)"
+ />
<report
id="action_report_pricelist"
@@ -30,6 +28,6 @@
report_type="qweb-pdf"
name="product.report_pricelist"
file="product.report_pricelist"
- menu="False"/>
+ menu="False"/>
</data>
</odoo>
diff --git a/addons/purchase/report/purchase_reports.xml b/addons/purchase/report/purchase_reports.xml
index 33524f2342c9982d0ec6270e71db483198809d25..913a41021ad370b5e5e69a060dde5efbf590692e 100644
--- a/addons/purchase/report/purchase_reports.xml
+++ b/addons/purchase/report/purchase_reports.xml
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
+ <data>
<report
string="Purchase Order"
id="action_report_purchase_order"
model="purchase.order"
report_type="qweb-pdf"
name="purchase.report_purchaseorder"
- file="purchase.report_purchaseorder"
+ file="purchase.report_purchaseorder"
+ print_report_name="
+ (object.state in ('draft', 'sent') and 'Request for Quotation - %s' % (object.name) or
+ 'Purchase Order - %s' % (object.name))"
/>
- <record id="action_report_purchase_order" model="ir.actions.report">
- <field name="print_report_name">(object.state in ('draft', 'sent') and 'Request for Quotation'+'-'+(object.name) or 'Purchase Order'+'-'+(object.name))</field>
- </record>
<report
string="Request for Quotation"
@@ -19,8 +20,7 @@
report_type="qweb-pdf"
name="purchase.report_purchasequotation"
file="purchase.report_purchasequotation"
+ print_report_name="'Request for Quotation - %s' % (object.name)"
/>
- <record id="report_purchase_quotation" model="ir.actions.report">
- <field name="print_report_name">'Request for Quotation'+'-'+(object.name)</field>
- </record>
+ </data>
</odoo>
diff --git a/addons/purchase_requisition/report/purchase_requisition_report.xml b/addons/purchase_requisition/report/purchase_requisition_report.xml
index 0870c38afb0a1fff1280ba57f36abca29139f420..91b537ad3569a3b7eeed9a7b9d747b986515b08c 100644
--- a/addons/purchase_requisition/report/purchase_requisition_report.xml
+++ b/addons/purchase_requisition/report/purchase_requisition_report.xml
@@ -1,16 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
- <data>
- <report
- string="Call for Tenders"
- id="action_report_purchase_requisitions"
- model="purchase.requisition"
- report_type="qweb-pdf"
- name="purchase_requisition.report_purchaserequisitions"
- file="purchase_requisition.report.report_purchaserequisitions"
- />
- <record id="action_report_purchase_requisitions" model="ir.actions.report">
- <field name="print_report_name">'Tender'+'-'+(object.name)</field>
- </record>
- </data>
+ <report
+ string="Call for Tenders"
+ id="action_report_purchase_requisitions"
+ model="purchase.requisition"
+ report_type="qweb-pdf"
+ name="purchase_requisition.report_purchaserequisitions"
+ file="purchase_requisition.report.report_purchaserequisitions"
+ print_report_name="'Tender - %s' % (object.name)"
+ />
</odoo>
diff --git a/addons/report_intrastat/report/report_intrastat_report.xml b/addons/report_intrastat/report/report_intrastat_report.xml
index 126c059b109249f5c5b1f1afd0349ec141f441c4..01d37444b07c680a8c2e5348390980a61ed21edc 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))"
/>
- <record id="account_intrastatinvoices" model="ir.actions.report">
- <field name="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'+'-'+(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))</field>
- </record>
</odoo>
diff --git a/addons/sale/report/sale_report.xml b/addons/sale/report/sale_report.xml
index 866ec989a051ffd4390d762d0ffd19dc79deaef7..7601218711041cf98710ebfc72180efd140143bc 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)"
/>
- <record id="action_report_saleorder" model="ir.actions.report">
- <field name="print_report_name">(object.state in ('draft', 'sent') and 'Quotation'+'-'+(object.name) or 'Order'+'-'+(object.name))</field>
- </record>
<report
string="Pro-Forma"
@@ -20,9 +18,7 @@
report_type="qweb-pdf"
name="sale.report_saleproforma"
file="sale.report_saleorder"
+ print_report_name="'Pro-Forma - %s' % (object.name)"
/>
- <record id="report_proforma_quotation" model="ir.actions.report">
- <field name="print_report_name">'Pro-Forma'+'-'+(object.name)</field>
- </record>
</data>
</odoo>
diff --git a/addons/stock/report/stock_report_views.xml b/addons/stock/report/stock_report_views.xml
index 84988bfdb6adedc5a2bdd0a5118bfdcbed85cc5d..e1f84bb2620a616f3ed9e9846ff342aebb302e10 100644
--- a/addons/stock/report/stock_report_views.xml
+++ b/addons/stock/report/stock_report_views.xml
@@ -8,10 +8,8 @@
report_type="qweb-pdf"
name="stock.report_picking"
file="stock.report_picking_operations"
+ print_report_name="'Picking Operations - %s - %s' % (object.partner_id.name or '', object.name)"
/>
- <record id="action_report_picking" model="ir.actions.report">
- <field name="print_report_name">'Picking Operations'+'-'+(object.partner_id.name or '')+'-'+(object.name)</field>
- </record>
<report
string="Delivery Slip"
id="action_report_delivery"
@@ -19,30 +17,48 @@
report_type="qweb-pdf"
name="stock.report_deliveryslip"
file="stock.report_deliveryslip"
+ print_report_name="'Delivery Slip - %s - %s' % (object.partner_id.name or '', object.name)"
/>
- <record id="action_report_delivery" model="ir.actions.report">
- <field name="print_report_name">'Delivery Slip'+'-'+(object.partner_id.name or '')+'-'+(object.name)</field>
- </record>
<report
string="Inventory"
id="action_report_inventory"
model="stock.inventory"
report_type="qweb-pdf"
name="stock.report_inventory"
- file="stock.report_inventory"
+ file="stock.report_inventory"
+ print_report_name="'Inventory - %s' % (object.name)"
+ />
+ <report
+ string="Package BarCode with Contents"
+ id="action_report_quant_package_barcode"
+ model="stock.quant.package"
+ report_type="qweb-pdf"
+ name="stock.report_package_barcode"
+ file="stock.report_package_barcode"/>
+ <report
+ string="Package BarCode"
+ id="action_report_quant_package_barcode_small"
+ model="stock.quant.package"
+ report_type="qweb-pdf"
+ name="stock.report_package_barcode_small"
+ file="stock.report_package_barcode"/>
+ <report
+ string="Location BarCode"
+ id="action_report_location_barcode"
+ model="stock.location"
+ report_type="qweb-pdf"
+ name="stock.report_location_barcode"
+ file="stock.report_location_barcode"
+ print_report_name="'Location - %s' % object.name"
+ />
+ <report
+ string="Lot BarCode"
+ id="action_report_lot_barcode"
+ model="stock.production.lot"
+ report_type="qweb-pdf"
+ name="stock.report_lot_barcode"
+ file="stock.report_lot_barcode"
+ print_report_name="'Lot-Serial - %s' % object.name"
/>
- <record id="action_report_inventory" model="ir.actions.report">
- <field name="print_report_name">'Inventory'+'-'+(object.name)</field>
- </record>
- <report id="action_report_quant_package_barcode" model="stock.quant.package" report_type="qweb-pdf" name="stock.report_package_barcode" string="Package BarCode with Contents" file="stock.report_package_barcode"/>
- <report id="action_report_quant_package_barcode_small" model="stock.quant.package" report_type="qweb-pdf" name="stock.report_package_barcode_small" string="Package BarCode" file="stock.report_package_barcode"/>
- <report id="action_report_location_barcode" model="stock.location" report_type="qweb-pdf" name="stock.report_location_barcode" string="Location BarCode" file="stock.report_location_barcode"/>
- <record id="action_report_location_barcode" model="ir.actions.report">
- <field name="print_report_name">(object.name)+'-'+'Location'</field>
- </record>
- <report id="action_report_lot_barcode" model="stock.production.lot" report_type="qweb-pdf" name="stock.report_lot_barcode" string="Lot BarCode" file="stock.report_lot_barcode"/>
- <record id="action_report_lot_barcode" model="ir.actions.report">
- <field name="print_report_name">'Lot/Serial'+'-'+(object.name)</field>
- </record>
</data>
</odoo>
diff --git a/addons/website_quote/report/sale_order_reports.xml b/addons/website_quote/report/sale_order_reports.xml
index c3c8078545f4b102c4d259062d311121e0bb87f2..ce6877469fdabceed19b389f5462ae88d54e7dcb 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))"
/>
- <record id="report_web_quote" model="ir.actions.report">
- <field name="print_report_name">(object.state in ('draft', 'sent') and 'Quotation'+'-'+(object.name) or 'Order'+'-'+(object.name))</field>
- </record>
</odoo>
diff --git a/odoo/import_xml.rng b/odoo/import_xml.rng
index adcbd19e0333a431f58fdc6aa0a551bf87cecca1..81fef2b35c6c4660ad462993d4c0922ed82dcc26 100644
--- a/odoo/import_xml.rng
+++ b/odoo/import_xml.rng
@@ -73,6 +73,7 @@
<rng:attribute name="string"/>
<rng:attribute name="model"/>
<rng:attribute name="name"/>
+ <rng:optional><rng:attribute name="print_report_name"/></rng:optional>
<rng:optional><rng:attribute name="report_type"/></rng:optional>
<rng:optional><rng:attribute name="multi"/></rng:optional>
<rng:optional><rng:attribute name="menu"/></rng:optional>
diff --git a/odoo/tools/convert.py b/odoo/tools/convert.py
index 7e8e9f6e3ce56fb45d7bd500651e338edb797601..76c7ec523af51ec355544c611fd0e513cb6ca7f4 100644
--- a/odoo/tools/convert.py
+++ b/odoo/tools/convert.py
@@ -285,8 +285,14 @@ form: module.record_id""" % (xml_id,)
for dest,f in (('name','string'),('model','model'),('report_name','name')):
res[dest] = rec.get(f,'').encode('utf8')
assert res[dest], "Attribute %s of report is empty !" % (f,)
- for field,dest in (('attachment','attachment'),('attachment_use','attachment_use'), ('usage','usage'),
- ('file', 'report_file'), ('report_type', 'report_type'), ('parser', 'parser')):
+ for field, dest in (('attachment', 'attachment'),
+ ('attachment_use', 'attachment_use'),
+ ('usage', 'usage'),
+ ('file', 'report_file'),
+ ('report_type', 'report_type'),
+ ('parser', 'parser'),
+ ('print_report_name', 'print_report_name'),
+ ):
if rec.get(field):
res[dest] = rec.get(field).encode('utf8')
if rec.get('auto'):