X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcdr.pm;fp=FS%2FFS%2Fcdr.pm;h=e0c4bd4a4fe58832c478a890eb35c2e11c3c40d8;hp=97d444076522002792d34c4cfa542615ac4dca9c;hb=5d36f5f81d84e116caae80667e37750e6798e2b1;hpb=f8a1e695f5339a1fc93960e15f146c96845a881a

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 97d444076..e0c4bd4a4 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -1872,10 +1872,11 @@ sub batch_import {
   my $iopt = _import_options;
   $opt->{$_} = $iopt->{$_} foreach keys %$iopt;
 
-  if ( defined $opt->{'cdrtypenum'} ) {
-        $opt->{'preinsert_callback'} = sub {
-                my($record,$param) = (shift,shift);
-                $record->cdrtypenum($opt->{'cdrtypenum'});
+  if ( grep defined $opt->{$_}, qw(cdrtypenum carrierid) ) {
+        $opt->{preinsert_callback} = sub {
+                my($record, $param) = @_;
+                $record->$_($opt->{$_})
+                  foreach grep defined $opt->{$_}, qw(cdrtypenum carrierid);
                 '';
         };
   }