diff --git a/addons/account/controllers/portal.py b/addons/account/controllers/portal.py
index d649ab4134f..98999814dc5 100644
--- a/addons/account/controllers/portal.py
+++ b/addons/account/controllers/portal.py
@@ -45,6 +45,13 @@ class PortalAccount(CustomerPortal):
         }
         if access_token:
             values['no_breadcrumbs'] = True
+        if kwargs.get('error'):
+            values['error'] = kwargs['error']
+        if kwargs.get('warning'):
+            values['warning'] = kwargs['warning']
+        if kwargs.get('success'):
+            values['success'] = kwargs['success']
+
         return values
 
     @http.route(['/my/invoices', '/my/invoices/page/<int:page>'], type='http', auth="user", website=True)
diff --git a/addons/account/views/account_portal_templates.xml b/addons/account/views/account_portal_templates.xml
index b724c466d13..c4c7abc140e 100644
--- a/addons/account/views/account_portal_templates.xml
+++ b/addons/account/views/account_portal_templates.xml
@@ -97,6 +97,8 @@
                         </div>
                     </div>
                     <div class="panel-body">
+                        <t t-if="error or warning" t-call="account.portal_invoice_error"/>
+                        <t t-if="success and (not error and not warning)" t-call="account.portal_invoice_success"/>
                         <t t-call="account.portal_invoice_report"/>
                     </div>
                 </div>
@@ -261,4 +263,23 @@
             <span t-field="invoice.fiscal_position_id.note"/>
         </p>
     </template>
+
+    <template id="portal_invoice_error" name="Invoice error/warning display">
+        <div class="row">
+            <div t-att-class="'col-md-6 col-md-offset-3 text-center alert alert-dismissable %s' % ('alert-danger' if error else 'alert-warning')">
+                <a href="#" class="close" data-dismiss="alert" aria-label="close" title="close">×</a>
+                <t t-if="error == 'generic'" name="generic">
+                    There was an error processing this page.
+                </t>
+            </div>
+        </div>
+    </template>
+
+    <template id="portal_invoice_success" name="Invoice success display">
+        <div class="row">
+            <div class="col-md-6 col-md-offset-3 text-center alert alert-dismissable alert-success">
+                <a href="#" class="close" data-dismiss="alert" aria-label="close" title="close">×</a>
+            </div>
+        </div>
+    </template>
 </odoo>
\ No newline at end of file