--CRM-20585, fixed financial trxn entry for deferred revenue

CRM-20585, fixed jenkins style ---------------------------------------- * CRM-20585: Correct the from and to accounts for deferred revenue transactions https://issues.civicrm.org/jira/browse/CRM-20585
civicrm · May 17, 2017 · 090a3ab · 090a3ab
1 parent 87bf7cb
commit 090a3ab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CRM/Core/BAO/FinancialTrxn.php b/CRM/Core/BAO/FinancialTrxn.php
@@ -685,10 +685,10 @@ public static function createDeferredTrxn($lineItems, $contributionDetails, $upd
         }
         foreach ($results['values'] as $result) {
           if ($result['account_relationship'] == $accountRel) {
-            $trxnParams['to_financial_account_id'] = $result['financial_account_id'];
+            $trxnParams['from_financial_account_id'] = $result['financial_account_id'];
           }
           else {
-            $trxnParams['from_financial_account_id'] = $result['financial_account_id'];
+            $trxnParams['to_financial_account_id'] = $result['financial_account_id'];
           }
         }
         foreach ($deferredRevenue['revenue'] as $revenue) {

diff --git a/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php b/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
@@ -1275,7 +1275,7 @@ public function testContributionWithDeferredRevenue() {
     $checkAgainst = array(
       'financial_trxn_id.to_financial_account_id.name' => 'Deferred Revenue - Event Fee',
       'financial_trxn_id.from_financial_account_id.name' => 'Event Fee',
-      'financial_trxn_id' => '2'
+      'financial_trxn_id' => '2',
     );
     $result = $this->callAPISuccessGetSingle('EntityFinancialTrxn', array(
       'return' => array(