[freeside-commits] branch FREESIDE_4_BRANCH updated. b238c8cf058e5ee1df637ffe97b79948ff5f1853

[Mark Wells]

The branch, FREESIDE_4_BRANCH has been updated
       via  b238c8cf058e5ee1df637ffe97b79948ff5f1853 (commit)
       via  d5df4bcae22fc17e7c4ef11df6f6b9353a4db2dd (commit)
      from  a2bb568ac8f2b12250d068d388b1f75431f4cd5c (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 b238c8cf058e5ee1df637ffe97b79948ff5f1853
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 7363700..be2d15b 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -149,7 +149,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',
                               },
 

commit d5df4bcae22fc17e7c4ef11df6f6b9353a4db2dd
Author: Mark Wells <mark at freeside.biz>
Date:   Thu May 12 13:52:41 2016 -0700

    fix sync_bill_date when customer has no other packages, minor fallout from #39822

diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index 7b5a3f6..3e63242 100644
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -174,7 +174,7 @@ sub cutoff_day {
   my $cust_pkg = shift;
   if ( $self->option('sync_bill_date',1) ) {
     my $next_bill = $cust_pkg->cust_main->next_bill_date;
-    if ( defined($next_bill) ) {
+    if ( $next_bill ) {
       # careful here. if the prorate calculation is going to round to 
       # the nearest day, this needs to always return the same result
       if ( $self->option('prorate_round_day', 1) ) {

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

Summary of changes:
 FS/FS/cdr.pm               |    3 +++
 FS/FS/part_pkg/flat.pm     |    2 +-
 FS/FS/part_pkg/voip_cdr.pm |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)