diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml
index 9cab56fb073..c38b1f8829a 100644
--- a/addons/account/edi/invoice_action_data.xml
+++ b/addons/account/edi/invoice_action_data.xml
@@ -67,7 +67,7 @@
             <a style="display:block; width: 150px; height:20px; margin-left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat no-repeat;" 
                href="${ctx.get('edi_web_url_view') or ''}">View Invoice</a>
     
-    % if object.company_id.paypal_account:
+    % if object.company_id.paypal_account and object.type in ('out_invoice', 'in_refund'):
     <% 
     comp_name = quote(object.company_id.name)
     inv_number = quote(object.number)
@@ -138,7 +138,7 @@ A new invoice is available for ${object.partner_id.name}:
 You can view the invoice document, download it and pay online using the following link:
     ${ctx.get('edi_web_url_view') or 'n/a'}
 
-% if object.company_id.paypal_account:
+% if object.company_id.paypal_account and object.type in ('out_invoice', 'in_refund'):
 <% 
 comp_name = quote(object.company_id.name)
 inv_number = quote(object.number)
diff --git a/addons/edi/static/src/xml/edi.xml b/addons/edi/static/src/xml/edi.xml
index 8c569011559..1e662a2b2cc 100644
--- a/addons/edi/static/src/xml/edi.xml
+++ b/addons/edi/static/src/xml/edi.xml
@@ -41,7 +41,7 @@
 
                         <div class="oe_edi_option">
                         <input type="radio" id="oe_edi_import_saas" name="oe_edi_import" class="oe_edi_import_choice"/>
-                        <label for="oe_edi_import_saas"  id="oe_edi_import_saas" class="oe_edi_import_choice_label">Import it into a new OpenERP Online instance:</label>
+                        <label for="oe_edi_import_saas"  id="oe_edi_import_saas" class="oe_edi_import_choice_label">Import it into a new OpenERP Online instance</label>
                         </div>
                         <p class="oe_edi_nested_block_import oe_edi_import_saas_nested">
                             <button type="button" class="oe_edi_import_button" id="oe_edi_import_create">Create my new OpenERP instance</button>
diff --git a/addons/edi/static/src/xml/edi_account.xml b/addons/edi/static/src/xml/edi_account.xml
index fcb9f89a98a..d9c9af9c401 100644
--- a/addons/edi/static/src/xml/edi_account.xml
+++ b/addons/edi/static/src/xml/edi_account.xml
@@ -124,7 +124,7 @@
     </div>
 </t>
 <t t-name="Edi.account.invoice.sidebar">
-    <t t-if="!doc.reconciled">
+    <t t-if="!doc.reconciled &amp;&amp; (doc.type == 'out_invoice' or doc.type == 'in_refund')">
         <t t-if="doc.company_address.paypal_account || doc.company_address.bank_ids">
             <p class="oe_edi_sidebar_title">Pay Online</p>
             <t t-if="doc.company_address.paypal_account">