Merge pull request #1229 from totten/master-exttesthook

[civicrm-core.git] / CRM / Financial / Page / AJAX.php

diff --git a/CRM/Financial/Page/AJAX.php b/CRM/Financial/Page/AJAX.php
index a7cdc05d3f75bdc6e7bdef244da515f81f95fd0c..b4a773810d93b8e929b96ff3185ec00e2f6323b0 100644 (file)
--- a/CRM/Financial/Page/AJAX.php
+++ b/CRM/Financial/Page/AJAX.php
@@ -62,10 +62,11 @@ class CRM_Financial_Page_AJAX {
         '8' => 1, //premium inventory
         '9' => 3, //discount account is
       );
-
-      $financialAccountType = "{$financialAccountType[$_GET['_value']]}";
+      $financialAccountType = CRM_Utils_Array::value($_GET['_value'], $financialAccountType);
       $result = CRM_Contribute_PseudoConstant::financialAccount(NULL, $financialAccountType);
-      $defaultId = CRM_Core_DAO::singleValueQuery("SELECT id FROM civicrm_financial_account WHERE is_default = 1 AND financial_account_type_id = $financialAccountType");
+      if ($financialAccountType) {
+        $defaultId = CRM_Core_DAO::singleValueQuery("SELECT id FROM civicrm_financial_account WHERE is_default = 1 AND financial_account_type_id = $financialAccountType");
+      }
     }
     $elements = array(
       array(
@@ -97,7 +98,7 @@ class CRM_Financial_Page_AJAX {
     }
 
     if ($_GET['_value'] == 'select') {
-      $result = CRM_Core_PseudoConstant::accountOptionValues('account_relationship');
+      $result = CRM_Core_PseudoConstant::get('CRM_Financial_DAO_EntityFinancialAccount', 'account_relationship');
     }
     else {
       $financialAccountType = array(
@@ -107,7 +108,7 @@ class CRM_Financial_Page_AJAX {
         '4' => array(7), //cost of sales
       );
       $financialAccountTypeId = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_FinancialAccount', $_GET['_value'], 'financial_account_type_id');
-      $result = CRM_Core_PseudoConstant::accountOptionValues('account_relationship');
+      $result = CRM_Core_PseudoConstant::get('CRM_Financial_DAO_EntityFinancialAccount', 'account_relationship');
     }
 
     $elements = array(
@@ -215,7 +216,7 @@ class CRM_Financial_Page_AJAX {
           case 'reopen':
             $status = $op == 'close' ? 'Closed' : 'Open';
             $ids['batchID'] = $recordID;
-            $batchStatus = CRM_Core_PseudoConstant::accountOptionValues('batch_status');
+            $batchStatus = CRM_Core_PseudoConstant::get('CRM_Batch_DAO_Batch', 'status_id');
             $params['status_id'] = CRM_Utils_Array::key($status, $batchStatus);
             $session = CRM_Core_Session::singleton();
             $params['modified_date'] = date('YmdHis');