X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FRecord.pm;h=f8282c0314f52a405916efbf48a31f641bd474ad;hb=8e2372530191ae32938786363885aa4b540e29c7;hp=4546741a981137b3efe949f25cfb3e6e8dd150e0;hpb=85c78d955fbc2fd6c3991156b387d37c185b9f64;p=freeside.git

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 4546741a9..f8282c031 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -45,6 +45,8 @@ our $nowarn_classload = 0;
 our $no_update_diff = 0;
 our $no_history = 0;
 
+our $qsearch_qualify_columns = 1;
+
 our $no_check_foreign = 1; #well, not inefficiently in perl by default anymore
 
 my $rsa_module;
@@ -754,7 +756,7 @@ sub get_real_fields {
 
       my $op = '=';
       my $column = $_;
-      my $table_column = "$table.$column";
+      my $table_column = $qsearch_qualify_columns ? "$table.$column" : $column;
       my $type = dbdef->table($table)->column($column)->type;
       my $value = $record->{$column};
       $value = $value->{'value'} if ref($value);
@@ -1807,6 +1809,7 @@ sub process_batch_import {
     #?
     default_csv                => $opt->{default_csv},
     postinsert_callback        => $opt->{postinsert_callback},
+    insert_args_callback       => $opt->{insert_args_callback},
   );
 
   if ( $opt->{'batch_namecol'} ) {
@@ -1893,6 +1896,9 @@ sub batch_import {
   my $preinsert_callback = '';
   $preinsert_callback = $param->{'preinsert_callback'}
 	  if $param->{'preinsert_callback'};
+  my $insert_args_callback = '';
+  $insert_args_callback = $param->{'insert_args_callback'}
+	  if $param->{'insert_args_callback'};
 
   if ( $param->{'format'} ) {
 
@@ -2202,7 +2208,12 @@ sub batch_import {
       next if exists $param->{skiprow} && $param->{skiprow};
     }
 
-    my $error = $record->insert;
+    my @insert_args = ();
+    if ( $insert_args_callback ) {
+      @insert_args = &{$insert_args_callback}($record, $param);
+    }
+
+    my $error = $record->insert(@insert_args);
 
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;