Merge branch '4.4' of https://github.com/civicrm/civicrm-core into 4.5
authorEileen McNaughton <eileen@fuzion.co.nz>
Wed, 24 Sep 2014 04:15:02 +0000 (16:15 +1200)
committerEileen McNaughton <eileen@fuzion.co.nz>
Wed, 24 Sep 2014 04:15:02 +0000 (16:15 +1200)
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

1  2 
tests/phpunit/api/v3/CaseTest.php

index 5e56500a1ae822d97555adc850637a45d2c56ed7,091ac02595f5f5794e6db4eda0b406f88e27a755..74fe11ce643e01d97df8dea7674f336ca8471faf
@@@ -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