From b800df9372c02a235068fd91e973891d95b974a8 Mon Sep 17 00:00:00 2001 From: Pradeep Nayak Date: Fri, 31 May 2013 13:46:53 +0530 Subject: [PATCH] -- fixed notice errors for CRM-12470 ---------------------------------------- * CRM-12470: Creating new financial type without AR account leads to unbalanced transactions http://issues.civicrm.org/jira/browse/CRM-12470 --- CRM/Financial/Form/FinancialTypeAccount.php | 2 +- CRM/Financial/Page/AJAX.php | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CRM/Financial/Form/FinancialTypeAccount.php b/CRM/Financial/Form/FinancialTypeAccount.php index a703c2526c..ef991cb20e 100644 --- a/CRM/Financial/Form/FinancialTypeAccount.php +++ b/CRM/Financial/Form/FinancialTypeAccount.php @@ -187,7 +187,7 @@ class CRM_Financial_Form_FinancialTypeAccount extends CRM_Contribute_Form { '9' => 3 //discount account is ); - $financialAccountType = $financialAccountType[$this->_submitValues['account_relationship']]; + $financialAccountType = CRM_Utils_Array::value($this->_submitValues['account_relationship'], $financialAccountType); $result = CRM_Contribute_PseudoConstant::financialAccount(NULL, $financialAccountType); $financialAccountSelect = array('' => ts('- select -')) + $result; diff --git a/CRM/Financial/Page/AJAX.php b/CRM/Financial/Page/AJAX.php index a7cdc05d3f..5913e692aa 100644 --- 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( -- 2.25.1