quiet warnings about CGI::param in list context

[freeside.git] / httemplate / search / report_cdr.html

diff --git a/httemplate/search/report_cdr.html b/httemplate/search/report_cdr.html
index 0e1693b..4c16f74 100644 (file)
--- a/httemplate/search/report_cdr.html
+++ b/httemplate/search/report_cdr.html
@@ -148,6 +148,11 @@
   </TR>
 
   <TR>
+    <TD ALIGN="right">Acct Code (one per-line):</TD>
+    <TD><TEXTAREA NAME="accountcode"></TEXTAREA></TD>
+  </TR>
+
+  <TR>
     <TH CLASS="background" COLSPAN=2>&nbsp;</TH>
   </TR>
 
@@ -183,7 +188,21 @@ die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('List rating data');
 
 my @fields = fields('cdr');
+push @fields, 'ratename';
+push @fields, map "cdr_termination.$_", qw( rated_price rated_seconds rated_minutes rated_granularity status svcnum );
+
 my $labels = FS::cdr->table_info->{'fields'};
+$labels->{ratename} = 'Rate plan';
+$labels->{'cdr_termination.rated_price'} = 'Termination rated price';
+$labels->{'cdr_termination.rated_seconds'} = 'Termination rated seconds';
+$labels->{'cdr_termination.rated_minutes'} = 'Termination rated minutes';
+$labels->{'cdr_termination.rated_granularity'} = 'Termination rated granularity';
+$labels->{'cdr_termination.status'} = 'Termination status';
+$labels->{'cdr_termination.svcnum'} = 'Termination service';
+
+my $conf = new FS::Conf;
+my $default_phone_countrycode =
+  $conf->config('default_phone_countrycode') || '1';
 
 #XXX config
 my @show_default = qw(
@@ -217,7 +236,7 @@ if ( $cgi->param('custnum') =~ /^(\d+)$/ ) {
   });
   die "Customer not found!" unless $cust_main;
 
-  #historical?
+  #historical packages?  It would help, it was still usage, it happened
   foreach my $cust_pkg ( $cust_main->ncancelled_pkgs ) {
 
     my @voip_pkgs =
@@ -242,7 +261,7 @@ if ( $cgi->param('custnum') =~ /^(\d+)$/ ) {
       my @numbers = map {
                           my $number = $_->phonenum;
                           $number = $_->countrycode. $number
-                            unless $_->countrycode eq '1';
+                           unless $_->countrycode eq $default_phone_countrycode;
                           $number;
                         }
                       @svc_phone;