From cc405f4e8d717c34a838f2560ee8debeb2237848 Mon Sep 17 00:00:00 2001 From: kurund Date: Fri, 29 Nov 2013 16:46:38 +0530 Subject: [PATCH] CRM-13847, upgrade fixes ---------------------------------------- * CRM-13847: Upgrade 4.2.14 -> 4.4.2 fails when Language set to German http://issues.civicrm.org/jira/browse/CRM-13847 --- CRM/Upgrade/Incremental/php/FourThree.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CRM/Upgrade/Incremental/php/FourThree.php b/CRM/Upgrade/Incremental/php/FourThree.php index bbc88ab3d9..3c4571aa1e 100644 --- a/CRM/Upgrade/Incremental/php/FourThree.php +++ b/CRM/Upgrade/Incremental/php/FourThree.php @@ -477,14 +477,16 @@ AND financial_account_type_id = {$accountType} "; $financialAccountId = CRM_Core_DAO::singleValueQuery($query); - $accountRelationsips = CRM_Core_PseudoConstant::get('CRM_Financial_DAO_EntityFinancialAccount', 'account_relationship'); + $accountRelationsips = CRM_Core_PseudoConstant::get('CRM_Financial_DAO_EntityFinancialAccount', + 'account_relationship', CRM_Core_DAO::$_nullArray, 'validate'); $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::get('CRM_Financial_DAO_FinancialItem', 'status_id'); + $financialItemStatus = CRM_Core_PseudoConstant::get('CRM_Financial_DAO_FinancialItem', 'status_id', + CRM_Core_DAO::$_nullArray, 'validate'); $unpaidStatus = array_search('Unpaid', $financialItemStatus); $paidStatus = array_search('Paid', $financialItemStatus); -- 2.25.1