--CRM-16542, fixed billing info for paypal pro and express

diff --git a/templates/CRM/Core/BillingBlock.tpl b/templates/CRM/Core/BillingBlock.tpl
index 32038385fef35448a32777f975c16738c0da4dfb..3e569b833c810ac8029b01c0d2ea758eb574210a 100644 (file)
--- 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>