X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;ds=sidebyside;f=acqui%2Faddorderiso2709.pl;h=b18e68806bf11a5d7af911e903ded058a22df834;hb=b6f9241d66b8a857dba51d747cb8fb67d2115433;hp=1921a5af6ec7080a845bc6463e263ce338179d5f;hpb=1a8e1165ca7abf9e2b7e5c7de0cdf26cbd4e30ac;p=koha-ffzg.git

diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl
index 1921a5af6e..b18e68806b 100755
--- a/acqui/addorderiso2709.pl
+++ b/acqui/addorderiso2709.pl
@@ -23,22 +23,25 @@
 
 use Modern::Perl;
 use CGI qw ( -utf8 );
-use Carp;
-use YAML qw/Load/;
-use List::MoreUtils qw/uniq/;
+use YAML::XS;
+use List::MoreUtils;
+use Encode;
 
 use C4::Context;
-use C4::Auth;
-use C4::Output;
-use C4::ImportBatch;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
+use C4::ImportBatch qw( SetImportBatchStatus GetImportBatch GetImportBatchRangeDesc GetNumberOfNonZ3950ImportBatches GetImportBatchOverlayAction GetImportBatchNoMatchAction GetImportBatchItemAction );
 use C4::Matcher;
-use C4::Search qw/FindDuplicate/;
-use C4::Acquisition;
-use C4::Biblio;
-use C4::Items;
-use C4::Koha;
-use C4::Budgets;
-use C4::Acquisition;
+use C4::Search qw( FindDuplicate );
+use C4::Biblio qw(
+    AddBiblio
+    GetMarcFromKohaField
+    GetMarcPrice
+    GetMarcQuantity
+    TransformHtmlToXml
+);
+use C4::Items qw( PrepareItemrecordDisplay AddItemFromMarc );
+use C4::Budgets qw( GetBudget GetBudgets GetBudgetHierarchy CanUserUseBudget GetBudgetByCode );
 use C4::Suggestions;    # GetSuggestion
 use C4::Members;
 
@@ -48,16 +51,15 @@ use Koha::Acquisition::Baskets;
 use Koha::Acquisition::Currencies;
 use Koha::Acquisition::Orders;
 use Koha::Acquisition::Booksellers;
+use Koha::Import::Records;
 use Koha::Patrons;
 
-my $input = new CGI;
+my $input = CGI->new;
 my ($template, $loggedinuser, $cookie, $userflags) = get_template_and_user({
     template_name => "acqui/addorderiso2709.tt",
     query => $input,
     type => "intranet",
-    authnotrequired => 0,
     flagsrequired   => { acquisition => 'order_manage' },
-    debug => 1,
 });
 
 my $cgiparams = $input->Vars;
@@ -93,23 +95,22 @@ if ($op eq ""){
 #
 } elsif ($op eq "batch_details"){
 #display lines inside the selected batch
-    # get currencies (for change rates calcs if needed)
-    my @currencies = Koha::Acquisition::Currencies->search;
 
     $template->param("batch_details" => 1,
                      "basketno"      => $cgiparams->{'basketno'},
-                     currencies => \@currencies,
+                     # get currencies (for change rates calcs if needed)
+                     currencies => Koha::Acquisition::Currencies->search,
                      bookseller => $bookseller,
                      "allmatch" => $allmatch,
                      );
     import_biblios_list($template, $cgiparams->{'import_batch_id'});
     if ( $basket->effective_create_items eq 'ordering' && !$basket->is_standing ) {
         # prepare empty item form
-        my $cell = PrepareItemrecordDisplay( '', '', '', 'ACQ' );
+        my $cell = PrepareItemrecordDisplay( '', '', undef, 'ACQ' );
 
         #     warn "==> ".Data::Dumper::Dumper($cell);
         unless ($cell) {
-            $cell = PrepareItemrecordDisplay( '', '', '', '' );
+            $cell = PrepareItemrecordDisplay( '', '', undef, '' );
             $template->param( 'NoACQframework' => 1 );
         }
         my @itemloop;
@@ -134,12 +135,15 @@ if ($op eq ""){
 
     # retrieve the file you want to import
     my $import_batch_id = $cgiparams->{'import_batch_id'};
-    my $biblios = GetImportRecordsRange($import_batch_id);
+    my $import_records = Koha::Import::Records->search({
+        import_batch_id => $import_batch_id,
+    });
     my $duplinbatch;
     my $imported = 0;
     my @import_record_id_selected = $input->multi_param("import_record_id");
     my @quantities = $input->multi_param('quantity');
     my @prices = $input->multi_param('price');
+    my @orderreplacementprices = $input->multi_param('replacementprice');
     my @budgets_id = $input->multi_param('budget_id');
     my @discount = $input->multi_param('discount');
     my @sort1 = $input->multi_param('sort1');
@@ -147,21 +151,22 @@ if ($op eq ""){
     my $matcher_id = $input->param('matcher_id');
     my $active_currency = Koha::Acquisition::Currencies->get_active;
     my $biblio_count = 0;
-    for my $biblio (@$biblios){
+    while( my $import_record = $import_records->next ){
         $biblio_count++;
         my $duplifound = 0;
         # Check if this import_record_id was selected
-        next if not grep { $_ eq $$biblio{import_record_id} } @import_record_id_selected;
-        my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} );
-        my $marcrecord = MARC::Record->new_from_usmarc($marcblob) || die "couldn't translate marc information";
-        my $match = GetImportRecordMatches( $biblio->{'import_record_id'}, 1 );
-        my $biblionumber=$#$match > -1?$match->[0]->{'biblionumber'}:0;
+        next if not grep { $_ eq $import_record->import_record_id } @import_record_id_selected;
+        my $marcrecord = $import_record->get_marc_record || die "couldn't translate marc information";
+        my $matches = $import_record->get_import_record_matches({ chosen => 1 });
+        my $match = $matches->count ? $matches->next : undef;
+        my $biblionumber = $match ? $match->candidate_match_id : 0;
         my $c_quantity = shift( @quantities ) || GetMarcQuantity($marcrecord, C4::Context->preference('marcflavour') ) || 1;
         my $c_budget_id = shift( @budgets_id ) || $input->param('all_budget_id') || $budget_id;
         my $c_discount = shift ( @discount);
-        $c_discount = $c_discount / 100 if $c_discount > 1;
         my $c_sort1 = shift( @sort1 ) || $input->param('all_sort1') || '';
         my $c_sort2 = shift( @sort2 ) || $input->param('all_sort2') || '';
+        my $c_replacement_price = shift( @orderreplacementprices );
+        my $c_price = shift( @prices ) || GetMarcPrice($marcrecord, C4::Context->preference('marcflavour'));
 
         # Insert the biblio, or find it through matcher
         unless ( $biblionumber ) {
@@ -182,7 +187,7 @@ if ($op eq ""){
             my $bibitemnum;
 
             # remove ISBN -
-            my ( $isbnfield, $isbnsubfield ) = GetMarcFromKohaField( 'biblioitems.isbn', '' );
+            my ( $isbnfield, $isbnsubfield ) = GetMarcFromKohaField( 'biblioitems.isbn' );
             if ( $marcrecord->field($isbnfield) ) {
                 foreach my $field ( $marcrecord->field($isbnfield) ) {
                     foreach my $subfield ( $field->subfield($isbnsubfield) ) {
@@ -193,48 +198,53 @@ if ($op eq ""){
                 }
             }
             ( $biblionumber, $bibitemnum ) = AddBiblio( $marcrecord, $cgiparams->{'frameworkcode'} || '' );
-            SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' );
+            $import_record->status('imported')->store;
         } else {
-            SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' );
+            $import_record->status('imported')->store;
         }
 
+        $import_record->import_biblio->matched_biblionumber($biblionumber)->store;
+
         # Add items from MarcItemFieldsToOrder
-        my @homebranches = $input->multi_param('homebranch_' . $biblio_count);
+        my @homebranches = $input->multi_param('homebranch_' . $import_record->import_record_id);
         my $count = scalar @homebranches;
-        my @holdingbranches = $input->multi_param('holdingbranch_' . $biblio_count);
-        my @itypes = $input->multi_param('itype_' . $biblio_count);
-        my @nonpublic_notes = $input->multi_param('nonpublic_note_' . $biblio_count);
-        my @public_notes = $input->multi_param('public_note_' . $biblio_count);
-        my @locs = $input->multi_param('loc_' . $biblio_count);
-        my @ccodes = $input->multi_param('ccode_' . $biblio_count);
-        my @notforloans = $input->multi_param('notforloan_' . $biblio_count);
-        my @uris = $input->multi_param('uri_' . $biblio_count);
-        my @copynos = $input->multi_param('copyno_' . $biblio_count);
-        my @budget_codes = $input->multi_param('budget_code_' . $biblio_count);
-        my @itemprices = $input->multi_param('itemprice_' . $biblio_count);
-        my @replacementprices = $input->multi_param('replacementprice_' . $biblio_count);
-        my @itemcallnumbers = $input->multi_param('itemcallnumber_' . $biblio_count);
+        my @holdingbranches = $input->multi_param('holdingbranch_' . $import_record->import_record_id);
+        my @itypes = $input->multi_param('itype_' . $import_record->import_record_id);
+        my @nonpublic_notes = $input->multi_param('nonpublic_note_' . $import_record->import_record_id);
+        my @public_notes = $input->multi_param('public_note_' . $import_record->import_record_id);
+        my @locs = $input->multi_param('loc_' . $import_record->import_record_id);
+        my @ccodes = $input->multi_param('ccode_' . $import_record->import_record_id);
+        my @notforloans = $input->multi_param('notforloan_' . $import_record->import_record_id);
+        my @uris = $input->multi_param('uri_' . $import_record->import_record_id);
+        my @copynos = $input->multi_param('copyno_' . $import_record->import_record_id);
+        my @budget_codes = $input->multi_param('budget_code_' . $import_record->import_record_id);
+        my @itemprices = $input->multi_param('itemprice_' . $import_record->import_record_id);
+        my @replacementprices = $input->multi_param('replacementprice_' . $import_record->import_record_id);
+        my @itemcallnumbers = $input->multi_param('itemcallnumber_' . $import_record->import_record_id);
         my $itemcreation = 0;
 
         my @itemnumbers;
         for (my $i = 0; $i < $count; $i++) {
             $itemcreation = 1;
-            my ($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem({
-                homebranch => $homebranches[$i],
-                holdingbranch => $holdingbranches[$i],
-                itemnotes_nonpublic => $nonpublic_notes[$i],
-                itemnotes => $public_notes[$i],
-                location => $locs[$i],
-                ccode => $ccodes[$i],
-                itype => $itypes[$i],
-                notforloan => $notforloans[$i],
-                uri => $uris[$i],
-                copynumber => $copynos[$i],
-                price => $itemprices[$i],
-                replacementprice => $replacementprices[$i],
-                itemcallnumber => $itemcallnumbers[$i],
-            }, $biblionumber);
-            push( @itemnumbers, $itemnumber );
+            my $item = Koha::Item->new(
+                {
+                    biblionumber        => $biblionumber,
+                    homebranch          => $homebranches[$i],
+                    holdingbranch       => $holdingbranches[$i],
+                    itemnotes_nonpublic => $nonpublic_notes[$i],
+                    itemnotes           => $public_notes[$i],
+                    location            => $locs[$i],
+                    ccode               => $ccodes[$i],
+                    itype               => $itypes[$i],
+                    notforloan          => $notforloans[$i],
+                    uri                 => $uris[$i],
+                    copynumber          => $copynos[$i],
+                    price               => $itemprices[$i],
+                    replacementprice    => $replacementprices[$i],
+                    itemcallnumber      => $itemcallnumbers[$i],
+                }
+            )->store;
+            push( @itemnumbers, $item->itemnumber );
         }
         if ($itemcreation == 1) {
             # Group orderlines from MarcItemFieldsToOrder
@@ -242,6 +252,7 @@ if ($op eq ""){
             for (my $i = 0; $i < $count; $i++) {
                 $budget_hash->{$budget_codes[$i]}->{quantity} += 1;
                 $budget_hash->{$budget_codes[$i]}->{price} = $itemprices[$i];
+                $budget_hash->{$budget_codes[$i]}->{replacementprice} = $replacementprices[$i];
                 $budget_hash->{$budget_codes[$i]}->{itemnumbers} //= [];
                 push @{ $budget_hash->{$budget_codes[$i]}->{itemnumbers} }, $itemnumbers[$i];
             }
@@ -258,45 +269,31 @@ if ($op eq ""){
                     );
 
                     my $price = $infos->{price};
-                    my $replacementprice = $infos->{replacementprice};
                     if ($price){
                         # in France, the cents separator is the , but sometimes, ppl use a .
                         # in this case, the price will be x100 when unformatted ! Replace the . by a , to get a proper price calculation
                         $price =~ s/\./,/ if C4::Context->preference("CurrencyFormat") eq "FR";
                         $price = Koha::Number::Price->new($price)->unformat;
-                        $orderinfo{tax_rate} = $bookseller->tax_rate;
-                        my $c = $c_discount ? $c_discount : $bookseller->discount / 100;
-                        $orderinfo{discount} = $c;
-                        if ( $c_discount ) {
-                            $orderinfo{ecost} = $price;
-                            $orderinfo{rrp}   = $orderinfo{ecost} / ( 1 - $c );
-                        } else {
-                            $orderinfo{ecost} = $price * ( 1 - $c );
-                            $orderinfo{rrp}   = $price;
-                        }
+                        $orderinfo{tax_rate_on_ordering} = $bookseller->tax_rate;
+                        $orderinfo{tax_rate_on_receiving} = $bookseller->tax_rate;
+                        my $order_discount = $c_discount ? $c_discount : $bookseller->discount;
+                        $orderinfo{discount} = $order_discount;
+                        $orderinfo{rrp} = $price;
+                        $orderinfo{ecost} = $order_discount ? $price * ( 1 - $order_discount / 100 ) : $price;
                         $orderinfo{listprice} = $orderinfo{rrp} / $active_currency->rate;
                         $orderinfo{unitprice} = $orderinfo{ecost};
-                        $orderinfo{total} = $orderinfo{ecost} * $infos->{quantity};
                     } else {
                         $orderinfo{listprice} = 0;
                     }
-                    $orderinfo{replacementprice} = $replacementprice || 0;
+                    $orderinfo{replacementprice} = $infos->{replacementprice} || 0;
 
                     # remove uncertainprice flag if we have found a price in the MARC record
                     $orderinfo{uncertainprice} = 0 if $orderinfo{listprice};
 
-                    %orderinfo = %{
-                        C4::Acquisition::populate_order_with_prices(
-                            {
-                                order        => \%orderinfo,
-                                booksellerid => $booksellerid,
-                                ordering     => 1,
-                                receiving    => 1,
-                            }
-                        )
-                    };
-
-                    my $order = Koha::Acquisition::Order->new( \%orderinfo )->store;
+                    my $order = Koha::Acquisition::Order->new( \%orderinfo );
+                    $order->populate_with_prices_for_ordering();
+                    $order->populate_with_prices_for_receiving();
+                    $order->store;
                     $order->add_item( $_ ) for @{ $budget_hash->{$budget_id}->{itemnumbers} };
                 }
             }
@@ -317,27 +314,22 @@ if ($op eq ""){
                 order_internalnote => $cgiparams->{'all_order_internalnote'},
                 order_vendornote   => $cgiparams->{'all_order_vendornote'},
                 currency           => $cgiparams->{'all_currency'},
+                replacementprice   => $c_replacement_price,
             );
             # get the price if there is one.
-            my $price= shift( @prices ) || GetMarcPrice($marcrecord, C4::Context->preference('marcflavour'));
-            if ($price){
+            if ($c_price){
                 # in France, the cents separator is the , but sometimes, ppl use a .
                 # in this case, the price will be x100 when unformatted ! Replace the . by a , to get a proper price calculation
-                $price =~ s/\./,/ if C4::Context->preference("CurrencyFormat") eq "FR";
-                $price = Koha::Number::Price->new($price)->unformat;
-                $orderinfo{tax_rate} = $bookseller->tax_rate;
-                my $c = $c_discount ? $c_discount : $bookseller->discount / 100;
-                $orderinfo{discount} = $c;
-                if ( $c_discount ) {
-                    $orderinfo{ecost} = $price;
-                    $orderinfo{rrp}   = $orderinfo{ecost} / ( 1 - $c );
-                } else {
-                    $orderinfo{ecost} = $price * ( 1 - $c );
-                    $orderinfo{rrp}   = $price;
-                }
+                $c_price =~ s/\./,/ if C4::Context->preference("CurrencyFormat") eq "FR";
+                $c_price = Koha::Number::Price->new($c_price)->unformat;
+                $orderinfo{tax_rate_on_ordering} = $bookseller->tax_rate;
+                $orderinfo{tax_rate_on_receiving} = $bookseller->tax_rate;
+                my $order_discount = $c_discount ? $c_discount : $bookseller->discount;
+                $orderinfo{discount} = $order_discount;
+                $orderinfo{rrp}   = $c_price;
+                $orderinfo{ecost} = $order_discount ? $c_price * ( 1 - $order_discount / 100 ) : $c_price;
                 $orderinfo{listprice} = $orderinfo{rrp} / $active_currency->rate;
                 $orderinfo{unitprice} = $orderinfo{ecost};
-                $orderinfo{total} = $orderinfo{ecost} * $c_quantity;
             } else {
                 $orderinfo{listprice} = 0;
             }
@@ -345,18 +337,10 @@ if ($op eq ""){
         # remove uncertainprice flag if we have found a price in the MARC record
         $orderinfo{uncertainprice} = 0 if $orderinfo{listprice};
 
-        %orderinfo = %{
-            C4::Acquisition::populate_order_with_prices(
-                {
-                    order        => \%orderinfo,
-                    booksellerid => $booksellerid,
-                    ordering     => 1,
-                    receiving    => 1,
-                }
-            )
-        };
-
-        my $order = Koha::Acquisition::Order->new( \%orderinfo )->store;
+        my $order = Koha::Acquisition::Order->new( \%orderinfo );
+        $order->populate_with_prices_for_ordering();
+        $order->populate_with_prices_for_receiving();
+        $order->store;
 
         # 4th, add items if applicable
         # parse the item sent by the form, and create an item just for the import_record_id we are dealing with
@@ -366,26 +350,24 @@ if ($op eq ""){
             my @subfields    = $input->multi_param('subfield');
             my @field_values = $input->multi_param('field_value');
             my @serials      = $input->multi_param('serial');
-            my @ind_tag   = $input->multi_param('ind_tag');
-            my @indicator = $input->multi_param('indicator');
-            my $item;
-            push @{ $item->{tags} },         $tags[0];
-            push @{ $item->{subfields} },    $subfields[0];
-            push @{ $item->{field_values} }, $field_values[0];
-            push @{ $item->{ind_tag} },      $ind_tag[0];
-            push @{ $item->{indicator} },    $indicator[0];
-            my $xml = TransformHtmlToXml( \@tags, \@subfields, \@field_values, \@indicator, \@ind_tag );
+            my $xml = TransformHtmlToXml( \@tags, \@subfields, \@field_values );
             my $record = MARC::Record::new_from_xml( $xml, 'UTF-8' );
             for (my $qtyloop=1;$qtyloop <= $c_quantity;$qtyloop++) {
                 my ( $biblionumber, $bibitemnum, $itemnumber ) = AddItemFromMarc( $record, $biblionumber );
                 $order->add_item( $itemnumber );
                 }
             } else {
-                SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' );
+                $import_record->status( 'imported' )->store;
             }
         }
         $imported++;
     }
+
+    # If all bibliographic records from the batch have been imported we modifying the status of the batch accordingly
+    SetImportBatchStatus( $import_batch_id, 'imported' )
+        if Koha::Import::Records->search({import_batch_id => $import_batch_id, status => 'imported' })->count
+           == Koha::Import::Records->search({import_batch_id => $import_batch_id})->count;
+
     # go to basket page
     if ( $imported ) {
         print $input->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=".$cgiparams->{'basketno'}."&amp;duplinbatch=$duplinbatch");
@@ -406,9 +388,6 @@ my $budget_loop = [];
 my $budgets_hierarchy = GetBudgetHierarchy;
 foreach my $r ( @{$budgets_hierarchy} ) {
     next unless (CanUserUseBudget($patron, $r, $userflags));
-    if ( !defined $r->{budget_amount} || $r->{budget_amount} == 0 ) {
-        next;
-    }
     push @{$budget_loop},
       { b_id  => $r->{budget_id},
         b_txt => $r->{budget_name},
@@ -436,8 +415,11 @@ sub import_batches_list {
     foreach my $batch (@$batches) {
         if ( $batch->{'import_status'} =~ /^staged$|^reverted$/ && $batch->{'record_type'} eq 'biblio') {
             # check if there is at least 1 line still staged
-            my $stagedList=GetImportRecordsRange($batch->{'import_batch_id'}, undef, 1, $batch->{import_status}, { order_by_direction => 'ASC' });
-            if (scalar @$stagedList) {
+            my $import_records_count = Koha::Import::Records->search({
+                import_batch_id => $batch->{'import_batch_id'},
+                status          => $batch->{import_status}
+            })->count;
+            if ( $import_records_count ) {
                 push @list, {
                         import_batch_id => $batch->{'import_batch_id'},
                         num_records => $batch->{'num_records'},
@@ -449,6 +431,7 @@ sub import_batches_list {
                 };
             } else {
                 # if there are no more line to includes, set the status to imported
+                # FIXME This should be removed in the future.
                 SetImportBatchStatus( $batch->{'import_batch_id'}, 'imported' );
             }
         }
@@ -462,7 +445,10 @@ sub import_biblios_list {
     my ($template, $import_batch_id) = @_;
     my $batch = GetImportBatch($import_batch_id,'staged');
     return () unless $batch and $batch->{import_status} =~ /^staged$|^reverted$/;
-    my $biblios = GetImportRecordsRange($import_batch_id,'','',$batch->{import_status});
+    my $import_records = Koha::Import::Records->search({
+        import_batch_id => $import_batch_id,
+        status => $batch->{import_status}
+    });
     my @list = ();
     my $item_error = 0;
 
@@ -484,30 +470,24 @@ sub import_biblios_list {
     }
 
     my $biblio_count = 0;
-    foreach my $biblio (@$biblios) {
+    while ( my $import_record = $import_records->next ) {
         my $item_id = 1;
         $biblio_count++;
-        my $citation = $biblio->{'title'};
-        $citation .= " $biblio->{'author'}" if $biblio->{'author'};
-        $citation .= " (" if $biblio->{'issn'} or $biblio->{'isbn'};
-        $citation .= $biblio->{'isbn'} if $biblio->{'isbn'};
-        $citation .= ", " if $biblio->{'issn'} and $biblio->{'isbn'};
-        $citation .= $biblio->{'issn'} if $biblio->{'issn'};
-        $citation .= ")" if $biblio->{'issn'} or $biblio->{'isbn'};
-        my $match = GetImportRecordMatches($biblio->{'import_record_id'}, 1);
+        my $matches = $import_record->get_import_record_matches({ chosen => 1 });
+        my $match = $matches->count ? $matches->next : undef;
+        my $match_biblio = $match ? Koha::Biblios->find({ biblionumber => $match->candidate_match_id }) : undef;
         my %cellrecord = (
-            import_record_id => $biblio->{'import_record_id'},
-            citation => $citation,
+            import_record_id => $import_record->import_record_id,
+            import_biblio => $import_record->import_biblio,
             import  => 1,
-            status => $biblio->{'status'},
-            record_sequence => $biblio->{'record_sequence'},
-            overlay_status => $biblio->{'overlay_status'},
-            match_biblionumber => $#$match > -1 ? $match->[0]->{'biblionumber'} : 0,
-            match_citation     => $#$match > -1 ? $match->[0]->{'title'} || '' . ' ' . $match->[0]->{'author'} || '': '',
-            match_score => $#$match > -1 ? $match->[0]->{'score'} : 0,
+            status => $import_record->status,
+            record_sequence => $import_record->record_sequence,
+            overlay_status => $import_record->overlay_status,
+            match_biblionumber => $match ? $match->candidate_match_id : 0,
+            match_citation     => $match_biblio ? ($match_biblio->title || '') . ' ' .( $match_biblio->author || ''): '',
+            match_score => $match ? $match->score : 0,
         );
-        my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} );
-        my $marcrecord = MARC::Record->new_from_usmarc($marcblob) || die "couldn't translate marc information";
+        my $marcrecord = $import_record->get_marc_record || die "couldn't translate marc information";
 
         my $infos = get_infos_syspref('MarcFieldsToOrder', $marcrecord, ['price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2','replacementprice']);
         my $price = $infos->{price};
@@ -604,8 +584,7 @@ sub import_biblios_list {
     my $overlay_action = GetImportBatchOverlayAction($import_batch_id);
     my $nomatch_action = GetImportBatchNoMatchAction($import_batch_id);
     my $item_action = GetImportBatchItemAction($import_batch_id);
-    my @itypes = Koha::ItemTypes->search;
-    $template->param(biblio_list => \@list,
+    $template->param(import_biblio_list => \@list,
                         num_results => $num_records,
                         import_batch_id => $import_batch_id,
                         "overlay_action_${overlay_action}" => 1,
@@ -615,9 +594,9 @@ sub import_biblios_list {
                         "item_action_${item_action}" => 1,
                         item_action => $item_action,
                         item_error => $item_error,
-                        libraries => scalar Koha::Libraries->search(),
+                        libraries => Koha::Libraries->search,
                         locationloop => \@locations,
-                        itypeloop => \@itypes,
+                        itemtypes => Koha::ItemTypes->search,
                         ccodeloop => \@ccodes,
                         notforloanloop => \@notforloans,
                     );
@@ -670,7 +649,7 @@ sub get_infos_syspref {
     my $syspref = C4::Context->preference($syspref_name);
     $syspref = "$syspref\n\n"; # YAML is anal on ending \n. Surplus does not hurt
     my $yaml = eval {
-        YAML::Load($syspref);
+        YAML::XS::Load(Encode::encode_utf8($syspref));
     };
     if ( $@ ) {
         warn "Unable to parse $syspref syspref : $@";
@@ -716,7 +695,7 @@ sub get_infos_syspref_on_item {
     my $syspref = C4::Context->preference($syspref_name);
     $syspref = "$syspref\n\n"; # YAML is anal on ending \n. Surplus does not hurt
     my $yaml = eval {
-        YAML::Load($syspref);
+        YAML::XS::Load(Encode::encode_utf8($syspref));
     };
     if ( $@ ) {
         warn "Unable to parse $syspref syspref : $@";