X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_main.html;h=b6db4e4341af851f688a21a678b5c94ee3921b63;hb=9b05a3660eabd3215bdebf9429eb490b41570436;hp=d6586e84eb46d827390040e37dfcf56938f1fc9f;hpb=1c2b820bd8d41fb9620e81faf617adffe85dbd33;p=freeside.git

diff --git a/httemplate/search/cust_main.html b/httemplate/search/cust_main.html
index d6586e84e..b6db4e434 100755
--- a/httemplate/search/cust_main.html
+++ b/httemplate/search/cust_main.html
@@ -44,8 +44,8 @@ my %search_hash = ();
 
 #scalars
 my @scalars = qw (
-  agentnum status cancelled_pkgs cust_fields flattened_pkgs custbatch
-  no_censustract paydate_year paydate_month
+  agentnum status cancelled_pkgs cust_fields flattened_pkgs custbatch usernum
+  no_censustract paydate_year paydate_month invoice_terms
 );
 
 for my $param ( @scalars ) {
@@ -66,10 +66,10 @@ foreach my $field (qw( signupdate )) {
 
   my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field);
 
-  next if $beginning == 0 && $ending == 4294967295;
+  next if $beginning == 0 && $ending == 4294967295 && !defined($cgi->param('signuphour'));
        #or $disable{$cgi->param('status')}->{$field};
 
-  $search_hash{$field} = [ $beginning, $ending ];
+  $search_hash{$field} = [ $beginning, $ending, $cgi->param('signuphour') ];
 
 }
 
@@ -84,7 +84,7 @@ $search_hash{'current_balance'} =
 # etc
 ###
 
-my $sql_query = FS::cust_main->search_sql(\%search_hash);
+my $sql_query = FS::cust_main::Search->search(\%search_hash);
 my $count_query   = delete($sql_query->{'count_query'});
 my @extra_headers = @{ delete($sql_query->{'extra_headers'}) };
 my @extra_fields  = @{ delete($sql_query->{'extra_fields'})  };
@@ -104,7 +104,7 @@ if ( $FS::CurrentUser::CurrentUser->access_right('Bulk send customer notices') )
   my $query = $uri->query;
 
   push @$menubar, 'Email a notice to these customers' =>
-                    "${p}misc/email-customers.html?$query",
+                    "${p}misc/email-customers.html?table=cust_main&$query",
 
 }