Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-13-15-51-23

Conflicts:
	sql/civicrm_generated.mysql
	tests/phpunit/api/v3/SyntaxConformanceTest.php

diff --cc CRM/Case/BAO/CaseType.php
Simple merge

diff --cc CRM/Contact/BAO/GroupContactCache.php
Simple merge

diff --cc CRM/Contribute/BAO/Contribution.php
Simple merge

diff --cc CRM/Contribute/BAO/Contribution/Utils.php
index 6756c3cb526861f6b5ad42b7128dc3926851c1be,b3449beac12beeff42a9af64526980c91032126c..202d22066daae97acc5ecf6c175f7f036f7011d4
--- 1/CRM/Contribute/BAO/Contribution/Utils.php
--- 2/CRM/Contribute/BAO/Contribution/Utils.php
+++ b/CRM/Contribute/BAO/Contribution/Utils.php
@@@ -226,23 -225,28 +226,29 @@@ class CRM_Contribute_BAO_Contribution_U
          // (i.e., the amount NOT associated with the membership). Temporarily
          // cache the is_recur values so we can process the additional gift as a
          // one-off payment.
+         $pending = FALSE;
          if ($form->_membershipBlock['is_separate_payment']) {
-           $cachedFormValue = CRM_Utils_Array::value('is_recur', $form->_values);
-           unset($form->_values['is_recur']);
-           $cachedParamValue = CRM_Utils_Array::value('is_recur', $paymentParams);
-           unset($paymentParams['is_recur']);
+           if (!empty($form->_params['auto_renew'])) {
+             $cachedFormValue = CRM_Utils_Array::value('is_recur', $form->_values);
+             $cachedParamValue = CRM_Utils_Array::value('is_recur', $paymentParams);
+             unset($form->_values['is_recur']);
+             unset($paymentParams['is_recur']);
+           }
+           else {
+             $pending = TRUE;
+           }
          }
  
 -        $contribution = CRM_Contribute_Form_Contribution_Confirm::processContribution(
 +        $contribution = CRM_Contribute_Form_Contribution_Confirm::processFormContribution(
            $form,
            $paymentParams,
            NULL,
            $contactID,
            $contributionType,
-           TRUE, TRUE,
+           $pending, TRUE,
            $isTest,
 -          $lineItems
 +          $lineItems,
 +          $form->_bltID
          );
  
          // restore cached values (part of fix for CRM-14354)

diff --cc CRM/Contribute/Form/Contribution.php
Simple merge

diff --cc CRM/Contribute/Form/Contribution/Confirm.php
Simple merge

diff --cc CRM/Contribute/Form/ContributionPage/Amount.php
Simple merge

diff --cc CRM/Core/BAO/Mapping.php
Simple merge

diff --cc CRM/Event/Form/Registration/Confirm.php
Simple merge

diff --cc CRM/Member/BAO/Membership.php
Simple merge

diff --cc CRM/Member/Form/MembershipBlock.php
Simple merge

diff --cc CRM/Price/BAO/PriceSet.php
Simple merge

diff --cc CRM/Report/Form/Contribute/Summary.php
Simple merge

diff --cc ang/crmUi.js
Simple merge

diff --cc api/v3/utils.php
Simple merge

diff --cc tests/phpunit/CRM/Case/BAO/CaseTypeTest.php
Simple merge

diff --cc tests/phpunit/CiviTest/CiviUnitTestCase.php
Simple merge

diff --cc tests/phpunit/WebTest/Contact/AdvancedSearchTest.php
Simple merge

diff --cc tests/phpunit/api/v3/SyntaxConformanceTest.php
Simple merge

diff --cc xml/templates/civicrm_data.tpl
Simple merge

diff --cc xml/templates/civicrm_state_province.tpl
Simple merge