From c0c0303fcc76788fd55d2fc5319dde9ccda008f1 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 24 Apr 2019 00:09:44 -0400 Subject: [PATCH] Bug 22762: Fix items.collection display on receiving Caused by commit 31c29fd31f557306233e6a2936148a5bb10b89a1 Bug 21206: Replace C4::Items::GetItem The log says: The method Koha::Item->collection is not covered by tests! It has highlighted an older problem: Since commit bb1e9c500c810402c64436c53bcc00ffb9a0b857 Bug 17248 - Koha::AuthorisedValues - Remove GetKohaAuthorisedValueLib the "Collection code" is not filled correctly (items.collection vs items.ccode). Test plan: - Set acqcreateitem to "when placing an order" - Receive an order with items => The "Collection code" column must be filled with the items.ccode value - Edit an item - Change the collection code value => The "Collection code" column must be filled with the new value Signed-off-by: Martin Renvoize (cherry picked from commit 49c99ced88af8d9d17d433c69322b862d30aee8a) Signed-off-by: Lucas Gass --- acqui/orderreceive.pl | 2 +- catalogue/getitem-ajax.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl index 1394d55324..f9dc493962 100755 --- a/acqui/orderreceive.pl +++ b/acqui/orderreceive.pl @@ -143,7 +143,7 @@ if ($AcqCreateItem eq 'receiving') { $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({frameworkcode => $fw, kohafield => 'items.location', authorised_value => $item->{location} }); $item->{location} = $descriptions->{lib} // ''; - $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({frameworkcode => $fw, kohafield => 'items.collection', authorised_value => $item->{collection} }); + $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({frameworkcode => $fw, kohafield => 'items.ccode', authorised_value => $item->{ccode} }); $item->{collection} = $descriptions->{lib} // ''; $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({frameworkcode => $fw, kohafield => 'items.materials', authorised_value => $item->{materials} }); diff --git a/catalogue/getitem-ajax.pl b/catalogue/getitem-ajax.pl index 10df69ef75..550dfee73e 100755 --- a/catalogue/getitem-ajax.pl +++ b/catalogue/getitem-ajax.pl @@ -66,7 +66,7 @@ if($itemnumber) { $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({ frameworkcode => $fw, kohafield => 'items.location', authorised_value => $item->{location} }); $item->{location} = $descriptions->{lib} // ''; - $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({ frameworkcode => $fw, kohafield => 'items.collection', authorised_value => $item->{collection} }); + $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({ frameworkcode => $fw, kohafield => 'items.ccode', authorised_value => $item->{ccode} }); $item->{collection} = $descriptions->{lib} // ''; $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({ frameworkcode => $fw, kohafield => 'items.materials', authorised_value => $item->{materials} }); -- 2.39.5