X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_bill_pkg.cgi;h=4779071a4d654f846d6fd163e24cd87336a9bab0;hb=2c757d7db4cb6a7b9655de13206fcc84fb7ce61f;hp=082ccc893191c1671d69b3e2853a65a83e1883cd;hpb=ac6c8883615cd02d768c3222e38b59c3a51b7e7a;p=freeside.git

diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi
index 082ccc893..4779071a4 100644
--- a/httemplate/search/cust_bill_pkg.cgi
+++ b/httemplate/search/cust_bill_pkg.cgi
@@ -4,7 +4,7 @@ my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
 
 my $join_cust = "
     JOIN cust_bill USING ( invnum ) 
-    JOIN cust_main USING ( custnum )
+    LEFT JOIN cust_main USING ( custnum )
 ";
 
 my $join_pkg = "
@@ -12,10 +12,22 @@ my $join_pkg = "
     LEFT JOIN part_pkg USING ( pkgpart )
 ";
 
-my $where = "
-  WHERE _date >= $beginning AND _date <= $ending
-    AND payby != 'COMP'
-";
+my $where = " WHERE _date >= $beginning AND _date <= $ending ";
+
+$where .= " AND payby != 'COMP' "
+  unless $cgi->param('include_comp_cust');
+
+if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+  $where .= " AND agentnum = $1 ";
+}
+
+if ( $cgi->param('classnum') =~ /^(\d+)$/ ) {
+  if ( $1 == 0 ) {
+    $where .= " AND classnum IS NULL ";
+  } else {
+    $where .= " AND classnum = $1 ";
+  }
+}
 
 if ( $cgi->param('out') ) {
 
@@ -62,19 +74,27 @@ my $count_query;
 if ( $cgi->param('pkg_tax') ) {
 
   $count_query =
-    "SELECT COUNT(*), SUM( ( CASE WHEN part_pkg.setuptax = 'Y'
-                                 THEN cust_bill_pkg.setup
-                                 ELSE 0 )
-                          +
-                          ( CASE WHEN part_pkg.recurtax = 'Y'
-                                 THEN cust_bill_pkg.recur
-                                 ELSE 0 )
-                        )";
+    "SELECT COUNT(*), SUM(
+                           ( CASE WHEN part_pkg.setuptax = 'Y'
+                                  THEN cust_bill_pkg.setup
+                                  ELSE 0
+                             END
+                           )
+                           +
+                           ( CASE WHEN part_pkg.recurtax = 'Y'
+                                  THEN cust_bill_pkg.recur
+                                  ELSE 0
+                             END
+                           )
+                         )
+    ";
 
   $where .= " AND (
                        ( part_pkg.setuptax = 'Y' AND cust_bill_pkg.setup > 0 )
                     OR ( part_pkg.recurtax = 'Y' AND cust_bill_pkg.recur > 0 )
-                  )";
+                  )
+              AND ( tax != 'Y' OR tax IS NULL )
+            ";
 
 } else {