From b5eab10733f09985f9add62ffc55f3a2536751b0 Mon Sep 17 00:00:00 2001
From: Pradeep Nayak <pradpnayak@gmail.com>
Date: Mon, 31 Aug 2015 23:54:25 +0530
Subject: [PATCH] --CRM-16542, fixed billing info for paypal pro and express

---
 templates/CRM/Core/BillingBlock.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/CRM/Core/BillingBlock.tpl b/templates/CRM/Core/BillingBlock.tpl
index 32038385fe..3e569b833c 100644
--- a/templates/CRM/Core/BillingBlock.tpl
+++ b/templates/CRM/Core/BillingBlock.tpl
@@ -54,7 +54,7 @@
       </div>
     </fieldset>
   {/if}
-  {if $billingDetailsFields|@count && !$form.$expressButtonName}
+  {if $billingDetailsFields|@count && $paymentProcessor.payment_processor_type neq 'PayPal_Express'}
     {if $profileAddressFields}
       <input type="checkbox" id="billingcheckbox" value="0">
       <label for="billingcheckbox">{ts}My billing address is the same as above{/ts}</label>
-- 
2.25.1