From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Wed, 24 Sep 2014 04:15:02 +0000 (+1200)
Subject: Merge branch '4.4' of https://github.com/civicrm/civicrm-core into 4.5
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d92623decb352eab5b403d0c9cab181a831bfaac;p=civicrm-core.git

Merge branch '4.4' of https://github.com/civicrm/civicrm-core into 4.5

Conflicts:
	CRM/Core/DAO.php
	CRM/Financial/BAO/FinancialAccount.php
	CRM/Financial/BAO/FinancialType.php
	tests/phpunit/api/v3/CaseTest.php
	tests/phpunit/api/v3/SyntaxConformanceTest.php
---

d92623decb352eab5b403d0c9cab181a831bfaac
diff --cc tests/phpunit/api/v3/CaseTest.php
index 5e56500a1a,091ac02595..74fe11ce64
--- a/tests/phpunit/api/v3/CaseTest.php
+++ b/tests/phpunit/api/v3/CaseTest.php
@@@ -97,8 -269,8 +97,8 @@@ class api_v3_CaseTest extends CiviCaseT
      $params = $this->_params;
      // Test using label instead of value
      unset($params['case_type_id']);
 -    $params['case_type'] = 'Housing Support';
 +    $params['case_type'] = $this->caseType;
-     $result = $this->callAPISuccess('case', 'create', $params);
+     $result = $this->callAPIAndDocument('case', 'create', $params, __FUNCTION__, __FILE__);
      $id = $result['id'];
  
      // Check result