[freeside-commits] branch master updated. 348c5272c0bf04dc34a0fc773555104806f4cb57

[Mark Wells]

The branch, master has been updated
       via  348c5272c0bf04dc34a0fc773555104806f4cb57 (commit)
       via  b92ac439205c878ab88510a18e1336d34ec7d8e8 (commit)
      from  191a9fb439b8ed15fdcd458dd51f5890dbf60f29 (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 348c5272c0bf04dc34a0fc773555104806f4cb57
Author: Mark Wells <mark at freeside.biz>
Date:   Tue May 12 20:51:16 2015 -0700

    remove reference to deleted Conf_compat17

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index d82ae6b..f80f2d5 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -11,7 +11,6 @@ use MIME::Base64;
 use Locale::Currency;
 use FS::ConfItem;
 use FS::ConfDefaults;
-use FS::Conf_compat17;
 use FS::Locales;
 use FS::payby;
 use FS::conf;

commit b92ac439205c878ab88510a18e1336d34ec7d8e8
Author: Mark Wells <mark at freeside.biz>
Date:   Tue May 12 17:04:48 2015 -0700

    PBXware CDRs: strip trailing non-numeric stuff from src/dst numbers, #34575

diff --git a/FS/FS/part_export/pbxware.pm b/FS/FS/part_export/pbxware.pm
index 3da4c2a..36b1a2a 100644
--- a/FS/FS/part_export/pbxware.pm
+++ b/FS/FS/part_export/pbxware.pm
@@ -140,6 +140,11 @@ sub import_cdrs {
         uniqueid    => $uniqueid,
       );
       @hash{@names} = @$row;
+      # strip non-numeric junk that sometimes gets appended to these (it 
+      # causes problems creating Freeside detail records)
+      foreach (qw(src dst)) {
+        $hash{$_} =~ s/\D*$//;
+      }
 
       my $cdr = FS::cdr->new(\%hash);
       $error = $cdr->insert;

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

Summary of changes:
 FS/FS/Conf.pm                |    1 -
 FS/FS/part_export/pbxware.pm |    5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)