X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcdr%2Ffreeside_description_default.pm;h=fd91530ef810795c7a372414efa4b1db0225d42d;hb=HEAD;hp=bbac86fdcc163e987d110ef01a45e580a4ee0219;hpb=89d81f2d5e133aca8274d6bf034d040f31f0a47c;p=freeside.git diff --git a/FS/FS/cdr/freeside_description_default.pm b/FS/FS/cdr/freeside_description_default.pm index bbac86fdc..fd91530ef 100644 --- a/FS/FS/cdr/freeside_description_default.pm +++ b/FS/FS/cdr/freeside_description_default.pm @@ -10,6 +10,7 @@ use FS::cdr; %info = ( 'name' => 'Freeside default with description field as destination', 'weight' => 25, + 'type' => 'csv', 'header' => 1, 'import_fields' => [ 'charged_party', # Billed number @@ -37,9 +38,9 @@ use FS::cdr; # Number sub { my($cdr, $number) = @_; - $number =~ /(\d+)\s(\d+)$/ + $number =~ /(\+|)(\d+)\s([\d\*]+)$/ or die "unparsable number: $number"; #maybe we shouldn't die... - $cdr->dst("$1$2"); + $cdr->dst("$1$2$3"); }, 'description', # Destination (regionname)