X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcdr%2FImport.pm;h=39a7772a36735eaf8de6ed2a098aff3f5834797c;hb=7ca9326e9367cc930df0fb15283cab480b24f279;hp=ca6ae936c136c983de5c275bf2abb2b7f0a285c9;hpb=1d050e512416494a9f3efe232ec19ccf18b7b9af;p=freeside.git

diff --git a/FS/FS/cdr/Import.pm b/FS/FS/cdr/Import.pm
index ca6ae936c..39a7772a3 100644
--- a/FS/FS/cdr/Import.pm
+++ b/FS/FS/cdr/Import.pm
@@ -34,7 +34,7 @@ CDR importing
 
 =head1 CLASS METHODS
 
-=item do_cli_import
+=item dbi_import
 
 =cut
 
@@ -81,7 +81,7 @@ sub dbi_import {
   #      )
 
   #my @cols = values %{ $args{column_map} };
-  my $sql = "SELECT * FROM $table "; # join(',', @cols). " FROM $table ".
+  my $sql = "SELECT $table.* FROM $table "; # join(',', @cols). " FROM $table ".
   $sql .=  'LEFT JOIN '. $args{status_table}.
            " ON ( $table.$pkey = ". $args{status_table}. ".$pkey )"
     if $args{status_table};
@@ -117,8 +117,7 @@ sub dbi_import {
 
     $cdr->cdrtypenum($opt{c}) if $opt{c};
 
-    my $pkey_value = $args{status_table} ? $row->{"$table.$pkey"}
-                                         : $row->{$pkey};
+    my $pkey_value = $row->{$pkey};
 
     #print "$pkey_value\n" if $opt{v};
     my $error = $cdr->insert;