odds and ends

5 files changed, 19 insertions, 5 deletions

diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html
index 16128d5c8..79c05dc42 100755
--- a/httemplate/search/cust_bill.html
+++ b/httemplate/search/cust_bill.html
@@ -37,7 +37,7 @@
        $begin = str2time($1);
        push @where, "cust_bill._date >= $begin";
      }
-     if (  $cgi->param('ending')
+     if ( $cgi->param('ending')
            && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
        $end = str2time($1) + 86399;
        push @where, "cust_bill._date < $end";
@@ -52,6 +52,13 @@
        push @where, "cust_bill._date < $end";
      }
 
+     if ( $cgi->param('invnum_min') =~ /^\s*(\d+)\s*$/ ) {
+       push @where, "cust_bill.invnum >= $1";
+     }
+     if ( $cgi->param('invnum_max') =~ /^\s*(\d+)\s*$/ ) {
+       push @where, "cust_bill.invnum <= $1";
+     }
+
      if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
        $agentnum = $1;
        push @where, "cust_main.agentnum = $agentnum";
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index ef68ba05e..0f2f3ef45 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -95,6 +95,7 @@ my $sql_query = {
   'hashref'   => {}, # \%svc_acct,
   'select'    => join(', ',
                     'svc_acct.*',
+                    'part_svc.svc',
                     'cust_main.custnum',
                     FS::UI::Web::cust_sql_fields(),
                   ),
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index 1eda3733c..ecb77792f 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -56,8 +56,9 @@ my $sql_query = {
   'hashref'   => \%svc_domain,
   'select'    => join(', ',
                    'svc_domain.*',
-                    'cust_main.custnum',
-                    FS::UI::Web::cust_sql_fields(),
+                   'part_svc.svc',
+                   'cust_main.custnum',
+                   FS::UI::Web::cust_sql_fields(),
                  ),
   'extra_sql' => "$extra_sql $orderby",
   'addl_from' => $addl_from,
diff --git a/httemplate/search/svc_forward.cgi b/httemplate/search/svc_forward.cgi
index 4961967d7..d391a1834 100755
--- a/httemplate/search/svc_forward.cgi
+++ b/httemplate/search/svc_forward.cgi
@@ -39,8 +39,9 @@ my $sql_query = {
   'hashref'   => {},
   'select'    => join(', ',
                    'svc_forward.*',
-                    'cust_main.custnum',
-                    FS::UI::Web::cust_sql_fields(),
+                   'part_svc.svc',
+                   'cust_main.custnum',
+                   FS::UI::Web::cust_sql_fields(),
                  ),
   'extra_sql' => "$extra_sql $orderby",
   'addl_from' => $addl_from,
diff --git a/httemplate/search/svc_www.cgi b/httemplate/search/svc_www.cgi
index ae51c61fc..ef4045cf9 100755
--- a/httemplate/search/svc_www.cgi
+++ b/httemplate/search/svc_www.cgi
@@ -17,6 +17,7 @@ my $sql_query = {
   'hashref'   => {},
   'select'    => join(', ',
                    'svc_www.*',
+                   'part_svc.svc',
                    'cust_main.custnum',
                    FS::UI::Web::cust_sql_fields(),
                  ),
@@ -43,11 +44,13 @@ my $link_cust = sub {
                  'count_query' => $count_query,
                  'redirect'    => $link,
                  'header'      => [ '#',
+                                    'Service',
                                     'Zone',
                                     'User',
                                     FS::UI::Web::cust_header(),
                                   ],
                  'fields'      => [ 'svcnum',
+                                    'svc',
                                     sub { $_[0]->domain_record->zone },
                                     sub {
                                           my $svc_www = shift;
@@ -59,6 +62,7 @@ my $link_cust = sub {
                                     \&FS::UI::Web::cust_fields,
                                   ],
                  'links'       => [ $link,
+                                    $link,
                                     '',
                                     $ulink,
                                     ( map { $link_cust }