Merge pull request #14059 from Stoob/patch-2

change is_override logic

diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index b359fdd15d0ba945199e0d472f4a80cc6e6b5fc4..49e5181b8be41e3632a807459c1d369e201b7b2f 100644 (file)
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -2272,7 +2272,7 @@ WHERE      civicrm_membership.is_test = 0
       self::processOverriddenUntilDateMembership($dao1);
     }
 
-    $query = $baseQuery . " AND civicrm_membership.is_override IS NULL
+    $query = $baseQuery . " AND (civicrm_membership.is_override = 0 OR civicrm_membership.is_override IS NULL) 
      AND civicrm_membership.status_id NOT IN (%1, %2, %3, %4)
      AND civicrm_membership.owner_membership_id IS NULL ";
     $params = array(