X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcdr.pm;h=df16c7fda804486921625bd7740fdf095e9d23f9;hb=b43dc5871854ed8662f75f5ee00229bd761bedd4;hp=8ccf7af63dce2bfede1515f5bbcca5e9860f03ab;hpb=e78d51a5053c8d3c0c7192c8b5cdeff5999fafd7;p=freeside.git

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 8ccf7af63..df16c7fda 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -546,6 +546,9 @@ sub parse_number {
 
   my $field = $options{column} || 'dst';
   my $intl = $options{international_prefix} || '011';
+  # Still, don't break anyone's CDR rating if they have an empty string in
+  # there. Require an explicit statement that there's no prefix.
+  $intl = '' if lc($intl) eq 'none';
   my $countrycode = '';
   my $number = $self->$field();
 
@@ -924,8 +927,10 @@ sub rate_prefix {
 
       # by default, set the included minutes for this region/time to
       # what's in the rate_detail
-      $included_min->{$regionnum}{$ratetimenum} = $rate_detail->min_included
-        unless exists $included_min->{$regionnum}{$ratetimenum};
+      if (!exists( $included_min->{$regionnum}{$ratetimenum} )) {
+        $included_min->{$regionnum}{$ratetimenum} =
+          ($rate_detail->min_included * $cust_pkg->quantity || 1);
+      }
 
       if ( $included_min->{$regionnum}{$ratetimenum} >= $minutes ) {
         $charge_sec = 0;