X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_main.cgi;h=b6aa0fa6dc2eedc0118b8fa091811226417da5eb;hb=ddb601f6bb7bdce8e0912e78472335f5613d20db;hp=aa8c079e1587f0518704ec3a9615add0f3e7d835;hpb=2ec92076c7dae5648da28e510efa1f733da9fd76;p=freeside.git

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index aa8c079e1..b6aa0fa6d 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -128,7 +128,10 @@
 %          'select'      => 'part_svc.*, COUNT(*) AS num_cust_svc',
 %          'table'       => 'part_svc', 
 %          'addl_from'   => 'LEFT JOIN cust_svc USING ( svcpart )',
-%          'extra_sql'   => 'WHERE pkgnum = ? GROUP BY part_svc.svcpart',
+%          'extra_sql'   => 'WHERE pkgnum = ? '.
+%                           ' GROUP BY '. join(', ',
+%                             map "part_svc.$_", fields('part_svc')
+%                           ),
 %          'extra_param' => [ [$cust_pkg->pkgnum,'int'] ],
 %        })
 %      ) {
@@ -500,7 +503,7 @@ if ( $cgi->param('browse')
     );
   }
 
-  @cust_main = grep { $_->num_ncancelled_pkgs || ! $_->num_pkgs } @cust_main
+  @cust_main = grep { $_->status ne 'cancelled' } @cust_main
     if ! $cgi->param('cancelled')
        && (
          $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me