X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_cdr.html;h=0eefd4ce70a487195a19e7b13e2275769f905b77;hb=4df3cb3192930c482c07c8d8e077a736244d4fc6;hp=e3418a7d44fd3a70bb0254eb8727c023e2cc915b;hpb=5b73387992a96f7b80e40b5ecb2fedabd8a78d6b;p=freeside.git

diff --git a/httemplate/search/report_cdr.html b/httemplate/search/report_cdr.html
index e3418a7d4..0eefd4ce7 100644
--- a/httemplate/search/report_cdr.html
+++ b/httemplate/search/report_cdr.html
@@ -24,9 +24,12 @@
       <SELECT NAME="freesidestatus">
         <OPTION VALUE="">(all)</OPTION>
         <OPTION VALUE="NULL">unprocessed</OPTION>
+%# <OPTION VALUE="processing-tiered">processing</OPTION>
         <OPTION VALUE="rated">prerated
-        <OPTION VALUE="done">processed</OPTION>
-        <OPTION VALUE="failed">skipped</OPTION>
+        <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>
@@ -145,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>
 
@@ -182,6 +190,10 @@ die "access denied"
 my @fields = fields('cdr');
 my $labels = FS::cdr->table_info->{'fields'};
 
+my $conf = new FS::Conf;
+my $default_phone_countrycode =
+  $conf->config('default_phone_countrycode') || '1';
+
 #XXX config
 my @show_default = qw(
   calldate clid src dst dcontext charged_party
@@ -214,7 +226,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 =
@@ -239,7 +251,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;