Refactored out of CRM_Core_PseudoConstant: accountOptionValues(). CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

diff --git a/CRM/Admin/Form/OptionValue.php b/CRM/Admin/Form/OptionValue.php
index 9cd7e54a4f1acef4391ec7c2ea470ed818970304..dacf2c780aff862550d1c1a5c9e2d01b8d7cd93c 100644 (file)
--- a/CRM/Admin/Form/OptionValue.php
+++ b/CRM/Admin/Form/OptionValue.php
@@ -162,7 +162,7 @@ class CRM_Admin_Form_OptionValue extends CRM_Admin_Form {
 
     // CRM-11516
     if ($this->_gName == 'payment_instrument') {
-      $accountType = CRM_Core_PseudoConstant::accountOptionValues('financial_account_type', NULL, " AND v.name = 'Asset' ");
+      $accountType = CRM_Core_OptionGroup::values('financial_account_type', false, false, false, " AND v.name = 'Asset' ");
       $financialAccount = CRM_Contribute_PseudoConstant::financialAccount(NULL, key($accountType));
       
       $this->add('select', 'financial_account_id', ts('Financial Account'), 
@@ -272,7 +272,7 @@ class CRM_Admin_Form_OptionValue extends CRM_Admin_Form {
       $optionValue = CRM_Core_BAO_OptionValue::add($params, $ids);
       // CRM-11516
       if (CRM_Utils_Array::value('financial_account_id', $params)) {
-        $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Asset Account is' "));
+        $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Asset Account is' "));
         $params = array(
           'entity_table' => 'civicrm_option_value',
           'entity_id' => $optionValue->id,

diff --git a/CRM/Admin/Form/Options.php b/CRM/Admin/Form/Options.php
index 32ae6c12f8865e0757c7ab5f9d2350a19e9c2ff5..400e9fd622150951aacee343573da20a94fd7a1f 100644 (file)
--- a/CRM/Admin/Form/Options.php
+++ b/CRM/Admin/Form/Options.php
@@ -190,7 +190,7 @@ class CRM_Admin_Form_Options extends CRM_Admin_Form {
     }
     // CRM-11516
     if ($this->_gName == 'payment_instrument') {
-      $accountType = CRM_Core_PseudoConstant::accountOptionValues('financial_account_type', NULL, " AND v.name = 'Asset' ");
+      $accountType = CRM_Core_OptionGroup::values('financial_account_type', false, false, false, " AND v.name = 'Asset' ");
       $financialAccount = CRM_Contribute_PseudoConstant::financialAccount(NULL, key($accountType));
       
       $this->add('select', 'financial_account_id', ts('Financial Account'), 
@@ -405,7 +405,7 @@ class CRM_Admin_Form_Options extends CRM_Admin_Form {
       
       // CRM-11516
       if (CRM_Utils_Array::value('financial_account_id', $params)) {
-        $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Asset Account is' "));
+        $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Asset Account is' "));
         $params = array(
           'entity_table' => 'civicrm_option_value',
           'entity_id' => $optionValue->id,

diff --git a/CRM/Admin/Form/PaymentProcessor.php b/CRM/Admin/Form/PaymentProcessor.php
index bc34146d0e4cd0573aa80ed227e85356fb346946..aa5de9ca3f9a2bee287b0fbb5bb1fbc9eed778cf 100644 (file)
--- a/CRM/Admin/Form/PaymentProcessor.php
+++ b/CRM/Admin/Form/PaymentProcessor.php
@@ -189,7 +189,7 @@ class CRM_Admin_Form_PaymentProcessor extends CRM_Admin_Form {
     );
 
     // Financial Account of account type asset CRM-11515
-    $accountType = CRM_Core_PseudoConstant::accountOptionValues('financial_account_type', NULL, " AND v.name = 'Asset' ");
+    $accountType = CRM_Core_OptionGroup::values('financial_account_type', false, false, false, " AND v.name = 'Asset' ");
     $financialAccount = CRM_Contribute_PseudoConstant::financialAccount(NULL, key($accountType));
     if ($fcount = count($financialAccount)) {
       $this->assign('financialAccount', $fcount);
@@ -380,7 +380,7 @@ class CRM_Admin_Form_PaymentProcessor extends CRM_Admin_Form {
     
     //CRM-11515
     
-    $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Asset Account is' "));
+    $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Asset Account is' "));
     $params = array(
       'entity_table' => 'civicrm_payment_processor',
       'entity_id' => $dao->id,

diff --git a/CRM/Batch/BAO/Batch.php b/CRM/Batch/BAO/Batch.php
index 706e4b93f11777068e40c3354ce7ed3325b472b3..829eb3bae266137372406c5cb49bddf541dfc12c 100644 (file)
--- a/CRM/Batch/BAO/Batch.php
+++ b/CRM/Batch/BAO/Batch.php
@@ -596,7 +596,7 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch {
   }
 
   static function closeReOpen($batchIds = array(), $status) {
-    $batchStatus = CRM_Core_PseudoConstant::accountOptionValues( 'batch_status' );
+    $batchStatus = CRM_Core_OptionGroup::values('batch_status');
     $params['status_id'] = CRM_Utils_Array::key( $status, $batchStatus );
     $session = CRM_Core_Session::singleton( );
     $params['modified_date'] = date('YmdHis');

diff --git a/CRM/Batch/Form/Entry.php b/CRM/Batch/Form/Entry.php
index 2bdd049f2a8822e50fd8a72223833070c919916d..eb42bc55dec64eef92ca632e1fab7fe1c28bda38 100644 (file)
--- a/CRM/Batch/Form/Entry.php
+++ b/CRM/Batch/Form/Entry.php
@@ -366,7 +366,7 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
     $this->_priceSet = current(CRM_Price_BAO_Set::getSetDetail($priceSetId));
     $fieldID = key($this->_priceSet['fields']);
 
-    $assetRelation = key(CRM_CORE_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Asset Account is' "));
+    $assetRelation = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Asset Account is' "));
 
     if (isset($params['field'])) {
       foreach ($params['field'] as $key => $value) {

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 6e56b0c7636e518662afed8742acd34fec0ce495..b77eda42beddb3dbb9864b3c0430483547bf7cfd 100644 (file)
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -2505,7 +2505,7 @@ WHERE  contribution_id = %1 ";
       !(CRM_Utils_Array::value('contribution_status_id', $params) == array_search('Pending', $contributionStatuses) && !$params['contribution']->is_pay_later)) {
       $skipRecords = TRUE;
       if (CRM_Utils_Array::value('contribution_status_id', $params) == array_search('Pending', $contributionStatuses)) {
-        $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Accounts Receivable Account is' "));
+        $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Accounts Receivable Account is' "));
         $params['to_financial_account_id'] = CRM_Contribute_PseudoConstant::financialAccountType($params['financial_type_id'], $relationTypeId);
       }
       elseif (CRM_Utils_Array::value('payment_processor', $params)) {
@@ -2597,7 +2597,7 @@ WHERE  contribution_id = %1 ";
         //if financial type is changed
         if (CRM_Utils_Array::value('financial_type_id', $params) &&
           $params['contribution']->financial_type_id != $params['prevContribution']->financial_type_id) {
-          $incomeTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Income Account is' "));
+          $incomeTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Income Account is' "));
           $oldFinancialAccount = CRM_Contribute_PseudoConstant::financialAccountType($params['prevContribution']->financial_type_id, $incomeTypeId);
           $newFinancialAccount = CRM_Contribute_PseudoConstant::financialAccountType($params['financial_type_id'], $incomeTypeId);
           if ($oldFinancialAccount != $newFinancialAccount) {
@@ -2689,8 +2689,7 @@ WHERE  contribution_id = %1 ";
           $params['trxnParams']['to_financial_account_id'] = NULL;
           $params['trxnParams']['total_amount'] = - $params['total_amount'];
         }
-        $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL,
-          " AND v.name LIKE 'Accounts Receivable Account is' "));
+        $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Accounts Receivable Account is' "));
         $params['trxnParams']['from_financial_account_id'] = CRM_Contribute_PseudoConstant::financialAccountType(
           $financialTypeID, $relationTypeId);
       }
@@ -2700,7 +2699,7 @@ WHERE  contribution_id = %1 ";
       if ($params['prevContribution']->payment_instrument_id != null
         && $params['prevContribution']->contribution_status_id == array_search('Pending', $contributionStatus)
         && $params['contribution']->contribution_status_id == array_search('Pending', $contributionStatus)) {
-        $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Accounts Receivable Account is' "));
+        $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Accounts Receivable Account is' "));
         $params['trxnParams']['from_financial_account_id'] = CRM_Contribute_PseudoConstant::financialAccountType($params['financial_type_id'], $relationTypeId);
       }
       elseif ($params['prevContribution']->payment_instrument_id != null) {

diff --git a/CRM/Core/BAO/FinancialTrxn.php b/CRM/Core/BAO/FinancialTrxn.php
index 95a675df667c3d8ec978141dc9b58abcebdcacb5..c7a42c4fe1e7659cafbd66f2be454772b0966f7a 100644 (file)
--- a/CRM/Core/BAO/FinancialTrxn.php
+++ b/CRM/Core/BAO/FinancialTrxn.php
@@ -286,7 +286,7 @@ WHERE ceft.entity_id = %1";
     if (CRM_Utils_Array::value('cost', $params)) {
       $contributionStatuses = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name');
       $financialAccountType = CRM_Contribute_PseudoConstant::financialAccountType($params['financial_type_id']);
-      $accountRelationship = CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND label IN ('Premiums Inventory Account is', 'Cost of Sales Account is')");
+      $accountRelationship = CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND label IN ('Premiums Inventory Account is', 'Cost of Sales Account is')");
       $toFinancialAccount = CRM_Utils_Array::value('isDeleted', $params) ? 'Premiums Inventory Account is' : 'Cost of Sales Account is';
       $fromFinancialAccount = CRM_Utils_Array::value('isDeleted', $params) ? 'Cost of Sales Account is': 'Premiums Inventory Account is';
       $accountRelationship = array_flip($accountRelationship);
@@ -329,7 +329,7 @@ WHERE ceft.entity_id = %1";
    */
 
   static function recordFees($params) {
-    $expenseTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Expense Account is' "));
+    $expenseTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Expense Account is' "));
     $domainId = CRM_Core_Config::domainID();
     $amount = 0;
     if (CRM_Utils_Array::value('prevContribution', $params)) {

diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php
index 656bed77e60c2668c4c9b5681a45200d80037bb0..e795035c221bc936bd7071a69fd83b366177940c 100644 (file)
--- a/CRM/Core/PseudoConstant.php
+++ b/CRM/Core/PseudoConstant.php
@@ -196,13 +196,6 @@ class CRM_Core_PseudoConstant {
    */
   private static $extensions;
 
-  /**
-   * Financial Account Type
-   * @var array
-   * @static
-   */
-  private static $accountOptionValues;
-
   /**
    * Get options for a given field.
    * @param String $daoName
@@ -1638,30 +1631,5 @@ WHERE  id = %1
   public static function getModuleExtensions($fresh = FALSE) {
     return CRM_Extension_System::singleton()->getMapper()->getActiveModuleFiles($fresh);
   }
-
-  /**
-   * Get all options values
-   *
-   * The static array option values is returned
-   *
-   * @access public
-   * @static
-   *
-   * @param boolean $optionGroupName - get All  Option Group values- default is to get only active ones.
-   *
-   * @return array - array reference of all Option Group Name
-   *
-   */
-  public static function accountOptionValues($optionGroupName, $id = null, $condition = null) {
-    $cacheKey = $optionGroupName . '_' . $condition;
-    if (empty(self::$accountOptionValues[$cacheKey])) {
-      self::$accountOptionValues[$cacheKey] = CRM_Core_OptionGroup::values($optionGroupName, false, false, false, $condition);
-    }
-    if ($id) {
-      return CRM_Utils_Array::value($id, self::$accountOptionValues[$cacheKey]);
-    }
-
-    return self::$accountOptionValues[$cacheKey];
-  }
 }
 

diff --git a/CRM/Event/BAO/Participant.php b/CRM/Event/BAO/Participant.php
index 134e56e3e8cbb1c19286ea5a7c39601a11eca18f..7939e021921406df4a24281ce4fb045a96c7f809 100644 (file)
--- a/CRM/Event/BAO/Participant.php
+++ b/CRM/Event/BAO/Participant.php
@@ -1745,7 +1745,7 @@ WHERE cpf.price_set_id = %1 AND cpfv.label LIKE %2";
       $params = array(1 => array($priceSetId, 'Integer'),
         2 => array($feeLevel, 'String'));
       $mainAmount = CRM_Core_DAO::singleValueQuery($query, $params);
-      $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Discounts Account is' "));
+      $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Discounts Account is' "));
       $contributionParams['trxnParams']['from_financial_account_id'] = CRM_Contribute_PseudoConstant::financialAccountType(
         $contributionParams['contribution']->financial_type_id, $relationTypeId);
       if (CRM_Utils_Array::value('from_financial_account_id', $contributionParams['trxnParams'])) {

diff --git a/CRM/Financial/BAO/FinancialAccount.php b/CRM/Financial/BAO/FinancialAccount.php
index 9c53bf618edb396ba74ea74326f507d9cdd7b7d3..be96c9bdb352f44b2602c762dd8e38ce4526fa72 100644 (file)
--- a/CRM/Financial/BAO/FinancialAccount.php
+++ b/CRM/Financial/BAO/FinancialAccount.php
@@ -159,7 +159,7 @@ class CRM_Financial_BAO_FinancialAccount extends CRM_Financial_DAO_FinancialAcco
    * @static
    */
   static function getAccountingCode($financialTypeId) {
-    $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Income Account is' "));
+    $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Income Account is' "));
     $query = "SELECT cfa.accounting_code
 FROM civicrm_financial_type cft
 LEFT JOIN civicrm_entity_financial_account cefa ON cefa.entity_id = cft.id AND cefa.entity_table = 'civicrm_financial_type'

diff --git a/CRM/Financial/BAO/FinancialItem.php b/CRM/Financial/BAO/FinancialItem.php
index 6db9134a47b2f0a5fc3c6af64d822f8330360138..fbea50dca874cdf94b0029bd443f386896eec749 100644 (file)
--- a/CRM/Financial/BAO/FinancialItem.php
+++ b/CRM/Financial/BAO/FinancialItem.php
@@ -78,7 +78,7 @@ class CRM_Financial_BAO_FinancialItem extends CRM_Financial_DAO_FinancialItem {
    */
   static function add($lineItem, $contribution) {
     $contributionStatuses = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name');
-    $financialItemStatus = CRM_Core_PseudoConstant::accountOptionValues('financial_item_status');
+    $financialItemStatus = CRM_Core_OptionGroup::values('financial_item_status');
     if ($contribution->contribution_status_id == array_search('Completed', $contributionStatuses)) {
       $itemStatus = array_search('Paid', $financialItemStatus);
     }

diff --git a/CRM/Financial/BAO/FinancialType.php b/CRM/Financial/BAO/FinancialType.php
index 197474f4d6163517e03a04a243a26cf15afc3f59..60b185454098dff9aa330c303fc755ba11ba4887 100644 (file)
--- a/CRM/Financial/BAO/FinancialType.php
+++ b/CRM/Financial/BAO/FinancialType.php
@@ -171,7 +171,7 @@ class CRM_Financial_BAO_FinancialType extends CRM_Financial_DAO_FinancialType {
     // Financial Type
     $financialType = CRM_Contribute_PseudoConstant::financialType();
     $revenueFinancialType = array();
-    $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Income Account is' "));
+    $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Income Account is' "));
     CRM_Core_PseudoConstant::populate( 
       $revenueFinancialType,
       'CRM_Financial_DAO_EntityFinancialAccount',

diff --git a/CRM/Financial/BAO/FinancialTypeAccount.php b/CRM/Financial/BAO/FinancialTypeAccount.php
index d4e74c0f6cf4bfafc9e21adc2d5f68cc9e0585a0..a39f637439a24c626a14467623285b83f4370b57 100644 (file)
--- a/CRM/Financial/BAO/FinancialTypeAccount.php
+++ b/CRM/Financial/BAO/FinancialTypeAccount.php
@@ -112,7 +112,7 @@ class CRM_Financial_BAO_FinancialTypeAccount extends CRM_Financial_DAO_EntityFin
   static function del($financialTypeAccountId, $accountId = null) {
     //checking if financial type is present
     $check = false;
-    $relationValues = CRM_Core_PseudoConstant::accountOptionValues('account_relationship');
+    $relationValues = CRM_Core_OptionGroup::values('account_relationship');
 
     $financialTypeId = CRM_Core_DAO::getFieldValue( 'CRM_Financial_DAO_EntityFinancialAccount', $financialTypeAccountId, 'entity_id' );
     //check dependencies

diff --git a/CRM/Financial/BAO/PaymentProcessor.php b/CRM/Financial/BAO/PaymentProcessor.php
index e536683819ad78b4c8bb40251688306c51fe9ddd..1d48156d238a5a004d20cd56a45f7f23bc6aa6b0 100644 (file)
--- a/CRM/Financial/BAO/PaymentProcessor.php
+++ b/CRM/Financial/BAO/PaymentProcessor.php
@@ -69,7 +69,7 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces
     // CRM-11826, add entry in civicrm_entity_financial_account
     // if financial_account_id is not NULL
     if (CRM_Utils_Array::value('financial_account_id', $params)) {
-      $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Asset Account is' "));
+      $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Asset Account is' "));
       $values = array(
         'entity_table' => 'civicrm_payment_processor',
         'entity_id' => $processor->id,

diff --git a/CRM/Financial/Form/Export.php b/CRM/Financial/Form/Export.php
index 99a4cca31447d5a4e31e729a98b50dfba29784f8..7fda32c47d8f17445ee5d76539785359224ff2f1 100644 (file)
--- a/CRM/Financial/Form/Export.php
+++ b/CRM/Financial/Form/Export.php
@@ -95,7 +95,7 @@ class CRM_Financial_Form_Export extends CRM_Core_Form {
       $this->_batchIds = $this->_id;
     }
 
-    $allBatchStatus = CRM_Core_PseudoConstant::accountOptionValues('batch_status');
+    $allBatchStatus = CRM_Core_OptionGroup::values('batch_status');
     $this->_exportStatusId = CRM_Utils_Array::key('Exported', $allBatchStatus);
 
     //check if batch status is valid, do not allow exported batches to export again

diff --git a/CRM/Financial/Form/FinancialAccount.php b/CRM/Financial/Form/FinancialAccount.php
index c418a31580c99f6fc83732a0c9917f0ec79fef5a..55a4eacc71dd52b3a27ca2b83d2d9563fee0b1ed 100644 (file)
--- a/CRM/Financial/Form/FinancialAccount.php
+++ b/CRM/Financial/Form/FinancialAccount.php
@@ -114,7 +114,7 @@ class CRM_Financial_Form_FinancialAccount extends CRM_Contribute_Form {
       $element->freeze();
     }
 
-    $financialAccountType = CRM_Core_PseudoConstant::accountOptionValues('financial_account_type');
+    $financialAccountType = CRM_Core_OptionGroup::values('financial_account_type');
     if (!empty($financialAccountType)) {
       $element = $this->add('select', 'financial_account_type_id', ts('Financial Account Type'),
         array('' => '- select -') + $financialAccountType, TRUE);

diff --git a/CRM/Financial/Form/FinancialBatch.php b/CRM/Financial/Form/FinancialBatch.php
index a06021dcc9721cdc9eca67929364f013b2bda5c0..fb6e99a1a9151b1f95e382310e791062317c4983 100644 (file)
--- a/CRM/Financial/Form/FinancialBatch.php
+++ b/CRM/Financial/Form/FinancialBatch.php
@@ -121,7 +121,7 @@ class CRM_Financial_Form_FinancialBatch extends CRM_Contribute_Form {
     );
 
     if ($this->_action & CRM_Core_Action::UPDATE && $this->_id) {
-      $batchStatus = CRM_Core_PseudoConstant::accountOptionValues('batch_status');
+      $batchStatus = CRM_Core_OptionGroup::values('batch_status');
 
       //unset exported status
       $exportedStatusId = CRM_Utils_Array::key('Exported', $batchStatus );
@@ -210,7 +210,7 @@ class CRM_Financial_Form_FinancialBatch extends CRM_Contribute_Form {
     $session = CRM_Core_Session::singleton();
     $ids = array();
     $params = $this->exportValues();
-    $batchStatus = CRM_Core_PseudoConstant::accountOptionValues('batch_status');
+    $batchStatus = CRM_Core_OptionGroup::values('batch_status');
     if ($this->_id) {
       $ids['batchID'] = $this->_id;
       $params['id'] = $this->_id;

diff --git a/CRM/Financial/Form/FinancialTypeAccount.php b/CRM/Financial/Form/FinancialTypeAccount.php
index 28644ffd4f7a5abf990fd01f5243be610bc15f3f..4256bc3917a4e7871f4708d5912973cca6e57263 100644 (file)
--- a/CRM/Financial/Form/FinancialTypeAccount.php
+++ b/CRM/Financial/Form/FinancialTypeAccount.php
@@ -162,7 +162,7 @@ class CRM_Financial_Form_FinancialTypeAccount extends CRM_Contribute_Form {
       //hidden field to catch the field id in profile
       $this->add('hidden', 'account_type_id', $this->_id);
     }
-    $AccountTypeRelationship = CRM_Core_PseudoConstant::accountOptionValues('account_relationship');
+    $AccountTypeRelationship = CRM_Core_OptionGroup::values('account_relationship');
     if (!empty($AccountTypeRelationship)) {
       $element = $this->add('select',
         'account_relationship',
@@ -255,8 +255,7 @@ class CRM_Financial_Form_FinancialTypeAccount extends CRM_Contribute_Form {
     $errorMsg = array();
     $errorFlag = FALSE;
     if ($self->_action == CRM_Core_Action::DELETE) {
-      $groupName = 'account_relationship';
-      $relationValues = CRM_Core_PseudoConstant::accountOptionValues($groupName);
+      $relationValues = CRM_Core_OptionGroup::values('account_relationship');
       if (CRM_Utils_Array::value('financial_account_id', $values) != 'select') {
         if ($relationValues[$values['account_relationship']] == 'Premiums Inventory Account is' || $relationValues[$values['account_relationship']] == 'Cost of Sales Account is') {
           $premiumsProduct = CRM_Core_DAO::getFieldValue('CRM_Contribute_DAO_PremiumsProduct', $values['financial_type_id'], 'product_id', 'financial_type_id');

diff --git a/CRM/Financial/Page/AJAX.php b/CRM/Financial/Page/AJAX.php
index 5913e692aa590de54489fdcd3af456b45b6c12c6..05cd3833232b6dcb5df4a4d7ac766407186e05c0 100644 (file)
--- a/CRM/Financial/Page/AJAX.php
+++ b/CRM/Financial/Page/AJAX.php
@@ -98,7 +98,7 @@ class CRM_Financial_Page_AJAX {
     }
 
     if ($_GET['_value'] == 'select') {
-      $result = CRM_Core_PseudoConstant::accountOptionValues('account_relationship');
+      $result = CRM_Core_OptionGroup::values('account_relationship');
     }
     else {
       $financialAccountType = array(
@@ -108,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_OptionGroup::values('account_relationship');
     }
 
     $elements = array(
@@ -216,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_OptionGroup::values('batch_status');
             $params['status_id'] = CRM_Utils_Array::key($status, $batchStatus);
             $session = CRM_Core_Session::singleton();
             $params['modified_date'] = date('YmdHis');

diff --git a/CRM/Financial/Page/FinancialAccount.php b/CRM/Financial/Page/FinancialAccount.php
index 5581502b3d5851eee9eea319f138a7813d92e8da..f9d734d65883aac7294715732472882028392442 100644 (file)
--- a/CRM/Financial/Page/FinancialAccount.php
+++ b/CRM/Financial/Page/FinancialAccount.php
@@ -133,7 +133,7 @@ class CRM_Financial_Page_FinancialAccount extends CRM_Core_Page_Basic {
     $dao = new CRM_Financial_DAO_FinancialAccount();
     $dao->orderBy('financial_account_type_id, name');
     $dao->find();
-    $financialAccountType = CRM_Core_PseudoConstant::accountOptionValues('financial_account_type');
+    $financialAccountType = CRM_Core_OptionGroup::values('financial_account_type');
 
     while ($dao->fetch()) {
       $contributionType[$dao->id] = array();

diff --git a/CRM/Financial/Page/FinancialTypeAccount.php b/CRM/Financial/Page/FinancialTypeAccount.php
index ac1685f68a09b5f7dc34edb30da8855617815e01..e8b021e5f94fab423a283818f4da2d0656e8bfc1 100644 (file)
--- a/CRM/Financial/Page/FinancialTypeAccount.php
+++ b/CRM/Financial/Page/FinancialTypeAccount.php
@@ -137,8 +137,8 @@ class CRM_Financial_Page_FinancialTypeAccount extends CRM_Core_Page {
       $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Accounts Receivable Account is' "));
       $this->_title = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_FinancialType', $this->_aid, 'name');
       CRM_Utils_System::setTitle($this->_title .' - '.ts( 'Assigned Financial Accounts'));
-      $financialAccountType = CRM_Core_PseudoConstant::accountOptionValues('financial_account_type');
-      $accountRelationship = CRM_Core_PseudoConstant::accountOptionValues('account_relationship');
+      $financialAccountType = CRM_Core_OptionGroup::values('financial_account_type');
+      $accountRelationship = CRM_Core_OptionGroup::values('account_relationship');
       $dao->copyValues($params);
       $dao->find();
       while ($dao->fetch()) {

diff --git a/CRM/Upgrade/Incremental/php/FourThree.php b/CRM/Upgrade/Incremental/php/FourThree.php
index 29798f0b09027e9913e6c680473db55a8caeabdd..878c0dccac93b49e5efeb4a9f0ec57bae04cd55c 100644 (file)
--- a/CRM/Upgrade/Incremental/php/FourThree.php
+++ b/CRM/Upgrade/Incremental/php/FourThree.php
@@ -390,7 +390,7 @@ AND       ceft.entity_table = 'civicrm_contribution'
       3 => array($cancelledStatus, 'Integer')
     );
 
-    $accountType = key(CRM_Core_PseudoConstant::accountOptionValues('financial_account_type', NULL, " AND v.name = 'Asset' "));
+    $accountType = key(CRM_Core_OptionGroup::values('financial_account_type', false, false, false, " AND v.name = 'Asset' "));
     $query = "
 SELECT id
 FROM   civicrm_financial_account
@@ -399,14 +399,14 @@ AND    financial_account_type_id = {$accountType}
 ";
     $financialAccountId = CRM_Core_DAO::singleValueQuery($query);
 
-    $accountRelationsips = CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL);
+    $accountRelationsips = CRM_Core_OptionGroup::values('account_relationship');
 
     $accountsReceivableAccount = array_search('Accounts Receivable Account is', $accountRelationsips);
     $incomeAccountIs = array_search('Income Account is', $accountRelationsips);
     $assetAccountIs = array_search('Asset Account is', $accountRelationsips);
     $expenseAccountIs = array_search('Expense Account is', $accountRelationsips);
 
-    $financialItemStatus = CRM_Core_PseudoConstant::accountOptionValues('financial_item_status');
+    $financialItemStatus = CRM_Core_OptionGroup::values('financial_item_status');
     $unpaidStatus = array_search('Unpaid', $financialItemStatus);
     $paidStatus = array_search('Paid', $financialItemStatus);
 

diff --git a/tests/phpunit/CRM/Financial/BAO/FinancialTypeAccountTest.php b/tests/phpunit/CRM/Financial/BAO/FinancialTypeAccountTest.php
index 975ac1f849a7ccadffd301a879fb4031a1fce7c7..2b0017aee3550f4e6dd5c45da7353be1bf3f9e1b 100755 (executable)
--- a/tests/phpunit/CRM/Financial/BAO/FinancialTypeAccountTest.php
+++ b/tests/phpunit/CRM/Financial/BAO/FinancialTypeAccountTest.php
@@ -58,7 +58,7 @@ class CRM_Financial_BAO_FinancialTypeAccountTest extends CiviUnitTestCase {
     $financialAccount = CRM_Financial_BAO_FinancialAccount::add($params, $ids);
     $params['name'] = 'test_financialType1';
     $financialType = CRM_Financial_BAO_FinancialType::add($params, $ids);
-    $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Income Account is' "));
+    $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Income Account is' "));
     $financialParams = array(
       'entity_table' => 'civicrm_financial_type',
       'entity_id' => $financialType->id,
@@ -93,7 +93,7 @@ class CRM_Financial_BAO_FinancialTypeAccountTest extends CiviUnitTestCase {
     $financialAccount = CRM_Financial_BAO_FinancialAccount::add($params, $ids);
     $params['name'] = 'test_financialType2';
     $financialType = CRM_Financial_BAO_FinancialType::add($params, $ids);
-    $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Expense Account is' "));
+    $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Expense Account is' "));
     $financialParams = array(
       'entity_table' => 'civicrm_financial_type',
       'entity_id' => $financialType->id,
@@ -121,7 +121,7 @@ class CRM_Financial_BAO_FinancialTypeAccountTest extends CiviUnitTestCase {
     $financialAccount = CRM_Financial_BAO_FinancialAccount::add($params, $ids);
     $params['name'] = 'test_financialType3';
     $financialType = CRM_Financial_BAO_FinancialType::add($params, $ids);
-    $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Asset Account is' "));
+    $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Asset Account is' "));
     $financialParams = array(
       'entity_table' => 'civicrm_financial_type',
       'entity_id' => $financialType->id,
@@ -182,7 +182,7 @@ class CRM_Financial_BAO_FinancialTypeAccountTest extends CiviUnitTestCase {
       'value' => $paymentInstrumentValue,
     );
     $optionValue = CRM_Core_BAO_OptionValue::retrieve($optionParams, $defaults);
-    $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Asset Account is' "));
+    $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Asset Account is' "));
     $financialParams = array(
       'entity_table' => 'civicrm_option_value',
       'entity_id' => $optionValue->id,
@@ -195,4 +195,4 @@ class CRM_Financial_BAO_FinancialTypeAccountTest extends CiviUnitTestCase {
 
     $this->assertEquals( $financialAccountId, $financialAccount->id, 'Verify Payment Instrument');
   }
-}
\ No newline at end of file
+}

diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php
index 3ab0882576cd68976920040ec7997da454c9aba6..2e9b3cf5872ddcd667e13c711dd42bc1ad35696d 100644 (file)
--- a/tests/phpunit/api/v3/ContributionTest.php
+++ b/tests/phpunit/api/v3/ContributionTest.php
@@ -1525,7 +1525,7 @@ class api_v3_ContributionTest extends CiviUnitTestCase {
      'id' => $trxn['financial_trxn_id'],
    );
    if ($context == 'payLater') {
-     $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Accounts Receivable Account is' "));
+     $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Accounts Receivable Account is' "));
      $compareParams = array(
        'status_id' => 1,
        'from_financial_account_id' => CRM_Contribute_PseudoConstant::financialAccountType($contribution['financial_type_id'], $relationTypeId),
@@ -1589,7 +1589,7 @@ class api_v3_ContributionTest extends CiviUnitTestCase {
      'version' => 3,
 );
    $optionValue = civicrm_api('option_value', 'create', $optionParams);
-   $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Asset Account is' "));
+   $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Asset Account is' "));
    $financialParams = array(
      'entity_table' => 'civicrm_option_value',
      'entity_id' => $optionValue['id'],