Merge pull request #6431 from JMAConsulting/CRM-16526

Crm 16526

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

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

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

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

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

diff --cc CRM/Core/Permission.php
Simple merge

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

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

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

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

diff --cc tests/phpunit/api/v3/ContributionPageTest.php
index 0d33c526a14815f7c05c7b8f153f8b1185bf142a,da92847a4d88a4d0764c33b689ead75c6a5c8429..1a46c1f6319a62a93a4a91e2db3fbb85f7962e48
--- 1/tests/phpunit/api/v3/ContributionPageTest.php
--- 2/tests/phpunit/api/v3/ContributionPageTest.php
+++ b/tests/phpunit/api/v3/ContributionPageTest.php
@@@ -565,16 -565,16 +565,18 @@@ class api_v3_ContributionPageTest exten
            'price_set_id' => $priceSetID,
            'price_field_id' => $priceField['id'],
            'label' => 'Long Haired Goat',
 +          'financial_type_id' => 'Donation',
            'amount' => 20,
+           'financial_type_id' => 'Donation',
          )
        );
        $priceFieldValue = $this->callAPISuccess('price_field_value', 'create', array(
            'price_set_id' => $priceSetID,
            'price_field_id' => $priceField['id'],
            'label' => 'Shoe-eating Goat',
 +          'financial_type_id' => 'Donation',
            'amount' => 10,
+           'financial_type_id' => 'Donation',
          )
        );
        $this->_ids['price_field_value'] = array($priceFieldValue['id']);