[freeside-commits] branch FREESIDE_3_BRANCH updated. b0c05606c571c67e750ccd3c34c35d5e77345aba

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  b0c05606c571c67e750ccd3c34c35d5e77345aba (commit)
      from  d0b6fc0f6355ec22c847f7e6592b91fed2be10ca (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b0c05606c571c67e750ccd3c34c35d5e77345aba
Author: Mark Wells <mark at freeside.biz>
Date:   Mon May 16 15:02:06 2016 -0700

    allow "none" as international prefix when all calls have country codes, #41198

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 8ccf7af..b3cceb4 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();
 
diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index c1dd522..fa2c02f 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -152,7 +152,7 @@ tie my %accountcode_tollfree_field, 'Tie::IxHash',
 #                                    'type' => 'checkbox',
 #                                  },
 
-    'international_prefix' => { 'name'    => 'Destination prefix for international CDR records',
+    'international_prefix' => { 'name'    => 'Destination prefix for international CDR records (or "none" for no prefix)',
                                 'default' => '011',
                               },
 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cdr.pm               |    3 +++
 FS/FS/part_pkg/voip_cdr.pm |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)