From 1e812b3a02c24829ee63b3dfe18aac4d1ea1f7c2 Mon Sep 17 00:00:00 2001 From: Jane Wagner Date: Fri, 1 Apr 2011 10:28:04 -0400 Subject: [PATCH] Bug 6034 - Shelving cart feature can wipe permanent shelving location in certain circumstances Bugfix for problems when shelving cart used without In Processing settings --- C4/Items.pm | 3 +++ cataloguing/additem.pl | 6 +++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/C4/Items.pm b/C4/Items.pm index 939e682..e55ea1d 100644 --- a/C4/Items.pm +++ b/C4/Items.pm @@ -413,6 +413,7 @@ my %default_values_for_mod_from_marc = ( itemnotes => undef, itype => undef, location => undef, + permanent_location => undef, materials => undef, notforloan => 0, paidfor => undef, @@ -1952,6 +1953,7 @@ sub _koha_new_item { holdingbranch = ?, paidfor = ?, location = ?, + permanent_location = ?, onloan = ?, issues = ?, renewals = ?, @@ -1989,6 +1991,7 @@ sub _koha_new_item { $item->{'holdingbranch'}, $item->{'paidfor'}, $item->{'location'}, + $item->{'permanent_location'}, $item->{'onloan'}, $item->{'issues'}, $item->{'renewals'}, diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl index b2b1192..0dfc304 100755 --- a/cataloguing/additem.pl +++ b/cataloguing/additem.pl @@ -65,12 +65,16 @@ sub get_item_from_barcode { sub set_item_default_location { my $itemnumber = shift; + my $item = GetItem( $itemnumber ); if ( C4::Context->preference('NewItemsDefaultLocation') ) { - my $item = GetItem( $itemnumber ); $item->{'permanent_location'} = $item->{'location'}; $item->{'location'} = C4::Context->preference('NewItemsDefaultLocation'); ModItem( $item, undef, $itemnumber); } + else { + $item->{'permanent_location'} = $item->{'location'} if !defined($item->{'permanent_location'}); + ModItem( $item, undef, $itemnumber); + } } # NOTE: This code is subject to change in the future with the implemenation of ajax based autobarcode code -- 1.5.6.5