From a9806b446d09d9968f3938765115ca81328b5639 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 25 Apr 2013 09:47:53 +0200 Subject: [PATCH] Bug 10088: FIX adding an order from a staged file. Content-Type: text/plain; charset="utf-8" Bug 9902 introduced an issue in the C4::Items::PrepareItemrecordDisplay routine. The existence of $defaulvalue hashref should be tested before getting to the branchcode key. Test plan: Before applying the patch, an error occurred when you try to create an order from a staged file. After applying the patch, the error does not appear anymore. Signed-off-by: Mathieu Saby Signed-off-by: Mason James --- C4/Items.pm | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/C4/Items.pm b/C4/Items.pm index e173dc2..89b092b 100644 --- a/C4/Items.pm +++ b/C4/Items.pm @@ -2709,7 +2709,11 @@ sub PrepareItemrecordDisplay { $authorised_lib{$branchcode} = $branchname; } } - $defaultvalue = $defaultvalues->{branchcode} || C4::Context->userenv->{branch}; + + $defaultvalue = C4::Context->userenv->{branch}; + if ( $defaultvalues and $defaultvalues->{branchcode} ) { + $defaultvalue = $defaultvalues->{branchcode}; + } #----- itemtypes } elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) { -- 1.7.2.5