*** request.pl 2012-07-19 12:18:13.000000000 +0200 --- request.pl.old 2012-07-19 12:49:08.000000000 +0200 *************** *** 251,257 **** $count--; } ! if ( defined $borrowerinfo && $borrowerinfo->{borrowernumber} && ($borrowerinfo->{borrowernumber} eq $res->{borrowernumber}) ) { #PK MODIFIED $warnings = 1; $alreadyreserved = 1; $biblioloopiter{warn} = 1; --- 251,257 ---- $count--; } ! if ( defined $borrowerinfo && ($borrowerinfo->{borrowernumber} eq $res->{borrowernumber}) ) { $warnings = 1; $alreadyreserved = 1; $biblioloopiter{warn} = 1; *************** *** 440,446 **** my $policy_holdallowed = 1; $item->{'holdallowed'} = $branchitemrule->{'holdallowed'}; ! $borrowerinfo->{'branchcode'}='' if !($borrowerinfo->{'branchcode'}); #PK MODIFIED if ( $branchitemrule->{'holdallowed'} == 0 || ( $branchitemrule->{'holdallowed'} == 1 && $borrowerinfo->{'branchcode'} ne $item->{'homebranch'} ) ) { --- 440,446 ---- my $policy_holdallowed = 1; $item->{'holdallowed'} = $branchitemrule->{'holdallowed'}; ! if ( $branchitemrule->{'holdallowed'} == 0 || ( $branchitemrule->{'holdallowed'} == 1 && $borrowerinfo->{'branchcode'} ne $item->{'homebranch'} ) ) { *************** *** 516,522 **** ); } ! if ( defined $res && $res->{'found'} && ($res->{'found'} eq 'W' || $res->{'found'} eq 'T' )) { #PK MODIFIED my $item = $res->{'itemnumber'}; $item = GetBiblioFromItemNumber($item,undef); $reserve{'wait'}= 1; --- 516,522 ---- ); } ! if ( defined $res->{'found'} && $res->{'found'} eq 'W' || $res->{'found'} eq 'T' ) { my $item = $res->{'itemnumber'}; $item = GetBiblioFromItemNumber($item,undef); $reserve{'wait'}= 1; *** placerequest.pl 2012-07-19 12:25:58.000000000 +0200 --- placerequest.pl.old 2012-07-19 12:49:00.000000000 +0200 *************** *** 72,78 **** # if we have an item selectionned, and the pickup branch is the same as the holdingbranch # of the document, we force the value $rank and $found . ! if ($checkitem && $checkitem ne ''){ #PK MODIFIED $rank[0] = '0' unless C4::Context->preference('ReservesNeedReturns'); my $item = $checkitem; $item = GetItem($item); --- 72,78 ---- # if we have an item selectionned, and the pickup branch is the same as the holdingbranch # of the document, we force the value $rank and $found . ! if ($checkitem ne ''){ $rank[0] = '0' unless C4::Context->preference('ReservesNeedReturns'); my $item = $checkitem; $item = GetItem($item); *************** *** 98,104 **** } my $const; ! if ($checkitem && $checkitem ne ''){ #PK MODIFIED my $item = GetItem($checkitem); if ($item->{'biblionumber'} ne $biblionumber) { $biblionumber = $item->{'biblionumber'}; --- 98,104 ---- } my $const; ! if ($checkitem ne ''){ my $item = GetItem($checkitem); if ($item->{'biblionumber'} ne $biblionumber) { $biblionumber = $item->{'biblionumber'}; *************** *** 115,121 **** if ($input->param('request') eq 'any'){ # place a request on 1st available AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem,$found); ! } elsif ($reqbib[0] && $reqbib[0] ne ''){ #PK MODIFIED # FIXME : elsif probably never reached, (see top of the script) # place a request on a given item AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,'o',\@reqbib,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem, $found); --- 115,121 ---- if ($input->param('request') eq 'any'){ # place a request on 1st available AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem,$found); ! } elsif ($reqbib[0] ne ''){ # FIXME : elsif probably never reached, (see top of the script) # place a request on a given item AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,'o',\@reqbib,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem, $found);