diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml index 7cc4f4978f7..0501c86635b 100644 --- a/addons/account/edi/invoice_action_data.xml +++ b/addons/account/edi/invoice_action_data.xml @@ -49,7 +49,7 @@ % endif

- % if object.company_id.paypal_account and object.type in ('out_invoice', 'in_refund'): + % if object.company_id.paypal_account and object.type in ('out_invoice'): <% comp_name = quote(object.company_id.name) inv_number = quote(object.number) diff --git a/addons/portal_sale/portal_sale.py b/addons/portal_sale/portal_sale.py index 818da5e8784..7cda77ed9ea 100644 --- a/addons/portal_sale/portal_sale.py +++ b/addons/portal_sale/portal_sale.py @@ -67,7 +67,7 @@ class account_invoice(osv.Model): result = dict.fromkeys(ids, False) payment_acquirer = self.pool.get('portal.payment.acquirer') for this in self.browse(cr, uid, ids, context=context): - if this.state not in ('draft','done') and not this.reconciled: + if this.type == 'out_invoice' and this.state not in ('draft','done') and not this.reconciled: result[this.id] = payment_acquirer.render_payment_block(cr, uid, this, this.number, this.currency_id, this.residual, context=context) return result diff --git a/addons/portal_sale/portal_sale_data.xml b/addons/portal_sale/portal_sale_data.xml index 8239f1cbcca..43d0bba27a3 100644 --- a/addons/portal_sale/portal_sale_data.xml +++ b/addons/portal_sale/portal_sale_data.xml @@ -150,7 +150,7 @@ href="${signup_url}">View Invoice % endif - % if object.company_id.paypal_account and object.type in ('out_invoice', 'in_refund'): + % if object.company_id.paypal_account and object.type in ('out_invoice'): <% comp_name = quote(object.company_id.name) inv_number = quote(object.number)