Merge pull request #8346 from sqweets/auto-renew-filter-changes

CRM-17684 Find Memberships with no auto-renew

diff --cc CRM/Member/BAO/Query.php
index def1576a87e90a079380b96c5c20e00d8fdff57b,6fcb7e1228f8048e36e6c18d05ba2b171d15cc1f..b1b2ec27df0129e25974d9483b08a1433aa6366a
--- 1/CRM/Member/BAO/Query.php
--- 2/CRM/Member/BAO/Query.php
+++ b/CRM/Member/BAO/Query.php
@@@ -445,9 -474,20 +475,20 @@@ class CRM_Member_BAO_Query 
  
      $form->addYesNo('member_is_primary', ts('Primary Member?'), TRUE);
      $form->addYesNo('member_pay_later', ts('Pay Later?'), TRUE);
-     $form->addYesNo('member_auto_renew', ts('Auto-Renew?'), TRUE);
+ 
+     $form->add('select', 'member_auto_renew',
+       ts('Auto-Renew Subscription Status?'),
+       array(
+         '1' => ts('- None -'),
+         '2' => ts('In Progress'),
+         '3' => ts('Failed'),
+         '4' => ts('Cancelled'),
+         '5' => ts('Ended'),
+       )
+     );
+ 
      $form->addYesNo('member_test', ts('Membership is a Test?'), TRUE);
 -    $form->addYesNo('member_is_override', ts('Membership Status Is Override?'), TRUE);
 +    $form->addYesNo('member_is_override', ts('Membership Status Is Overriden?'), TRUE);
  
      // add all the custom  searchable fields
      $extends = array('Membership');