diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 7cc26443506..ac6355399b8 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -9,7 +9,14 @@
         <report auto="False" id="account_general_journal" model="account.journal.period" name="account.general.journal" rml="account/report/general_journal.rml" string="General Journal"/>
         <report auto="False" id="account_journal" model="account.journal.period" name="account.journal.period.print" rml="account/report/account_journal.rml" string="Journal"/>
         <report auto="False" id="account_overdue" model="res.partner" name="account.overdue" rml="account/report/overdue.rml" string="Overdue Payments"/>
-        <report auto="False" id="account_invoices" model="account.invoice" name="account.invoice" rml="account/report/invoice.rml" string="Invoices" attachment="print-"/>
+        <report
+            auto="False"
+            id="account_invoices"
+            model="account.invoice"
+            name="account.invoice"
+            rml="account/report/invoice.rml"
+            string="Invoices"
+            attachment="(object.state in ('open','paid')) and (time.strftime('%Y-%m-%d')+'-'+object.number)"/>
         <report id="account_transfers" model="account.transfer" name="account.transfer" string="Transfers" xml="account/report/transfer.xml" xsl="account/report/transfer.xsl"/>
         <report auto="False" id="account_intracom" menu="False" model="account.move.line" name="account.intracom" string="IntraCom"/>