From: ivan <ivan>
Date: Mon, 15 Sep 2003 21:33:04 +0000 (+0000)
Subject: package search skips cancelled packages when searching by date range
X-Git-Tag: freeside_1_4_2beta1~521
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=6c6a13eebe6f38119ebe3bd8f98e7759fede1d3e;p=freeside.git

package search skips cancelled packages when searching by date range
---

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 444eff9b6..2fca0bf0b 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -33,6 +33,8 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
     $range .= ( $range ? ' AND ' : ' WHERE ' ). " bill <= $ending ";
   }
 
+  $range .= ( $range ? 'AND ' : ' WHERE ' ). '( cancel IS NULL OR cancel = 0 )';
+
   #false laziness with below
   my $statement = "SELECT COUNT(*) FROM cust_pkg $range";
   warn $statement;