X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fvoip_cdr.pm;h=87c3247ad8f3614fd575170519e0f6a16baa707e;hp=715d5c09bc82b00cdf3e8ddec1041ff88562d72f;hb=064be49dc8f265aabe40efc681116472ec647528;hpb=057fc61586d26199005660b908ece68a7a1da681

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 715d5c09b..87c3247ad 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -166,13 +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,
-                          'js_validate' => 'digits',
+                          '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,
-                             'js_validate' => 'digits',
+                             '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: ',
@@ -679,7 +679,7 @@ sub check_chargable {
       and $cdr->max_callers <= $self->option_cacheable('skip_max_callers');
 
   return "calldate < ". $self->option_cacheable('skip_old')
-    if $self->option_cacheable('skip_old')
+    if length($self->option_cacheable('skip_old'))
     && $cdr->calldate_unix < str2time($self->option_cacheable('skip_old')); 
 
   #all right then, rate it