Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-16-18-06-10

Conflicts:
	sql/civicrm_generated.mysql
	templates/CRM/Member/Form/MembershipRenewal.tpl

diff --cc CRM/Activity/Form/Search.php
Simple merge

diff --cc CRM/Admin/Form/ScheduleReminders.php
Simple merge

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

diff --cc CRM/Contact/Form/Search/Advanced.php
Simple merge

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

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

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

diff --cc CRM/Member/Form/MembershipRenewal.php
index 653fc69d22416af7c1eac16c6932cf1ff930240f,ac40b1ab077054d08f4d1ed9ed72cbcb42e8e002..6bc62300dd5e248e15d1f82cd2156cd69dcae58f
--- 1/CRM/Member/Form/MembershipRenewal.php
--- 2/CRM/Member/Form/MembershipRenewal.php
+++ b/CRM/Member/Form/MembershipRenewal.php
@@@ -265,8 -257,16 +265,14 @@@ class CRM_Member_Form_MembershipRenewa
      $this->assign('entityID', $this->_id);
      $selOrgMemType[0][0] = $selMemTypeOrg[0] = ts('- select -');
  
 -    $allMemberships = CRM_Member_BAO_Membership::buildMembershipTypeValues($this);
 -
 -    $allMembershipInfo = $membershipType = array();
 +    $allMembershipInfo = array();
  
+     //CRM-16950
+     $taxRates = CRM_Core_PseudoConstant::getTaxRates();
+     $taxRate = CRM_Utils_Array::value($allMemberships[$defaults['membership_type_id']]['financial_type_id'], $taxRates);
+ 
+     $invoiceSettings = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME, 'contribution_invoice_settings');
+ 
      // auto renew options if enabled for the membership
      $options = CRM_Core_SelectValues::memberAutoRenew();
  

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

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

diff --cc CRM/Upgrade/Incremental/php/FourSix.php
Simple merge

diff --cc templates/CRM/Admin/Page/ScheduleReminders.tpl
Simple merge

diff --cc templates/CRM/Member/Form/MembershipRenewal.tpl
Simple merge

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