From: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Tue, 4 Aug 2015 22:15:57 +0000 (+1200)
Subject: CRM-16523 test fix
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=12829b5d722f78fd6963c5936fbefd9d35ef603f;p=civicrm-core.git

CRM-16523 test fix
---

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 04c72bc5e3..ae495441a6 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -4044,6 +4044,7 @@ WHERE con.id = {$contributionId}
       'payment_instrument_id',
       'is_test',
       'campaign_id',
+      'receive_date',
     );
 
     $contributionParams = array_merge(array(
diff --git a/CRM/Core/Payment/PayPalProIPN.php b/CRM/Core/Payment/PayPalProIPN.php
index cd1c2a6cf5..0cd114e3b0 100644
--- a/CRM/Core/Payment/PayPalProIPN.php
+++ b/CRM/Core/Payment/PayPalProIPN.php
@@ -520,7 +520,7 @@ INNER JOIN civicrm_membership_payment mp ON m.id = mp.membership_id AND mp.contr
     $input['fee_amount'] = self::retrieve('mc_fee', 'Money', 'POST', FALSE);
     $input['net_amount'] = self::retrieve('settle_amount', 'Money', 'POST', FALSE);
     $input['trxn_id'] = self::retrieve('txn_id', 'String', 'POST', FALSE);
-    $input['payment_date'] = self::retrieve('payment_date', 'String', 'POST', FALSE);
+    $input['payment_date'] = $input['receive_date'] = self::retrieve('payment_date', 'String', 'POST', FALSE);
   }
 
   /**