disable_src fixes

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index b8b64df..381b97f 100644 (file)
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -655,6 +655,9 @@ sub get_cdrs_for_update {
   my @where =  map " $_ = '$number'        ", @fields;
   push @where, map " $_ = '$prefix$number' ", @fields
     if length($prefix);
+  if ( $prefix =~ /^\+(\d+)$/ ) {
+    push @where, map " $_ = '$1$number' ", @fields
+  }
 
   my $extra_sql = ' AND ( '. join(' OR ', @where ). ' ) ';
 

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 6a3a2ac..bd41cc6 100644 (file)
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -150,7 +150,9 @@ sub calc_recur {
   ) {
 
     foreach my $cdr (
-      $cust_svc->get_cdrs_for_update()  # $last_bill, $$sdate )
+      $cust_svc->get_cdrs_for_update( 'disable_src'    => $self->option('disable_src'),
+                                      'default_prefix' => $self->option('default_prefix'),
+                                    )  # $last_bill, $$sdate )
     ) {
       if ( $DEBUG > 1 ) {
         warn "rating CDR $cdr\n".