X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=acqui%2Faddorderiso2709.pl;h=43abac8207d69bdfd7f80a3445fd97b826514428;hb=9d6d641d1f8b77271800f43bc027b651f9aea52b;hp=ea5fa0fe8a6193f5357a186f195675b1561fb16f;hpb=7c4565428d85b08fa2f375c0ba56a160a4750d9c;p=srvgit diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl index ea5fa0fe8a..43abac8207 100755 --- a/acqui/addorderiso2709.pl +++ b/acqui/addorderiso2709.pl @@ -2,7 +2,7 @@ #A script that lets the user populate a basket from an iso2709 file #the script first displays a list of import batches, then when a batch is selected displays all the biblios in it. -#The user can then pick which biblios he wants to order +#The user can then pick which biblios they want to order # Copyright 2008 - 2011 BibLibre SARL # @@ -23,39 +23,44 @@ 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( GetImportRecordsRange GetImportRecordMarc GetImportRecordMatches sub SetImportRecordStatus SetMatchedBiblionumber 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::Acquisition qw( populate_order_with_prices ); +use C4::Biblio qw( + AddBiblio + GetMarcFromKohaField + GetMarcPrice + GetMarcQuantity + TransformHtmlToXml +); +use C4::Items qw( PrepareItemrecordDisplay sub AddItemFromMarc ); +use C4::Budgets qw( GetBudget GetBudgets GetBudgetHierarchy CanUserUseBudget GetBudgetByCode ); +use C4::Acquisition qw( populate_order_with_prices ); use C4::Suggestions; # GetSuggestion use C4::Members; use Koha::Number::Price; use Koha::Libraries; +use Koha::Acquisition::Baskets; use Koha::Acquisition::Currencies; -use Koha::Acquisition::Order; +use Koha::Acquisition::Orders; use Koha::Acquisition::Booksellers; +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; @@ -77,6 +82,7 @@ if ($cgiparams->{'import_batch_id'} && $op eq ""){ if (! $cgiparams->{'basketno'}){ die "Basketnumber required to order from iso2709 file import"; } +my $basket = Koha::Acquisition::Baskets->find( $cgiparams->{basketno} ); # # 1st step = choose the file to import into acquisition @@ -100,8 +106,7 @@ if ($op eq ""){ "allmatch" => $allmatch, ); import_biblios_list($template, $cgiparams->{'import_batch_id'}); - my $basket = GetBasket($cgiparams->{basketno}); - if ( C4::Context->preference('AcqCreateItem') eq 'ordering' && !$basket->{is_standing} ) { + if ( $basket->effective_create_items eq 'ordering' && !$basket->is_standing ) { # prepare empty item form my $cell = PrepareItemrecordDisplay( '', '', '', 'ACQ' ); @@ -138,6 +143,7 @@ if ($op eq ""){ 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,6 +153,7 @@ if ($op eq ""){ my $biblio_count = 0; for my $biblio (@$biblios){ $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'} ); @@ -160,26 +167,26 @@ if ($op eq ""){ my $c_sort1 = shift( @sort1 ) || $input->param('all_sort1') || ''; my $c_sort2 = shift( @sort2 ) || $input->param('all_sort2') || ''; - # 1st insert the biblio, or find it through matcher + # Insert the biblio, or find it through matcher unless ( $biblionumber ) { if ($matcher_id) { if ( $matcher_id eq '_TITLE_AUTHOR_' ) { - $duplinbatch = $import_batch_id if FindDuplicate($marcrecord); + $duplifound = 1 if FindDuplicate($marcrecord); } else { my $matcher = C4::Matcher->fetch($matcher_id); my @matches = $matcher->get_matches( $marcrecord, my $max_matches = 1 ); - $duplinbatch = $import_batch_id if @matches; + $duplifound = 1 if @matches; } - next if $duplinbatch; + $duplinbatch = $import_batch_id and next if $duplifound; } # add the biblio 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) ) { @@ -191,14 +198,12 @@ if ($op eq ""){ } ( $biblionumber, $bibitemnum ) = AddBiblio( $marcrecord, $cgiparams->{'frameworkcode'} || '' ); SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' ); - # 2nd add authorities if applicable - if (C4::Context->preference("BiblioAddsAuthorities")){ - my $headings_linked =BiblioAutoLink($marcrecord, $cgiparams->{'frameworkcode'}); - } } else { SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' ); } + SetMatchedBiblionumber( $biblio->{import_record_id}, $biblionumber ); + # Add items from MarcItemFieldsToOrder my @homebranches = $input->multi_param('homebranch_' . $biblio_count); my $count = scalar @homebranches; @@ -207,27 +212,38 @@ if ($op eq ""){ 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('ccodes_' . $biblio_count); - my @notforloans = $input->multi_param('notforloans_' . $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 $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], - notforloan => $notforloans[$i], - uri => $uris[$i], - copynumber => $copynos[$i], - price => $itemprices[$i], - }, $biblionumber); + 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 @@ -235,10 +251,13 @@ 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]; } # Create orderlines from MarcItemFieldsToOrder - while(my ($budget_id, $infos) = each $budget_hash) { + while(my ($budget_id, $infos) = each %$budget_hash) { if ($budget_id) { my %orderinfo = ( biblionumber => $biblionumber, @@ -254,24 +273,15 @@ if ($op eq ""){ # 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{gstrate} = $bookseller->{gstrate}; - my $c = $c_discount ? $c_discount : $bookseller->{discount} / 100; - if ( $bookseller->{listincgst} ) { - if ( $c_discount ) { - $orderinfo{ecost} = $price; - $orderinfo{rrp} = $orderinfo{ecost} / ( 1 - $c ); - } else { - $orderinfo{ecost} = $price * ( 1 - $c ); - $orderinfo{rrp} = $price; - } + $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 { - if ( $c_discount ) { - $orderinfo{ecost} = $price / ( 1 + $orderinfo{gstrate} ); - $orderinfo{rrp} = $orderinfo{ecost} / ( 1 - $c ); - } else { - $orderinfo{rrp} = $price / ( 1 + $orderinfo{gstrate} ); - $orderinfo{ecost} = $orderinfo{rrp} * ( 1 - $c ); - } + $orderinfo{ecost} = $price * ( 1 - $c ); + $orderinfo{rrp} = $price; } $orderinfo{listprice} = $orderinfo{rrp} / $active_currency->rate; $orderinfo{unitprice} = $orderinfo{ecost}; @@ -279,22 +289,36 @@ if ($op eq ""){ } else { $orderinfo{listprice} = 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}; - my $order = Koha::Acquisition::Order->new( \%orderinfo )->insert; + + %orderinfo = %{ + C4::Acquisition::populate_order_with_prices( + { + order => \%orderinfo, + booksellerid => $booksellerid, + ordering => 1, + receiving => 1, + } + ) + }; + + my $order = Koha::Acquisition::Order->new( \%orderinfo )->store; + $order->add_item( $_ ) for @{ $budget_hash->{$budget_id}->{itemnumbers} }; } } } else { # 3rd add order - my $patron = C4::Members::GetMember( borrowernumber => $loggedinuser ); + my $patron = Koha::Patrons->find( $loggedinuser ); # get quantity in the MARC record (1 if none) my $quantity = GetMarcQuantity($marcrecord, C4::Context->preference('marcflavour')) || 1; my %orderinfo = ( biblionumber => $biblionumber, basketno => $cgiparams->{'basketno'}, quantity => $c_quantity, - branchcode => $patron->{branchcode}, + branchcode => $patron->branchcode, budget_id => $c_budget_id, uncertainprice => 1, sort1 => $c_sort1, @@ -302,6 +326,7 @@ if ($op eq ""){ order_internalnote => $cgiparams->{'all_order_internalnote'}, order_vendornote => $cgiparams->{'all_order_vendornote'}, currency => $cgiparams->{'all_currency'}, + replacementprice => shift( @orderreplacementprices ), ); # get the price if there is one. my $price= shift( @prices ) || GetMarcPrice($marcrecord, C4::Context->preference('marcflavour')); @@ -310,24 +335,15 @@ if ($op eq ""){ # 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{gstrate} = $bookseller->{gstrate}; - my $c = $c_discount ? $c_discount : $bookseller->{discount} / 100; - if ( $bookseller->{listincgst} ) { - if ( $c_discount ) { - $orderinfo{ecost} = $price; - $orderinfo{rrp} = $orderinfo{ecost} / ( 1 - $c ); - } else { - $orderinfo{ecost} = $price * ( 1 - $c ); - $orderinfo{rrp} = $price; - } + $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 { - if ( $c_discount ) { - $orderinfo{ecost} = $price / ( 1 + $orderinfo{gstrate} ); - $orderinfo{rrp} = $orderinfo{ecost} / ( 1 - $c ); - } else { - $orderinfo{rrp} = $price / ( 1 + $orderinfo{gstrate} ); - $orderinfo{ecost} = $orderinfo{rrp} * ( 1 - $c ); - } + $orderinfo{ecost} = $price * ( 1 - $c ); + $orderinfo{rrp} = $price; } $orderinfo{listprice} = $orderinfo{rrp} / $active_currency->rate; $orderinfo{unitprice} = $orderinfo{ecost}; @@ -350,13 +366,12 @@ if ($op eq ""){ ) }; - my $order = Koha::Acquisition::Order->new( \%orderinfo )->insert; + my $order = Koha::Acquisition::Order->new( \%orderinfo )->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 # this is not optimised, but it's working ! - my $basket = GetBasket($cgiparams->{basketno}); - if ( C4::Context->preference('AcqCreateItem') eq 'ordering' && !$basket->{is_standing} ) { + if ( $basket->effective_create_items eq 'ordering' && !$basket->is_standing ) { my @tags = $input->multi_param('tag'); my @subfields = $input->multi_param('subfield'); my @field_values = $input->multi_param('field_value'); @@ -374,13 +389,19 @@ if ($op eq ""){ 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' ); } } $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 @{ GetImportRecordsRange( $import_batch_id, undef, undef, 'imported' )} + == @{ GetImportRecordsRange( $import_batch_id )}; + # go to basket page if ( $imported ) { print $input->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=".$cgiparams->{'basketno'}."&duplinbatch=$duplinbatch"); @@ -393,18 +414,14 @@ if ($op eq ""){ my $budgets = GetBudgets(); my $budget_id = @$budgets[0]->{'budget_id'}; # build bookfund list -my $borrower = GetMember( 'borrowernumber' => $loggedinuser ); -my ( $flags, $homebranch ) = ( $borrower->{'flags'}, $borrower->{'branchcode'} ); +my $patron = Koha::Patrons->find( $loggedinuser )->unblessed; my $budget = GetBudget($budget_id); # build budget list my $budget_loop = []; my $budgets_hierarchy = GetBudgetHierarchy; foreach my $r ( @{$budgets_hierarchy} ) { - next unless (CanUserUseBudget($borrower, $r, $userflags)); - if ( !defined $r->{budget_amount} || $r->{budget_amount} == 0 ) { - next; - } + next unless (CanUserUseBudget($patron, $r, $userflags)); push @{$budget_loop}, { b_id => $r->{budget_id}, b_txt => $r->{budget_name}, @@ -445,6 +462,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,8 +480,9 @@ sub import_biblios_list { my @list = (); my $item_error = 0; - my $ccodes = GetKohaAuthorisedValues("items.ccode"); - my $locations = GetKohaAuthorisedValues("items.location"); + my $ccodes = { map { $_->{authorised_value} => $_->{opac_description} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => '', kohafield => 'items.ccode' } ) }; + my $locations = { map { $_->{authorised_value} => $_->{opac_description} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => '', kohafield => 'items.location' } ) }; + my $notforloans = { map { $_->{authorised_value} => $_->{lib} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => '', kohafield => 'items.notforloan' } ) }; # location list my @locations; foreach (sort keys %$locations) { @@ -473,7 +492,10 @@ sub import_biblios_list { foreach (sort {$ccodes->{$a} cmp $ccodes->{$b}} keys %$ccodes) { push @ccodes, { code => $_, description => $ccodes->{$_} }; } - + my @notforloans; + foreach (sort {$notforloans->{$a} cmp $notforloans->{$b}} keys %$notforloans) { + push @notforloans, { code => $_, description => $notforloans->{$_} }; + } my $biblio_count = 0; foreach my $biblio (@$biblios) { @@ -501,8 +523,9 @@ sub import_biblios_list { my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} ); my $marcrecord = MARC::Record->new_from_usmarc($marcblob) || die "couldn't translate marc information"; - my $infos = get_infos_syspref('MarcFieldsToOrder', $marcrecord, ['price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2']); + my $infos = get_infos_syspref('MarcFieldsToOrder', $marcrecord, ['price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2','replacementprice']); my $price = $infos->{price}; + my $replacementprice = $infos->{replacementprice}; my $quantity = $infos->{quantity}; my $budget_code = $infos->{budget_code}; my $discount = $infos->{discount}; @@ -519,7 +542,7 @@ sub import_biblios_list { # Items my @itemlist = (); my $all_items_quantity = 0; - my $alliteminfos = get_infos_syspref_on_item('MarcItemFieldsToOrder', $marcrecord, ['homebranch', 'holdingbranch', 'itype', 'nonpublic_note', 'public_note', 'loc', 'ccode', 'notforloan', 'uri', 'copyno', 'price', 'quantity', 'budget_code']); + my $alliteminfos = get_infos_syspref_on_item('MarcItemFieldsToOrder', $marcrecord, ['homebranch', 'holdingbranch', 'itype', 'nonpublic_note', 'public_note', 'loc', 'ccode', 'notforloan', 'uri', 'copyno', 'price', 'replacementprice', 'itemcallnumber', 'quantity', 'budget_code']); if ($alliteminfos != -1) { foreach my $iteminfos (@$alliteminfos) { my $item_homebranch = $iteminfos->{homebranch}; @@ -534,7 +557,16 @@ sub import_biblios_list { my $item_copyno = $iteminfos->{copyno}; my $item_quantity = $iteminfos->{quantity} || 1; my $item_budget_code = $iteminfos->{budget_code}; + my $item_budget_id; + if ( $iteminfos->{budget_code} ) { + my $item_budget = GetBudgetByCode( $iteminfos->{budget_code} ); + if ( $item_budget ) { + $item_budget_id = $item_budget->{budget_id}; + } + } my $item_price = $iteminfos->{price}; + my $item_replacement_price = $iteminfos->{replacementprice}; + my $item_callnumber = $iteminfos->{itemcallnumber}; for (my $i = 0; $i < $item_quantity; $i++) { @@ -552,8 +584,10 @@ sub import_biblios_list { 'uri' => $item_uri, 'copyno' => $item_copyno, 'quantity' => $item_quantity, - 'budget_code' => $item_budget_code || $budget_code, + 'budget_id' => $item_budget_id || $budget_id, 'itemprice' => $item_price || $price, + 'replacementprice' => $item_replacement_price || $replacementprice, + 'itemcallnumber' => $item_callnumber, ); $all_items_quantity++; push @itemlist, \%itemrecord; @@ -563,12 +597,13 @@ sub import_biblios_list { $cellrecord{'iteminfos'} = \@itemlist; } else { - $item_error = 1; + $cellrecord{'item_error'} = 1; } push @list, \%cellrecord; if ($alliteminfos == -1 || scalar(@$alliteminfos) == 0) { $cellrecord{price} = $price || ''; + $cellrecord{replacementprice} = $replacementprice || ''; $cellrecord{quantity} = $quantity || ''; $cellrecord{budget_id} = $budget_id || ''; $cellrecord{discount} = $discount || ''; @@ -598,6 +633,7 @@ sub import_biblios_list { locationloop => \@locations, itypeloop => \@itypes, ccodeloop => \@ccodes, + notforloanloop => \@notforloans, ); batch_info($template, $batch); } @@ -648,7 +684,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 : $@"; @@ -672,18 +708,21 @@ sub get_infos_syspref { sub equal_number_of_fields { my ($tags_list, $record) = @_; - my $refcount = 0; - my $count = 0; + my $tag_fields_count; for my $tag (@$tags_list) { - return -1 if $count != $refcount; - $count = 0; - for my $field ($record->field($tag)) { - $count++; + my @fields = $record->field($tag); + $tag_fields_count->{$tag} = scalar @fields; + } + + my $tags_count; + foreach my $key ( keys %$tag_fields_count ) { + if ( $tag_fields_count->{$key} > 0 ) { # Having 0 of a field is ok + $tags_count //= $tag_fields_count->{$key}; # Start with the count from the first occurrence + return -1 if $tag_fields_count->{$key} != $tags_count; # All counts of various fields should be equal if they exist } - $refcount = $count if ($refcount == 0); } - return -1 if $count != $refcount; - return $count; + + return $tags_count; } sub get_infos_syspref_on_item { @@ -691,7 +730,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 : $@"; @@ -713,7 +752,7 @@ sub get_infos_syspref_on_item { @tags_list = List::MoreUtils::uniq(@tags_list); my $tags_count = equal_number_of_fields(\@tags_list, $record); - # Return if the number of theses fields in the record is not the same. + # Return if the number of these fields in the record is not the same. return -1 if $tags_count == -1; # Gather the fields @@ -734,7 +773,7 @@ sub get_infos_syspref_on_item { for my $field ( @fields ) { my ( $f, $sf ) = split /\$/, $field; next unless $f and $sf; - my $v = $fields_hash->{$f}[$i]->subfield( $sf ); + my $v = $fields_hash->{$f}[$i] ? $fields_hash->{$f}[$i]->subfield( $sf ) : undef; $r->{$field_name} = $v if (defined $v); last if $yaml->{$field}; }