diff --git a/addons/account_voucher/account_voucher_pay_invoice.xml b/addons/account_voucher/account_voucher_pay_invoice.xml
index 83bda5d9511..284632b9b5f 100644
--- a/addons/account_voucher/account_voucher_pay_invoice.xml
+++ b/addons/account_voucher/account_voucher_pay_invoice.xml
@@ -8,9 +8,9 @@
+ attrs="{'invisible': ['|', ('state','!=','open'), ('sent','=',True)]}" groups="base.group_user"/>
+ attrs="{'invisible': ['|', ('state','!=','open'), ('sent','=',False)]}" class="oe_highlight" groups="base.group_user"/>
diff --git a/addons/portal_sale/portal_sale_view.xml b/addons/portal_sale/portal_sale_view.xml
index 7d3ab5b3632..0a10c80e3ef 100644
--- a/addons/portal_sale/portal_sale_view.xml
+++ b/addons/portal_sale/portal_sale_view.xml
@@ -53,17 +53,19 @@
Invoices
account.invoice
tree,form
- [('type','=','out_invoice')]
- {'type':'out_invoice', 'journal_type': 'sale'}
+ [('type','in',['out_invoice','out_refund'])]
+ {'type':['out_invoice','out_refund'], 'journal_type': 'sale'}
We haven't sent you any invoice.
+
tree
+
@@ -71,24 +73,12 @@
-
- Customer Refunds
- account.invoice
- tree,form
- [('type','=','out_refund')]
- {'type':'out_refund'}
-
- We haven't sent you any refund.
-
-
-