From 6028469a6ccd16ba7e0e31d2f5d5f8bb1716f46c Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 18 Aug 2014 13:25:48 +0200 Subject: [PATCH] Bug 7817: Follow-up for original patch Content-Type: text/plain; charset=utf-8 This patch removes the commented line for permanent_location. It adds a more general comment. Adjusts the exists check on permanent_location. Adds a reference to bug 12817 that will deal with paidfor similarly. Signed-off-by: Marcel de Rooy --- C4/Items.pm | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/C4/Items.pm b/C4/Items.pm index f5ffada..b89a8df 100644 --- a/C4/Items.pm +++ b/C4/Items.pm @@ -443,6 +443,9 @@ Returns item record =cut my %default_values_for_mod_from_marc = ( +# DO NOT include (internal) item fields here. +# Only fields that are related to the MARC structure used in additem.pl +# Bug 7817 removed permanent_location. barcode => undef, booksellerid => undef, ccode => undef, @@ -459,10 +462,9 @@ my %default_values_for_mod_from_marc = ( itemnotes => undef, itype => undef, location => undef, -# permanent_location => undef, # "undef" counts as "exists" which disrupts proper handling of location and permanent_location in _do_column_fixes_for_mod() materials => undef, notforloan => 0, - paidfor => undef, + paidfor => undef, # should not be here: see BZ 12817 price => undef, replacementprice => undef, replacementpricedate => undef, @@ -2025,7 +2027,7 @@ sub _do_column_fixes_for_mod { (not defined $item->{'withdrawn'} or $item->{'withdrawn'} eq '')) { $item->{'withdrawn'} = 0; } - if (exists $item->{'location'} && !exists $item->{'permanent_location'}) { + if (exists $item->{'location'} && !$item->{'permanent_location'}) { $item->{'permanent_location'} = $item->{'location'}; } if (exists $item->{'timestamp'}) { -- 1.7.7.6