X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/45cd4d0a939886769833995855d38f9577604ab3..d2e078315810c382a8f8d331849fceedbcc7dda7:/SL/Controller/CsvImport/Base.pm diff --git a/SL/Controller/CsvImport/Base.pm b/SL/Controller/CsvImport/Base.pm index 43906bf80..9e8956f22 100644 --- a/SL/Controller/CsvImport/Base.pm +++ b/SL/Controller/CsvImport/Base.pm @@ -34,7 +34,7 @@ sub run { $self->controller->track_progress(phase => 'parsing csv', progress => 0); my $profile = $self->profile; - $self->csv(SL::Helper::Csv->new(file => $self->file->file_name, + $self->csv(SL::Helper::Csv->new(file => ('SCALAR' eq ref $self->file)? $self->file: $self->file->file_name, encoding => $self->controller->profile->get('charset'), profile => [{ profile => $profile, class => $self->class, mapping => $self->controller->mappings_for_profile }], ignore_unknown_columns => 1, @@ -603,8 +603,10 @@ sub _save_history { : $self->controller->{type} eq 'ar_transactions' ? 'invnumber_' . $object->invnumber : ''; - my $what_done = $self->controller->{type} eq 'orders' ? 'sales_order' - : ''; + my $what_done = ''; + if ($self->controller->{type} eq 'orders') { + $what_done = $object->customer_id ? 'sales_order' : 'purchase_order'; + } SL::DB::History->new( trans_id => $object->id,