use C4::Branch; # GetBranches
use C4::Log; # logaction
+use Data::Dumper;
+
our ($VERSION,@ISA,@EXPORT,@EXPORT_OK,%EXPORT_TAGS);
# set the version for version checking
my $branch_borrower = $borrower->{'branchcode'};
my $dbh = C4::Context->dbh;
- my $branch_issuer = C4::Context->userenv->{'branchcode'};
-#TODO : specify issuer or borrower for circrule.
- my $type = (C4::Context->preference('item-level_itypes'))
+ my $branch_issuer = C4::Context->userenv->{'branchcode'};
+ # TODO : specify issuer or borrower for circrule.
+ my $type = (C4::Context->preference('item-level_itypes'))
? $item->{'itype'} # item-level
: $item->{'itemtype'}; # biblio-level
- my $sth =
+ my $sth =
$dbh->prepare(
'SELECT * FROM issuingrules
WHERE categorycode = ?
- AND branchcode = ?
- AND itemtype = ? '
+ AND itemtype = ?
+ AND branchcode = ?'
);
my $query2 = "SELECT COUNT(*) FROM issues i, biblioitems s1, items s2
WHERE i.borrowernumber = ?
AND i.returndate IS NULL
AND i.itemnumber = s2.itemnumber
- AND s1.biblioitemnumber = s2.biblioitemnumber"
- . (C4::Context->preference('item-level_itypes'))
- ? " AND s2.itype=? "
- : " AND s1.itemtype= ? ";
+ AND s1.biblioitemnumber = s2.biblioitemnumber";
+ (C4::Context->preference('item-level_itypes')) ? $query2.=" AND s2.itype=? " : $query2.=" AND s1.itemtype= ? ";
my $sth2= $dbh->prepare($query2);
my $sth3 =
$dbh->prepare(
my %issuingimpossible; # filled with problems that causes the issue to be IMPOSSIBLE
my $item = GetItem(GetItemnumberFromBarcode( $barcode ));
my $issue = GetItemIssue($item->{itemnumber});
+ my $biblioitem = GetBiblioItemData($item->{biblioitemnumber});
+ $item->{'itemtype'}=$biblioitem->{'itemtype'};
my $dbh = C4::Context->dbh;
#
#
# JB34 CHECKS IF BORROWERS DONT HAVE ISSUE TOO MANY BOOKS
#
-
my $toomany = TooMany( $borrower, $item->{biblionumber}, $item );
$needsconfirmation{TOO_MANY} = $toomany if $toomany;
$dbh->prepare(
"select issuelength from issuingrules where categorycode=? and itemtype=? and branchcode=? and issuelength is not null"
);
-
+# warn "in get loan lenght $borrowertype $itemtype $branchcode ";
# try to find issuelength & return the 1st available.
# check with borrowertype, itemtype and branchcode, then without one of those parameters
$sth->execute( $borrowertype, $itemtype, $branchcode );
=head2 AddReturn
($doreturn, $messages, $iteminformation, $borrower) =
- &AddReturn($barcode, $branch);
+ &AddReturn($barcode, $branch, $exemptfine);
Returns a book.
C<$barcode> is the bar code of the book being returned. C<$branch> is
-the code of the branch where the book is being returned.
+the code of the branch where the book is being returned. C<$exemptfine>
+indicates that overdue charges for the item will not be applied.
C<&AddReturn> returns a list of four items:
=cut
sub AddReturn {
- my ( $barcode, $branch ) = @_;
+ my ( $barcode, $branch, $exemptfine ) = @_;
my $dbh = C4::Context->dbh;
my $messages;
my $doreturn = 1;
# get information on item
my $iteminformation = GetItemIssue( GetItemnumberFromBarcode($barcode));
+ my $biblio = GetBiblioFromItemNumber($iteminformation->{'itemnumber'});
unless ($iteminformation->{'itemnumber'} ) {
$messages->{'BadBarcode'} = $barcode;
$doreturn = 0;
if ( $hbr && $branches->{$hbr}->{'PE'} ) {
$messages->{'IsPermanent'} = $hbr;
}
-
+
+ # if independent branches are on and returning to different branch, refuse the return
+ if ($hbr ne C4::Context->userenv->{'branch'} && C4::Context->preference("IndependantBranches")){
+ $messages->{'Wrongbranch'} = 1;
+ $doreturn=0;
+ }
+
# check that the book has been cancelled
if ( $iteminformation->{'wthdrawn'} ) {
$messages->{'wthdrawn'} = 1;
my $sth = $dbh->prepare("UPDATE items SET onloan = NULL where itemnumber = ?");
$sth->execute($iteminformation->{'itemnumber'});
$sth->finish();
- my $record = GetMarcItem( $iteminformation->{'biblionumber'}, $iteminformation->{'itemnumber'} );
- my $frameworkcode = GetFrameworkCode( $iteminformation->{'biblionumber'} );
- ModItemInMarc( $record, $iteminformation->{'biblionumber'}, $iteminformation->{'itemnumber'}, $frameworkcode );
+ my $record = GetMarcItem( $biblio->{'biblionumber'}, $iteminformation->{'itemnumber'} );
+ my $frameworkcode = GetFrameworkCode( $biblio->{'biblionumber'} );
+ ModItemInMarc( $record, $biblio->{'biblionumber'}, $iteminformation->{'itemnumber'}, $frameworkcode );
if ($iteminformation->{borrowernumber}){
($borrower) = C4::Members::GetMemberDetails( $iteminformation->{borrowernumber}, 0 );
}
# fix up the overdues in accounts...
FixOverduesOnReturn( $borrower->{'borrowernumber'},
- $iteminformation->{'itemnumber'} );
+ $iteminformation->{'itemnumber'}, $exemptfine );
# find reserves.....
# if we don't have a reserve with the status W, we launch the Checkreserves routine
#we check, if we don't have reserv or transfert for this document, if not, return it to homebranch .
if ( ($iteminformation->{'holdingbranch'} ne $iteminformation->{'homebranch'}) and not $messages->{'WrongTransfer'} and ($validTransfert ne 1) and ($reserveDone ne 1) ){
- if (C4::Context->preference("AutomaticItemReturn") == 1) {
- ModItemTransfer($iteminformation->{'itemnumber'}, C4::Context->userenv->{'branch'}, $iteminformation->{'homebranch'});
- $messages->{'WasTransfered'} = 1;
- warn "was transfered";
- }
+ if (C4::Context->preference("AutomaticItemReturn") == 1) {
+ ModItemTransfer($iteminformation->{'itemnumber'}, C4::Context->userenv->{'branch'}, $iteminformation->{'homebranch'});
+ $messages->{'WasTransfered'} = 1;
+ }
+ else {
+ $messages->{'NeedsTransfer'} = 1;
+ }
}
}
return ( $doreturn, $messages, $iteminformation, $borrower );
=head2 FixOverduesOnReturn
- &FixOverduesOnReturn($brn,$itm);
+ &FixOverduesOnReturn($brn,$itm, $exemptfine);
C<$brn> borrowernumber
=cut
sub FixOverduesOnReturn {
- my ( $borrowernumber, $item ) = @_;
+ my ( $borrowernumber, $item, $exemptfine ) = @_;
my $dbh = C4::Context->dbh;
# check for overdue fine
$sth->execute( $borrowernumber, $item );
# alter fine to show that the book has been returned
- if ( my $data = $sth->fetchrow_hashref ) {
- my $usth =
- $dbh->prepare(
-"UPDATE accountlines SET accounttype='F' WHERE (borrowernumber = ?) AND (itemnumber = ?) AND (accountno = ?)"
- );
- $usth->execute( $borrowernumber, $item, $data->{'accountno'} );
+ my $data;
+ if ($data = $sth->fetchrow_hashref) {
+ my $uquery =($exemptfine)? "update accountlines set accounttype='FFOR', amountoutstanding=0":"update accountlines set accounttype='F' ";
+ $uquery .= " where (borrowernumber = ?) and (itemnumber = ?) and (accountno = ?)";
+ my $usth = $dbh->prepare($uquery);
+ $usth->execute($borrowernumber,$item ,$data->{'accountno'});
$usth->finish();
}
+
$sth->finish();
return;
}
if ($amountleft > 0){
$amountleft*=-1;
}
- my $desc="Book Returned ".$iteminfo->{'barcode'};
+ my $desc="Item Returned ".$iteminfo->{'barcode'};
$usth = $dbh->prepare("INSERT INTO accountlines
(borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding)
VALUES (?,?,now(),?,?,'CR',?)");
projects / koha.git / blobdiff