CRM-16304 fix-Incorrect FinancialTrxn dates for Backoffice Event Registration
authorpratikshad <pratiksha.dubey@webaccess.co.in>
Mon, 27 Apr 2015 09:18:44 +0000 (14:48 +0530)
committerpratikshad <pratiksha.dubey@webaccess.co.in>
Mon, 27 Apr 2015 09:18:44 +0000 (14:48 +0530)
----------------------------------------
* CRM-16304: Incorrect FinancialTrxn dates for Backoffice Event Registration
  https://issues.civicrm.org/jira/browse/CRM-16304

CRM/Contribute/BAO/Contribution.php

index 811b51d87b3d9669396d1d4e0a65712339040652..127b17871f68b97cf016935e43a428864d04e6c8 100644 (file)
@@ -2725,7 +2725,7 @@ WHERE  contribution_id = %1 ";
         $balanceTrxnParams['total_amount'] = $partialAmtTotal;
         $balanceTrxnParams['to_financial_account_id'] = $toFinancialAccount;
         $balanceTrxnParams['contribution_id'] = $params['contribution']->id;
-        $balanceTrxnParams['trxn_date'] = date('YmdHis');
+        $balanceTrxnParams['trxn_date'] = !empty($params['contribution']->receipt_date) ? $params['contribution']->receipt_date : date('YmdHis');
         $balanceTrxnParams['fee_amount'] = CRM_Utils_Array::value('fee_amount', $params);
         $balanceTrxnParams['net_amount'] = CRM_Utils_Array::value('net_amount', $params);
         $balanceTrxnParams['currency'] = $params['contribution']->currency;
@@ -2778,7 +2778,7 @@ WHERE  contribution_id = %1 ";
       $trxnParams = array(
         'contribution_id' => $params['contribution']->id,
         'to_financial_account_id' => $params['to_financial_account_id'],
-        'trxn_date' => date('YmdHis'),
+        'trxn_date' => !empty($params['contribution']->receipt_date) ? $params['contribution']->receipt_date : date('YmdHis'),
         'total_amount' => $totalAmount,
         'fee_amount' => CRM_Utils_Array::value('fee_amount', $params),
         'net_amount' => CRM_Utils_Array::value('net_amount', $params, $totalAmount),