X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fvoip_cdr.pm;h=74deb8bb32625a7059dee74681ef6136f8ef0f1b;hb=d5d62e40593d5153afd64527accad35b7f4fda2e;hp=522e4aa6f2ddf237212dee2cfeb5f9fbbed98b8d;hpb=b7f3e1493aeb4061c65a5ba52dd8318f4662eb2e;p=freeside.git

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 522e4aa6f..74deb8bb3 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -166,9 +166,13 @@ tie my %accountcode_tollfree_field, 'Tie::IxHash',
                          },
 
     'use_cdrtypenum' => { 'name' => 'Only charge for CDRs where the CDR Type is set to this cdrtypenum: ',
+                          'validate' => \&FS::part_pkg::validate_number_blank,
+                          'js_validate' => 'digits: true',
                          },
     
     'ignore_cdrtypenum' => { 'name' => 'Do not charge for CDRs where the CDR Type is set to this cdrtypenum: ',
+                             'validate' => \&FS::part_pkg::validate_number_blank,
+                             'js_validate' => 'digits: true',
                          },
 
     'use_calltypenum' => { 'name' => 'Only charge for CDRs where the CDR Call Type is set to this calltypenum: ',
@@ -674,9 +678,9 @@ sub check_chargable {
       and length($cdr->max_callers)
       and $cdr->max_callers <= $self->option_cacheable('skip_max_callers');
 
-  return "calldate < ". str2time($self->option_cacheable('skip_old'))
+  return "calldate < ". $self->option_cacheable('skip_old')
     if $self->option_cacheable('skip_old')
-    && $self->calldate_unix < str2time($self->option_cacheable('skip_old')); 
+    && $cdr->calldate_unix < str2time($self->option_cacheable('skip_old')); 
 
   #all right then, rate it
   '';