@@ -, +, @@ C4::Circulation - Run: $ prove prove t/db_dependent/Members/IssueSlip.t - Apply the patch - Run: $ prove prove t/db_dependent/Members/IssueSlip.t - Sign off :-D --- C4/Circulation.pm | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) --- a/C4/Circulation.pm +++ a/C4/Circulation.pm @@ -374,7 +374,7 @@ sub transferbook { $messages->{'WasTransfered'} = 1; } - ModDateLastSeen( $itemnumber ); + C4::Items::ModDateLastSeen( $itemnumber ); return ( $dotransfer, $messages, $biblio ); } @@ -664,7 +664,7 @@ sub CanBookBeIssued { my $onsite_checkout = $params->{onsite_checkout} || 0; my $override_high_holds = $params->{override_high_holds} || 0; - my $item = GetItem(GetItemnumberFromBarcode( $barcode )); + my $item = C4::Items::GetItem(GetItemnumberFromBarcode( $barcode )); my $issue = GetItemIssue($item->{itemnumber}); my $biblioitem = GetBiblioItemData($item->{biblioitemnumber}); $item->{'itemtype'}=$item->{'itype'}; @@ -716,7 +716,7 @@ sub CanBookBeIssued { borrowernumber => $borrower->{'borrowernumber'}, ccode => $item->{'ccode'}} ); - ModDateLastSeen( $item->{'itemnumber'} ); + C4::Items::ModDateLastSeen( $item->{'itemnumber'} ); return( { STATS => 1 }, {}); } if ( ref $borrower->{flags} ) { @@ -1281,7 +1281,7 @@ sub AddIssue { # Stop here if the patron or barcode doesn't exist if ( $borrower && $barcode && $barcodecheck ) { # find which item we issue - my $item = GetItem( '', $barcode ) + my $item = C4::Items::GetItem( '', $barcode ) or return; # if we don't get an Item, abort. my $branch = _GetCircControlBranch( $item, $borrower ); @@ -1386,7 +1386,7 @@ sub AddIssue { } } - ModItem( + C4::Items::ModItem( { issues => $item->{'issues'}, holdingbranch => C4::Context->userenv->{'branch'}, @@ -1397,7 +1397,7 @@ sub AddIssue { $item->{'biblionumber'}, $item->{'itemnumber'} ); - ModDateLastSeen( $item->{'itemnumber'} ); + C4::Items::ModDateLastSeen( $item->{'itemnumber'} ); # If it costs to borrow this book, charge it to the patron's account. my ( $charge, $itemtype ) = GetIssuingCharges( $item->{'itemnumber'}, $borrower->{'borrowernumber'} ); @@ -1850,7 +1850,7 @@ sub AddReturn { my $stat_type = 'return'; # get information on item - my $item = GetItem( undef, $barcode ); + my $item = C4::Items::GetItem( undef, $barcode ); unless ($item) { return ( 0, { BadBarcode => $barcode } ); # no barcode means no item or borrower. bail out. } @@ -1886,7 +1886,7 @@ sub AddReturn { $item->{location} = $item->{permanent_location}; } - ModItem( $item, $item->{'biblionumber'}, $item->{'itemnumber'} ); + C4::Items::ModItem( $item, $item->{'biblionumber'}, $item->{'itemnumber'} ); } # full item data, but no borrowernumber or checkout info (no issue) @@ -1910,7 +1910,7 @@ sub AddReturn { foreach my $key ( keys %$rules ) { if ( $item->{notforloan} eq $key ) { $messages->{'NotForLoanStatusUpdated'} = { from => $item->{notforloan}, to => $rules->{$key} }; - ModItem( { notforloan => $rules->{$key} }, undef, $itemnumber ); + C4::Items::ModItem( { notforloan => $rules->{$key} }, undef, $itemnumber ); last; } } @@ -1982,7 +1982,7 @@ sub AddReturn { } - ModItem({ onloan => undef }, $issue->{'biblionumber'}, $item->{'itemnumber'}); + C4::Items::ModItem({ onloan => undef }, $issue->{'biblionumber'}, $item->{'itemnumber'}); } # the holdingbranch is updated if the document is returned to another location. @@ -1992,7 +1992,7 @@ sub AddReturn { UpdateHoldingbranch($branch, $item->{'itemnumber'}); $item->{'holdingbranch'} = $branch; # update item data holdingbranch too } - ModDateLastSeen( $item->{'itemnumber'} ); + C4::Items::ModDateLastSeen( $item->{'itemnumber'} ); # check if we have a transfer for this document my ($datesent,$frombranch,$tobranch) = GetTransfers( $item->{'itemnumber'} ); @@ -2206,7 +2206,7 @@ sub MarkIssueReturned { AND itemnumber = ?"); $sth_del->execute($borrowernumber, $itemnumber); - ModItem( { 'onloan' => undef }, undef, $itemnumber ); + C4::Items::ModItem( { 'onloan' => undef }, undef, $itemnumber ); if ( C4::Context->preference('StoreLastBorrower') ) { my $item = Koha::Items->find( $itemnumber ); @@ -2437,7 +2437,7 @@ sub _FixAccountForLostAndReturned { VALUES (?,?,?,?)"); $usth->execute($borrowernumber, $data->{'accountno'}, $nextaccntno, $offset); } - ModItem({ paidfor => '' }, undef, $itemnumber); + C4::Items::ModItem({ paidfor => '' }, undef, $itemnumber); return; } @@ -2757,7 +2757,7 @@ sub CanBookBeRenewed { my $dbh = C4::Context->dbh; my $renews = 1; - my $item = GetItem($itemnumber) or return ( 0, 'no_item' ); + my $item = C4::Items::GetItem($itemnumber) or return ( 0, 'no_item' ); my $itemissue = GetItemIssue($itemnumber) or return ( 0, 'no_checkout' ); return ( 0, 'onsite_checkout' ) if $itemissue->{onsite_checkout}; @@ -2814,7 +2814,7 @@ sub CanBookBeRenewed { foreach my $b (@borrowernumbers) { my ($borr) = C4::Members::GetMemberDetails($b); foreach my $i (@itemnumbers) { - my $item = GetItem($i); + my $item = C4::Items::GetItem($i); if ( IsAvailableForItemLevelRequest( $item, $borr ) && CanItemBeReserved( $b, $i ) && !IsItemOnHoldAndFound($i) ) @@ -2940,7 +2940,7 @@ sub AddRenewal { my $datedue = shift; my $lastreneweddate = shift || DateTime->now(time_zone => C4::Context->tz)->ymd(); - my $item = GetItem($itemnumber) or return; + my $item = C4::Items::GetItem($itemnumber) or return; my $biblio = GetBiblioFromItemNumber($itemnumber) or return; my $dbh = C4::Context->dbh; @@ -2989,7 +2989,7 @@ sub AddRenewal { # Update the renewal count on the item, and tell zebra to reindex $renews = $biblio->{'renewals'} + 1; - ModItem({ renewals => $renews, onloan => $datedue->strftime('%Y-%m-%d %H:%M')}, $biblio->{'biblionumber'}, $itemnumber); + C4::Items::ModItem({ renewals => $renews, onloan => $datedue->strftime('%Y-%m-%d %H:%M')}, $biblio->{'biblionumber'}, $itemnumber); # Charge a new rental fee, if applicable? my ( $charge, $type ) = GetIssuingCharges( $itemnumber, $borrowernumber ); @@ -3062,7 +3062,7 @@ sub GetRenewCount { my $renewsleft = 0; my $borrower = C4::Members::GetMember( borrowernumber => $bornum); - my $item = GetItem($itemno); + my $item = C4::Items::GetItem($itemno); # Look in the issues table for this item, lent to this borrower, # and not yet returned. @@ -3111,7 +3111,7 @@ sub GetSoonestRenewDate { my $dbh = C4::Context->dbh; - my $item = GetItem($itemnumber) or return; + my $item = C4::Items::GetItem($itemnumber) or return; my $itemissue = GetItemIssue($itemnumber) or return; $borrowernumber ||= $itemissue->{borrowernumber}; @@ -3166,7 +3166,7 @@ sub GetLatestAutoRenewDate { my $dbh = C4::Context->dbh; - my $item = GetItem($itemnumber) or return; + my $item = C4::Items::GetItem($itemnumber) or return; my $itemissue = GetItemIssue($itemnumber) or return; $borrowernumber ||= $itemissue->{borrowernumber}; @@ -3559,7 +3559,7 @@ Simple methode for updating hodlingbranch in items BDD line sub UpdateHoldingbranch { my ( $branch,$itemnumber ) = @_; - ModItem({ holdingbranch => $branch }, undef, $itemnumber); + C4::Items::ModItem({ holdingbranch => $branch }, undef, $itemnumber); } =head2 CalcDateDue @@ -3753,7 +3753,7 @@ sub ReturnLostItem{ my @datearr = localtime(time); my $date = ( 1900 + $datearr[5] ) . "-" . ( $datearr[4] + 1 ) . "-" . $datearr[3]; my $bor = "$borrower->{'firstname'} $borrower->{'surname'} $borrower->{'cardnumber'}"; - ModItem({ paidfor => $old_note."Paid for by $bor $date" }, undef, $itemnum); + C4::Items::ModItem({ paidfor => $old_note."Paid for by $bor $date" }, undef, $itemnum); } @@ -3850,7 +3850,7 @@ sub ProcessOfflineReturn { undef, $operation->{timestamp}, ); - ModItem( + C4::Items::ModItem( { renewals => 0, onloan => undef }, $issue->{'biblionumber'}, $itemnumber @@ -3921,7 +3921,7 @@ sub ProcessOfflinePayment { sub TransferSlip { my ($branch, $itemnumber, $barcode, $to_branch) = @_; - my $item = GetItem( $itemnumber, $barcode ) + my $item = C4::Items::GetItem( $itemnumber, $barcode ) or return; return C4::Letters::GetPreparedLetter ( --