X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_cdr.html;h=4c16f74c01b10fe4dc44d33df09e44f7cc7ef1b4;hb=b65bbe5e2161ac6dd4e0e8239ccb7249e001639f;hp=07299d5dc41274d58cbd31aa0023eaaa1f8635e8;hpb=f3e9978acca77b92adcfc24632b21bd39d4cae82;p=freeside.git

diff --git a/httemplate/search/report_cdr.html b/httemplate/search/report_cdr.html
index 07299d5dc..4c16f74c0 100644
--- a/httemplate/search/report_cdr.html
+++ b/httemplate/search/report_cdr.html
@@ -22,9 +22,14 @@
     <TD ALIGN="right">Status: </TD>
     <TD>
       <SELECT NAME="freesidestatus">
-        <OPTION VALUE="">(all)
-        <OPTION VALUE="NULL">unprocessed
-        <OPTION VALUE="done">processed
+        <OPTION VALUE="">(all)</OPTION>
+        <OPTION VALUE="NULL">unprocessed</OPTION>
+%# <OPTION VALUE="processing-tiered">processing</OPTION>
+        <OPTION VALUE="rated">prerated
+        <OPTION VALUE="no-charge">processed (included)</OPTION>
+        <OPTION VALUE="done">processed (billed)</OPTION>
+        <OPTION VALUE="skipped">skipped</OPTION>
+        <OPTION VALUE="failed">failed</OPTION>
       </SELECT>
     </TD>
   </TR>
@@ -51,7 +56,9 @@
             label   => 'CDR Type',
             table   => 'cdr_type',
             name_col    => 'cdrtypename',
-            post_options => [ 'none', 'none' ] )
+            disable_empty   => 1,
+            pre_options => [    '',     'all', 
+                                'none', 'none' ] )
   %>
 
   <% include ( '/elements/tr-input-beginning_ending.html' ) %>
@@ -141,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>
 
@@ -176,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(
@@ -210,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 =
@@ -235,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;