@@ -, +, @@ GetKohaAuthorisedValuesFromField - inventory prove t/db_dependent/Items/GetItemsForInventory.t --- t/db_dependent/Items/GetItemsForInventory.t | 6 +++++- tools/inventory.pl | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) --- a/t/db_dependent/Items/GetItemsForInventory.t +++ a/t/db_dependent/Items/GetItemsForInventory.t @@ -20,6 +20,8 @@ use Modern::Perl; use Test::More tests => 6; +use Koha::AuthorisedValues; + $| = 1; BEGIN { @@ -143,7 +145,9 @@ sub OldWay { my ($f, $sf) = C4::Biblio::GetMarcFromKohaField("items.$field", $row->{'frameworkcode'}); if (defined($f) and defined($sf)) { # We replace the code with it's description - my $authvals = C4::Koha::GetKohaAuthorisedValuesFromField($f, $sf, $row->{'frameworkcode'}); + my $av = Koha::AuthorisedValues->search_by_marc_field({ frameworkcode => $row->{frameworkcode}, tagfield => $f, tagsubfield => $sf, }); + $av = $av->count ? $av->unblessed : []; + my $authvals = { map { ( $_->{authorised_value} => $_->{lib} ) } @$av }; $row->{$field} = $authvals->{$row->{$field}} if defined $authvals && defined $row->{$field} && defined $authvals->{$row->{$field}}; } } --- a/tools/inventory.pl +++ a/tools/inventory.pl @@ -36,6 +36,7 @@ use C4::Circulation; use C4::Reports::Guided; #_get_column_defs use C4::Charset; use Koha::DateUtils; +use Koha::AuthorisedValues; use List::MoreUtils qw( none ); @@ -297,7 +298,9 @@ foreach my $item ( @scanned_items ) { my ($f, $sf) = GetMarcFromKohaField("items.$field", $fc); if ($f and $sf) { # We replace the code with it's description - my $authvals = C4::Koha::GetKohaAuthorisedValuesFromField($f, $sf, $fc); + my $av = Koha::AuthorisedValues->search_by_marc_field({ frameworkcode => $fc, tagfield => $f, tagsubfield => $sf, }); + $av = $av->count ? $av->unblessed : []; + my $authvals = { map { ( $_->{authorised_value} => $_->{lib} ) } @$av }; if ($authvals and defined $item->{$field} and defined $authvals->{$item->{$field}}) { $item->{$field} = $authvals->{$item->{$field}}; } --