Attachment #3310 for bug #5872

View | Details | Raw Unified | Return to bug 5872
Collapse All | Expand All




use C4::Biblio;
use C4::Items;
use C4::Members;
use C4::IssuingRules;
use C4::Dates qw/format_date/;
use C4::Calendar;
use C4::Accounts;
use C4::Overdues ;
use C4::ItemCirculationAlertPreference;
use C4::Dates qw(format_date);
use C4::Message;
use C4::Debug;
use YAML;
use Date::Calc qw(
  Today
  Today_and_Now

  Date_to_Days
  Day_of_Week
  Add_Delta_Days	
  Delta_Days
  check_date
  Add_Delta_Days
);
use POSIX qw(strftime);
use C4::Branch; # GetBranches

		&GetItemIssues
		&GetBorrowerIssues
		&GetIssuingCharges
		&GetIssuingRule
        &GetBranchBorrowerCircRule
        &GetBranchItemRule
		&GetBiblioIssues
		&GetOpenIssue
		&AnonymiseIssueHistory

                &CreateBranchTransferLimit
                &DeleteBranchTransferLimits
	);
	
	# subs to deal with offline circulation
	push @EXPORT, qw(
      &GetOfflineOperations
		&GetOfflineOperation
		&AddOfflineOperation
		&DeleteOfflineOperation
		&ProcessOfflineOperation
	);	
}

=head1 NAME

	my $item		= shift;
    my $cat_borrower    = $borrower->{'categorycode'};
    my $dbh             = C4::Context->dbh;
	my $exactbranch;
	# Get which branchcode we need
	$exactbranch = _GetCircControlBranch($item,$borrower);
	my $itype = (C4::Context->preference('item-level_itypes')) 
  			? $item->{'itype'}         # item-level
			: $item->{'itemtype'};     # biblio-level
 
    # given branch, patron category, and item type, determine
    # applicable issuing rule
    my $branchfield = C4::Context->Preference('HomeOrHoldingBranch') || "homebranch";
    #By default, Patron is supposed not to be able to borrow
    my $toomany = 1;

    foreach my $branch ( $exactbranch, '*' ) {
        foreach my $type ( $itype, '*' ) {
            my $issuing_rule = GetIssuingRule( $cat_borrower, $type, $branch );

            # if a rule is found and has a loan limit set, count
            # how many loans the patron already has that meet that
            # rule
            if ( defined($issuing_rule) and defined( $issuing_rule->{'maxissueqty'} ) ) {
                my @bind_params;
                my $count_query = "SELECT COUNT(*) FROM issues
                                   JOIN items USING (itemnumber) ";

                my $rule_itemtype = $issuing_rule->{itemtype};
                if ($rule_itemtype eq "*") {
                    # matching rule has the default item type, so count all the items issued for that branch no
                    # those existing loans that don't fall under a more
                    # specific rule Not QUITE
                    if (C4::Context->preference('item-level_itypes')) {
                        $count_query .= " WHERE items.itype NOT IN (
                                                SELECT itemtype FROM issuingrules
                                                WHERE branchcode = ?
                                                AND   (categorycode = ? OR categorycode = ?)
                                                AND   itemtype <> '*'
                                           )";
                    } else {
                        $count_query .= " JOIN  biblioitems USING (biblionumber)
                                            WHERE biblioitems.itemtype NOT IN (
                                                SELECT itemtype FROM issuingrules
                                                WHERE branchcode = ?
                                                AND   (categorycode = ? OR categorycode = ?)
                                                AND   itemtype <> '*'
                                           )";
                    }
                    push @bind_params, $issuing_rule->{branchcode};
                    push @bind_params, $issuing_rule->{categorycode};
                    push @bind_params, $cat_borrower;
                } else {
                    # rule has specific item type, so count loans of that
                    # specific item type
                    if (C4::Context->preference('item-level_itypes')) {
                        $count_query .= " WHERE items.itype = ? ";
                    } else { 
                        $count_query .= " JOIN  biblioitems USING (biblionumber) 
                                      WHERE biblioitems.itemtype= ? ";
                    }
                    push @bind_params, $type;
                }
                $count_query .= " AND issues.branchcode = ? ";
                push @bind_params, $branch;
            } elsif (C4::Context->preference('CircControl') eq 'PatronLibrary') {
                ; # if branch is the patron's home branch, then count all loans by patron
            } else {
                $count_query .= " AND items.homebranch = ? ";
                push @bind_params, $branch;
            }
        }

        my $count_sth = $dbh->prepare($count_query);
        $count_sth->execute(@bind_params);
        my ($current_loan_count) = $count_sth->fetchrow_array;

                $count_query .= " AND borrowernumber = ? ";
                push @bind_params, $borrower->{'borrowernumber'};
                my $rule_branch = $issuing_rule->{branchcode};
                if ( $rule_branch ne "*" ) {
                    if ( C4::Context->preference('CircControl') eq 'PickupLibrary' ) {
                        $count_query .= " AND issues.branchcode = ? ";
                        push @bind_params, $branch;
                    } elsif ( C4::Context->preference('CircControl') eq 'PatronLibrary' ) {
                        ;    # if branch is the patron's home branch, then count all loans by patron
                    } else {
                        $count_query .= " AND items.$branchfield = ? ";
                        push @bind_params, $branch;
                    }
                }

                my $count_sth = $dbh->prepare($count_query);
                $count_sth->execute(@bind_params);
                my ($current_loan_count) = $count_sth->fetchrow_array;
        my @bind_params = ();
        my $branch_count_query = "SELECT COUNT(*) FROM issues 
                                  JOIN items USING (itemnumber)
                                  WHERE borrowernumber = ? ";
        push @bind_params, $borrower->{borrowernumber};

        if (C4::Context->preference('CircControl') eq 'PickupLibrary') {
            $branch_count_query .= " AND issues.branchcode = ? ";
            push @bind_params, $branch;
        } elsif (C4::Context->preference('CircControl') eq 'PatronLibrary') {
            ; # if branch is the patron's home branch, then count all loans by patron
        } else {
            $branch_count_query .= " AND items.homebranch = ? ";
            push @bind_params, $branch;
        }
        my $branch_count_sth = $dbh->prepare($branch_count_query);
        $branch_count_sth->execute(@bind_params);
        my ($current_loan_count) = $branch_count_sth->fetchrow_array;

                my $max_loans_allowed = $issuing_rule->{'maxissueqty'};
                if ( $current_loan_count >= $max_loans_allowed ) {
                    return 1,$current_loan_count,$max_loans_allowed;
                }
                else {
                    $toomany=0;
                }
            }
        }
    }
    return $toomany;
    # OK, the patron can issue !!!
    return;
}

=head2 itemissues

        my $branch = _GetCircControlBranch($item,$borrower);
        my $itype = ( C4::Context->preference('item-level_itypes') ) ? $item->{'itype'} : $biblioitem->{'itemtype'};
        my $loanlength = GetLoanLength( $borrower->{'categorycode'}, $itype, $branch );
        unless ($loanlength or C4::Context->preference("AllowNotForLoanOverride")) {
             $issuingimpossible{LOAN_LENGTH_UNDEFINED} = "$borrower->{'categorycode'}, $itype, $branch";
        }
        $duedate = CalcDateDue( C4::Dates->new( $issuedate, 'iso' ), $loanlength, $branch, $borrower ) ;

        # Offline circ calls AddIssue directly, doesn't run through here
        #  So issuingimpossible should be ok.

        $issuingimpossible{CARD_LOST} = 1;
    }
    if ( $borrower->{flags}->{'DBARRED'} ) {
		if (my $dateenddebarred=$borrower->{flags}->{'DBARRED'}->{'dateend'}){
        	$issuingimpossible{DEBARRED} = format_date($dateenddebarred);
		}
		else {
        	$issuingimpossible{DEBARRED} = 1;
		}
    }
    if ( $borrower->{'dateexpiry'} eq '0000-00-00') {
        $issuingimpossible{EXPIRED} = 1;
    } else {
        my @expirydate = split (/-/, $borrower->{'dateexpiry'});
        if (   $expirydate[0] == 0
            || $expirydate[1] == 0
            || $expirydate[2] == 0
            || Date_to_Days(Today) > Date_to_Days(@expirydate) ) {
            $issuingimpossible{EXPIRED} = 1;
        }
    }
    #

#
    # JB34 CHECKS IF BORROWERS DONT HAVE ISSUE TOO MANY BOOKS
    #
    my @toomany = TooMany( $borrower, $item->{biblionumber}, $item );

    if ( $toomany[0] == 1 && scalar(@toomany)<3) {
        $needsconfirmation{PATRON_CANT} = 1;
    } elsif (scalar(@toomany)==3) {
        $needsconfirmation{TOO_MANY} = "$toomany[1] / $toomany[2]";
            $needsconfirmation{TOO_MANY} = 1;
            $needsconfirmation{current_loan_count} = $current_loan_count;
            $needsconfirmation{max_loans_allowed} = $max_loans_allowed;
        }
    }


    #
    # ITEM CHECKING
    #

            }
        }
    }
    if ( $item->{'damaged'} && $item->{'damaged'} > 0 ){
        $needsconfirmation{DAMAGED} = $item->{'damaged'};
        my $fw                      = GetFrameworkCode($item->{biblionumber});
        my $category                = GetAuthValCode('items.damaged',$fw);
        my $authorizedvalues        = GetAuthorisedValues($category, $item->{damaged});
        
        foreach my $authvalue (@$authorizedvalues){
            $needsconfirmation{DAMAGED} = $authvalue->{lib} if $authvalue->{'authorised_value'} eq $item->{'damaged'};
        }
        
    }
    if ( $item->{'wthdrawn'} && $item->{'wthdrawn'} == 1 ) {
        $issuingimpossible{WTHDRAWN} = 1;
    }
    if (   $item->{'restricted'}

    {
        $issuingimpossible{RESTRICTED} = 1;
    }
    my $userenv = C4::Context->userenv;
    my $branch=$userenv->{branch};
    my $hbr= $item->{ C4::Context->preference("HomeOrHoldingBranch") };
    if ( C4::Context->preference("IndependantBranches") ) {
        my $userenv = C4::Context->userenv;
        if ( ($userenv) && ( $userenv->{flags} % 2 != 1 ) ) {
            $issuingimpossible{ITEMNOTSAMEBRANCH} = 1
              if ( $hbr ne $branch );
            $needsconfirmation{BORRNOTSAMEBRANCH} = GetBranchName( $borrower->{'branchcode'} )
              if ( $borrower->{'branchcode'} ne $userenv->{branch} );
        }
    }
    my $branchtransferfield=C4::Context->preference("BranchTransferLimitsType") eq "ccode" ? "ccode" : "itype";
    if  ( C4::Context->preference("UseBranchTransferLimits")
                and !IsBranchTransferAllowed( $branch, $hbr, $item->{ $branchtransferfield } ) ) {
        $needsconfirmation{BRANCH_TRANSFER_NOT_ALLOWED} = $hbr;
    }


    #
    # CHECK IF BOOK ALREADY ISSUED TO THIS BORROWER

		my ( $resborrower ) = C4::Members::GetMemberDetails( $resbor, 0 );
		my $branches  = GetBranches();
		my $branchname = $branches->{ $res->{'branchcode'} }->{'branchname'};
        if( $resbor ne $borrower->{'borrowernumber'}){
            if ( $restype eq "Waiting" ) {
                # The item is on reserve and waiting, but has been
                # reserved by some other patron.
                $needsconfirmation{RESERVE_WAITING} =
    "$resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'}, $branchname)";
            }
            elsif ( $restype eq "Reserved" ) {
                # The item is on reserve for someone else.
                $needsconfirmation{RESERVED} =
    "$res->{'reservedate'} : $resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'})";
            }
        elsif ( $restype eq "Reserved" ) {
            # The item is on reserve for someone else.
            $needsconfirmation{RESERVED} = 1;
            $needsconfirmation{'resfirstname'} = $resborrower->{'firstname'};
            $needsconfirmation{'ressurname'} = $resborrower->{'surname'};
            $needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};
            $needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};
            $needsconfirmation{'resbranchname'} = $branchname;
            $needsconfirmation{'resreservedate'} = format_date($res->{'reservedate'});
        }
    }
    return ( \%issuingimpossible, \%needsconfirmation );
}

=head2 AddIssue

				# who wants to borrow it now. mark it returned before issuing to the new borrower
				AddReturn(
					$item->{'barcode'},
					C4::Context->userenv->{'branch'},
					undef,
					undef,
					1
				);
			}


					ModReserve(1,
						$res->{'biblionumber'},
						$res->{'borrowernumber'},
						$res->{'branchcode'},
						undef,
						$res->{'reservenumber'}
					);
				}
			}

                branch   => $branch,
            });
        }

        logaction( "CIRCULATION", "ISSUE", $borrower->{'borrowernumber'}, $item->{'itemnumber'}  )
          if C4::Context->preference("IssueLog");
    }

    logaction("CIRCULATION", "ISSUE", $borrower->{'borrowernumber'}, $biblio->{'biblionumber'})
        if C4::Context->preference("IssueLog");
  }
  return ($datedue);	# not necessarily the same as when it came in!
}


sub GetLoanLength {
    my ( $borrowertype, $itemtype, $branchcode ) = @_;
    my $loanlength=GetIssuingRule($borrowertype,$itemtype,$branchcode);
    return $loanlength->{issuelength};
      $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 );
    my $loanlength = $sth->fetchrow_hashref;
    return $loanlength->{issuelength}
      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';

    $sth->execute( $borrowertype, "*", $branchcode );
    $loanlength = $sth->fetchrow_hashref;
    return $loanlength->{issuelength}
      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';

    $sth->execute( "*", $itemtype, $branchcode );
    $loanlength = $sth->fetchrow_hashref;
    return $loanlength->{issuelength}
      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';

    $sth->execute( "*", "*", $branchcode );
    $loanlength = $sth->fetchrow_hashref;
    return $loanlength->{issuelength}
      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';

    $sth->execute( $borrowertype, $itemtype, "*" );
    $loanlength = $sth->fetchrow_hashref;
    return $loanlength->{issuelength}
      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';

    $sth->execute( $borrowertype, "*", "*" );
    $loanlength = $sth->fetchrow_hashref;
    return $loanlength->{issuelength}
      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';

    $sth->execute( "*", $itemtype, "*" );
    $loanlength = $sth->fetchrow_hashref;
    return $loanlength->{issuelength}
      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';

    $sth->execute( "*", "*", "*" );
    $loanlength = $sth->fetchrow_hashref;
    return $loanlength->{issuelength}
      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';

    # if no rule is set => 21 days (hardcoded)
    return 21;
}

=head2 GetIssuingRule

  my $irule = &GetIssuingRule($borrowertype,$itemtype,branchcode)

FIXME - This is a copy-paste of GetLoanLength
as a stop-gap.  Do not wish to change API for GetLoanLength 
this close to release, however, Overdues::GetIssuingRules is broken.

Get the issuing rule for an itemtype, a borrower type and a branch
Returns a hashref from the issuingrules table.

=cut

sub GetIssuingRule {
    my ( $borrowertype, $itemtype, $branchcode ) = @_;
    my $dbh = C4::Context->dbh;
    my $sth =  $dbh->prepare( "select * from issuingrules where categorycode=? and itemtype=? and branchcode=? and issuelength is not null"  );
    my $irule;

	$sth->execute( $borrowertype, $itemtype, $branchcode );
    $irule = $sth->fetchrow_hashref;
    return $irule if defined($irule) ;

    $sth->execute( $borrowertype, "*", $branchcode );
    $irule = $sth->fetchrow_hashref;
    return $irule if defined($irule) ;

    $sth->execute( "*", $itemtype, $branchcode );
    $irule = $sth->fetchrow_hashref;
    return $irule if defined($irule) ;

    $sth->execute( "*", "*", $branchcode );
    $irule = $sth->fetchrow_hashref;
    return $irule if defined($irule) ;

    $sth->execute( $borrowertype, $itemtype, "*" );
    $irule = $sth->fetchrow_hashref;
    return $irule if defined($irule) ;

    $sth->execute( $borrowertype, "*", "*" );
    $irule = $sth->fetchrow_hashref;
    return $irule if defined($irule) ;

    $sth->execute( "*", $itemtype, "*" );
    $irule = $sth->fetchrow_hashref;
    return $irule if defined($irule) ;

    $sth->execute( "*", "*", "*" );
    $irule = $sth->fetchrow_hashref;
    return $irule if defined($irule) ;

    # if no rule matches,
    return undef;
}

=head2 GetBranchBorrowerCircRule

  my $branch_cat_rule = GetBranchBorrowerCircRule($branchcode, $categorycode);

Retrieves circulation rule attributes that apply to the given
branch and patron category, regardless of item type.  
The return value is a hashref containing the following key:

maxissueqty - maximum number of loans that a
patron of the given category can have at the given
branch.  If the value is undef, no limit.

This will first check for a specific branch and
category match from branch_borrower_circ_rules. 

If no rule is found, it will then check default_branch_circ_rules
(same branch, default category).  If no rule is found,
it will then check default_borrower_circ_rules (default 
branch, same category), then failing that, default_circ_rules
(default branch, default category).

If no rule has been found in the database, it will default to
the buillt in rule:

maxissueqty - undef

C<$branchcode> and C<$categorycode> should contain the
literal branch code and patron category code, respectively - no
wildcards.

=cut

sub GetBranchBorrowerCircRule {
    my $branchcode = shift;
    my $categorycode = shift;

    my $branch_cat_query = "SELECT maxissueqty
                            FROM branch_borrower_circ_rules
                            WHERE branchcode = ?
                            AND   categorycode = ?";
    my $dbh = C4::Context->dbh();
    my $sth = $dbh->prepare($branch_cat_query);
    $sth->execute($branchcode, $categorycode);
    my $result;
    if ($result = $sth->fetchrow_hashref()) {
        return $result;
    }

    # try same branch, default borrower category
    my $branch_query = "SELECT maxissueqty
                        FROM default_branch_circ_rules
                        WHERE branchcode = ?";
    $sth = $dbh->prepare($branch_query);
    $sth->execute($branchcode);
    if ($result = $sth->fetchrow_hashref()) {
        return $result;
    }

    # try default branch, same borrower category
    my $category_query = "SELECT maxissueqty
                          FROM default_borrower_circ_rules
                          WHERE categorycode = ?";
    $sth = $dbh->prepare($category_query);
    $sth->execute($categorycode);
    if ($result = $sth->fetchrow_hashref()) {
        return $result;
    }
  
    # try default branch, default borrower category
    my $default_query = "SELECT maxissueqty
                          FROM default_circ_rules";
    $sth = $dbh->prepare($default_query);
    $sth->execute();
    if ($result = $sth->fetchrow_hashref()) {
        return $result;
    }
    
    # built-in default circulation rule
    return {
        maxissueqty => undef,
    };
}

=head2 GetBranchItemRule

  my $branch_item_rule = GetBranchItemRule($branchcode, $itemtype);

Retrieves circulation rule attributes that apply to the given
branch and item type, regardless of patron category.

The return value is a hashref containing the following key:

holdallowed => Hold policy for this branch and itemtype. Possible values:
  0: No holds allowed.
  1: Holds allowed only by patrons that have the same homebranch as the item.
  2: Holds allowed from any patron.

This searches branchitemrules in the following order:

  * Same branchcode and itemtype
  * Same branchcode, itemtype '*'
  * branchcode '*', same itemtype
  * branchcode and itemtype '*'

Neither C<$branchcode> nor C<$categorycode> should be '*'.

=cut

sub GetBranchItemRule {
    my ( $branchcode, $itemtype ) = @_;
    my $dbh = C4::Context->dbh();
    my $result = {};

    my @attempts = (
        ['SELECT holdallowed
            FROM branch_item_rules
            WHERE branchcode = ?
              AND itemtype = ?', $branchcode, $itemtype],
        ['SELECT holdallowed
            FROM default_branch_circ_rules
            WHERE branchcode = ?', $branchcode],
        ['SELECT holdallowed
            FROM default_branch_item_rules
            WHERE itemtype = ?', $itemtype],
        ['SELECT holdallowed
            FROM default_circ_rules'],
    );

    foreach my $attempt (@attempts) {
        my ($query, @bind_params) = @{$attempt};

        # Since branch/category and branch/itemtype use the same per-branch
        # defaults tables, we have to check that the key we want is set, not
        # just that a row was returned
        return $result if ( defined( $result->{'holdallowed'} = $dbh->selectrow_array( $query, {}, @bind_params ) ) );
    }
    
    # built-in default circulation rule
    return {
        holdallowed => 2,
    };
}

=head2 AddReturn

=cut

sub AddReturn {
    my ( $barcode, $branch, $exemptfine, $dropbox, $force) = @_;
    if ( $branch and not GetBranchDetail($branch) ) {
        warn "AddReturn error: branch '$branch' not found.  Reverting to " . C4::Context->userenv->{'branch'};
        undef $branch;
    }

        my $branches = GetBranches();    # a potentially expensive call for a non-feature.
        $branches->{$hbr}->{PE} and $messages->{'IsPermanent'} = $hbr;
    }
    my $branchtransferfield=C4::Context->preference("BranchTransferLimitsType") eq "ccode" ? "ccode" : "itype";
    $debug && warn "$branch, $hbr, ",C4::Context->preference("BranchTransferLimitsType")," ,",$item->{ $branchtransferfield } ;
    $debug && warn Dump($item);
    $debug && warn IsBranchTransferAllowed( $branch, $hbr, $item->{ C4::Context->preference("BranchTransferLimitsType") } );
    # if indy branches and returning to different branch, refuse the return
    if ( !$force && ($hbr ne $branch)
		&& (C4::Context->preference("IndependantBranches") 
			or ( C4::Context->preference("UseBranchTransferLimits")
                and !IsBranchTransferAllowed( $branch, $hbr, $item->{$branchtransferfield } ) )
		    )
		){
        $messages->{'Wrongbranch'} = {
            Wrongbranch => $branch,
            Rightbranch => $hbr,

        # FIXME - even in an indy branches situation, there should
        # still be an option for the library to accept the item
        # and transfer it to its owning library.
        return ( $doreturn, $messages, $issue, $borrower );
    }

    if ( $item->{'wthdrawn'} ) { # book has been cancelled

    # case of a return of document (deal with issues and holdingbranch)
    if ($doreturn) {
        $borrower or warn "AddReturn without current borrower";
        my $circControlBranch;
        if ($dropbox) {
            $circControlBranch = _GetCircControlBranch( $item, $borrower );
            # don't allow dropbox mode to create an invalid entry in issues (issuedate > returndate) FIXME: actually checks eq, not gt
            undef($dropbox) if ( $item->{'issuedate'} eq C4::Dates->today('iso') );
            $circControlBranch = _GetCircControlBranch($item,$borrower) unless ( $item->{'issuedate'} eq C4::Dates->today('iso') );;
        }

        if ($borrowernumber) {

            $messages->{'WasReturned'} = 1;    # FIXME is the "= 1" right?  This could be the borrower hash.
        }

        ModItem( { renewals=>0, onloan => undef }, $issue->{'biblionumber'}, $item->{'itemnumber'} );
    	# the holdingbranch is updated if the document is returned to another location.
    	# this is always done regardless of whether the item was on loan or not
    	if ( $item->{'holdingbranch'} ne $branch ) {
       	    UpdateHoldingbranch( $branch, $item->{'itemnumber'} );
            $item->{'holdingbranch'} = $branch;    # update item data holdingbranch too
	    }	   
    }

    # the holdingbranch is updated if the document is returned to another location.
    # this is always done regardless of whether the item was on loan or not
    if ($item->{'holdingbranch'} ne $branch) {
        UpdateHoldingbranch($branch, $item->{'itemnumber'});
        $item->{'holdingbranch'} = $branch; # update item data holdingbranch too
    }
    ModDateLastSeen( $item->{'itemnumber'} );

    # check if we have a transfer for this document

        _FixAccountForLostAndReturned($item->{'itemnumber'}, $borrowernumber, $barcode);    # can tolerate undef $borrowernumber
        $messages->{'WasLost'} = 1;
    }
    if ($item->{'notforloan'}){
        $messages->{'NotForLoan'} = $item->{'notforloan'};
    }
    if ($item->{'damaged'}){
        $messages->{'Damaged'} = $item->{'damaged'};
    }

    if ($borrowernumber && $doreturn) {
        # fix up the overdues in accounts...
        my $fix = _FixOverduesOnReturn($borrowernumber, $item->{itemnumber}, $exemptfine, $dropbox);
        defined($fix) or warn "_FixOverduesOnReturn($borrowernumber, $item->{itemnumber}...) failed!";  # zero is OK, check defined
    
        # fix fine days
        my $debardate = _FixFineDaysOnReturn($borrower, $item, $issue->{date_due});
        $messages->{'Debarred'} = $debardate if($debardate);

        # get fines for the borrower
        my $fineamount = C4::Overdues::GetFine($borrowernumber);
        $messages->{'HaveFines'} = $fineamount if($fineamount);
        
    }

    # find reserves.....

            branch   => $branch,
        });
    }

    logaction( "CIRCULATION", "RETURN", $borrowernumber, $item->{'itemnumber'} )
      if C4::Context->preference("ReturnLog");

    # FIXME: make this comment intelligible.
    #adding message if holdingbranch is non equal a userenv branch to return the document to homebranch
    #we check, if we don't have reserv or transfert for this document, if not, return it to homebranch .

    if ( $doreturn and ( $branch ne $hbr ) and not $messages->{'WrongTransfer'} and ( $validTransfert ne 1 ) ) {
        if (C4::Context->preference("AutomaticItemReturn")
            or ( C4::Context->preference("UseBranchTransferLimits")
                and !IsBranchTransferAllowed( $branch, $hbr, $item->{ $branchtransferfield } ) )
          ) {
            $debug and warn sprintf "about to call ModItemTransfer(%s, %s, %s)", $item->{'itemnumber'}, $branch, $hbr;
            $debug and warn "item: " . Dumper($item);
            ModItemTransfer($item->{'itemnumber'}, $branch, $hbr);
            $messages->{'WasTransfered'} = 1;

    $sth_del->execute($borrowernumber, $itemnumber);
}

=head2 _FixFineDaysOnReturn

    &_FixFineDaysOnReturn($borrower, $item, $datedue);

C<$borrower> borrower hashref

C<$item> item hashref

C<$datedue> date due

Internal function, called only by AddReturn that calculate and update the user fine days, and debars him

=cut

sub _FixFineDaysOnReturn {
    my ($borrower, $item, $datedue) = @_;
    
    if($datedue){
        $datedue = C4::Dates->new($datedue,"iso");
    }else{
        return;
    }
    
    my $branchcode  =_GetCircControlBranch($item, $borrower);
    my $calendar    = C4::Calendar->new( branchcode => $branchcode );
    my $today       = C4::Dates->new();

    my $deltadays = $calendar->daysBetween($datedue, C4::Dates->new());

    my $circcontrol = C4::Context::preference('CircControl');
    my $issuingrule = GetIssuingRule($borrower->{categorycode}, $item->{itype}, $branchcode);
    my $finedays    = $issuingrule->{finedays};
    # exit if no finedays defined
    return unless $finedays;
    my $grace       = $issuingrule->{firstremind};

    if( $deltadays - $grace > 0){
        my @newdate     = Add_Delta_Days(Today(), $deltadays * $finedays );
        my $isonewdate  = join('-',@newdate);
        my ($deby, $debm, $debd) = split(/-/,$borrower->{debarred});
        if(check_date($deby, $debm, $debd)){
            my @olddate = split(/-/, $borrower->{debarred});

            if(Delta_Days(@olddate,@newdate) > 0){
                C4::Members::DebarMember($borrower->{borrowernumber}, $isonewdate);
                return $isonewdate;
            }
        }else{
            C4::Members::DebarMember($borrower->{borrowernumber}, $isonewdate);
            return $isonewdate;
        }
    }
}


=head2 _FixOverduesOnReturn

   &_FixOverduesOnReturn($brn,$itm, $exemptfine, $dropboxmode);

    my $circcontrol = C4::Context->preference('CircControl');
    my $branch;

    if ($circcontrol eq 'PickupLibrary' && C4::Context->userenv->{'branch'}) {
        $branch= C4::Context->userenv->{'branch'};
    } elsif ($circcontrol eq 'PatronLibrary') {
        $branch=$borrower->{branchcode};

    my ($itemnumber) = @_;
    return unless $itemnumber;
    my $sth = C4::Context->dbh->prepare(
        "SELECT *, issues.renewals as 'issues.renewals'
        FROM issues 
        LEFT JOIN items ON issues.itemnumber=items.itemnumber
        WHERE issues.itemnumber=?");

    }
    my $results = $sth->fetchall_arrayref({});
    foreach (@$results) {
        $_->{'overdue'} = ( $_->{'date_due'} lt $today && !defined($_->{return_date}) ) ? 1 : 0;
    }
    return $results;
}

sub CanBookBeRenewed {

    # check renewal status
    my ( $borrowernumber, $itemnumber ) = @_;
    my $dbh       = C4::Context->dbh;
    my $renews    = 1;
    my $renewokay = 1;
    my $error;

    # Look in the issues table for this item, lent to this borrower,
    # and not yet returned.

    # Look in the issues table for this item, lent to this borrower,
    # and not yet returned.
    my $borrower = C4::Members::GetMemberDetails( $borrowernumber, 0 ) or return undef;
    my $item = GetItem($itemnumber) or return undef;
    my $itemissue = GetItemIssue($itemnumber) or return undef;
    my $branchcode = _GetCircControlBranch($item, $borrower);
    if ($itemissue->{'overdue'}){
       $renewokay=0;
       $error->{message}='overdue'; 
    }
    
    my $issuingrule = GetIssuingRule($borrower->{categorycode}, $item->{itype}, $branchcode);
    
    if ( $issuingrule->{renewalsallowed} <= $itemissue->{'issues.renewals'} )  {
        $renewokay=0;
        $error->{message} = "too_many";
    }
                   LEFT JOIN borrowers USING (borrowernumber) 
                   LEFT JOIN biblioitems USING (biblioitemnumber)
                   
                   WHERE
                    (issuingrules.categorycode = borrowers.categorycode OR issuingrules.categorycode = '*')
                   AND
                    (issuingrules.itemtype = $itype OR issuingrules.itemtype = '*')
                   AND
                    (issuingrules.branchcode = $controlbranch OR issuingrules.branchcode = '*') 
                   AND 
                    borrowernumber = ? 
                   AND
                    itemnumber = ?
                   ORDER BY
                    issuingrules.categorycode desc,
                    issuingrules.itemtype desc,
                    issuingrules.branchcode desc
                   LIMIT 1;
                  ");

    $sthcount->execute( $borrowernumber, $itemnumber );
    if ( my $data1 = $sthcount->fetchrow_hashref ) {
        
        if ( ( $data1->{renewalsallowed} && $data1->{renewalsallowed} > $data1->{renewals} ) || $override_limit ) {
            $renewokay = 1;
        }
        else {
			$error="too_many";
		}
		
        my ( $resfound, $resrec ) = C4::Reserves::CheckReserves($itemnumber);
        if ($resfound) {
            $renewokay = 0;
			$error="on_reserve"
        }

    my ( $resfound, $resrec ) = C4::Reserves::CheckReserves($itemnumber);
    if ($resfound) {
        $renewokay = 0;
        $error->{message} = "on_reserve";
    }
    $error->{renewals}       = $itemissue->{'issues.renewals'};
    $error->{renewalsallowed}= $issuingrule->{renewalsallowed};

    return ( $renewokay, $error );
}

=head2 AddRenewal

    # based on the value of the RenewalPeriodBase syspref.
    unless ($datedue) {

        my $borrower   = C4::Members::GetMemberDetails( $borrowernumber, 0 ) or return undef;
        my $branchcode = _GetCircControlBranch($item, $borrower);
        my $loanlength = GetIssuingRule( $borrower->{categorycode}, $item->{itype}, $branchcode );

        $datedue =
          ( C4::Context->preference('RenewalPeriodBase') eq 'date_due' )
          ? C4::Dates->new( $issuedata->{date_due}, 'iso' )
          : C4::Dates->new();

        my $itype = ( C4::Context->preference('item-level_itypes') ) ? $biblio->{'itype'} : $biblio->{'itemtype'};
        my $controlbranch = _GetCircControlBranch( $item, $borrower );
        my $renewalperiod = $loanlength->{renewalperiod} || GetLoanLength( $borrower->{'categorycode'}, $itype, $controlbranch );

        $datedue = CalcDateDue( $datedue, $renewalperiod, $issuedata->{'branchcode'}, $borrower );

        $datedue = (C4::Context->preference('RenewalPeriodBase') eq 'date_due') ?
                                        C4::Dates->new($issuedata->{date_due}, 'iso') :
                                        C4::Dates->new();
        $datedue =  CalcDateDue($datedue,$loanlength,$issuedata->{'branchcode'},$borrower);
    }

    # Update the issues record to have the new due date, and a new count
    # of how many times it has been renewed.
    my $renews = $issuedata->{'renewals'} + 1;
    $sth = $dbh->prepare(
        "UPDATE issues SET date_due = ?, renewals = ?, lastreneweddate = ?
                            WHERE borrowernumber=? 
                            AND itemnumber=?"
    );

    $sth->finish;

    # Update the renewal count on the item, and tell zebra to reindex
    $renews = $item->{'renewals'} + 1;
    ModItem( { renewals => $renews, onloan => $datedue->output('iso') }, undef, $itemnumber );

    # Charge a new rental fee, if applicable?
    my ( $charge, $type ) = GetIssuingCharges( $itemnumber, $borrowernumber );

	my ($startdate,$loanlength,$branch,$borrower) = @_;
	my $datedue;

	my $calendar = C4::Calendar->new(  branchcode => $branch );
	$datedue = $calendar->addDate($startdate, $loanlength);
	#FIXME - assumes now even though we take a startdate 
		my @datearr  = localtime($timedue);
		$datedue = C4::Dates->new( sprintf("%04d-%02d-%02d", 1900 + $datearr[5], $datearr[4] + 1, $datearr[3]), 'iso');
	} else {
		my $calendar = C4::Calendar->new(  branchcode => $branch );
		$datedue = $calendar->addDate($startdate, $loanlength);
	}

	# if ReturnBeforeExpiry ON the datedue can't be after borrower expirydate
	if ( C4::Context->preference('ReturnBeforeExpiry') && $datedue->output('iso') gt $borrower->{dateexpiry} ) {


=head2 DeleteBranchTransferLimits

  DeleteBranchTransferLimits($tobranch);

=cut

sub DeleteBranchTransferLimits {
    my $branch = shift;
    my $dbh = C4::Context->dbh;
    my $sth = $dbh->prepare("DELETE FROM branch_transfer_limits WHERE toBranch = ?");
    $sth->execute($branch);
}

sub GetOfflineOperations {
	my $dbh = C4::Context->dbh;
	my $sth = $dbh->prepare("SELECT * FROM pending_offline_operations WHERE branchcode=? ORDER BY timestamp");
	$sth->execute(C4::Context->userenv->{'branch'});
	my $results = $sth->fetchall_arrayref({});
	$sth->finish;
	return $results;
}

sub GetOfflineOperation {
	my $dbh = C4::Context->dbh;
	my $sth = $dbh->prepare("SELECT * FROM pending_offline_operations WHERE operationid=?");
	$sth->execute( shift );
	my $result = $sth->fetchrow_hashref;
	$sth->finish;
	return $result;
}

sub AddOfflineOperation {
	my $dbh = C4::Context->dbh;
	warn Data::Dumper::Dumper(@_);
	my $sth = $dbh->prepare("INSERT INTO pending_offline_operations VALUES('',?,?,?,?,?,?)");
	$sth->execute( @_ );
	return "Added.";
}

sub DeleteOfflineOperation {
	my $dbh = C4::Context->dbh;
	my $sth = $dbh->prepare("DELETE FROM pending_offline_operations WHERE operationid=?");
	$sth->execute( shift );
	return "Deleted.";
}

sub ProcessOfflineOperation {
	my $operation = shift;

    my $report;
	if ( $operation->{action} eq 'return' ) {
        $report = ProcessOfflineReturn( $operation );
	} elsif ( $operation->{action} eq 'issue' ) {
	    $report = ProcessOfflineIssue( $operation );
	}
	
	DeleteOfflineOperation( $operation->{operationid} ) if $operation->{operationid};
	
	return $report;
}

sub ProcessOfflineReturn {
    my $operation = shift;

    my $itemnumber = C4::Items::GetItemnumberFromBarcode( $operation->{barcode} );
    
    if ( $itemnumber ) {
        my $issue = GetOpenIssue( $itemnumber );
        if ( $issue ) {
            MarkIssueReturned(
                $issue->{borrowernumber},
                $itemnumber,
                undef,
                $operation->{timestamp},
            );
            return "Success.";
        } else {
            return "Item not issued.";
        }
    } else {
        return "Item not found.";
    }
}

sub ProcessOfflineIssue {
    my $operation = shift;

    my $borrower = C4::Members::GetMemberDetails( undef, $operation->{cardnumber} ); # Get borrower from operation cardnumber
    
    if ( $borrower->{borrowernumber} ) { 
        my $itemnumber = C4::Items::GetItemnumberFromBarcode( $operation->{barcode} );
        my $issue = GetOpenIssue( $itemnumber );
        
        if ( $issue and ( $issue->{borrowernumber} ne $borrower->{borrowernumber} ) ) { # Item already issued to another borrower, mark it returned
            MarkIssueReturned(
                $issue->{borrowernumber},
                $itemnumber,
                undef,
                $operation->{timestamp},
            );
        }
        AddIssue(
            $borrower,
            $operation->{'barcode'},
            undef,
            1,
            $operation->{timestamp},
            undef,
        );
        return "Success.";
    } else {
        return "Borrower not found.";
    }
}


1;

__END__





use Date::Calc qw/Today Date_to_Days/;
use Date::Manip qw/UnixDate/;
use C4::Circulation;
use C4::IssuingRules;
use C4::Context;
use C4::Accounts;
use C4::Log; # logaction

	push @EXPORT, qw(
        &GetIssuesIteminfo
	);
    #
	# &GetIssuingRules - delete.
	# use C4::Circulation::GetIssuingRule instead.
	
	# subs to move to Members.pm
	push @EXPORT, qw(

   SELECT issues.*, items.itype as itemtype, items.homebranch, items.barcode
     FROM issues 
LEFT JOIN items       USING (itemnumber)
    WHERE DATE(date_due) < CURDATE()
";
    } else {
        $statement = "

     FROM issues 
LEFT JOIN items       USING (itemnumber)
LEFT JOIN biblioitems USING (biblioitemnumber)
    WHERE DATE(date_due) < CURDATE()
";
    }


         LEFT JOIN biblio      ON items.biblionumber     = biblio.biblionumber
         LEFT JOIN biblioitems ON items.biblioitemnumber = biblioitems.biblioitemnumber
            WHERE issues.borrowernumber  = ?
            AND   DATE(issues.date_due) < CURDATE()"
    );
    # FIXME: SELECT * across 4 tables?  do we really need the marc AND marcxml blobs??
    $sth->execute($borrowernumber);

	my $daystocharge;
	# get issuingrules (fines part will be used)
    $debug and warn sprintf("CalcFine calling GetIssuingRule(%s, %s, %s)", $bortype, $item->{'itemtype'}, $branchcode);
    my $data = GetIssuingRule($bortype, $item->{'itemtype'}, $branchcode);
	if($difference) {
		# if $difference is supplied, the difference has already been calculated, but we still need to adjust for the calendar.
    	# use copy-pasted functions from calendar module.  (deprecated -- these functions will be removed from C4::Overdues ).

    } else {
        # a zero (or null)  chargeperiod means no charge.
    }
    $amount = C4::Context->preference('MaxFine') if ( C4::Context->preference('MaxFine') && ( $amount > C4::Context->preference('MaxFine') ) );
	$debug and warn sprintf("CalcFine returning (%s, %s, %s, %s)", $amount, $data->{'chargename'}, $days_minus_grace, $daystocharge);
    return ($amount, $data->{'chargename'}, $days_minus_grace, $daystocharge);
    # FIXME: chargename is NEVER populated anywhere.


=cut


sub ReplacementCost {
    my ($itemnum) = @_;
    my $dbh       = C4::Context->dbh;


return the total of fine

C<$itemnum> is item number

C<$borrowernumber> is the borrowernumber

=cut


sub GetFine {
    my ( $borrowernumber ) = @_;
    my $dbh   = C4::Context->dbh();
    my $query = "SELECT sum(amountoutstanding) FROM accountlines
    where accounttype like 'F%'  
  AND amountoutstanding > 0 AND borrowernumber=?";
    my $sth = $dbh->prepare($query);
    $sth->execute( $borrowernumber );
    my $data = $sth->fetchrow_hashref();
    return ( $data->{'sum(amountoutstanding)'} );
}


=head2 GetIssuingRules

FIXME - This sub should be deprecated and removed.
It ignores branch and defaults.

    $data = &GetIssuingRules($itemtype,$categorycode);

Looks up for all issuingrules an item info 

C<$itemnumber> is a reference-to-hash whose keys are all of the fields
from the borrowers and categories tables of the Koha database. Thus,

C<$categorycode> contains  information about borrowers category 

C<$data> contains all information about both the borrower and
category he or she belongs to.
=cut 

sub GetIssuingRules {
	warn "GetIssuingRules is deprecated: use GetIssuingRule from C4::Circulation instead.";
   my ($itemtype,$categorycode)=@_;
   my $dbh   = C4::Context->dbh();    
   my $query=qq|SELECT *
        FROM issuingrules
        WHERE issuingrules.itemtype=?
            AND issuingrules.categorycode=?
        |;
    my $sth = $dbh->prepare($query);
    #  print $query;
    $sth->execute($itemtype,$categorycode);
    return $sth->fetchrow_hashref;
}


sub ReplacementCost2 {
    my ( $itemnum, $borrowernumber ) = @_;
    my $dbh   = C4::Context->dbh();


sub GetBranchcodesWithOverdueRules {
    my $dbh               = C4::Context->dbh;
    my $rqoverduebranches = $dbh->prepare("SELECT DISTINCT branchcode FROM overduerules WHERE delay1 IS NOT NULL ");
    $rqoverduebranches->execute;
    my @branches = map { shift @$_ } @{ $rqoverduebranches->fetchall_arrayref };
    return @branches;


Check if the borrowers is already debarred

C<$debarredstatus> return undef for not debarred and return end of debar date for debarred

C<$borrowernumber> contains the borrower number


        SELECT debarred
        FROM borrowers
        WHERE borrowernumber=?
        AND debarred > NOW()
    |;
    my $sth = $dbh->prepare($query);
    $sth->execute($borrowernumber);
    my $debarredstatus= $sth->fetchrow;
    return $debarredstatus;
    
}

=head2 UpdateBorrowerDebarred

   ($borrowerstatut) = &UpdateBorrowerDebarred($borrowernumber, $todate);

update status of borrowers in borrowers table (field debarred)

C<$borrowernumber> borrower number
C<$todate> end of bare

=cut

sub UpdateBorrowerDebarred{
    my($borrowernumber, $todate) = @_;
    my $dbh = C4::Context->dbh;
        my $query=qq|UPDATE borrowers
             SET debarred=?
                     WHERE borrowernumber=?
            |;
    my $sth=$dbh->prepare($query);
        $sth->execute($todate, $borrowernumber);
        $sth->finish;
        return 1;
}

Lines 22-27 package C4::Reserves; Link Here

(-)a/C4/Reserves.pm (-182 / +450 lines)
22		22
23	use strict;	23	use strict;
24	#use warnings; FIXME - Bug 2505	24	#use warnings; FIXME - Bug 2505
		25	use Date::Calc qw( Add_Delta_Days Time_to_Date Today);
25	use C4::Context;	26	use C4::Context;
26	use C4::Biblio;	27	use C4::Biblio;
27	use C4::Members;	28	use C4::Members;
Lines 32-41 use C4::Accounts; Link Here
32		33
33	# for _koha_notify_reserve	34	# for _koha_notify_reserve
34	use C4::Members::Messaging;	35	use C4::Members::Messaging;
35	use C4::Members qw();	36	use C4::Members ;
36	use C4::Letters;	37	use C4::Letters;
37	use C4::Branch qw( GetBranchDetail );	38	use C4::Branch qw( GetBranchDetail );
38	use C4::Dates qw( format_date_in_iso );	39	use C4::Dates qw( format_date_in_iso );
		40	use C4::IssuingRules;
39	use List::MoreUtils qw( firstidx );	41	use List::MoreUtils qw( firstidx );
40		42
41	use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);	43	use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
Lines 91-101 BEGIN { Link Here
91	@EXPORT = qw(	93	@EXPORT = qw(
92	&AddReserve	94	&AddReserve
93		95
		96	&GetMaxPickupDelay
		97	&GetMaxPickupDate
94	&GetReservesFromItemnumber	98	&GetReservesFromItemnumber
95	&GetReservesFromBiblionumber	99	&GetReservesFromBiblionumber
96	&GetReservesFromBorrowernumber	100	&GetReservesFromBorrowernumber
97	&GetReservesForBranch	101	&GetReservesForBranch
98	&GetReservesToBranch	102	&GetReservesToBranch
		103	&GetReservesControlBranch
99	&GetReserveCount	104	&GetReserveCount
100	&GetReserveFee	105	&GetReserveFee
101	&GetReserveInfo	106	&GetReserveInfo
Lines 113-125 BEGIN { Link Here
113	&CheckReserves	118	&CheckReserves
114	&CanBookBeReserved	119	&CanBookBeReserved
115	&CanItemBeReserved	120	&CanItemBeReserved
116	&CancelReserve	121	&CanHoldOnShelf
117	&CancelExpiredReserves	122	&CancelReserve
		123	&CancelExpiredReserves
118		124
119	&IsAvailableForItemLevelRequest	125	&IsAvailableForItemLevelRequest
120		126
121	&AlterPriority	127	&AlterPriority
122	&ToggleLowestPriority	128	&ToggleLowestPriority
		129	&CanHoldMultipleItems
		130	&BorrowerHasReserve
123	);	131	);
124	}	132	}
125		133
Lines 142-152 sub AddReserve { Link Here
142	my $const = lc substr( $constraint, 0, 1 );	150	my $const = lc substr( $constraint, 0, 1 );
143	$resdate = format_date_in_iso( $resdate ) if ( $resdate );	151	$resdate = format_date_in_iso( $resdate ) if ( $resdate );
144	$resdate = C4::Dates->today( 'iso' ) unless ( $resdate );	152	$resdate = C4::Dates->today( 'iso' ) unless ( $resdate );
		153	my $item = C4::Items::GetItem($checkitem);
		154	my @maxPickupDate = GetMaxPickupDate($resdate, $borrowernumber, $item);
		155	my $maxpickupdate = sprintf( "%d-%02d-%02d", @maxPickupDate );
145	if ($expdate) {	156	if ($expdate) {
146	$expdate = format_date_in_iso( $expdate );	157	$expdate = format_date_in_iso( $expdate );
		158	my @expdate = split("-", $expdate);
		159	$expdate = $maxpickupdate if Delta_Days(@expdate[ 0 .. 2 ], @maxPickupDate[ 0 .. 2 ]) < 0;
147	} else {	160	} else {
148	undef $expdate; # make reserves.expirationdate default to null rather than '0000-00-00'	161	$expdate = $maxpickupdate;
149	}	162	}
		163	undef $expdate if $resdate eq $maxpickupdate; # make reserves.expirationdate default to null rather than '0000-00-00'
150	if ( C4::Context->preference( 'AllowHoldDateInFuture' ) ) {	164	if ( C4::Context->preference( 'AllowHoldDateInFuture' ) ) {
151	# Make room in reserves for this before those of a later reserve date	165	# Make room in reserves for this before those of a later reserve date
152	$priority = _ShiftPriorityByDateAndPriority( $biblionumber, $resdate, $priority );	166	$priority = _ShiftPriorityByDateAndPriority( $biblionumber, $resdate, $priority );
Lines 250-273 sub GetReservesFromBiblionumber { Link Here
250		264
251	# Find the desired items in the reserves	265	# Find the desired items in the reserves
252	my $query = "	266	my $query = "
253	SELECT branchcode,	267	SELECT reserves.reservenumber,
254	timestamp AS rtimestamp,	268	reserves.branchcode,
255	priority,	269	reserves.timestamp AS rtimestamp,
256	biblionumber,	270	reserves.priority,
257	borrowernumber,	271	reserves.biblionumber,
258	reservedate,	272	reserves.borrowernumber,
259	constrainttype,	273	reserves.reservedate,
260	found,	274	reserves.constrainttype,
261	itemnumber,	275	reserves.found,
262	reservenotes,	276	reserves.itemnumber,
263	expirationdate,	277	reserves.reservenotes,
264	lowestPriority	278	reserves.expirationdate,
		279	reserves.lowestPriority,
		280	biblioitems.itemtype
265	FROM reserves	281	FROM reserves
266	WHERE biblionumber = ? ";	282	LEFT JOIN biblioitems ON biblioitems.biblionumber = reserves.biblionumber
		283	WHERE reserves.biblionumber = ? ";
267	unless ( $all_dates ) {	284	unless ( $all_dates ) {
268	$query .= "AND reservedate <= CURRENT_DATE()";	285	$query .= "AND reservedate <= CURRENT_DATE()";
269	}	286	}
270	$query .= "ORDER BY priority";	287	$query .= "ORDER BY reserves.priority";
271	my $sth = $dbh->prepare($query);	288	my $sth = $dbh->prepare($query);
272	$sth->execute($biblionumber);	289	$sth->execute($biblionumber);
273	my @results;	290	my @results;
Lines 373-381 sub GetReservesFromBorrowernumber { Link Here
373	return @$data;	390	return @$data;
374	}	391	}
375	#-------------------------------------------------------------------------------------	392	#-------------------------------------------------------------------------------------
		393	sub BorrowerHasReserve {
		394	my ( $borrowernumber, $biblionumber, $itemnumber ) = @_;
		395	my $dbh = C4::Context->dbh;
		396	my $sth;
		397
		398	if ( $biblionumber ) {
		399	$sth = $dbh->prepare("
		400	SELECT COUNT(*) AS hasReserve
		401	FROM reserves
		402	WHERE borrowernumber = ?
		403	AND biblionumber = ?
		404	ORDER BY reservedate
		405	");
		406	$sth->execute( $borrowernumber, $biblionumber );
		407	} elsif ( $itemnumber ) {
		408	$sth = $dbh->prepare("
		409	SELECT COUNT(*) AS hasReserve
		410	FROM reserves
		411	WHERE borrowernumber = ?
		412	AND itemnumber = ?
		413	ORDER BY reservedate
		414	");
		415	$sth->execute( $borrowernumber, $itemnumber );
		416	} else {
		417	return -1;
		418	}
		419
		420	my $data = $sth->fetchrow_hashref();
		421	return $data->{'hasReserve'};
		422	}
		423
376	=head2 CanBookBeReserved	424	=head2 CanBookBeReserved
377		425
378	$error = &CanBookBeReserved($borrowernumber, $biblionumber)	426	$error = &CanBookBeReserved($borrowernumber, $biblionumber)
379		427
380	=cut	428	=cut
381		429
Lines 399-405 This function return 1 if an item can be issued by this borrower. Link Here
399		447
400	sub CanItemBeReserved{	448	sub CanItemBeReserved{
401	my ($borrowernumber, $itemnumber) = @_;	449	my ($borrowernumber, $itemnumber) = @_;
402		450
403	my $dbh = C4::Context->dbh;	451	my $dbh = C4::Context->dbh;
404	my $allowedreserves = 0;	452	my $allowedreserves = 0;
405		453
Lines 407-413 sub CanItemBeReserved{ Link Here
407	my $itype = C4::Context->preference('item-level_itypes') ? "itype" : "itemtype";	455	my $itype = C4::Context->preference('item-level_itypes') ? "itype" : "itemtype";
408		456
409	# we retrieve borrowers and items informations #	457	# we retrieve borrowers and items informations #
410	my $item = GetItem($itemnumber);	458	my $item = C4::Items::GetItem($itemnumber);
411	my $borrower = C4::Members::GetMember('borrowernumber'=>$borrowernumber);	459	my $borrower = C4::Members::GetMember('borrowernumber'=>$borrowernumber);
412		460
413	# we retrieve user rights on this itemtype and branchcode	461	# we retrieve user rights on this itemtype and branchcode
Lines 438-459 sub CanItemBeReserved{ Link Here
438	my $branchfield = "reserves.branchcode";	486	my $branchfield = "reserves.branchcode";
439		487
440	if( $controlbranch eq "ItemHomeLibrary" ){	488	if( $controlbranch eq "ItemHomeLibrary" ){
441	$branchfield = "items.homebranch";	489	my $field=C4::Context->preference("HomeOrHoldingBranch")\|\|"homebranch";
442	$branchcode = $item->{homebranch};	490	$branchfield = "items.$field";
		491	$branchcode = $item->{$field};
443	}elsif( $controlbranch eq "PatronLibrary" ){	492	}elsif( $controlbranch eq "PatronLibrary" ){
444	$branchfield = "borrowers.branchcode";	493	$branchfield = "borrowers.branchcode";
445	$branchcode = $borrower->{branchcode};	494	$branchcode = $borrower->{branchcode};
446	}	495	}
447		496
448	# we retrieve rights	497	# we retrieve user rights on this itemtype and branchcode
449	$sth->execute($categorycode, $itemtype, $branchcode);	498	my $issuingrule = GetIssuingRule($borrower->{categorycode}, $item->{$itype}, $branchcode);
450	if(my $rights = $sth->fetchrow_hashref()){	499	return 0 if( defined $issuingrule->{reservesallowed} && not $issuingrule->{reservesallowed} );
451	$itemtype = $rights->{itemtype};	500
452	$allowedreserves = $rights->{reservesallowed};	501	# We retrieve the count of reserves allowed for this category code
		502	$issuingrule = GetIssuingRule ($borrower->{categorycode}, "", "");
		503
		504	if($issuingrule){
		505	$itemtype = $issuingrule->{itemtype};
		506	$allowedreserves = $issuingrule->{reservesallowed};
453	}else{	507	}else{
454	$itemtype = '*';	508	$itemtype = '*';
455	}	509	}
456		510
		511	return 0 if ($issuingrule->{reservesallowed}==0 \|\|
		512	($issuingrule->{holdrestricted}== 1 && !($branchcode eq $borrower->{branchcode}))
		513	);
457	# we retrieve count	514	# we retrieve count
458		515
459	$querycount .= "AND $branchfield = ?";	516	$querycount .= "AND $branchfield = ?";
Lines 479-484 sub CanItemBeReserved{ Link Here
479	return 0;	536	return 0;
480	}	537	}
481	}	538	}
		539
		540	=item GetMaxPickupDelay
		541
		542	$resallowed = &GetMaxPickupDelay($borrowernumber, $itemnumber)
		543
		544	this function return the number of allowed reserves.
		545
		546	=cut
		547
		548	sub GetMaxPickupDelay {
		549	my ($borrowernumber, $itemnumber) = @_;
		550
		551	my $dbh = C4::Context->dbh;
		552	my $allowedreserves = 0;
		553
		554	my $itype = C4::Context->preference('item-level_itypes') ? "itype" : "itemtype";
		555
		556	# we retrieve borrowers and items informations #
		557	my $item = C4::Items::GetItem($itemnumber);
		558	my $borrower = C4::Members::GetMember('borrowernumber'=>$borrowernumber);
		559	my $controlbranch = GetReservesControlBranch($borrower,$item);
		560
		561	# we retrieve user rights on this itemtype and branchcode
		562	my $sth = $dbh->prepare("SELECT holdspickupdelay
		563	FROM issuingrules
		564	WHERE categorycode=?
		565	AND itemtype=?
		566	AND branchcode=?
		567	AND holdspickupdelay IS NOT NULL"
		568	);
		569
		570	my $itemtype = $item->{$itype};
		571	my $borrowertype = $borrower->{categorycode};
		572	my $branchcode = $controlbranch;
		573
		574	$sth->execute( $borrowertype, $itemtype, $branchcode );
		575	my $pickupdelay = $sth->fetchrow_hashref;
		576	return $pickupdelay->{holdspickupdelay}
		577	if defined($pickupdelay) && $pickupdelay->{holdspickupdelay} ne 'NULL';
		578
		579	$sth->execute( $borrowertype, "*", $branchcode );
		580	$pickupdelay = $sth->fetchrow_hashref;
		581	return $pickupdelay->{holdspickupdelay}
		582	if defined($pickupdelay) && $pickupdelay->{holdspickupdelay} ne 'NULL';
		583
		584	$sth->execute( "*", $itemtype, $branchcode );
		585	$pickupdelay = $sth->fetchrow_hashref;
		586	return $pickupdelay->{holdspickupdelay}
		587	if defined($pickupdelay) && $pickupdelay->{holdspickupdelay} ne 'NULL';
		588
		589	$sth->execute( "", "", $branchcode );
		590	$pickupdelay = $sth->fetchrow_hashref;
		591	return $pickupdelay->{holdspickupdelay}
		592	if defined($pickupdelay) && $pickupdelay->{holdspickupdelay} ne 'NULL';
		593
		594	$sth->execute( $borrowertype, $itemtype, "*" );
		595	$pickupdelay = $sth->fetchrow_hashref;
		596	return $pickupdelay->{holdspickupdelay}
		597	if defined($pickupdelay) && $pickupdelay->{holdspickupdelay} ne 'NULL';
		598
		599	$sth->execute( $borrowertype, "", "" );
		600	$pickupdelay = $sth->fetchrow_hashref;
		601	return $pickupdelay->{holdspickupdelay}
		602	if defined($pickupdelay) && $pickupdelay->{holdspickupdelay} ne 'NULL';
603
604	$sth->execute( "", $itemtype, "" );
605	$pickupdelay = $sth->fetchrow_hashref;
606	return $pickupdelay->{holdspickupdelay}
607	if defined($pickupdelay) && $pickupdelay->{holdspickupdelay} ne 'NULL';
608
609	$sth->execute( "", "", "*" );
610	$pickupdelay = $sth->fetchrow_hashref;
611	return $pickupdelay->{holdspickupdelay}
612	if defined($pickupdelay) && $pickupdelay->{holdspickupdelay} ne 'NULL';
613
614	# if nothing found, return no rights
615	return 0;
616	}
617
618	=item GetMaxPickupDate
619
620	$maxpickupdate = &GetMaxPickupDate($date);
621
622	this function return the max pickup date.
623	(e.g. : the date after which the hold will be considered cancelled)
624
625	=cut
626
627	sub GetMaxPickupDate{
628	my $inputdate=shift;
629	my $borrowernumber=shift;
630	my $item=shift;
631	return unless $inputdate;
632	my @date = split(/-/,$inputdate);
633	my $delay = GetMaxPickupDelay($borrowernumber, $item->{'itemnumber'});
634	( @date ) =
635	Add_Delta_Days( @date[0..2], $delay);
636	return @date;
637	}
638
482	#--------------------------------------------------------------------------------	639	#--------------------------------------------------------------------------------
483	=head2 GetReserveCount	640	=head2 GetReserveCount
484		641
Lines 518-538 sub GetOtherReserves { Link Here
518	my $nextreservinfo;	675	my $nextreservinfo;
519	my ( $restype, $checkreserves ) = CheckReserves($itemnumber);	676	my ( $restype, $checkreserves ) = CheckReserves($itemnumber);
520	if ($checkreserves) {	677	if ($checkreserves) {
521	my $iteminfo = GetItem($itemnumber);	678	my $iteminfo = C4::Items::GetItem($itemnumber);
522	if ( $iteminfo->{'holdingbranch'} ne $checkreserves->{'branchcode'} ) {	679	if ( $iteminfo->{'holdingbranch'} ne $checkreserves->{'branchcode'} ) {
523	$messages->{'transfert'} = $checkreserves->{'branchcode'};	680	$messages->{'transfert'} = $checkreserves->{'branchcode'};
524	#minus priorities of others reservs	681	#minus priorities of others reservs
525	ModReserveMinusPriority(	682	ModReserveMinusPriority(
526	$itemnumber,	683	$itemnumber,
527	$checkreserves->{'borrowernumber'},	684	$checkreserves->{'borrowernumber'},
528	$iteminfo->{'biblionumber'}	685	$iteminfo->{'biblionumber'},
		686	$checkreserves->{'reservenumber'}
529	);	687	);
530		688
531	#launch the subroutine dotransfer	689	#launch the subroutine dotransfer
532	C4::Items::ModItemTransfer(	690	C4::Items::ModItemTransfer(
533	$itemnumber,	691	$itemnumber,
534	$iteminfo->{'holdingbranch'},	692	$iteminfo->{'holdingbranch'},
535	$checkreserves->{'branchcode'}	693	$checkreserves->{'branchcode'},
536	),	694	),
537	;	695	;
538	}	696	}
Lines 543-549 sub GetOtherReserves { Link Here
543	ModReserveMinusPriority(	701	ModReserveMinusPriority(
544	$itemnumber,	702	$itemnumber,
545	$checkreserves->{'borrowernumber'},	703	$checkreserves->{'borrowernumber'},
546	$iteminfo->{'biblionumber'}	704	$iteminfo->{'biblionumber'},
		705	$checkreserves->{'reservenumber'}
547	);	706	);
548	ModReserveStatus($itemnumber,'W');	707	ModReserveStatus($itemnumber,'W');
549	}	708	}
Lines 657-662 sub GetReserveFee { Link Here
657	return $fee;	816	return $fee;
658	}	817	}
659		818
		819	=head2 GetReservesControlBranch
		820
		821	$branchcode = &GetReservesControlBranch($borrower, $item)
		822
		823	Returns the branchcode to consider to check hold rules against
		824
		825	=cut
		826	sub GetReservesControlBranch{
		827	my ($borrower, $item) = @_;
		828	my $controlbranch = C4::Context->preference('ReservesControlBranch');
		829	my $hbr = C4::Context->preference('HomeOrHoldingBranch')\|\|"homebranch";
		830	my $branchcode="*";
		831	if($controlbranch eq "ItemHomeLibrary"){
		832	$branchcode = $item->{$hbr};
		833	} elsif($controlbranch eq "PatronLibrary"){
		834	$branchcode = $borrower->{'branchcode'};
		835	}
		836	return $branchcode;
		837	}
		838
660	=head2 GetReservesToBranch	839	=head2 GetReservesToBranch
661		840
662	@transreserv = GetReservesToBranch( $frombranch );	841	@transreserv = GetReservesToBranch( $frombranch );
Lines 840-862 sub CancelExpiredReserves { Link Here
840	$sth->execute();	1019	$sth->execute();
841		1020
842	while ( my $res = $sth->fetchrow_hashref() ) {	1021	while ( my $res = $sth->fetchrow_hashref() ) {
843	CancelReserve( $res->{'biblionumber'}, '', $res->{'borrowernumber'} );	1022	CancelReserve( $res->{'reservenumber'}, $res->{'biblionumber'} );
844	}	1023	}
845		1024
846	}	1025	}
847		1026
848	=head2 CancelReserve	1027	=head2 CancelReserve
849		1028
850	&CancelReserve($biblionumber, $itemnumber, $borrowernumber);	1029	&CancelReserve( $reservenumber, $biblionumber );
851		1030
852	Cancels a reserve.	1031	Cancels a reserve.
853		1032
854	Use either C<$biblionumber> or C<$itemnumber> to specify the item to	1033	C<$reservenumber> is the unique key for the reserve to be canceled.
855	cancel, but not both: if both are given, C<&CancelReserve> does
856	nothing.
857
858	C<$borrowernumber> is the borrower number of the patron on whose
859	behalf the book was reserved.
860		1034
861	If C<$biblionumber> was given, C<&CancelReserve> also adjusts the	1035	If C<$biblionumber> was given, C<&CancelReserve> also adjusts the
862	priorities of the other people who are waiting on the book.	1036	priorities of the other people who are waiting on the book.
Lines 864-872 priorities of the other people who are waiting on the book. Link Here
864	=cut	1038	=cut
865		1039
866	sub CancelReserve {	1040	sub CancelReserve {
867	my ( $biblio, $item, $borr ) = @_;	1041	my ( $reservenumber, $biblio ) = @_;
868	my $dbh = C4::Context->dbh;	1042	my $dbh = C4::Context->dbh;
869	if ( $item and $borr ) {	1043
		1044	my $sth = $dbh->prepare('SELECT * FROM reserves WHERE reservenumber = ?');
		1045	$sth->execute( $reservenumber );
		1046	my $reserve = $sth->fetchrow_hashref();
		1047
		1048	if ( $reserve->{'found'} eq 'W' ) {
870	# removing a waiting reserve record....	1049	# removing a waiting reserve record....
871	# update the database...	1050	# update the database...
872	my $query = "	1051	my $query = "
Lines 874-900 sub CancelReserve { Link Here
874	SET cancellationdate = now(),	1053	SET cancellationdate = now(),
875	found = Null,	1054	found = Null,
876	priority = 0	1055	priority = 0
877	WHERE itemnumber = ?	1056	WHERE reservenumber = ?
878	AND borrowernumber = ?
879	";	1057	";
880	my $sth = $dbh->prepare($query);	1058	my $sth = $dbh->prepare($query);
881	$sth->execute( $item, $borr );	1059	$sth->execute( $reservenumber );
882	$sth->finish;	1060
		1061	# get reserve information to place into old_reserves
883	$query = "	1062	$query = "
884	INSERT INTO old_reserves	1063	INSERT INTO old_reserves
885	SELECT * FROM reserves	1064	SELECT * FROM reserves
886	WHERE itemnumber = ?	1065	WHERE reservenumber = ?
887	AND borrowernumber = ?
888	";	1066	";
889	$sth = $dbh->prepare($query);	1067	$sth = $dbh->prepare($query);
890	$sth->execute( $item, $borr );	1068	$sth->execute( $reservenumber );
		1069	my $holditem = $sth->fetchrow_hashref;
		1070	my $insert_fields = '';
		1071	my $value_fields = '';
		1072	foreach my $column ('borrowernumber','reservedate','biblionumber','constrainttype','branchcode','notificationdate','reminderdate','cancellationdate','reservenotes','priority','found','itemnumber','waitingdate','expirationdate') {
		1073	if (defined($holditem->{$column})) {
		1074	if (length($insert_fields)) {
		1075	$insert_fields .= ",$column";
		1076	$value_fields .= ",\'$holditem->{$column}\'";
		1077	}
		1078	else {
		1079	$insert_fields .= "$column";
		1080	$value_fields .= "\'$holditem->{$column}\'";
		1081	}
		1082	}
		1083	}
		1084	$query = qq/
		1085	INSERT INTO old_reserves ($insert_fields)
		1086	VALUES ($value_fields)
		1087	/;
		1088	$sth = $dbh->prepare($query);
		1089	$sth->execute();
891	$query = "	1090	$query = "
892	DELETE FROM reserves	1091	DELETE FROM reserves
893	WHERE itemnumber = ?	1092	WHERE reservenumber = ?
894	AND borrowernumber = ?
895	";	1093	";
896	$sth = $dbh->prepare($query);	1094	$sth = $dbh->prepare($query);
897	$sth->execute( $item, $borr );	1095	$sth->execute( $reservenumber );
898	}	1096	}
899	else {	1097	else {
900	# removing a reserve record....	1098	# removing a reserve record....
Lines 902-953 sub CancelReserve { Link Here
902	my $priority;	1100	my $priority;
903	my $query = qq/	1101	my $query = qq/
904	SELECT priority FROM reserves	1102	SELECT priority FROM reserves
905	WHERE biblionumber = ?	1103	WHERE reservenumber = ?
906	AND borrowernumber = ?
907	AND cancellationdate IS NULL	1104	AND cancellationdate IS NULL
908	AND itemnumber IS NULL	1105	AND itemnumber IS NULL
909	/;	1106	/;
910	my $sth = $dbh->prepare($query);	1107	my $sth = $dbh->prepare($query);
911	$sth->execute( $biblio, $borr );	1108	$sth->execute( $reservenumber );
912	($priority) = $sth->fetchrow_array;	1109	($priority) = $sth->fetchrow_array;
913	$sth->finish;	1110	$sth->finish;
914	$query = qq/	1111	$query = qq/
915	UPDATE reserves	1112	UPDATE reserves
916	SET cancellationdate = now(),	1113	SET cancellationdate = now(),
917	found = Null,	1114	found = Null,
918	priority = 0	1115	priority = 0,
919	WHERE biblionumber = ?	1116	expirationdate = NULL
920	AND borrowernumber = ?	1117	WHERE reservenumber = ?
921	/;	1118	/;
922		1119
923	# update the database, removing the record...	1120	# update the database, removing the record...
924	$sth = $dbh->prepare($query);	1121	$sth = $dbh->prepare($query);
925	$sth->execute( $biblio, $borr );	1122	$sth->execute( $reservenumber );
926	$sth->finish;
927		1123
928	$query = qq/	1124	$query = qq/
929	INSERT INTO old_reserves	1125	INSERT INTO old_reserves
930	SELECT * FROM reserves	1126	SELECT * FROM reserves
931	WHERE biblionumber = ?	1127	WHERE reservenumber = ?
932	AND borrowernumber = ?	1128	/;
		1129	$sth = $dbh->prepare($query);
		1130	$sth->execute( $reservenumber );
		1131	my $holditem = $sth->fetchrow_hashref;
		1132
		1133	my $insert_fields = '';
		1134	my $value_fields = '';
		1135	foreach my $column ('borrowernumber','reservedate','biblionumber','constrainttype','branchcode','notificationdate','reminderdate','cancellationdate','reservenotes','priority','found','itemnumber','waitingdate','expirationdate') {
		1136	if (defined($holditem->{$column})) {
		1137	if (length($insert_fields)) {
		1138	$insert_fields .= ",$column";
		1139	$value_fields .= ",\'$holditem->{$column}\'";
		1140	}
		1141	else {
		1142	$insert_fields .= "$column";
		1143	$value_fields .= "\'$holditem->{$column}\'";
		1144	}
		1145	}
		1146	}
		1147	$query = qq/
		1148	INSERT INTO old_reserves ($insert_fields)
		1149	VALUES ($value_fields)
933	/;	1150	/;
934	$sth = $dbh->prepare($query);	1151	$sth = $dbh->prepare($query);
935	$sth->execute( $biblio, $borr );	1152	$sth->execute();
936		1153
937	$query = qq/	1154	$query = qq/
938	DELETE FROM reserves	1155	DELETE FROM reserves
939	WHERE biblionumber = ?	1156	WHERE reservenumber = ?
940	AND borrowernumber = ?
941	/;	1157	/;
942	$sth = $dbh->prepare($query);	1158	$sth = $dbh->prepare($query);
943	$sth->execute( $biblio, $borr );	1159	$sth->execute( $reservenumber );
944		1160
945	# now fix the priority on the others....	1161	# now fix the priority on the others....
946	_FixPriority( $biblio, $borr );	1162	_FixPriority( '', '', $priority,'', $reservenumber );
947	}	1163	}
948	}	1164	}
949		1165
950	=head2 ModReserve	1166	=item ModReserve
		1167
		1168	=over 4
951		1169
952	ModReserve($rank, $biblio, $borrower, $branch[, $itemnumber])	1170	ModReserve($rank, $biblio, $borrower, $branch[, $itemnumber])
953		1171
Lines 980-1031 itemnumber and supplying itemnumber. Link Here
980		1198
981	sub ModReserve {	1199	sub ModReserve {
982	#subroutine to update a reserve	1200	#subroutine to update a reserve
983	my ( $rank, $biblio, $borrower, $branch , $itemnumber) = @_;	1201	my ( $rank, $biblio, $borrower, $branch , $itemnumber, $reservenumber) = @_;
984	return if $rank eq "W";	1202	return if $rank eq "W";
985	return if $rank eq "n";	1203	return if $rank eq "n";
986	my $dbh = C4::Context->dbh;	1204	my $dbh = C4::Context->dbh;
987	if ( $rank eq "del" ) {	1205	if ( $rank eq "del" ) {
988	my $query = qq/	1206	my $query = qq/
989	UPDATE reserves	1207	UPDATE reserves
990	SET cancellationdate=now()	1208	SET cancellationdate=now(),
991	WHERE biblionumber = ?	1209	expirationdate = NULL
992	AND borrowernumber = ?	1210	WHERE reservenumber = ?
993	/;	1211	/;
994	my $sth = $dbh->prepare($query);	1212	my $sth = $dbh->prepare($query);
995	$sth->execute( $biblio, $borrower );	1213	$sth->execute( $reservenumber );
996	$sth->finish;	1214	$sth->finish;
997	$query = qq/	1215	$query = qq/
998	INSERT INTO old_reserves	1216	INSERT INTO old_reserves
999	SELECT *	1217	SELECT * FROM reserves
1000	FROM reserves	1218	WHERE reservenumber = ?
1001	WHERE biblionumber = ?
1002	AND borrowernumber = ?
1003	/;	1219	/;
1004	$sth = $dbh->prepare($query);	1220	$sth = $dbh->prepare($query);
1005	$sth->execute( $biblio, $borrower );	1221	$sth->execute( $reservenumber );
1006	$query = qq/	1222	$query = qq/
1007	DELETE FROM reserves	1223	DELETE FROM reserves
1008	WHERE biblionumber = ?	1224	WHERE reservenumber = ?
1009	AND borrowernumber = ?
1010	/;	1225	/;
1011	$sth = $dbh->prepare($query);	1226	$sth = $dbh->prepare($query);
1012	$sth->execute( $biblio, $borrower );	1227	$sth->execute( $reservenumber );
1013		1228
1014	}	1229	}
1015	elsif ($rank =~ /^\d+/ and $rank > 0) {	1230	elsif ($rank =~ /^\d+/ and $rank > 0) {
1016	my $query = qq/	1231	my $query = qq/
1017	UPDATE reserves SET priority = ? ,branchcode = ?, itemnumber = ?, found = NULL, waitingdate = NULL	1232	UPDATE reserves SET priority = ? ,branchcode = ?, itemnumber = ?, found = NULL, waitingdate = NULL
1018	WHERE biblionumber = ?	1233	WHERE reservenumber = ?
1019	AND borrowernumber = ?
1020	/;	1234	/;
1021	my $sth = $dbh->prepare($query);	1235	my $sth = $dbh->prepare($query);
1022	$sth->execute( $rank, $branch,$itemnumber, $biblio, $borrower);	1236	$sth->execute( $rank, $branch, $itemnumber, $reservenumber );
1023	$sth->finish;	1237	$sth->finish;
1024	_FixPriority( $biblio, $borrower, $rank);	1238	_FixPriority( $biblio, $borrower, $rank, '', $reservenumber);
1025	}	1239	}
1026	}	1240	}
1027		1241
1028	=head2 ModReserveFill	1242	=item ModReserveFill
1029		1243
1030	&ModReserveFill($reserve);	1244	&ModReserveFill($reserve);
1031		1245
Lines 1044-1059 sub ModReserveFill { Link Here
1044	my $biblionumber = $res->{'biblionumber'};	1258	my $biblionumber = $res->{'biblionumber'};
1045	my $borrowernumber = $res->{'borrowernumber'};	1259	my $borrowernumber = $res->{'borrowernumber'};
1046	my $resdate = $res->{'reservedate'};	1260	my $resdate = $res->{'reservedate'};
		1261	my $resnumber = $res->{'reservenumber'};
1047		1262
1048	# get the priority on this record....	1263	# get the priority on this record....
1049	my $priority;	1264	my $priority;
1050	my $query = "SELECT priority	1265	my $query = "SELECT priority
1051	FROM reserves	1266	FROM reserves
1052	WHERE biblionumber = ?	1267	WHERE borrowernumber = ?
1053	AND borrowernumber = ?	1268	AND reservenumber = ?
1054	AND reservedate = ?";	1269	AND reservedate = ?";
1055	my $sth = $dbh->prepare($query);	1270	my $sth = $dbh->prepare($query);
1056	$sth->execute( $biblionumber, $borrowernumber, $resdate );	1271	$sth->execute( $resnumber, $borrowernumber, $resdate );
1057	($priority) = $sth->fetchrow_array;	1272	($priority) = $sth->fetchrow_array;
1058	$sth->finish;	1273	$sth->finish;
1059		1274
Lines 1061-1095 sub ModReserveFill { Link Here
1061	$query = "UPDATE reserves	1276	$query = "UPDATE reserves
1062	SET found = 'F',	1277	SET found = 'F',
1063	priority = 0	1278	priority = 0
1064	WHERE biblionumber = ?	1279	WHERE reservenumber = ?
1065	AND reservedate = ?	1280	AND reservedate = ?
1066	AND borrowernumber = ?	1281	AND borrowernumber = ?
1067	";	1282	";
1068	$sth = $dbh->prepare($query);	1283	$sth = $dbh->prepare($query);
1069	$sth->execute( $biblionumber, $resdate, $borrowernumber );	1284	$sth->execute( $resnumber, $resdate, $borrowernumber );
1070	$sth->finish;	1285	$sth->finish;
1071		1286
1072	# move to old_reserves	1287	# move to old_reserves
1073	$query = "INSERT INTO old_reserves	1288	$query = "INSERT INTO old_reserves
1074	SELECT * FROM reserves	1289	SELECT * FROM reserves
1075	WHERE biblionumber = ?	1290	WHERE reservenumber = ?
1076	AND reservedate = ?	1291	AND reservedate = ?
1077	AND borrowernumber = ?	1292	AND borrowernumber = ?
1078	";	1293	";
1079	$sth = $dbh->prepare($query);	1294	$sth = $dbh->prepare($query);
1080	$sth->execute( $biblionumber, $resdate, $borrowernumber );	1295	$sth->execute( $resnumber, $resdate, $borrowernumber );
1081	$query = "DELETE FROM reserves	1296	$query = "DELETE FROM reserves
1082	WHERE biblionumber = ?	1297	WHERE reservenumber = ?
1083	AND reservedate = ?	1298	AND reservedate = ?
1084	AND borrowernumber = ?	1299	AND borrowernumber = ?
1085	";	1300	";
1086	$sth = $dbh->prepare($query);	1301	$sth = $dbh->prepare($query);
1087	$sth->execute( $biblionumber, $resdate, $borrowernumber );	1302	$sth->execute( $resnumber, $resdate, $borrowernumber );
1088		1303
1089	# now fix the priority on the others (if the priority wasn't	1304	# now fix the priority on the others (if the priority wasn't
1090	# already sorted!)....	1305	# already sorted!)....
1091	unless ( $priority == 0 ) {	1306	unless ( $priority == 0 ) {
1092	_FixPriority( $biblionumber, $borrowernumber );	1307	_FixPriority( $priority, $biblionumber,undef,undef, $res->{reservenumber} );
1093	}	1308	}
1094	}	1309	}
1095		1310
Lines 1106-1112 $newstatus is the new status. Link Here
1106	=cut	1321	=cut
1107		1322
1108	sub ModReserveStatus {	1323	sub ModReserveStatus {
1109
1110	#first : check if we have a reservation for this item .	1324	#first : check if we have a reservation for this item .
1111	my ($itemnumber, $newstatus) = @_;	1325	my ($itemnumber, $newstatus) = @_;
1112	my $dbh = C4::Context->dbh;	1326	my $dbh = C4::Context->dbh;
Lines 1140-1148 take care of the waiting status Link Here
1140	=cut	1354	=cut
1141		1355
1142	sub ModReserveAffect {	1356	sub ModReserveAffect {
1143	my ( $itemnumber, $borrowernumber,$transferToDo ) = @_;	1357	my ( $itemnumber, $borrowernumber,$transferToDo, $reservenumber ) = @_;
1144	my $dbh = C4::Context->dbh;	1358	my $dbh = C4::Context->dbh;
1145
1146	# we want to attach $itemnumber to $borrowernumber, find the biblionumber	1359	# we want to attach $itemnumber to $borrowernumber, find the biblionumber
1147	# attached to $itemnumber	1360	# attached to $itemnumber
1148	my $sth = $dbh->prepare("SELECT biblionumber FROM items WHERE itemnumber=?");	1361	my $sth = $dbh->prepare("SELECT biblionumber FROM items WHERE itemnumber=?");
Lines 1160-1186 sub ModReserveAffect { Link Here
1160	$query = "	1373	$query = "
1161	UPDATE reserves	1374	UPDATE reserves
1162	SET priority = 0,	1375	SET priority = 0,
1163	itemnumber = ?,	1376	itemnumber = ?
1164	found = 'T'	1377	WHERE reservenumber = ?
1165	WHERE borrowernumber = ?
1166	AND biblionumber = ?
1167	";	1378	";
1168	}	1379	}
1169	else {	1380	else {
1170	# affect the reserve to Waiting as well.	1381	# affect the reserve to Waiting as well.
1171	$query = "	1382	my $holdperiod = C4::Context->preference('ReservesMaxPickUpDelay');
1172	UPDATE reserves	1383	if ((!defined($holdperiod)) \|\| ($holdperiod eq '') \|\| ($holdperiod == 0)) {
1173	SET priority = 0,	1384	$query = "
1174	found = 'W',	1385	UPDATE reserves
1175	waitingdate=now(),	1386	SET priority = 0,
1176	itemnumber = ?	1387	found = 'W',
1177	WHERE borrowernumber = ?	1388	waitingdate=now(),
1178	AND biblionumber = ?	1389	itemnumber = ?
1179	";	1390	WHERE reservenumber = ?
		1391	";
		1392	}
		1393	else {
		1394	my ($holdexpyear,$holdexpmonth,$holdexpday) = Today();
		1395	my $holdstartdate = C4::Dates->new(sprintf "%02d/%02d/%04d",$holdexpmonth,$holdexpday,$holdexpyear, 'us');
		1396
		1397	# Grab branch for calendar purposes
		1398	$sth = $dbh->prepare("SELECT branchcode FROM reserves WHERE borrowernumber=? AND biblionumber=?");
		1399	$sth->execute($borrowernumber,$biblionumber);
		1400	my ($branch) = $sth->fetchrow;
		1401
		1402	# Check to see if hold expiration date falls on a closed library day.
		1403	# Note the useDaysMode syspref will need to be set to Calendar for
		1404	# the code to advance to the next non-closed day.
		1405	my $calendar = C4::Calendar->new( branchcode => $branch);
		1406	my $holdexpdate = $calendar->addDate($holdstartdate, $holdperiod);
		1407	my $sqlexpdate = $holdexpdate->output('iso');
		1408	$query = "
		1409	UPDATE reserves
		1410	SET priority = 0,
		1411	found = 'W',
		1412	waitingdate=now(),
		1413	itemnumber = ?,
		1414	expirationdate='$sqlexpdate'
		1415	WHERE reservenumber = ?
		1416	";
		1417	}
1180	}	1418	}
1181	$sth = $dbh->prepare($query);	1419	$sth = $dbh->prepare($query);
1182	$sth->execute( $itemnumber, $borrowernumber,$biblionumber);	1420	$sth->execute( $itemnumber, $reservenumber );
1183	_koha_notify_reserve( $itemnumber, $borrowernumber, $biblionumber ) if ( !$transferToDo && !$already_on_shelf );	1421	_koha_notify_reserve( $itemnumber, $borrowernumber, $biblionumber, $reservenumber ) if ( !$transferToDo && !$already_on_shelf );
1184		1422
1185	if ( C4::Context->preference("ReturnToShelvingCart") ) {	1423	if ( C4::Context->preference("ReturnToShelvingCart") ) {
1186	CartToShelf( $itemnumber );	1424	CartToShelf( $itemnumber );
Lines 1220-1242 Reduce the values of queuded list Link Here
1220	=cut	1458	=cut
1221		1459
1222	sub ModReserveMinusPriority {	1460	sub ModReserveMinusPriority {
1223	my ( $itemnumber, $borrowernumber, $biblionumber ) = @_;	1461	my ( $itemnumber, $borrowernumber, $biblionumber, $reservenumber ) = @_;
1224
1225	#first step update the value of the first person on reserv	1462	#first step update the value of the first person on reserv
1226	my $dbh = C4::Context->dbh;	1463	my $dbh = C4::Context->dbh;
1227	my $query = "	1464	my $query = "
1228	UPDATE reserves	1465	UPDATE reserves
1229	SET priority = 0 , itemnumber = ?	1466	SET priority = 0 , itemnumber = ?
1230	WHERE borrowernumber=?	1467	WHERE reservenumber=?
1231	AND biblionumber=?
1232	";	1468	";
1233	my $sth_upd = $dbh->prepare($query);	1469	my $sth_upd = $dbh->prepare($query);
1234	$sth_upd->execute( $itemnumber, $borrowernumber, $biblionumber );	1470	$sth_upd->execute( $itemnumber, $reservenumber );
1235	# second step update all others reservs	1471	# second step update all others reservs
1236	_FixPriority($biblionumber, $borrowernumber, '0');	1472	_FixPriority($biblionumber, $borrowernumber, '0', '', $reservenumber);
1237	}	1473	}
1238		1474
1239	=head2 GetReserveInfo	1475	=item GetReserveInfo
1240		1476
1241	&GetReserveInfo($borrowernumber,$biblionumber);	1477	&GetReserveInfo($borrowernumber,$biblionumber);
1242		1478
Lines 1321-1327 and canreservefromotherbranches. Link Here
1321	sub IsAvailableForItemLevelRequest {	1557	sub IsAvailableForItemLevelRequest {
1322	my $itemnumber = shift;	1558	my $itemnumber = shift;
1323		1559
1324	my $item = GetItem($itemnumber);	1560	my $item = C4::Items::GetItem($itemnumber);
1325		1561
1326	# must check the notforloan setting of the itemtype	1562	# must check the notforloan setting of the itemtype
1327	# FIXME - a lot of places in the code do this	1563	# FIXME - a lot of places in the code do this
Lines 1356-1365 sub IsAvailableForItemLevelRequest { Link Here
1356	$notforloan_per_itemtype;	1592	$notforloan_per_itemtype;
1357		1593
1358		1594
1359	if (C4::Context->preference('AllowOnShelfHolds')) {	1595	if (CanHoldOnShelf($itemnumber)) {
1360	return $available_per_item;	1596	return $available_per_item;
1361	} else {	1597	} else {
1362	return ($available_per_item and ($item->{onloan} or GetReserveStatus($itemnumber) eq "W"));	1598	return ($available_per_item and ($item->{onloan} or GetReserveStatus($itemnumber) eq "W"));
1363	}	1599	}
1364	}	1600	}
1365		1601
Lines 1387-1401 sub AlterPriority { Link Here
1387		1623
1388	my $priority = $reserve->{'priority'};	1624	my $priority = $reserve->{'priority'};
1389	$priority = $where eq 'up' ? $priority - 1 : $priority + 1;	1625	$priority = $where eq 'up' ? $priority - 1 : $priority + 1;
1390	_FixPriority( $biblionumber, $borrowernumber, $priority )	1626	_FixPriority( $biblionumber, $borrowernumber, $priority ,undef,$reserve->{reservenumber})
1391		1627
1392	} elsif ( $where eq 'top' ) {	1628	} elsif ( $where eq 'top' ) {
1393		1629
1394	_FixPriority( $biblionumber, $borrowernumber, '1' )	1630	_FixPriority( $biblionumber, $borrowernumber, '1',undef,$reserve->{reservenumber} )
1395		1631
1396	} elsif ( $where eq 'bottom' ) {	1632	} elsif ( $where eq 'bottom' ) {
1397		1633
1398	_FixPriority( $biblionumber, $borrowernumber, '999999' )	1634	_FixPriority( $biblionumber, $borrowernumber, '999999',undef,$reserve->{reservenumber} )
1399		1635
1400	}	1636	}
1401	}	1637	}
Lines 1418-1435 sub ToggleLowestPriority { Link Here
1418	WHERE biblionumber = ?	1654	WHERE biblionumber = ?
1419	AND borrowernumber = ?"	1655	AND borrowernumber = ?"
1420	);	1656	);
1421	$sth->execute(	1657	$sth->execute( $biblionumber, $borrowernumber, );
1422	$biblionumber,
1423	$borrowernumber,
1424	);
1425	$sth->finish;	1658	$sth->finish;
1426		1659
1427	_FixPriority( $biblionumber, $borrowernumber, '999999' );	1660	_FixPriority( $biblionumber, $borrowernumber, '999999' );
1428	}	1661	}
1429		1662
		1663	=head2 CanHoldOnShelf
		1664
		1665	my $canhold = &CanHoldOnShelf($itemnumber);
		1666
		1667	Check if a book can be hold on shelf.
		1668
		1669	=cut
		1670
		1671	sub CanHoldOnShelf {
		1672	my ($itemnumber) = @_;
		1673
		1674	my $item = C4::Items::GetItem($itemnumber);
		1675	my $itemtype = C4::Context->preference('item-level_itypes');
		1676	$itemtype = $itemtype ? $item->{itype} : $item->{itemtype} ;
		1677	my $branch = $item->{C4::Context->preference('HomeOrHoldingBranch')};
		1678
		1679	my $issuingrule = GetIssuingRule('*', $itemtype, $branch);
		1680	return $issuingrule->{allowonshelfholds};
		1681
		1682	}
		1683
		1684	sub CanHoldMultipleItems {
		1685	my ( $itemtype ) = @_;
		1686
		1687	my @multi_itemtypes = split( / /, C4::Context->preference('AllowMultipleHoldsPerBib') );
		1688	for my $mtype ( @multi_itemtypes ) {
		1689	if ( $itemtype eq $mtype ) {
		1690	return 1;
		1691	}
		1692	}
		1693
		1694	return 0;
		1695	}
		1696
1430	=head2 _FixPriority	1697	=head2 _FixPriority
		1698	>>>>>>> [MT2355] Ergonomy improvement in smart rule management
1431		1699
1432	&_FixPriority($biblio,$borrowernumber,$rank,$ignoreSetLowestRank);	1700	&_FixPriority($biblio,$borrowernumber,$rank,$ignoreSetLowestRank,$reservenumber);
1433		1701
1434	Only used internally (so don't export it)	1702	Only used internally (so don't export it)
1435	Changed how this functions works #	1703	Changed how this functions works #
Lines 1441-1447 in new priority rank Link Here
1441	=cut	1709	=cut
1442		1710
1443	sub _FixPriority {	1711	sub _FixPriority {
1444	my ( $biblio, $borrowernumber, $rank, $ignoreSetLowestRank ) = @_;	1712	my ( $biblio, $borrowernumber, $rank, $ignoreSetLowestRank, $reservenumber ) = @_;
1445	my $dbh = C4::Context->dbh;	1713	my $dbh = C4::Context->dbh;
1446	if ( $rank eq "del" ) {	1714	if ( $rank eq "del" ) {
1447	CancelReserve( $biblio, undef, $borrowernumber );	1715	CancelReserve( $biblio, undef, $borrowernumber );
Lines 1452-1463 sub _FixPriority { Link Here
1452	my $query = qq/	1720	my $query = qq/
1453	UPDATE reserves	1721	UPDATE reserves
1454	SET priority = 0	1722	SET priority = 0
1455	WHERE biblionumber = ?	1723	WHERE reservenumber = ?
1456	AND borrowernumber = ?	1724	AND found IN ('W',"T")
1457	AND found IN ('W', 'T')
1458	/;	1725	/;
1459	my $sth = $dbh->prepare($query);	1726	my $sth = $dbh->prepare($query);
1460	$sth->execute( $biblio, $borrowernumber );	1727	$sth->execute( $reservenumber );
1461	}	1728	}
1462	my @priority;	1729	my @priority;
1463	my @reservedates;	1730	my @reservedates;
Lines 1468-1474 sub _FixPriority { Link Here
1468	# This is wrong a waiting reserve has W set	1735	# This is wrong a waiting reserve has W set
1469	# The assumption that having an itemnumber set means waiting is wrong and should be corrected any place it occurs	1736	# The assumption that having an itemnumber set means waiting is wrong and should be corrected any place it occurs
1470	my $query = qq/	1737	my $query = qq/
1471	SELECT borrowernumber, reservedate, constrainttype	1738	SELECT borrowernumber, reservedate, constrainttype, reservenumber
1472	FROM reserves	1739	FROM reserves
1473	WHERE biblionumber = ?	1740	WHERE biblionumber = ?
1474	AND ((found <> 'W' AND found <> 'T') or found is NULL)	1741	AND ((found <> 'W' AND found <> 'T') or found is NULL)
Lines 1503-1518 sub _FixPriority { Link Here
1503	$query = "	1770	$query = "
1504	UPDATE reserves	1771	UPDATE reserves
1505	SET priority = ?	1772	SET priority = ?
1506	WHERE biblionumber = ?	1773	WHERE reservenumber = ?
1507	AND borrowernumber = ?
1508	AND reservedate = ?	1774	AND reservedate = ?
1509	AND found IS NULL	1775	AND found IS NULL
1510	";	1776	";
1511	$sth = $dbh->prepare($query);	1777	$sth = $dbh->prepare($query);
1512	for ( my $j = 0 ; $j < @priority ; $j++ ) {	1778	for ( my $j = 0 ; $j < @priority ; $j++ ) {
1513	$sth->execute(	1779	$sth->execute(
1514	$j + 1, $biblio,	1780	$j + 1,
1515	$priority[$j]->{'borrowernumber'},	1781	$priority[$j]->{'reservenumber'},
1516	$priority[$j]->{'reservedate'}	1782	$priority[$j]->{'reservedate'}
1517	);	1783	);
1518	$sth->finish;	1784	$sth->finish;
Lines 1552-1566 sub _Findgroupreserve { Link Here
1552	# TODO: consolidate at least the SELECT portion of the first 2 queries to a common $select var.	1818	# TODO: consolidate at least the SELECT portion of the first 2 queries to a common $select var.
1553	# check for exact targetted match	1819	# check for exact targetted match
1554	my $item_level_target_query = qq/	1820	my $item_level_target_query = qq/
1555	SELECT reserves.biblionumber AS biblionumber,	1821	SELECT reserves.reservenumber AS reservenumber,
1556	reserves.borrowernumber AS borrowernumber,	1822	reserves.biblionumber AS biblionumber,
1557	reserves.reservedate AS reservedate,	1823	reserves.borrowernumber AS borrowernumber,
1558	reserves.branchcode AS branchcode,	1824	reserves.reservedate AS reservedate,
1559	reserves.cancellationdate AS cancellationdate,	1825	reserves.branchcode AS branchcode,
1560	reserves.found AS found,	1826	reserves.cancellationdate AS cancellationdate,
1561	reserves.reservenotes AS reservenotes,	1827	reserves.found AS found,
1562	reserves.priority AS priority,	1828	reserves.reservenotes AS reservenotes,
1563	reserves.timestamp AS timestamp,	1829	reserves.priority AS priority,
		1830	reserves.timestamp AS timestamp,
1564	biblioitems.biblioitemnumber AS biblioitemnumber,	1831	biblioitems.biblioitemnumber AS biblioitemnumber,
1565	reserves.itemnumber AS itemnumber	1832	reserves.itemnumber AS itemnumber
1566	FROM reserves	1833	FROM reserves
Lines 1582-1596 sub _Findgroupreserve { Link Here
1582		1849
1583	# check for title-level targetted match	1850	# check for title-level targetted match
1584	my $title_level_target_query = qq/	1851	my $title_level_target_query = qq/
1585	SELECT reserves.biblionumber AS biblionumber,	1852	SELECT reserves.reservenumber AS reservenumber,
1586	reserves.borrowernumber AS borrowernumber,	1853	reserves.biblionumber AS biblionumber,
1587	reserves.reservedate AS reservedate,	1854	reserves.borrowernumber AS borrowernumber,
1588	reserves.branchcode AS branchcode,	1855	reserves.reservedate AS reservedate,
1589	reserves.cancellationdate AS cancellationdate,	1856	reserves.branchcode AS branchcode,
1590	reserves.found AS found,	1857	reserves.cancellationdate AS cancellationdate,
1591	reserves.reservenotes AS reservenotes,	1858	reserves.found AS found,
1592	reserves.priority AS priority,	1859	reserves.reservenotes AS reservenotes,
1593	reserves.timestamp AS timestamp,	1860	reserves.priority AS priority,
		1861	reserves.timestamp AS timestamp,
1594	biblioitems.biblioitemnumber AS biblioitemnumber,	1862	biblioitems.biblioitemnumber AS biblioitemnumber,
1595	reserves.itemnumber AS itemnumber	1863	reserves.itemnumber AS itemnumber
1596	FROM reserves	1864	FROM reserves
Lines 1611-1626 sub _Findgroupreserve { Link Here
1611	return @results if @results;	1879	return @results if @results;
1612		1880
1613	my $query = qq/	1881	my $query = qq/
1614	SELECT reserves.biblionumber AS biblionumber,	1882	SELECT reserves.reservenumber AS reservenumber,
1615	reserves.borrowernumber AS borrowernumber,	1883	reserves.biblionumber AS biblionumber,
1616	reserves.reservedate AS reservedate,	1884	reserves.borrowernumber AS borrowernumber,
1617	reserves.waitingdate AS waitingdate,	1885	reserves.reservedate AS reservedate,
1618	reserves.branchcode AS branchcode,	1886	reserves.branchcode AS branchcode,
1619	reserves.cancellationdate AS cancellationdate,	1887	reserves.cancellationdate AS cancellationdate,
1620	reserves.found AS found,	1888	reserves.found AS found,
1621	reserves.reservenotes AS reservenotes,	1889	reserves.reservenotes AS reservenotes,
1622	reserves.priority AS priority,	1890	reserves.priority AS priority,
1623	reserves.timestamp AS timestamp,	1891	reserves.timestamp AS timestamp,
1624	reserveconstraints.biblioitemnumber AS biblioitemnumber,	1892	reserveconstraints.biblioitemnumber AS biblioitemnumber,
1625	reserves.itemnumber AS itemnumber	1893	reserves.itemnumber AS itemnumber
1626	FROM reserves	1894	FROM reserves
Lines 1652-1681 ModReserveAffect, _not_ ModReserveFill) Link Here
1652	=cut	1920	=cut
1653		1921
1654	sub _koha_notify_reserve {	1922	sub _koha_notify_reserve {
1655	my ($itemnumber, $borrowernumber, $biblionumber) = @_;	1923	my ($itemnumber, $borrowernumber, $biblionumber, $reservenumber) = @_;
1656		1924
1657	my $dbh = C4::Context->dbh;	1925	my $dbh = C4::Context->dbh;
1658	my $borrower = C4::Members::GetMember(borrowernumber => $borrowernumber);	1926	my $borrower = C4::Members::GetMember( 'borrowernumber'=> $borrowernumber );
1659	my $letter_code;	1927	my $letter_code;
1660	my $print_mode = 0;	1928	my $print_mode = 0;
1661	my $messagingprefs;	1929	my $messagingprefs;
1662	if ( $borrower->{'email'} \|\| $borrower->{'smsalertnumber'} ) {	1930	if ( C4::Members::GetFirstValidEmailAddress($borrowernumber) \|\| $borrower->{'smsalertnumber'} ) {
1663	$messagingprefs = C4::Members::Messaging::GetMessagingPreferences( { borrowernumber => $borrowernumber, message_name => 'Hold Filled' } );	1931	$messagingprefs = C4::Members::Messaging::GetMessagingPreferences( { borrowernumber => $borrowernumber, message_name => 'Hold Filled' } );
1664		1932
1665	return if ( !defined( $messagingprefs->{'letter_code'} ) );	1933	return if ( !defined( $messagingprefs->{'letter_code'} ) );
1666	$letter_code = $messagingprefs->{'letter_code'};	1934	$letter_code = $messagingprefs->{'letter_code'};
1667	} else {	1935	} else {
1668	$letter_code = 'HOLD_PRINT';	1936	$letter_code = 'HOLD';
1669	$print_mode = 1;	1937	$print_mode = 1;
1670	}	1938	}
1671		1939
1672	my $sth = $dbh->prepare("	1940	my $sth = $dbh->prepare("
1673	SELECT *	1941	SELECT *
1674	FROM reserves	1942	FROM reserves
1675	WHERE borrowernumber = ?	1943	WHERE reservenumber = ?
1676	AND biblionumber = ?
1677	");	1944	");
1678	$sth->execute( $borrowernumber, $biblionumber );	1945	$sth->execute( $reservenumber );
1679	my $reserve = $sth->fetchrow_hashref;	1946	my $reserve = $sth->fetchrow_hashref;
1680	my $branch_details = GetBranchDetail( $reserve->{'branchcode'} );	1947	my $branch_details = GetBranchDetail( $reserve->{'branchcode'} );
1681		1948
Lines 1688-1693 sub _koha_notify_reserve { Link Here
1688	C4::Letters::parseletter( $letter, 'borrowers', $borrowernumber );	1955	C4::Letters::parseletter( $letter, 'borrowers', $borrowernumber );
1689	C4::Letters::parseletter( $letter, 'biblio', $biblionumber );	1956	C4::Letters::parseletter( $letter, 'biblio', $biblionumber );
1690	C4::Letters::parseletter( $letter, 'reserves', $borrowernumber, $biblionumber );	1957	C4::Letters::parseletter( $letter, 'reserves', $borrowernumber, $biblionumber );
		1958	C4::Letters::parseletter( $letter, 'items', $itemnumber );
1691		1959
1692	if ( $reserve->{'itemnumber'} ) {	1960	if ( $reserve->{'itemnumber'} ) {
1693	C4::Letters::parseletter( $letter, 'items', $reserve->{'itemnumber'} );	1961	C4::Letters::parseletter( $letter, 'items', $reserve->{'itemnumber'} );





## If Form Data Passed, Update the Database
if ( $input->param('updateLimits') ) {
	DeleteBranchTransferLimits($branchcode);

	foreach my $code ( @codes ) {
		foreach my $fromBranch ( @branchcodes ) {
			my $isSet = not $input->param( $code . "_" . $fromBranch);
			if ( $isSet ) {
			    CreateBranchTransferLimit( $branchcode, $fromBranch, $code );
			}
		}
	}

## Build the default data
my @codes_loop;
foreach my $code ( @codes ) {
	my @from_branch_loop;
	my %row_data;
	$row_data{ code } = $code;
	$row_data{ from_branch_loop } = \@from_branch_loop;
	foreach my $fromBranch ( @branchcodes ) {
		my %row_data;
        my $isChecked = IsBranchTransferAllowed( $branchcode, $fromBranch, $code );
		$row_data{ code }         = $code;
		$row_data{ fromBranch }     = $fromBranch;
		$row_data{ isChecked }    = $isChecked;	
		$row_data{ fromBranchname } = GetBranchName($fromBranch);	
		push( @from_branch_loop, \%row_data );
	}

	push( @codes_loop, \%row_data );




use C4::Auth;
use C4::Koha;
use C4::Debug;
use C4::Branch;
use C4::IssuingRules;
use C4::Circulation;

my $input = new CGI;
my $dbh = C4::Context->dbh;

my ($template, $loggedinuser, $cookie) = get_template_and_user({
    template_name   => "admin/smart-rules.tmpl",
    query           => $input,
    type            => "intranet",
    authnotrequired => 0,
    flagsrequired   => {parameters => 1},
    debug           => 1,
});

my $type       = $input->param('type');
my $branchcode = $input->param('branchcode') || ( C4::Branch::onlymine() ? ( C4::Branch::mybranch() || '*' ) : '*' );
my $op         = $input->param('op');
my $confirm    = $input->param('confirm'); 

# This block builds the branch list
if ($op eq 'delete') {
    my $itemtype     = $input->param('itemtype');
    my $categorycode = $input->param('categorycode');
    $debug and warn "deleting $1 $2 $branch";

    my $sth_Idelete = $dbh->prepare("delete from issuingrules where branchcode=? and categorycode=? and itemtype=?");
    $sth_Idelete->execute($branch, $categorycode, $itemtype);
}
elsif ($op eq 'delete-branch-cat') {
    my $categorycode  = $input->param('categorycode');
    if ($branch eq "*") {
        if ($categorycode eq "*") {
            my $sth_delete = $dbh->prepare("DELETE FROM default_circ_rules");
            $sth_delete->execute();
        } else {
            my $sth_delete = $dbh->prepare("DELETE FROM default_borrower_circ_rules
                                            WHERE categorycode = ?");
            $sth_delete->execute($categorycode);
        }
    } elsif ($categorycode eq "*") {
        my $sth_delete = $dbh->prepare("DELETE FROM default_branch_circ_rules
                                        WHERE branchcode = ?");
        $sth_delete->execute($branch);
    } else {
        my $sth_delete = $dbh->prepare("DELETE FROM branch_borrower_circ_rules
                                        WHERE branchcode = ?
                                        AND categorycode = ?");
        $sth_delete->execute($branch, $categorycode);
    }
}
elsif ($op eq 'delete-branch-item') {
    my $itemtype  = $input->param('itemtype');
    if ($branch eq "*") {
        if ($itemtype eq "*") {
            my $sth_delete = $dbh->prepare("DELETE FROM default_circ_rules");
            $sth_delete->execute();
        } else {
            my $sth_delete = $dbh->prepare("DELETE FROM default_branch_item_rules
                                            WHERE itemtype = ?");
            $sth_delete->execute($itemtype);
        }
    } elsif ($itemtype eq "*") {
        my $sth_delete = $dbh->prepare("DELETE FROM default_branch_circ_rules
                                        WHERE branchcode = ?");
        $sth_delete->execute($branch);
    } else {
        my $sth_delete = $dbh->prepare("DELETE FROM branch_item_rules
                                        WHERE branchcode = ?
                                        AND itemtype = ?");
        $sth_delete->execute($branch, $itemtype);
    }
}
# save the values entered
elsif ($op eq 'add') {
    my $sth_search = $dbh->prepare("SELECT COUNT(*) AS total FROM issuingrules WHERE branchcode=? AND categorycode=? AND itemtype=?");
    my $sth_insert = $dbh->prepare("INSERT INTO issuingrules (branchcode, categorycode, itemtype, maxissueqty, renewalsallowed, reservesallowed, issuelength, fine, finedays, firstremind, chargeperiod,rentaldiscount) VALUES(?,?,?,?,?,?,?,?,?,?,?,?)");
    my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, reservesallowed=?, issuelength=?, rentaldiscount=?  WHERE branchcode=? AND categorycode=? AND itemtype=?");
    
    my $br = $branch; # branch
    my $bor  = $input->param('categorycode'); # borrower category
    my $cat  = $input->param('itemtype');     # item type
    my $fine = $input->param('fine');
    my $finedays     = $input->param('finedays');
    my $firstremind  = $input->param('firstremind');
    my $chargeperiod = $input->param('chargeperiod');
    my $maxissueqty  = $input->param('maxissueqty');
    my $renewalsallowed  = $input->param('renewalsallowed');
    my $reservesallowed  = $input->param('reservesallowed');
    $maxissueqty =~ s/\s//g;
    $maxissueqty = undef if $maxissueqty !~ /^\d+/;
    my $issuelength  = $input->param('issuelength');
    my $rentaldiscount = $input->param('rentaldiscount');
    $debug and warn "Adding $br, $bor, $cat, $fine, $maxissueqty";

    $sth_search->execute($br,$bor,$cat);
    my $res = $sth_search->fetchrow_hashref();
    if ($res->{total}) {
        $sth_update->execute($fine, $finedays,$firstremind, $chargeperiod, $maxissueqty, $renewalsallowed,$reservesallowed, $issuelength,$rentaldiscount, $br,$bor,$cat);
    } else {
        $sth_insert->execute($br,$bor,$cat,$maxissueqty,$renewalsallowed,$reservesallowed,$issuelength,$fine,$finedays,$firstremind,$chargeperiod,$rentaldiscount);
    }
} 
elsif ($op eq "set-branch-defaults") {
    my $categorycode  = $input->param('categorycode');
    my $maxissueqty   = $input->param('maxissueqty');
    my $holdallowed   = $input->param('holdallowed');
    $maxissueqty =~ s/\s//g;
    $maxissueqty = undef if $maxissueqty !~ /^\d+/;
    $holdallowed =~ s/\s//g;
    $holdallowed = undef if $holdallowed !~ /^\d+/;

    if ($branch eq "*") {
        my $sth_search = $dbh->prepare("SELECT count(*) AS total
                                        FROM default_circ_rules");
        my $sth_insert = $dbh->prepare("INSERT INTO default_circ_rules
                                        (maxissueqty, holdallowed)
                                        VALUES (?, ?)");
        my $sth_update = $dbh->prepare("UPDATE default_circ_rules
                                        SET maxissueqty = ?, holdallowed = ?");

        $sth_search->execute();
        my $res = $sth_search->fetchrow_hashref();
        if ($res->{total}) {
            $sth_update->execute($maxissueqty, $holdallowed);
        } else {
            $sth_insert->execute($maxissueqty, $holdallowed);
        }
    } else {
        my $sth_search = $dbh->prepare("SELECT count(*) AS total
                                        FROM default_branch_circ_rules
                                        WHERE branchcode = ?");
        my $sth_insert = $dbh->prepare("INSERT INTO default_branch_circ_rules
                                        (branchcode, maxissueqty, holdallowed)
                                        VALUES (?, ?, ?)");
        my $sth_update = $dbh->prepare("UPDATE default_branch_circ_rules
                                        SET maxissueqty = ?, holdallowed = ?
                                        WHERE branchcode = ?");
        $sth_search->execute($branch);
        my $res = $sth_search->fetchrow_hashref();
        if ($res->{total}) {
            $sth_update->execute($maxissueqty, $holdallowed, $branch);
        } else {
            $sth_insert->execute($branch, $maxissueqty, $holdallowed);
        }
    }
}
elsif ($op eq "add-branch-cat") {
    my $categorycode  = $input->param('categorycode');
    my $maxissueqty   = $input->param('maxissueqty');
    $maxissueqty =~ s/\s//g;
    $maxissueqty = undef if $maxissueqty !~ /^\d+/;

    if ($branch eq "*") {
        if ($categorycode eq "*") {
            my $sth_search = $dbh->prepare("SELECT count(*) AS total
                                            FROM default_circ_rules");
            my $sth_insert = $dbh->prepare("INSERT INTO default_circ_rules
                                            (maxissueqty)
                                            VALUES (?)");
            my $sth_update = $dbh->prepare("UPDATE default_circ_rules
                                            SET maxissueqty = ?");

            $sth_search->execute();
            my $res = $sth_search->fetchrow_hashref();
            if ($res->{total}) {
                $sth_update->execute($maxissueqty);
            } else {
                $sth_insert->execute($maxissueqty);
            }
        } else {
            my $sth_search = $dbh->prepare("SELECT count(*) AS total
                                            FROM default_borrower_circ_rules
                                            WHERE categorycode = ?");
            my $sth_insert = $dbh->prepare("INSERT INTO default_borrower_circ_rules
                                            (categorycode, maxissueqty)
                                            VALUES (?, ?)");
            my $sth_update = $dbh->prepare("UPDATE default_borrower_circ_rules
                                            SET maxissueqty = ?
                                            WHERE categorycode = ?");
            $sth_search->execute($branch);
            my $res = $sth_search->fetchrow_hashref();
            if ($res->{total}) {
                $sth_update->execute($maxissueqty, $categorycode);
            } else {
                $sth_insert->execute($categorycode, $maxissueqty);
            }
        }
    } elsif ($categorycode eq "*") {
        my $sth_search = $dbh->prepare("SELECT count(*) AS total
                                        FROM default_branch_circ_rules
                                        WHERE branchcode = ?");
        my $sth_insert = $dbh->prepare("INSERT INTO default_branch_circ_rules
                                        (branchcode, maxissueqty)
                                        VALUES (?, ?)");
        my $sth_update = $dbh->prepare("UPDATE default_branch_circ_rules
                                        SET maxissueqty = ?
                                        WHERE branchcode = ?");
        $sth_search->execute($branch);
        my $res = $sth_search->fetchrow_hashref();
        if ($res->{total}) {
            $sth_update->execute($maxissueqty, $branch);
        } else {
            $sth_insert->execute($branch, $maxissueqty);
        }
    } else {
        my $sth_search = $dbh->prepare("SELECT count(*) AS total
                                        FROM branch_borrower_circ_rules
                                        WHERE branchcode = ?
                                        AND   categorycode = ?");
        my $sth_insert = $dbh->prepare("INSERT INTO branch_borrower_circ_rules
                                        (branchcode, categorycode, maxissueqty)
                                        VALUES (?, ?, ?)");
        my $sth_update = $dbh->prepare("UPDATE branch_borrower_circ_rules
                                        SET maxissueqty = ?
                                        WHERE branchcode = ?
                                        AND categorycode = ?");

        $sth_search->execute($branch, $categorycode);
        my $res = $sth_search->fetchrow_hashref();
        if ($res->{total}) {
            $sth_update->execute($maxissueqty, $branch, $categorycode);
        } else {
            $sth_insert->execute($branch, $categorycode, $maxissueqty);
        }
    }
}
elsif ($op eq "add-branch-item") {
    my $itemtype  = $input->param('itemtype');
    my $holdallowed   = $input->param('holdallowed');
    $holdallowed =~ s/\s//g;
    $holdallowed = undef if $holdallowed !~ /^\d+/;

    if ($branch eq "*") {
        if ($itemtype eq "*") {
            my $sth_search = $dbh->prepare("SELECT count(*) AS total
                                            FROM default_circ_rules");
            my $sth_insert = $dbh->prepare("INSERT INTO default_circ_rules
                                            (holdallowed)
                                            VALUES (?)");
            my $sth_update = $dbh->prepare("UPDATE default_circ_rules
                                            SET holdallowed = ?");

            $sth_search->execute();
            my $res = $sth_search->fetchrow_hashref();
            if ($res->{total}) {
                $sth_update->execute($holdallowed);
            } else {
                $sth_insert->execute($holdallowed);
            }
        } else {
            my $sth_search = $dbh->prepare("SELECT count(*) AS total
                                            FROM default_branch_item_rules
                                            WHERE itemtype = ?");
            my $sth_insert = $dbh->prepare("INSERT INTO default_branch_item_rules
                                            (itemtype, holdallowed)
                                            VALUES (?, ?)");
            my $sth_update = $dbh->prepare("UPDATE default_branch_item_rules
                                            SET holdallowed = ?
                                            WHERE itemtype = ?");
            $sth_search->execute($itemtype);
            my $res = $sth_search->fetchrow_hashref();
            if ($res->{total}) {
                $sth_update->execute($holdallowed, $itemtype);
            } else {
                $sth_insert->execute($itemtype, $holdallowed);
            }
        }
    } elsif ($itemtype eq "*") {
        my $sth_search = $dbh->prepare("SELECT count(*) AS total
                                        FROM default_branch_circ_rules
                                        WHERE branchcode = ?");
        my $sth_insert = $dbh->prepare("INSERT INTO default_branch_circ_rules
                                        (branchcode, holdallowed)
                                        VALUES (?, ?)");
        my $sth_update = $dbh->prepare("UPDATE default_branch_circ_rules
                                        SET holdallowed = ?
                                        WHERE branchcode = ?");
        $sth_search->execute($branch);
        my $res = $sth_search->fetchrow_hashref();
        if ($res->{total}) {
            $sth_update->execute($holdallowed, $branch);
        } else {
            $sth_insert->execute($branch, $holdallowed);
        }
    } else {
        my $sth_search = $dbh->prepare("SELECT count(*) AS total
                                        FROM branch_item_rules
                                        WHERE branchcode = ?
                                        AND   itemtype = ?");
        my $sth_insert = $dbh->prepare("INSERT INTO branch_item_rules
                                        (branchcode, itemtype, holdallowed)
                                        VALUES (?, ?, ?)");
        my $sth_update = $dbh->prepare("UPDATE branch_item_rules
                                        SET holdallowed = ?
                                        WHERE branchcode = ?
                                        AND itemtype = ?");

        $sth_search->execute($branch, $itemtype);
        my $res = $sth_search->fetchrow_hashref();
        if ($res->{total}) {
            $sth_update->execute($holdallowed, $branch, $itemtype);
        } else {
            $sth_insert->execute($branch, $itemtype, $holdallowed);
        }
    }
}

my $branches = GetBranches();
my @branchloop;
for my $thisbranch (sort { $branches->{$a}->{'branchname'} cmp $branches->{$b}->{'branchname'} } keys %$branches) {
    my $selected = 1 if $thisbranch eq $branchcode;
    my %row =(value => $thisbranch,
                selected => $selected,
                branchname => $branches->{$thisbranch}->{'branchname'},

    push @branchloop, \%row;
}

# Get the patron category list
my @category_loop = C4::Category->all;
my @category_loop;
while (my $data=$sth->fetchrow_hashref){
    push @category_loop,$data;
}

$sth->finish;
$sth=$dbh->prepare("SELECT description,itemtype FROM itemtypes ORDER BY description");
$sth->execute;
# $i=0;
my @row_loop;
my @itemtypes;
while (my $row=$sth->fetchrow_hashref){
    push @itemtypes,$row;
}

# Get the item types list
my @itemtypes = C4::ItemType->all;
    FROM issuingrules
    LEFT JOIN itemtypes
        ON (itemtypes.itemtype = issuingrules.itemtype)
    LEFT JOIN categories
        ON (categories.categorycode = issuingrules.categorycode)
    WHERE issuingrules.branchcode = ?
");
$sth2->execute($branch);

if ( $op eq 'delete' ) {
    DelIssuingRule({
        branchcode   => $branchcode,
        categorycode => $input->param('categorycode'),
        itemtype     => $input->param('itemtype'),
    });
    push @row_loop, $row;
}
# save the values entered
elsif ( $op eq 'add' ) {
my @sorted_row_loop = sort by_category_and_itemtype @row_loop;

    # Converts '' to undef, so we can have NULL in database fields
    my $issuingrule;
    for ( $input->param ) {
        my $v = $input->param($_);
        $issuingrule->{$_} = length $v ? $v : undef;
    }
        
    ");
    $sth_branch_cat->execute();
} else {
    $sth_branch_cat = $dbh->prepare("
        SELECT branch_borrower_circ_rules.*, categories.description AS humancategorycode
        FROM branch_borrower_circ_rules
        JOIN categories USING (categorycode)
        WHERE branch_borrower_circ_rules.branchcode = ?
    ");
    $sth_branch_cat->execute($branch);
}

    # We don't want op to be passed to the API
    delete $issuingrule->{'op'};

    # If the (branchcode,categorycode,itemtype) combination already exists...
    my @issuingrules = GetIssuingRules({
        branchcode      => $issuingrule->{'branchcode'},
        categorycode    => $issuingrule->{'categorycode'},
        itemtype        => $issuingrule->{'itemtype'},
    });

    # ...we modify the existing rule...
    if ( @issuingrules ) {
        ModIssuingRule( $issuingrule );
#    } elsif (@issuingrules){
#        $template->param(confirm=>1);
#        $template->param(%$issuingrule);
#        foreach (@category_loop) { 
#            $_->{selected}="selected" if ($_->{categorycode} eq $issuingrule->{categorycode});
#        }
#        foreach (@itemtypes) { 
#            $_->{selected}="selected" if ($_->{itemtype} eq $issuingrule->{itemtype});
#        }
    # ...else we add a new rule.
    } else {
        AddIssuingRule( $issuingrule );
    }
}
my @sorted_branch_cat_rules = sort { $a->{'humancategorycode'} cmp $b->{'humancategorycode'} } @branch_cat_rules;

# Get the issuing rules list...
my @issuingrules = GetIssuingRulesByBranchCode($branchcode);
    $entry->{unlimited_maxissueqty} = 1 unless defined($entry->{maxissueqty});
}

# ...and refine its data, row by row.
for my $rule ( @issuingrules ) {
    $rule->{'humanitemtype'}             ||= $rule->{'itemtype'};
    $rule->{'default_humanitemtype'}       = $rule->{'humanitemtype'} eq '*';
    $rule->{'humancategorycode'}         ||= $rule->{'categorycode'};
    $rule->{'default_humancategorycode'}   = $rule->{'humancategorycode'} eq '*';

    # This block is to show herited values in grey.
    # We juste compare keys from our raw rule, with keys from the computed rule.
    my $computedrule = GetIssuingRule($rule->{'categorycode'}, $rule->{'itemtype'}, $rule->{'branchcode'});
    for ( keys %$rule ) {
        if ( not defined $rule->{$_} ) {
            $rule->{$_} = $computedrule->{$_};
            $rule->{"herited_$_"} = 1;
        }
    }
    $sth_branch_item = $dbh->prepare("
        SELECT branch_item_rules.*, itemtypes.description AS humanitemtype
        FROM branch_item_rules
        JOIN itemtypes USING (itemtype)
        WHERE branch_item_rules.branchcode = ?
    ");
    $sth_branch_item->execute($branch);
}

# Get the issuing rules list...
my @issuingrules = GetIssuingRulesByBranchCode($branchcode);
    push @branch_item_rules, $row;
}
my @sorted_branch_item_rules = sort { $a->{'humanitemtype'} cmp $b->{'humanitemtype'} } @branch_item_rules;

# ...and refine its data, row by row.
for my $rule ( @issuingrules ) {
    $rule->{'humanitemtype'}             ||= $rule->{'itemtype'};
    $rule->{'default_humanitemtype'}       = $rule->{'humanitemtype'} eq '*';
    $rule->{'humancategorycode'}         ||= $rule->{'categorycode'};
    $rule->{'default_humancategorycode'}   = $rule->{'humancategorycode'} eq '*';

    # This block is to show herited values in grey.
    # We juste compare keys from our raw rule, with keys from the computed rule.
    my $computedrule = GetIssuingRule($rule->{'categorycode'}, $rule->{'itemtype'}, $rule->{'branchcode'});
    for ( keys %$rule ) {
        if ( not defined $rule->{$_} ) {
            $rule->{$_} = $computedrule->{$_};
            $rule->{"herited_$_"} = 1;
        }
    }

    $rule->{'fine'}                        = sprintf('%.2f', $rule->{'fine'});
if ($branch eq "*") {
    $sth_defaults = $dbh->prepare("
        SELECT *
        FROM default_circ_rules
    ");
    $sth_defaults->execute();
} else {
    $sth_defaults = $dbh->prepare("
        SELECT *
        FROM default_branch_circ_rules
        WHERE branchcode = ?
    ");
    $sth_defaults->execute($branch);
}

my $defaults = $sth_defaults->fetchrow_hashref;

if ($defaults) {
    $template->param(default_holdallowed_none => 1) if($defaults->{holdallowed} == 0);
    $template->param(default_holdallowed_same => 1) if($defaults->{holdallowed} == 1);
    $template->param(default_holdallowed_any => 1) if($defaults->{holdallowed} == 2);
    $template->param(default_maxissueqty => $defaults->{maxissueqty});
}

$template->param(default_rules => ($defaults ? 1 : 0));

$template->param(
    categoryloop  => \@category_loop,
    itemtypeloop  => \@itemtypes,
    rules         => \@issuingrules,
    branchloop    => \@branchloop,
    humanbranch   => ($branchcode ne '*' ? $branches->{$branchcode}->{branchname} : ''),
    branchcode    => $branchcode,
    definedbranch => scalar(@issuingrules) > 0,
);

output_html_with_http_headers $input, $cookie, $template->output;

exit 0;

# sort by patron category, then item type, putting
# default entries at the bottom
sub by_category_and_itemtype {
    unless (by_category($a, $b)) {
        return by_itemtype($a, $b);
    }
}

sub by_category {
    my ($a, $b) = @_;
    if ($a->{'default_humancategorycode'}) {
        return ($b->{'default_humancategorycode'} ? 0 : 1);
    } elsif ($b->{'default_humancategorycode'}) {
        return -1;
    } else {
        return $a->{'humancategorycode'} cmp $b->{'humancategorycode'};
    }
}

sub by_itemtype {
    my ($a, $b) = @_;
    if ($a->{'default_humanitemtype'}) {
        return ($b->{'default_humanitemtype'} ? 0 : 1);
    } elsif ($b->{'default_humanitemtype'}) {
        return -1;
    } else {
        return $a->{'humanitemtype'} cmp $b->{'humanitemtype'};
    }
}

Lines 87-93 if ( $request eq "KillWaiting" ) { Link Here

(-)a/circ/branchtransfers.pl (-1 / +3 lines)
87	}	87	}
88	elsif ( $request eq "SetWaiting" ) {	88	elsif ( $request eq "SetWaiting" ) {
89	my $item = $query->param('itemnumber');	89	my $item = $query->param('itemnumber');
90	ModReserveAffect( $item, $borrowernumber );	90	my $itemhash=C4::Items::GetItem($item);
		91	my ( $reservetype, $reserve ) = C4::Reserves::CheckReserves( undef, $itemhash->{barcode} );
		92	ModReserveAffect( $item, $borrowernumber,$tobranchcd ne C4::Context->userenv->{'branch'}, $reserve->{reservenumber});
91	$ignoreRs = 1;	93	$ignoreRs = 1;
92	$setwaiting = 1;	94	$setwaiting = 1;
93	$reqmessage = 1;	95	$reqmessage = 1;




use C4::Branch; # GetBranches
use C4::Koha;   # GetPrinter
use C4::Circulation;
use C4::Overdues qw/CheckBorrowerDebarred/;
use C4::Members;
use C4::Biblio;
use C4::Reserves;
use C4::Context;
use C4::Debug;
use CGI::Session;
use C4::Items;
use JSON;
use YAML;
use Date::Calc qw(
  Today
  Add_Delta_YM
  Add_Delta_Days
  Date_to_Days
);
use List::MoreUtils qw/uniq/;


#
# PARAMETERS READING
#
my $query = new CGI;
my $dbh = C4::Context->dbh;
my $remotehost = $query->remote_host();
my $sessionID  = $query->cookie("CGISESSID");
my $session    = get_session($sessionID);

# branch and printer are now defined by the userenv
# but first we have to check if someone has tried to change them


my $branches = GetBranches();

my @failedrenews  = $query->param('failedrenew');   # expected to be itemnumbers
my @failedreturns = $query->param('failedreturn');  # expected to be barcodes
my @renewerrors   = $query->param('renewerror');    # expected to be json
my @returnerrors  = $query->param('returnerror');   # expected to be json
my %renew_failed;
my %return_failed;
for (@failedrenews) { $renew_failed{$_} = decode_json(shift @renewerrors); }
for (@failedreturns) { $return_failed{GetItemnumberFromBarcode($_)} = decode_json(shift @returnerrors); }

my $findborrower = $query->param('findborrower');
$findborrower =~ s|,| |g;

my $print          = $query->param('print');
my $newexpiry      = $query->param('dateexpiry');
my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
$debug && warn $newexpiry;
# Check if stickyduedate is turned off
if ( $barcode ) {
    # was stickyduedate loaded from session?
    if ( $stickyduedate && ! $query->param("stickyduedate") ) {
        $session->clear( 'stickyduedate' );
        $stickyduedate  = $query->param('stickyduedate');
        $duedatespec    = $query->param('duedatespec');
    }
}


    $datedue = $globalduedate if ($globalduedate);
}

my $todaysdate = C4::Dates->new->output( 'iso' );

# check and see if we should print
if ( $barcode eq '' && $print eq 'maybe' ) {


    # Warningdate is the date that the warning starts appearing
    my (  $today_year,   $today_month,   $today_day) = Today();
    my ($warning_year, $warning_month, $warning_day) = split (/-/, $borrower->{'dateexpiry'});
    my (  $enrol_year,   $enrol_month,   $enrol_day) = split (/-/, $borrower->{'dateenrolled'});
    # Renew day is calculated by adding the enrolment period to today
    my (  $renew_year,   $renew_month,   $renew_day);
    if ($enrol_year*$enrol_month*$enrol_day>0) {

            flagged  => "1",
            noissues => "1",
            expired     => format_date($borrower->{dateexpiry}),
            warning     => 1,
            renewaldate => format_date("$renew_year-$renew_month-$renew_day")
        );
    }

    {
        # borrower card soon to expire warn librarian
        $template->param("warndeparture" => format_date($borrower->{dateexpiry}),
        flagged       => "1", "warning" => 1);
        if (C4::Context->preference('ReturnBeforeExpiry')){
            $template->param("returnbeforeexpiry" => 1, "warning => 1");
        }
    }
    $template->param(

        issuecount   => $issue,
        finetotal    => $fines
    );

    my $debar = CheckBorrowerDebarred($borrowernumber);
    if($debar){
        $template->param(userdebarred => 1);
        $template->param(debarredcomment => $borrower->{debarredcomment});
        if( $debar ne "9999-12-31"){
            $template->param(userdebarreddate => C4::Dates::format_date($debar));
        }
    }
}

#
# STEP 3 : ISSUING
#
#
my $confirm_required = 0;
if ($barcode) {
    # always check for blockers on issuing
    my ( $error, $question ) =

    # FIXME If the issue is confirmed, we launch another time GetMemberIssuesAndFines, now display the issue count after issue 
    my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrowernumber );
    $template->param( issuecount   => $issue );

    # Is there a circulation note?
    my $itemnumber = GetItemnumberFromBarcode($barcode);
    my $biblionumber = GetBiblionumberFromItemnumber($itemnumber);
    my $record = GetMarcBiblio($biblionumber);
    my $frameworkcode = GetFrameworkCode($biblionumber);
    my $circnotefield = GetRecordValue('circnote', $record, $frameworkcode);
    if (defined @$circnotefield[0]) {
	$template->param(circnote => @$circnotefield[0]->{'subfield'});
    }
}


# Setting the right status if an hold has been confirmed
#This should never be used in fact
my $resbarcode = $query->param("resbarcode");
if ($resbarcode) {
        if ( my ( $reservetype, $reserve ) = C4::Reserves::CheckReserves( undef, $resbarcode ) ) {
            if ( $reservetype eq "Waiting" || $reservetype eq "Reserved" ) {
                my $transfer = C4::Context->userenv->{branch} ne $reserve->{branchcode};
                ModReserveAffect( $reserve->{itemnumber}, $reserve->{borrowernumber}, $transfer, $reserve->{"reservenumber"} );
            }
        }
}



# reload the borrower info for the sake of reseting the flags.....
if ($borrowernumber) {
    $borrower = GetMemberDetails( $borrowernumber, 0 );

        $getreserv{itemcallnumber} = $getiteminfo->{'itemcallnumber'};
        $getreserv{biblionumber}   = $getiteminfo->{'biblionumber'};
        $getreserv{waitingat}      = GetBranchName( $num_res->{'branchcode'} );
	my $materials = $getiteminfo->{'materials'};
        $template->param(materials         => $materials);
        #         check if we have a waiting status for reservations
        if ( $num_res->{'found'} eq 'W' ) {
            $getreserv{color}   = 'reserved';
            $getreserv{waiting} = 1;
#     genarate information displaying only waiting reserves
        my @maxpickupdate = $num_res->{'waitingdate'} ? GetMaxPickupDate( $num_res->{'waitingdate'}, $borrowernumber, $num_res ) : '';
        $getreserv{'maxpickupdate'} = sprintf( "%d-%02d-%02d", @maxpickupdate );
        $getWaitingReserveInfo{'formattedwaitingdate'} = format_date( $getreserv{'maxpickupdate'} );
        $getreserv{'formattedwaitingdate'} = format_date( $getreserv{'maxpickupdate'} );

        $getWaitingReserveInfo{title}        = $getiteminfo->{'title'};
        $getWaitingReserveInfo{biblionumber} = $getiteminfo->{'biblionumber'};
        $getWaitingReserveInfo{itemtype}     = $itemtypeinfo->{'description'};

my @todaysissues;
my @previousissues;

my @borrowers_with_issues;
my @relissues;
my @relprevissues;
my $displayrelissues;
## ADDED BY JF: new itemtype issuingrules counter stuff
my $issued_itemtypes_count;
my @issued_itemtypes_count_loop;

my $totalprice = 0;

sub build_issue_data {
    my $issueslist = shift;
    my $relatives = shift;
    # split in 2 arrays for today & previous
    foreach my $it ( @$issueslist ) {
        my $itemtypeinfo = getitemtypeinfo( (C4::Context->preference('item-level_itypes')) ? $it->{'itype'} : $it->{'itemtype'} );
        # set itemtype per item-level_itype syspref - FIXME this is an ugly hack
        $it->{'itemtype'} = ( C4::Context->preference( 'item-level_itypes' ) ) ? $it->{'itype'} : $it->{'itemtype'};

  # split in 2 arrays for today & previous
    foreach my $it (@$issueslist) {
        my $itemtypeinfo = getitemtypeinfo( ( C4::Context->preference('item-level_itypes') ) ? $it->{'itype'} : $it->{'itemtype'} );

	# Getting borrower details
	my $memberdetails = GetMemberDetails($it->{'borrowernumber'});
	$it->{'borrowername'} = $memberdetails->{'firstname'} . " " . $memberdetails->{'surname'};

        # set itemtype per item-level_itype syspref - FIXME this is an ugly hack
        $it->{'itemtype'} = ( C4::Context->preference('item-level_itypes') ) ? $it->{'itype'} : $it->{'itemtype'};

        ( $it->{'charge'}, $it->{'itemtype_charge'} ) = GetIssuingCharges( $it->{'itemnumber'}, $borrower->{'borrowernumber'} );
        $it->{'charge'} = sprintf( "%.2f", $it->{'charge'} );
        my ( $can_renew, $can_renew_error ) = CanBookBeRenewed( $borrower->{'borrowernumber'}, $it->{'itemnumber'} );
        if ( defined $can_renew_error->{message} ) {
            $it->{ "renew_error_" . $can_renew_error->{message} } = 1;
            $it->{'renew_error'} = 1;
        }
        $it->{renewals} ||= 0;
        $it->{$_} = $can_renew_error->{$_} for (qw(renewalsallowed reserves));
        my ( $restype, $reserves ) = CheckReserves( $it->{'itemnumber'} );
        if ($restype) {
            $it->{'reserved'} = 1;
            $it->{$restype} = 1;
        }
        $it->{'can_renew'}    = $can_renew;
        $it->{'can_confirm'}  = !$can_renew && !$restype;
        $it->{'renew_error'}  = $restype;
        $it->{'checkoutdate'} = $it->{'issuedate'};

        $totalprice += $it->{'replacementprice'};
        $it->{'itemtype'}       = $itemtypeinfo->{'description'};
        $it->{'itemtype_image'} = $itemtypeinfo->{'imageurl'};
        $it->{'dd'}             = format_date( $it->{'date_due'} );
        $it->{'displaydate'}    = format_date( $it->{'issuedate'} );
        ( $it->{'author'} eq '' ) and $it->{'author'} = ' ';
        if ( defined( $return_failed{ $it->{'itemnumber'} } ) ) {
            $it->{ 'return_error_' . $return_failed{ $it->{'itemnumber'} }->{message} } = 1;
            delete $return_failed{ $it->{'itemnumber'} };
        if ( $todaysdate eq $it->{'issuedate'} or $todaysdate eq $it->{'lastreneweddate'} ) {
            push @todaysissues, $it;
        } else {
            push @previousissues, $it;
        }
        if ( defined( $renew_failed{ $it->{'itemnumber'} } ) ) {
            $it->{ 'renew_error_' . $renew_failed{ $it->{'itemnumber'} }->{message} } = 1;
        }
        $it->{'return_failed'} = defined( $return_failed{ $it->{'itemnumber'} } );
        $it->{'branchdisplay'} = GetBranchName( ( C4::Context->preference('HomeOrHoldingBranch') eq 'holdingbranch' ) ? $it->{'holdingbranch'} : $it->{'homebranch'} );

        # ADDED BY JF: NEW ITEMTYPE COUNT DISPLAY
        $issued_itemtypes_count->{ $it->{'itemtype'} }++;
	if ( $todaysdate eq $it->{'checkoutdate'} or $todaysdate eq $it->{'lastreneweddate'} ) {
	    (!$relatives) ? push @todaysissues, $it : push @relissues, $it;
	} else {
	    (!$relatives) ? push @previousissues, $it : push @relprevissues, $it;
	}

    }

}

if ($borrower) {

    # Getting borrower relatives
    my @relborrowernumbers = GetMemberRelatives($borrower->{'borrowernumber'});
    #push @borrowernumbers, $borrower->{'borrowernumber'};

    # get each issue of the borrower & separate them in todayissues & previous issues
    my ($issueslist) = GetPendingIssues($borrower->{'borrowernumber'});
    my ($relissueslist) = GetPendingIssues(@relborrowernumbers);

    build_issue_data($issueslist, 0);
    build_issue_data($relissueslist, 1);
  
    $displayrelissues = scalar($relissueslist);

    if ( C4::Context->preference("todaysIssuesDefaultSortOrder") eq 'asc' ) {
        @todaysissues = sort { $a->{'timestamp'} cmp $b->{'timestamp'} } @todaysissues;
    } else {
        @todaysissues = sort { $b->{'timestamp'} cmp $a->{'timestamp'} } @todaysissues;
    }
    if ( C4::Context->preference( "previousIssuesDefaultSortOrder" ) eq 'asc' ){
        @previousissues = sort { $a->{'date_due'} cmp $b->{'date_due'} } @previousissues;

        @previousissues = sort { $b->{'date_due'} cmp $a->{'date_due'} } @previousissues;
    }
}
my @reserveswaiting;
foreach my $itemnumber (keys %return_failed){
   next unless $return_failed{$itemnumber}->{'reservesdata'};
   my $hashdata=$return_failed{$itemnumber}->{'reservesdata'};
   $hashdata->{circborrowernumber}=$borrowernumber;
   $hashdata->{script_name}=$query->script_name();
   push @reserveswaiting, $hashdata if (%$hashdata);
}

$template->param(reserves_waiting=>\@reserveswaiting);

#### ADDED BY JF FOR COUNTS BY ITEMTYPE RULES
# FIXME: This should utilize all the issuingrules options rather than just the defaults
# and it should be moved to a module

# how many of each is allowed?
my $issueqty_sth = $dbh->prepare(
    'SELECT itemtypes.description AS description,issuingrules.itemtype,maxissueqty ' .
    'FROM issuingrules LEFT JOIN itemtypes ON (itemtypes.itemtype=issuingrules.itemtype) ' .
    'WHERE categorycode=?'
);
$issueqty_sth->execute(q{*}); # This is a literal asterisk, not a wildcard.

while ( my $data = $issueqty_sth->fetchrow_hashref() ) {

    # subtract how many of each this borrower has
    $data->{'count'} = $issued_itemtypes_count->{ $data->{'description'} };  
    $data->{'left'}  =
      ( $data->{'maxissueqty'} -
          $issued_itemtypes_count->{ $data->{'description'} } );

    # can't have a negative number of remaining
    if ( $data->{'left'} < 0 ) { $data->{'left'} = '0' }
    if ( $data->{maxissueqty} <= $data->{count} ) {
        $data->{flag} = 1;
    }
    if ( $data->{maxissueqty} > 0 && $data->{itemtype} !~m/^(\*|CIRC)$/ ) {
        push @issued_itemtypes_count_loop, $data;
    }
}

#### / JF

my @values;
my %labels;


#title
my $flags = $borrower->{'flags'};
    $debug && warn Dump($flags);
foreach my $flag ( sort keys %$flags ) {
    $template->param( flagged=> 1);
    $flags->{$flag}->{'message'} =~ s#\n#<br />#g;

            noissues => 'true',
        );
        if ( $flag eq 'GNA' ) {
            $template->param( gna => 'true', gonenoaddresscomment => $borrower->{'gonenoaddresscomment'}, warning => 1 );
        }
        elsif ( $flag eq 'LOST' ) {
            $template->param( lost => 'true', lostcomment => $borrower->{'lostcomment'}, warning => 1 );
        } elsif ( $flag eq 'DEBARRED' ) {
            $template->param( userdebarred => 'true', warning => 1, userdebarreddate=> format_date($flags->{DEBARRED}->{dateend}),debardebarredcomment=>$borrower->{'debarredcomment'});
        } elsif ( $flag eq 'CHARGES' ) {
        }
        elsif ( $flag eq 'CHARGES' ) {
            $template->param(
                charges    => 'true',
                chargesmsg => $flags->{'CHARGES'}->{'message'},
                chargesamount => $flags->{'CHARGES'}->{'amount'},
                charges_is_blocker => 1,
                warning => 1
            );
        }
        elsif ( $flag eq 'CREDITS' ) {

                credits    => 'true',
                creditsmsg => $flags->{'CREDITS'}->{'message'},
                creditsamount => sprintf("%.02f", -($flags->{'CREDITS'}->{'amount'})), # from patron's pov
		        warning => 1
            );
        }
    }

                flagged    => 1,
                chargesmsg => $flags->{'CHARGES'}->{'message'},
                chargesamount => $flags->{'CHARGES'}->{'amount'},
                warning => 1
            );
        }
        elsif ( $flag eq 'CREDITS' ) {

                credits    => 'true',
                creditsmsg => $flags->{'CREDITS'}->{'message'},
                creditsamount => sprintf("%.02f", -($flags->{'CREDITS'}->{'amount'})), # from patron's pov
		warning => 1
            );
        }
        elsif ( $flag eq 'ODUES' ) {
            $template->param(
                odues    => 'true',
                flagged  => 1,
                oduesmsg => $flags->{'ODUES'}->{'message'},
                warning => 1
            );

            my $items = $flags->{$flag}->{'itemlist'};

my $bor_messages_loop = GetMessages( $borrowernumber, 'B', $branch );
if($bor_messages_loop){ $template->param(flagged => 1 ); }


# Computes full borrower address
my (undef, $roadttype_hashref) = &GetRoadTypes();
my $address = $borrower->{'streetnumber'}.' ' if ($borrower->{'streetnumber'});
$address    .= $roadttype_hashref->{$borrower->{'streettype'}}.' ' if ( $roadttype_hashref->{$borrower->{'streettype'}});
$address    .= $borrower->{'address'};


$duedatespec = "" if not ($stickyduedate or scalar $confirm_required);
my @categories = C4::Category->all;

my $fast_cataloging = 0;
    if (defined getframeworkinfo('FA')) {

    printername       => $printer,
    firstname         => $borrower->{'firstname'},
    surname           => $borrower->{'surname'},
    printer                     => $printer,
    printername                 => $printer,
    expiry            => format_date($borrower->{'dateexpiry'}),
    categorycode      => $borrower->{'categorycode'},
    categoryname      => $borrower->{description},
    address           => $address,
    address2          => $borrower->{'address2'},

    zipcode           => $borrower->{'zipcode'},
    country           => $borrower->{'country'},
    phone             => $borrower->{'phone'} || $borrower->{'mobile'},
    cardnumber        => $borrower->{'cardnumber'},
    amountold         => $amountold,
    barcode           => $barcode,
    stickyduedate     => $stickyduedate,

    totaldue          => sprintf('%.2f', $total),
    todayissues       => \@todaysissues,
    previssues        => \@previousissues,
    relissues			=> \@relissues,
    relprevissues		=> \@relprevissues,
    displayrelissues		=> $displayrelissues,
    inprocess         => $inprocess,
    memberofinstution => $member_of_institution,
    CGIorganisations  => $CGIorganisations,

    circview => 1,
    soundon           => C4::Context->preference("SoundOn"),
    fast_cataloging   => $fast_cataloging,
    categoryloop      => \@categories,
);

$template->param(newexpiry => format_date($newexpiry)) if (defined $newexpiry);

SetMemberInfosInTemplate($borrowernumber, $template);

# save stickyduedate to session
if ($stickyduedate) {
    $session->param( 'stickyduedate', $duedatespec );




use C4::Dates qw/format_date/;
use Date::Calc qw/Add_Delta_Days/;
use C4::Calendar;
use C4::Budgets qw/GetCurrency/;
use C4::Print;
use C4::Reserves;
use C4::Biblio;
use C4::Items;
use C4::Members;
use C4::Overdues qw/CheckBorrowerDebarred/;
use C4::Branch; # GetBranches GetBranchName
use C4::Koha;   # FIXME : is it still useful ?
use C4::RotatingCollections;
use C4::Debug;

my $query = new CGI;
my $remotehost = $query->remote_host();

if (!C4::Context->userenv){
    my $sessionID = $query->cookie("CGISESSID");

    my $item           = $query->param('itemnumber');
    my $borrowernumber = $query->param('borrowernumber');
    my $resbarcode     = $query->param('resbarcode');
    my $reservenumber = $query->param('reservenumber');
    my $diffBranchReturned = $query->param('diffBranch');
    my $iteminfo   = GetBiblioFromItemNumber($item);
    # fix up item type for display

    my $diffBranchSend = ($userenv_branch ne $diffBranchReturned) ? $diffBranchReturned : undef;
# diffBranchSend tells ModReserveAffect whether document is expected in this library or not,
# i.e., whether to apply waiting status
    ModReserveAffect( $item, $borrowernumber, $diffBranchSend, $reservenumber );

#   check if we have other reserves for this document, if we have a return send the message of transfer
    my ( $reservemessages, $nextreservinfo ) = GetOtherReserves($item);

    my ($borr) = GetMemberDetails( $nextreservinfo, 0 );
    my $name   = $borr->{'surname'} . ", " . $borr->{'title'} . " " . $borr->{'firstname'};
    if ( $reservemessages->{'transfert'} ) {
        $template->param(
            itemtitle      => $iteminfo->{'title'},
            itembiblionumber => $iteminfo->{'biblionumber'},
            iteminfo       => $iteminfo->{'author'},
            tobranchname   => GetBranchName($reservemessages->{'transfert'}),
            name           => $name,
            borrowernumber => $borrowernumber,
            borcnum        => $borr->{'cardnumber'},

my $messages;
my $issueinformation;
my $itemnumber;
my $biblio;
my $barcode     = $query->param('barcode');
my $exemptfine  = $query->param('exemptfine');
my $dropboxmode = $query->param('dropboxmode');
my $dotransfer  = $query->param('dotransfer');
my $override    = $query->param('override');
my $calendar    = C4::Calendar->new( branchcode => $userenv_branch );
#dropbox: get last open day (today - 1)
my $today       = C4::Dates->new();

}

# actually return book and prepare item table.....
if ($barcode and not $query->param('cancel')) {
    $barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace
    $barcode = barcodedecode($barcode) if C4::Context->preference('itemBarcodeInputFilter');
    $itemnumber = GetItemnumberFromBarcode($barcode);

# save the return
#
    ( $returned, $messages, $issueinformation, $borrower ) =
      AddReturn( $barcode, $userenv_branch, $exemptfine, $dropboxmode,$override);     # do the return
    my $homeorholdingbranchreturn = C4::Context->preference('HomeOrHoldingBranchReturn') or 'homebranch';

            my @ips=split /,|\|/, C4::Context->preference("CI-3M:AuthorizedIPs");
            #my $pid=fork();
            #unless($pid && $remotehost=~qr(^$ips$)){
            #if (!$pid && any{ $remotehost eq $_ }@ips ){
            if (any{ $remotehost eq $_ }@ips ){
                system("../services/magnetise.pl $remotehost in");
                #die 0;
            }
    # get biblio description
    $biblio = GetBiblioFromItemNumber($itemnumber);
    # fix up item type for display
    $biblio->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $biblio->{'itype'} : $biblio->{'itemtype'};


        }

    }
    elsif ( !$messages->{'BadBarcode'} and ! $messages->{'Wrongbranch'} ) {
        $input{duedate}   = 0;
        $returneditems{0} = $barcode;
        $riduedate{0}     = 0;

}
$template->param( inputloop => \@inputloop );


# Is there a circulation note?
my $itemnumber = GetItemnumberFromBarcode($barcode);
my $biblionumber = GetBiblionumberFromItemnumber($itemnumber);
my $record = GetMarcBiblio($biblionumber);
my $frameworkcode = GetFrameworkCode($biblionumber);
my $circnotefield = GetRecordValue('circnote', $record, $frameworkcode);
if (defined @$circnotefield[0]) {
   $template->param(circnote => @$circnotefield[0]->{'subfield'});
}


my $found    = 0;
my $waiting  = 0;
my $reserved = 0;

}

if ( $messages->{'Wrongbranch'} ){
	$template->param(
		wrongbranch => $branches->{$messages->{'Wrongbranch'}->{'Wrongbranch'}}->{'branchname'},
		rightbranch => $branches->{$messages->{'Wrongbranch'}->{'Rightbranch'}}->{'branchname'},
		barcode     => $barcode,
		exemptfine  => $exemptfine,
		dropboxmode => $dropboxmode,
	);
}

# case of wrong transfert, if the document wasn't transfered to the right library (according to branchtransfer (tobranch) BDD)

                reserved     => 1,
            );
        }
        my $debarred = CheckBorrowerDebarred($reserve->{borrowernumber});
        # same params for Waiting or Reserved
        $template->param(
            found          => 1,

            borcity        => $borr->{'city'},
            borzip         => $borr->{'zipcode'},
            borcnum        => $borr->{'cardnumber'},
            debarred       => $debarred,
            gonenoaddress  => $borr->{'gonenoaddress'},
            barcode        => $barcode,
            reservenumber  => $reserve->{'reservenumber'},
            destbranch	   => $reserve->{'branchcode'},
            borrowernumber => $reserve->{'borrowernumber'},
            itemnumber     => $reserve->{'itemnumber'},
            reservenotes   => $reserve->{'reservenotes'},
        );
    } # else { ; }  # error?
}
$borrower->{'flags'}= C4::Members::patronflags($borrower);
# Error Messages
my @errmsgloop;
foreach my $code ( keys %$messages ) {

    elsif ( $code eq 'WasTransfered' ) {
        ;    # FIXME... anything to do here?
    }
    elsif ( $code eq 'NotForLoan' ) {
        my $fw               = GetFrameworkCode($biblio->{'biblionumber'});
        my $category         = GetAuthValCode('items.notforloan',$fw);
        my $authorizedvalues = GetAuthorisedValues($category, $messages->{$code});

        foreach my $authvalue (@$authorizedvalues){
            $err{notforloan} = $authvalue->{lib} if $authvalue->{'authorised_value'} eq $messages->{$code};
        }
    }
    elsif ( $code eq 'Damaged' ) {
        my $fw               = GetFrameworkCode($biblio->{'biblionumber'});
        my $category         = GetAuthValCode('items.damaged',$fw);
        my $authorizedvalues = GetAuthorisedValues($category, $messages->{$code});

        foreach my $authvalue (@$authorizedvalues){
            $err{damaged} = $authvalue->{lib} if $authvalue->{'authorised_value'} eq $messages->{$code};
        }
    }
    elsif( $code eq 'Debarred' ){
        $err{debarred}            = format_date($messages->{'Debarred'});
        $err{debarcardnumber}     = $borrower->{cardnumber};
        $err{debarborrowernumber} = $borrower->{borrowernumber};
        $err{debarname}           = "$borrower->{firstname} $borrower->{surname}";
    }
    elsif( $code eq 'HaveFines' ){
        $err{havefines}       = $borrower->{'flags'}->{'CHARGES'}->{'amount'} . %{GetCurrency()}->{symbol};
        $err{finecardnumber} = $borrower->{cardnumber};
        $err{finename}       = "$borrower->{firstname} $borrower->{surname}";
    }
    elsif ( $code eq 'wthdrawn' ) {
        $err{withdrawn} = 1;
        $exit_required_p = 1;

    }
    elsif ( $code eq 'Wrongbranch' ) {
    }

    else {
        die "Unknown error code $code";    # note we need all the (empty) elsif's above, or we die.
        # This forces the issue of staying in sync w/ Circulation.pm


# patrontable ....
if ($borrower) {
    my $flags = $borrower->{'flags'};
    my @flagloop;
    my $flags=$borrower->{flags};
    foreach my $flag ( sort keys %$flags ) {
        my %flaginfo;
        unless ($flagset) { $flagset = 1; }
        $flaginfo{redfont} = ( $flags->{$flag}->{'noissues'} );
        $flaginfo{flag}    = $flag;
        if ( $flag eq 'CHARGES' ) {
            $flaginfo{msg}            = $flag;
            $flaginfo{charges}        = 1;

            foreach my $item (@$items) {
                my $biblio = GetBiblioFromItemNumber( $item->{'itemnumber'});
                push @waitingitemloop, {
                    biblionumber=> $biblio->{'biblionumber'},
                    author      => $biblio->{'author'},
                    itemtype    => $item->{'ccode'},
                    reservedate => format_date($item->{'reservedate'}),
                    waitingdate => format_date($item->{'waitingdate'}),
                    barcode     => $item->{'barcode'},
                    maxpickupdate=> format_date( sprintf("%d-%02d-%02d",GetMaxPickupDate($item->{'waitingdate'}, $borrower->{borrowernumber},$item ))),
                    title       => $biblio->{'title'},
                    brname      => $branches->{ $item->{'branchcode'} }->{'branchname'},
                    waitinghere => ($item->{'branchcode'} eq $userenv_branch)
                };
            }
            $flaginfo{itemloop} = \@waitingitemloop;
        }
        elsif ( $flag =~ /DEBARRED|LOST|GNA/ ) {
            if ($flag ne "GNA"){
                $flag=lc($flag);
            }
            else{
                $flag="gonenoaddress";
            }
            %flaginfo=( $flag =>1, $flag."comment"=>$borrower->{$flag."comment"},dateend=>$flags->{uc($flag)}->{dateend});
        }
        elsif ( $flag eq 'ODUES' ) {
            my $items = $flags->{$flag}->{'itemlist'};
            my @itemloop;

        push( @flagloop, \%flaginfo );
    }
    $template->param(
        flagset          => $flagset,
        flagloop         => \@flagloop,
        riborrowernumber => $borrower->{'borrowernumber'},
        riborcnum        => $borrower->{'cardnumber'},

}

#set up so only the last 8 returned items display (make for faster loading pages)
my $returned_counter = ( C4::Context->preference('numReturnedItemsToShow') ) ? C4::Context->preference('numReturnedItemsToShow') : 10;
my $count = 0;
my @riloop;
foreach ( sort { $a <=> $b } keys %returneditems ) {

        else {
            $ri{borrowernumber} = $riborrowernumber{$_};
        }

        #        my %ri;
        my $biblio = GetBiblioFromItemNumber(GetItemnumberFromBarcode($bar_code));
        my $item = GetItem(GetItemnumberFromBarcode($bar_code));
        # fix up item type for display
        $biblio->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $biblio->{'itype'} : $biblio->{'itemtype'};
        $ri{itembiblionumber} = $biblio->{'biblionumber'};
        $ri{itemtitle}        = $biblio->{'title'};
        $ri{itemauthor}       = $biblio->{'author'};
        $ri{itemtype}         = $biblio->{'itemtype'};
        $ri{itemnote}         = $biblio->{'itemnotes'};
        $ri{ccode}            = $biblio->{'ccode'};
        $ri{itemnumber}       = $biblio->{'itemnumber'};
        $ri{itemtype}         = $item->{'itype'};
        $ri{ccode}            = $item->{'ccode'};
        $ri{itemcallnumber}   = $item->{'itemcallnumber'};
        $ri{homebranch}       = $item->{'homebranch'};
        $ri{holdingbranch}    = $item->{'holdingbranch'};
        $ri{barcode}          = $bar_code;
        my $shelflocations    = GetKohaAuthorisedValues('items.location','');
        $ri{itemlocation}     = $shelflocations->{$biblio->{'location'}};
        
    }
    else {
        last;




			return false;
		});

        $('#selectlibrary input[type=submit]').hide();
	});
</script>
<style type="text/css">td { text-align: center; }</style>

    <form method="get" action="/cgi-bin/koha/admin/branch_transfer_limits.pl" id="selectlibrary">
        <label for="branchselect">Select a library :</label>
            <select name="branchcode" id="branchselect">
            <option value="">Choose one</option>
		<!-- TMPL_LOOP NAME="branch_loop" -->
            <!-- TMPL_IF EXPR="value eq branchcode" -->
                <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
            <!-- TMPL_ELSE -->
                <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option>
            <!-- /TMPL_IF -->
		<!-- /TMPL_LOOP -->
            </select>
	    <input type="submit" value="Choose" />	    
    </form>
<!-- TMPL_IF NAME="branchcode" -->
<p class="help">Check the boxes for the libraries you accept to checkin items from.</p>
<fieldset>For <strong>all</strong> <!--TMPL_VAR NAME="limit_phrase" -->s: <a id="CheckAll" href="#">Check All</a> | <a id="UncheckAll" href="#">Uncheck All</a></fieldset>


			</thead>

			<tbody>
					<!-- TMPL_LOOP NAME="from_branch_loop" -->
						<!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE
--><tr><!-- /TMPL_UNLESS -->
							<td><label style="min-width:400px;" for="<!-- TMPL_VAR NAME="code" --><!-- TMPL_VAR NAME="fromBranch" -->row"><!-- TMPL_VAR NAME="fromBranch" --> - <!-- TMPL_VAR NAME="fromBranchname" --></label></td>
							<td><input type="checkbox" id="<!-- TMPL_VAR NAME="code" --><!-- TMPL_VAR NAME="fromBranch" -->row" name="<!-- TMPL_VAR NAME="code" -->_<!-- TMPL_VAR NAME="fromBranch" -->" <!-- TMPL_IF NAME="isChecked" -->checked="checked" <!-- /TMPL_IF --> /></td>
						</tr>
					<!-- /TMPL_LOOP -->
			</tbody>

		</div>
  </div>
</div>
<!-- /TMPL_IF -->
<div class="yui-b">
  <!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
</div>

Lines 24-30 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tmpl (-1 / +2 lines)
24	<!-- TMPL_IF NAME="error" -->	24	<!-- TMPL_IF NAME="error" -->
25	<div class="dialog alert">Cloning of issuing rules failed!</div>	25	<div class="dialog alert">Cloning of issuing rules failed!</div>
26	<!-- TMPL_ELSE -->	26	<!-- TMPL_ELSE -->
27	<div class="dialog message"><p>The rules have been cloned.</p></div>	27	<div class="message"><p>The rules have <a href="/cgi-bin/koha/admin/smart-rules.pl?branch=<!-- TMPL_VAR NAME="tobranch" -->">been cloned</a>.</p></div>
		28	<script language="javascript">document.location.href = "/cgi-bin/koha/admin/smart-rules.pl?branch=<!-- TMPL_VAR NAME="tobranch" -->";</script>
28	<!-- /TMPL_IF -->	29	<!-- /TMPL_IF -->
29	<a href="/cgi-bin/koha/admin/smart-rules.pl">Return to Issuing rules</a>	30	<a href="/cgi-bin/koha/admin/smart-rules.pl">Return to Issuing rules</a>
30	<!-- TMPL_ELSE -->	31	<!-- TMPL_ELSE -->




//<![CDATA[
$(document).ready(function() {
        $('#selectlibrary').find("input:submit").hide();
        $('#branchcode').change(function() {
                $('#selectlibrary').submit();
        });
        $('#filter').keyup(function() {
                $.uiTableFilter( $('#smartrules'), this.value );
        });
        $('#nofilter').click(function() {
            $('.issues').show();
            $('.fines').show();
            $('.reserves').show();
            $('.issues :input').removeAttr('disabled',true);
            $('.fines :input').removeAttr('disabled',true);
            $('.reserves :input').removeAttr('disabled',true);
            $(this).parent().attr('class','ui-tabs-selected');
            $('#issuesfilter').parent().attr('class',null);
            $('#finesfilter').parent().attr('class',null);
            $('#reservesfilter').parent().attr('class',null);
        });
        $('#issuesfilter').click(function() {
            $('.issues').show();
            $('.fines').hide();
            $('.reserves').hide();
            $('.issues :input').removeAttr('disabled',true);
            $('.fines :input').attr('disabled',true);
            $('.reserves :input').attr('disabled',true);
            $(this).parent().attr('class','ui-tabs-selected');
            $('#nofilter').parent().attr('class',null);
            $('#finesfilter').parent().attr('class',null);
            $('#reservesfilter').parent().attr('class',null);
        });
        $('#finesfilter').click(function() {
            $('.issues').hide();
            $('.fines').show();
            $('.reserves').hide();
            $('.issues :input').attr('disabled',true);
            $('.fines :input').removeAttr('disabled',true);
            $('.reserves :input').attr('disabled',true);
            $(this).parent().attr('class','ui-tabs-selected');
            $('#issuesfilter').parent().attr('class',null);
            $('#nofilter').parent().attr('class',null);
            $('#reservesfilter').parent().attr('class',null);
        });
        $('#reservesfilter').click(function() {
            $('.issues').hide();
            $('.fines').hide();
            $('.reserves').show();
            $('.issues :input').attr('disabled',true);
            $('.fines :input').attr('disabled',true);
            $('.reserves :input').removeAttr('disabled',true);
            $(this).parent().attr('class','ui-tabs-selected');
            $('#issuesfilter').parent().attr('class',null);
            $('#finesfilter').parent().attr('class',null);
            $('#nofilter').parent().attr('class',null);
        });

        // Inline editor
        var editor = false;
        $('#smartrules>tbody>tr>td.editable').click(function() {
            if ( ! editor ) {
                var td = $(this);
                var tdvalue = td.text().trim();
                td.text('');

                var type;
                if ( $.inArray('boolean', td.attr('class').split(' ')) != -1 ) { // If the td is boolean, we display a checkbox
                    editor = $('<input id="inlineeditor" type="checkbox" /\>');
                    editor.attr('checked', tdvalue == 'Yes' ? 'checked' : '');
                    type = 'boolean';
                } else if ( $.inArray('triple', td.attr('class').split(' ')) != -1 ) { // else if it is a triple, we display a listbox
                    var selectedn = tdvalue ==  ''   ? 'selected="selected"' : '';
                    var selected1 = tdvalue == 'Yes' ? 'selected="selected"' : '';
                    var selected0 = tdvalue == 'No'  ? 'selected="selected"' : '';
                    var str  = '<select id="inlineeditor">';
                        str += '<option value=""  ' + selectedn + '></option>';
                        str += '<option value="1" ' + selected1 + '>Yes</option>';
                        str += '<option value="0" ' + selected0 + '>No</option>';
                        str += '</select>';
                    editor = $(str);
                    type = 'triple';
                } else { // else we display a textbox
                    editor = $('<input id="inlineeditor" type="text" size="4" /\>');
                    editor.attr('value', tdvalue);
                }

                editor.focus();

                editor.keyup(function(e) {   // on press
                    if ( e.keyCode == 13 ) { // enter

                        // let's build the atomic rule
                        var branchcode   = $('#branchcode').val();
                        var categorycode = td.parent().children('td.categorycode').children('span').text();
                        var itemtype     = td.parent().children('td.itemtype').children('span').text();
                        var varname      = td.attr('class').split(' ')[0];
                        var inputvalue;
                        switch ( type ) {
                            case 'boolean':
                                inputvalue = editor.attr('checked') ? 1 : 0;
                                break;
                            default:
                                inputvalue = editor.val();
                                break;
                        }

                        // post it to the server
                        $.ajax({
                            url: '/cgi-bin/koha/admin/smart-rules-service.pl',
                            type: "POST",
                            async: false,
                            data: "branchcode="+branchcode+"&categorycode="+categorycode+"&itemtype="+itemtype+"&varname="+varname+"&inputvalue="+inputvalue,
                            success: function(result) {

                                // repopulate the td with data
                                switch ( type ) {
                                    case 'boolean':
                                        td.text(result == '1' ? 'Yes' : 'No');
                                        break;
                                    case 'triple':
                                        switch ( result ) {
                                            case '' : td.text('');    break;
                                            case '1': td.text('Yes'); break;
                                            case '0': td.text('No');  break;
                                        }
                                        break;
                                    default:
                                        td.text(result);
                                        break;
                                }

                                editor.remove();
                                editor = false;
                            }
                        });
                    }
                });

                td.append(editor);
            }
        });
});
//]]>
</script>

            Defining circulation and fine rules for all libraries
        <!-- /TMPL_IF -->
    </h1>
    <div id="bloc100">
        <p>The rules are applied from most specific to less specific, using the first found in this order:</p>
        <ul>
            <li>same library, same patron type, same item type</li>
            <li>same library, same patron type, all item types</li>
            <li>same library, all patron types, same item type</li>
            <li>same library, all patron types, all item types</li>
            <li>all libraries, same patron type, same item type</li>
            <li>all libraries, same patron type, all item types</li>
            <li>all libraries, all patron types, same item type</li>
            <li>all libraries, all patron types, all item types</li>
        </ul>
        <p>To modify a rule, create a new one with the same patron type and item type.</p>
    </div>
    <div>
        <form method="get" action="/cgi-bin/koha/admin/smart-rules.pl" id="selectlibrary">
        Select a library :
            <select name="branchcode" id="branchcode" style="width:20em;">
                <option value="*">Default</option>
            <!-- TMPL_LOOP NAME="branchloop" -->
				<!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option><!-- /TMPL_IF -->
            <!-- /TMPL_LOOP -->

for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidden" name="frombranch" value="<!-- TMPL_VAR NAME="current_branch" -->" />
            <select name="tobranch" id="tobranch"><!-- TMPL_LOOP NAME="branchloop" --><option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option><!-- /TMPL_LOOP --></select> <input type="submit" value="Clone" /></form><!-- /TMPL_IF --></fieldset>

        <div class="toptabs">
            <ul class="ui-tabs-nav">
                <li class="ui-tabs-selected"><a id="nofilter">All</a></li>
                <li><a id="issuesfilter">Issues</a></li>
                <li><a id="finesfilter">Fines</a></li>
                <li><a id="reservesfilter">Reserves</a></li>
                <div style="text-align:right;">
                    <label for="filter" style="float:none;">Filter: </label>
                    <input type="text" name="filter" id="filter" />
                </div>
            </ul>
            <div class="tabs-container">
                    <table id="smartrules" width="100%">
                        <thead>
                            <tr>
                                <th>Patron category</th>
                                <th>Item type</th>
                                <th class="issues">Current checkouts allowed</th>
                                <th class="issues">Loan period (day)</th>
                                <th class="fines">Fine amount</th>
                                <th class="fines">Fine charging interval</th>
                                <th class="fines">Grace period (day)</th>
                                <th class="fines">Suspension duration (day)</th>
                                <th class="issues">Renewals allowed (count)</th>
                                <th class="issues">Renewals period (days)</th>
                                <th class="reserves">Holds allowed (count)</th>
                                <th class="reserves">Holds pickup delay (day)</th>
                                <th class="reserves">Allow on shelf holds</th>
                                <th class="reserves">Holds restricted to library</th>
                                <th class="issues">Rental Discount (%)</th>
                                <th>&nbsp;</th>
                            </tr>
                        </thead>
                        <tbody>
                        <!-- TMPL_LOOP NAME="rules" -->
                            <!-- TMPL_UNLESS NAME="__odd__" -->
                            <tr class="highlight">
								<!-- TMPL_ELSE -->
									<!-- TMPL_VAR NAME="maxissueqty" -->
								<!-- /TMPL_IF -->
							</td>
							<td><!-- TMPL_VAR NAME="issuelength" --></td>
							<td><!-- TMPL_VAR NAME="fine" --></td>
							<td><!-- TMPL_VAR NAME="chargeperiod" --></td>
							<td><!-- TMPL_VAR NAME="firstremind" --></td>
							<td><!-- TMPL_VAR NAME="finedays" --></td>
							<td><!-- TMPL_VAR NAME="renewalsallowed" --></td>
							<td><!-- TMPL_VAR NAME="reservesallowed" --></td>
							<td><!-- TMPL_VAR NAME="rentaldiscount" --></td>
							<td>
								<a class="button" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=<!-- TMPL_VAR NAME="itemtype" -->&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->&amp;branch=<!-- TMPL_VAR NAME="current_branch" -->">Delete</a>
							</td>
                	</tr>
            	<!-- /TMPL_LOOP -->
                <tr>
                    <td>
                        <select name="categorycode">
                            <option value="*">All</option>
                        <!-- TMPL_LOOP NAME="categoryloop" -->
                            <option value="<!-- TMPL_VAR NAME="categorycode" -->"><!-- TMPL_VAR NAME="description" --></option>
                        <!-- /TMPL_LOOP -->
                        </select>
                    </td>
                    <td>
                        <select name="itemtype" style="width:13em;">
                            <option value="*">All</option>
                        <!-- TMPL_LOOP NAME="itemtypeloop" -->
                            <option value="<!-- TMPL_VAR NAME="itemtype" -->"><!-- TMPL_VAR NAME="description" --></option>
                        <!-- /TMPL_LOOP -->
                        </select>
                    </td>
                    <td><input name="maxissueqty" size="3" /></td>
                    <td><input name="issuelength" size="3" /> </td>
                    <td><input name="fine" size="4" /></td>
                    <td><input name="chargeperiod" size="2" /></td>
                    <td><input name="firstremind" size="2" /> </td>
                    <td><input name="finedays" size="3" /> </td>
                    <td><input name="renewalsallowed" size="2" /></td>
                    <td><input name="reservesallowed" size="2" /></td>
		    <td><input name="rentaldiscount" size="2" /></td>
                    <td><input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="current_branch" -->"/><input type="submit" value="Add" class="submit" /></td>
                </tr>
            </table>
        </form>
    </div>
    <div id="defaults-for-this-library" class="container">
    <h3>Default checkout and hold policy for <!-- TMPL_IF NAME="humanbranch" --><!-- TMPL_VAR NAME="humanbranch" --><!-- TMPL_ELSE -->all libraries<!-- /TMPL_IF --></h3>
        <p>You can set a default maximum number of checkouts and hold policy that will be used if none is defined below for a particular item type or category.</p>
        <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
            <input type="hidden" name="op" value="set-branch-defaults" />
            <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="current_branch" -->"/>
            <table>
                <tr>
                    <th>&nbsp;</th>
                    <th>Total Current Checkouts Allowed</th>
                    <th>Hold Policy</th>
                    <th>&nbsp;</th>
                    <th>&nbsp;</th>
                </tr>
                <tr>
                    <td><em>Defaults<!-- TMPL_UNLESS NAME="default_rules" --> (not set)<!-- /TMPL_IF --></em></td>
                    <td><input type="text" name="maxissueqty" size="3" value="<!-- TMPL_VAR NAME="default_maxissueqty" -->"/></td>
                    <td>
                        <select name="holdallowed">
                            <!-- TMPL_IF NAME="default_holdallowed_any" -->
                            <option value="2" selected="selected">
                            <!-- TMPL_ELSE -->
                            <option value="2">
                            <!-- /TMPL_IF -->
                                From Any Library
                            </option>
                            <!-- TMPL_IF NAME="default_holdallowed_same" -->
                            <option value="1" selected="selected">
                            <!-- TMPL_ELSE -->
                            <option value="1">
                            <!-- /TMPL_IF -->
                                From Home Library
                            </option>
                            <!-- TMPL_IF NAME="default_holdallowed_none" -->
                            <option value="0" selected="selected">
                            <!-- TMPL_ELSE -->
                            <option value="0">
                            <!-- /TMPL_IF -->
                                No Holds Allowed
                            </option>
                        </select>
                    </td>
                    <td><input type="submit" value="Save" class="submit" /></td>
                    <td>
                        <a class="button" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-cat&amp;categorycode=*&amp;branch=<!-- TMPL_VAR NAME="current_branch" -->">Unset</a>
                    </td>
                </tr>
            </table>
        </form>
    </div>
    <!-- TMPL_IF NAME="show_branch_cat_rule_form" -->
    <div id="holds-policy-by-patron-category" class="container">
    <h3>Checkout limit by patron category for <!-- TMPL_IF NAME="humanbranch" --><!-- TMPL_VAR NAME="humanbranch" --><!-- TMPL_ELSE -->all libraries<!-- /TMPL_IF --></h3>
        <p>For this library, you can specify the maximum number of loans that
            a patron of a given category can make, regardless of the item type.
        </p>
        <p>If the total amount loanable for a given patron category is left blank,
           no limit applies, except possibly for a limit you define for a specific item type.
        </p>
        <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
            <input type="hidden" name="op" value="add-branch-cat" />
            <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="current_branch" -->"/>
            <table>
                <tr>
                    <th>Patron Category</th>
                    <th>Total Current Checkouts Allowed</th>
                    <th>&nbsp;</th>
                </tr>
                <!-- TMPL_LOOP NAME="branch_cat_rule_loop" -->
                    <!-- TMPL_UNLESS NAME="__odd__" -->
                    <tr class="highlight">
                    <!-- TMPL_ELSE -->
                    <tr>
                    <!-- /TMPL_UNLESS -->
                        <td><!-- TMPL_IF NAME="default_humancategorycode" -->
                                <em>Default</em>
                            <!-- TMPL_ELSE -->
                            <tr>
                            <!-- /TMPL_UNLESS -->
                                    <td class="categorycode">
                                        <span style="display:none;"><!-- TMPL_VAR NAME="categorycode" --></span>
                                        <!-- TMPL_IF NAME="default_humancategorycode" -->
                                            <em>Default</em>
                                        <!-- TMPL_ELSE -->
                                            <!-- TMPL_VAR NAME="humancategorycode" -->
                                        <!-- /TMPL_IF -->
                                    </td>
                                    <td class="itemtype">
                                        <span style="display:none;"><!-- TMPL_VAR NAME="itemtype" --></span>
                                        <!-- TMPL_IF NAME="default_humanitemtype" -->
                                            <em>Default</em>
                                        <!-- TMPL_ELSE -->
                                            <!-- TMPL_VAR NAME="humanitemtype" -->
                                        <!-- /TMPL_IF -->
                                    </td>
                                    <!-- TMPL_IF NAME="herited_maxissueqty" -->
                                    <td class="maxissueqty editable issues herited">
                                    <!-- TMPL_ELSE -->
                                    <td class="maxissueqty editable issues">
                                    <!-- /TMPL_IF -->
                                        <!-- TMPL_IF NAME="unlimited_maxissueqty" -->
                                            Unlimited
                                        <!-- TMPL_ELSE -->
                                            <!-- TMPL_VAR NAME="maxissueqty" -->
                                        <!-- /TMPL_IF -->
                                    </td>
                                    <!-- TMPL_IF NAME="herited_issuelength" -->
                                    <td class="issuelength editable issues herited">
                                    <!-- TMPL_ELSE -->
                                    <td class="issuelength editable issues">
                                    <!-- /TMPL_IF -->
                                    <!-- TMPL_VAR NAME="issuelength" -->
                                    </td>
                                    <!-- TMPL_IF NAME="herited_fine" -->
                                    <td class="fine editable fines herited">
                                    <!-- TMPL_ELSE -->
                                    <td class="fine editable fines">
                                    <!-- /TMPL_IF -->
                                    <!-- TMPL_VAR NAME="fine" -->
                                    </td>
                                    <!-- TMPL_IF NAME="herited_chargeperiod" -->
                                    <td class="chargeperiod editable fines herited">
                                    <!-- TMPL_ELSE -->
                                    <td class="chargeperiod editable fines">
                                    <!-- /TMPL_IF -->
                                    <!-- TMPL_VAR NAME="chargeperiod" -->
                                    </td>
                                    <!-- TMPL_IF NAME="herited_firstremind" -->
                                    <td class="firstremind editable fines herited">
                                    <!-- TMPL_ELSE -->
                                    <td class="firstremind editable fines">
                                    <!-- /TMPL_IF -->
                                    <!-- TMPL_VAR NAME="firstremind" -->
                                    </td>
                                    <!-- TMPL_IF NAME="herited_finedays" -->
                                    <td class="finedays editable fines herited">
                                    <!-- TMPL_ELSE -->
                                    <td class="finedays editable fines">
                                    <!-- /TMPL_IF -->
                                    <!-- TMPL_VAR NAME="finedays" -->
                                    </td>
                                    <!-- TMPL_IF NAME="herited_renewalsallowed" -->
                                    <td class="renewalsallowed editable issues herited">
                                    <!-- TMPL_ELSE -->
                                    <td class="renewalsallowed editable issues">
                                    <!-- /TMPL_IF -->
                                    <!-- TMPL_VAR NAME="renewalsallowed" -->
                                    </td>
                                    <!-- TMPL_IF NAME="herited_renewalperiod" -->
                                    <td class="renewalperiod editable issues herited">
                                    <!-- TMPL_ELSE -->
                                    <td class="renewalperiod editable issues">
                                    <!-- /TMPL_IF -->
                                    <!-- TMPL_VAR NAME="renewalperiod" -->
                                    </td>
                                    <!-- TMPL_IF NAME="herited_reservesallowed" -->
                                    <td class="reservesallowed editable reserves herited">
                                    <!-- TMPL_ELSE -->
                                    <td class="reservesallowed editable reserves">
                                    <!-- /TMPL_IF -->
                                    <!-- TMPL_VAR NAME="reservesallowed" -->
                                    </td>
                                     <!-- TMPL_IF NAME="herited_holdspickupdelay" -->
                                    <td class="holdspickupdelay editable reserves herited">
                                    <!--TMPL_ELSE-->
                                    <td class="holdspickupdelay editable reserves">
                                    <!--/TMPL_IF-->
                                    <!-- TMPL_VAR NAME="holdspickupdelay" -->
                                    </td>
                                    <!-- TMPL_IF NAME="herited_allowonshelfholds" -->
                                    <td class="allowonshelfholds editable reserves triple herited">
                                    <!--TMPL_ELSE-->
                                    <td class="allowonshelfholds editable reserves triple">
				    <!--/TMPL_IF-->
                                    <!-- TMPL_IF NAME="allowonshelfholds" -->
                                    Yes
                                    <!--TMPL_ELSE-->
                                    No
                                    <!--/TMPL_IF-->
                                    </td>
                                    <!-- TMPL_IF NAME="herited_holdrestricted" -->
                                    <td class="holdrestricted editable reserves boolean herited">
                                    <!--TMPL_ELSE-->
                                     <td class="holdrestricted editable reserves boolean">
                                    <!--/TMPL_IF-->
                                    <!-- TMPL_IF NAME="holdrestricted" -->
                                    Yes
                                    <!--TMPL_ELSE-->
                                    No
                                    <!--/TMPL_IF-->
                                    </td>
                                    <!-- TMPL_IF NAME="herited_rentaldiscount" -->
                                    <td class="rentaldiscount editable issues herited">
                                    <!-- TMPL_ELSE -->
                                    <td class="rentaldiscount editable issues">
                                    <!-- /TMPL_IF -->
                                    <!-- TMPL_VAR NAME="rentaldiscount" -->
                                    </td>
                                    <td>
                                        <a class="button" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=<!-- TMPL_VAR NAME="itemtype" -->&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->&amp;branchcode=<!-- TMPL_VAR NAME="branchcode" -->">Delete</a>
                                    </td>
                                </tr>
                            <!-- /TMPL_LOOP -->
                        </tbody>
                        <form method="post" name="inputrules" action="/cgi-bin/koha/admin/smart-rules.pl">
                            <input type="hidden" name="op" value="add" />
                        <tfoot>
                            <tr>
                                <td>
                                    <select name="categorycode" id="categorycode" style="width:12em;">
                                        <option value="*">Default</option>
                                    <!-- TMPL_LOOP NAME="categoryloop" -->
                                        <!-- TMPL_IF Name="selected"-->
                                        <option value="<!-- TMPL_VAR NAME="categorycode" -->" selected="selected"><!-- TMPL_VAR NAME="description" --></option>
                                        <!--TMPL_ELSE --> <option value="<!-- TMPL_VAR NAME="categorycode" -->" ><!-- TMPL_VAR NAME="description" --></option>
                                        <!-- /TMPL_IF -->
                                    <!-- /TMPL_LOOP -->
                                    </select>
                                </td>
                                <td>
                                    <select name="itemtype" style="width:12em;">
                                        <option value="*">Default</option>
                                    <!-- TMPL_LOOP NAME="itemtypeloop" -->
                                        <!-- TMPL_IF Name="selected"-->
                                        <option value="<!-- TMPL_VAR NAME="itemtype" -->" selected="selected"><!-- TMPL_VAR NAME="description" --></option>
                                        <!--TMPL_ELSE --> <option value="<!-- TMPL_VAR NAME="itemtype" -->"><!-- TMPL_VAR NAME="description" --></option>
                                        <!-- /TMPL_IF -->
                                    <!-- /TMPL_LOOP -->
                                    </select>
                                </td>
                                <td class="issues"><input name="maxissueqty" size="3" value="<!-- TMPL_VAR NAME="maxissueqty" -->"/></td>
                                <td class="issues"><input name="issuelength" size="3" value="<!-- TMPL_VAR NAME="issuelength" -->"/> </td>
                                <td class="fines"><input name="fine" size="4" value="<!-- TMPL_VAR NAME="fine" -->"/></td>
                                <td class="fines"><input name="chargeperiod" size="2" value="<!-- TMPL_VAR NAME="chargeperiod" -->"/></td>
                                <td class="fines"><input name="firstremind" size="2" value="<!-- TMPL_VAR NAME="firstremind" -->"/> </td>
                                <td class="fines"><input name="finedays" size="3" value="<!-- TMPL_VAR NAME="finedays" -->"/> </td>
                                <td class="issues"><input name="renewalsallowed" size="2" value="<!-- TMPL_VAR NAME="renewalsallowed" -->"/></td>
                                <td class="issues"><input name="renewalperiod" size="2" value="<!-- TMPL_VAR NAME="renewalperiod" -->"/></td>
                                <td class="reserves"><input name="reservesallowed" size="2" value="<!-- TMPL_VAR NAME="reservesallowed" -->"/></td>
                                <td class="reserves"><input name="holdspickupdelay" size="2" value="<!-- TMPL_VAR NAME="holdspickupdelay" -->"/></td>
                                <td class="reserves">
                                    <select name="allowonshelfholds">
                                        <option value=""></option>
                                        <option value="1">Yes</option>
                                        <option value="0">No</option>
                                    </select>
                                </td>
                                <td class="reserves"><!-- TMPL_IF NAME="holdrestricted"--><input type="checkbox" name="holdrestricted" checked="checked" value="1"/> <!--TMPL_ELSE--><input type="checkbox" name="holdrestricted" value="1"/> <!-- /TMPL_IF --></td>
		                        <td class="issues"><input name="rentaldiscount" size="2" /></td>
                                <td><input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->"/><input type="submit" value="Add" class="submit" /></td>
                            </tr>
                        </tfoot>
                </form>
                    </table>
            </div><!-- tabs-container -->
        </div><!-- toptabs -->
    </div>
</div>


Lines 10-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl (-153 / +286 lines)
10	<script type="text/javascript">	10	<script type="text/javascript">
11	//<![CDATA[	11	//<![CDATA[
12	if($.cookie("holdfor") != <!-- TMPL_VAR NAME="borrowernumber" -->){ $.cookie("holdfor",null, { path: "/", expires: 0 }); }	12	if($.cookie("holdfor") != <!-- TMPL_VAR NAME="borrowernumber" -->){ $.cookie("holdfor",null, { path: "/", expires: 0 }); }
		13
		14	function Dopop(link) {
		15	var newin=window.open(link,'popup','width=600,height=400,resizable=1,toolbar=0,scrollbars=1,top');
		16	}
		17
		18
13	<!-- TMPL_IF NAME="UseTablesortForCirc" -->$.tablesorter.addParser({	19	<!-- TMPL_IF NAME="UseTablesortForCirc" -->$.tablesorter.addParser({
14	id: 'articles',	20	id: 'articles',
15	is: function(s) {return false; },	21	is: function(s) {return false; },
Lines 24-32 if($.cookie("holdfor") != <!-- TMPL_VAR NAME="borrowernumber" -->){ $.cookie("ho Link Here
24	dateFormat: 'uk',<!-- /TMPL_IF -->	30	dateFormat: 'uk',<!-- /TMPL_IF -->
25	headers: { 1: { sorter: 'articles' },5: { sorter: false },6:{sorter:false},7:{sorter:false},8:{sorter:false}}	31	headers: { 1: { sorter: 'articles' },5: { sorter: false },6:{sorter:false},7:{sorter:false},8:{sorter:false}}
26	});	32	});
		33	$("#relissuest").tablesorter({<!-- TMPL_IF NAME="dateformat_metric" -->
		34	dateFormat: 'uk',<!-- /TMPL_IF -->
		35	headers: { 1: { sorter: 'articles' },5: { sorter: false },6:{sorter:false},7:{sorter:false},8:{sorter:false}}
		36	});
		37
		38	//FIXME: Sorting does not work when there are previous checkouts only
		39	// (It works fine when there are only checkouts of the day, or both previous and today checkouts)
27	$("#issuest").bind("sortEnd",function() {	40	$("#issuest").bind("sortEnd",function() {
28	$("#previous").parents("tr").remove(); // 'previous checkouts' header chokes table sorter	41	$("#previous").parents("tr").remove(); // 'previous checkouts' header chokes table sorter
29	});	42	});
		43	$("#relissuest").bind("sortEnd",function() {
		44	$("#relprevious").parents("tr").remove(); // 'previous checkouts' header chokes table sorter
		45	});
		46
30	$("#holdst").tablesorter({<!-- TMPL_IF NAME="dateformat_metric" -->	47	$("#holdst").tablesorter({<!-- TMPL_IF NAME="dateformat_metric" -->
31	dateFormat: 'uk',<!-- /TMPL_IF -->	48	dateFormat: 'uk',<!-- /TMPL_IF -->
32	sortList: [[0,0]],	49	sortList: [[0,0]],
Lines 43-56 if($.cookie("holdfor") != <!-- TMPL_VAR NAME="borrowernumber" -->){ $.cookie("ho Link Here
43	<!-- /TMPL_IF -->	60	<!-- /TMPL_IF -->
44		61
45	var allcheckboxes = $(".checkboxed");	62	var allcheckboxes = $(".checkboxed");
46	$("#renew_all").click(function(){
47	$(allcheckboxes).checkCheckboxes(":input[name*=items]");
48	$(allcheckboxes).unCheckCheckboxes(":input[name*=barcodes]");
49	});
50	$("#CheckAllitems").click(function(){	63	$("#CheckAllitems").click(function(){
51	$(allcheckboxes).checkCheckboxes(":input[name*=items]");	64	$(allcheckboxes).checkCheckboxes(":input[name*=items]");
52	$(allcheckboxes).unCheckCheckboxes(":input[name*=barcodes]"); return false;	65	$(allcheckboxes).unCheckCheckboxes(":input[name*=barcodes]"); return false;
53	});	66	});
		67	// $(":input[name*]=items").click(function(){
		68	// var itemnumber=getitemnumber($(this).attr(‘id’));
		69	// alert(getitemnumber($(this).attr(‘id’)));
		70	// $("#return_"+itemnumber).attr('checked', !$(this).attr('checked'));
		71	// });
54	$("#CheckNoitems").click(function(){	72	$("#CheckNoitems").click(function(){
55	$(allcheckboxes).unCheckCheckboxes(":input[name*=items]"); return false;	73	$(allcheckboxes).unCheckCheckboxes(":input[name*=items]"); return false;
56	});	74	});
Lines 65-76 var allcheckboxes = $(".checkboxed"); Link Here
65	<!-- TMPL_IF NAME="CAN_user_circulate_override_renewals" -->	83	<!-- TMPL_IF NAME="CAN_user_circulate_override_renewals" -->
66	<!-- TMPL_IF NAME="AllowRenewalLimitOverride" -->	84	<!-- TMPL_IF NAME="AllowRenewalLimitOverride" -->
67	$( '#override_limit' ).click( function () {	85	$( '#override_limit' ).click( function () {
68	if ( this.checked ) {	86	$( '.renewals-allowed' ).toggle();
69	$( '.renewals-allowed' ).show(); $( '.renewals-disabled' ).hide();
70	} else {
71	$( '.renewals-allowed' ).hide(); $( '.renewals-disabled' ).show();
72	}
73	} ).attr( 'checked', false );	87	} ).attr( 'checked', false );
		88	$( '.renewals-allowed' ).hide();
74	<!-- /TMPL_IF -->	89	<!-- /TMPL_IF -->
75	<!-- /TMPL_IF -->	90	<!-- /TMPL_IF -->
76	// Clicking the table cell checks the checkbox inside it	91	// Clicking the table cell checks the checkbox inside it
Lines 109-121 var allcheckboxes = $(".checkboxed"); Link Here
109	radioCheckBox($(this));	124	radioCheckBox($(this));
110	});	125	});
111	});	126	});
112		127	index = id.IndexOf("_");
		128	return id.substr(index+1);
		129	}
		130	function uncheck_sibling(me){
		131	nodename=me.getAttribute("name");
		132	if (nodename =="barcodes[]"){
		133	var Node=me.parentNode.previousSibling;
		134	while (Node.nodeName!="TD"){Node=Node.previousSibling}
		135	var Nodes=Node.childNodes;
		136	for (var i=0;i<Nodes.length;i++){
		137	if (Nodes[i].nodeName=="INPUT" && Nodes[i].getAttribute("type")=="checkbox"){
		138	Nodes[i].checked=false;
		139	}
		140	}
		141
		142	}else {
		143	var Node=me.parentNode.nextSibling;
		144	while (Node.nodeName!="TD"){Node=Node.nextSibling}
		145	var Nodes=Node.childNodes;
		146	for (var i=0;i<Nodes.length;i++){
		147	if (Nodes[i].nodeName=="INPUT" && Nodes[i].getAttribute("type")=="checkbox"){
		148	Nodes[i].checked=false;
		149	}
		150	}
		151	}
		152	}
113	function validate1(date) {	153	function validate1(date) {
114	var today = new Date();	154	var today = new Date();
115	if ( date < today ) {	155	if ( today < date \|\| date.toDateString() == today.toDateString() ) {
116	return true;
117	} else {
118	return false;	156	return false;
		157	} else {
		158	return true;
119	}	159	}
120	};	160	};
121	function refocus(calendar) {	161	function refocus(calendar) {
Lines 191-200 function refocus(calendar) { Link Here
191	</form>	231	</form>
192	</div>	232	</div>
193		233
194	<!-- TMPL_IF NAME="dateexpiry" --><div class="dialog message">Patron's account has been renewed until <!-- TMPL_VAR NAME="dateexpiry" --></div><!-- /TMPL_IF -->	234	<!-- TMPL_INCLUDE NAME="reserves_waiting.inc" -->
		235
		236	<!-- TMPL_IF name="circnote" -->
		237	<div id="circnote" class="dialog alert">
		238	<h3>Circulation note:</h2>
		239	<!-- TMPL_VAR name="circnote" -->
		240	</div>
		241	<!-- /TMPL_IF -->
		242	<!-- TMPL_IF NAME="newexpiry" --><div class="dialog message">Patron's account has been renewed until <!-- TMPL_VAR NAME="newexpiry" --></div><!-- /TMPL_IF -->
195	<!-- TMPL_IF NAME="NEEDSCONFIRMATION" -->	243	<!-- TMPL_IF NAME="NEEDSCONFIRMATION" -->
196	<div class="yui-g">	244	<div class="yui-g">
197
198	<div id="circ_needsconfirmation" class="dialog alert">	245	<div id="circ_needsconfirmation" class="dialog alert">
199	<h3>Please Confirm Checkout</h3>	246	<h3>Please Confirm Checkout</h3>
200		247
Lines 220-242 function refocus(calendar) { Link Here
220	<!-- /TMPL_IF -->	267	<!-- /TMPL_IF -->
221		268
222	<!-- TMPL_IF NAME="TOO_MANY" -->	269	<!-- TMPL_IF NAME="TOO_MANY" -->
223	<li>Too many checked out. <!-- TMPL_VAR NAME="current_loan_count" --> checked out, only <!-- TMPL_VAR NAME="max_loans_allowed" --> are allowed.</li>	270	<li>Check out limit reached (already checked out / max : <!-- TMPL_VAR name="TOO_MANY" -->)</li>
224	<!-- /TMPL_IF -->	271	<!-- /TMPL_IF -->
225		272
226	<!-- TMPL_IF NAME="BORRNOTSAMEBRANCH" -->	273	<!-- TMPL_IF NAME="BORRNOTSAMEBRANCH" -->
227	<li>This patrons is from a different library (<!-- TMPL_VAR NAME="BORRNOTSAMEBRANCH" -->)</li>	274	<li>This patrons is from a different library (<!-- TMPL_VAR NAME="BORRNOTSAMEBRANCH" -->)</li>
228	<!-- /TMPL_IF -->	275	<!-- /TMPL_IF -->
229		276
		277	<!-- TMPL_IF NAME="BRANCH_TRANSFER_NOT_ALLOWED" -->
		278	<li>Item should be at <!--TMPL_VAR Name="BRANCH_TRANSFER_NOT_ALLOWED"-->.<br /> It should not be checked out in this library.</li>
		279	<!-- /TMPL_IF -->
		280
230	<!-- TMPL_IF NAME="PATRON_CANT" -->	281	<!-- TMPL_IF NAME="PATRON_CANT" -->
231	<li>This patron can't check out this item per library circulation policy</i>	282	<li>This patron can't check out this item per library circulation policy</li>
		283	<!-- /TMPL_IF -->
		284
		285	<!-- TMPL_IF NAME="USERBLOCKEDOVERDUE" -->
		286	<li>This patron can't check out this item. Debarred until : <!--TMPL_VAR Name="USERBLOCKEDOVERDUE"--> </li>
232	<!-- /TMPL_IF -->	287	<!-- /TMPL_IF -->
233		288
234	<!-- TMPL_IF NAME="NOT_FOR_LOAN_FORCING" -->	289	<!-- TMPL_IF NAME="NOT_FOR_LOAN_FORCING" -->
235	<li>Item is normally not for loan. Check out anyway?</li>	290	<li>Item is normally not for loan. Check out anyway?</li>
236	<!-- /TMPL_IF -->	291	<!-- /TMPL_IF -->
237	<!-- TMPL_IF NAME="USERBLOCKEDOVERDUE" -->	292	<!-- TMPL_IF NAME="DAMAGED" -->
238	<li>Patron has <!-- TMPL_VAR NAME="USERBLOCKEDOVERDUE" --> overdue item(s). Check out anyway?</li>	293	<li>Item is considered damaged (<!-- TMPL_VAR NAME="DAMAGED" -->). Check out anyway?</li>
		294	<!-- /TMPL_IF -->
		295
		296	<!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
		297	<li>Item ( <!-- TMPL_VAR NAME="getTitleMessageIteminfo" --> ) checked out to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Check in and check out?</li>
239	<!-- /TMPL_IF -->	298	<!-- /TMPL_IF -->
		299
		300	<!-- TMPL_IF NAME="RENEW_ISSUE" -->
		301	<li>Item is currently checked out to this patron. Renew?</li>
		302	<!-- /TMPL_IF -->
		303
		304	<!-- TMPL_IF NAME="USERBLOCKEDREMAINING" -->
		305	<li>Patron cannot check-out this item : has overdue items.</li>
		306	<!-- /TMPL_IF -->
		307
240	</ul>	308	</ul>
241		309
242	<form method="post" action="/cgi-bin/koha/circ/circulation.pl">	310	<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
Lines 309-314 function refocus(calendar) { Link Here
309	<!-- /TMPL_IF -->	377	<!-- /TMPL_IF -->
310	<!-- /TMPL_IF -->	378	<!-- /TMPL_IF -->
311		379
		380	<!-- TMPL_IF NAME="LOAN_LENGTH_UNDEFINED" -->
		381	<li>No circulation rule defined for <!-- TMPL_VAR Name="LOAN_LENGTH_UNDEFINED"--> </li>
		382	<!-- /TMPL_IF -->
		383
312	<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->	384	<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
313	<li>Item not for loan</li>	385	<li>Item not for loan</li>
314	<!-- /TMPL_IF -->	386	<!-- /TMPL_IF -->
Lines 322-336 function refocus(calendar) { Link Here
322	<!-- /TMPL_IF -->	394	<!-- /TMPL_IF -->
323		395
324	<!-- TMPL_IF NAME="GNA" -->	396	<!-- TMPL_IF NAME="GNA" -->
325	<li>Patron's address is in doubt</li>	397	<li>Patron's address is in doubt<!-- TMPL_IF NAME="gonenoaddresscomment" -->: <!-- TMPL_VAR NAME="gonenoaddresscomment" --><!-- /TMPL_IF --></li>
326	<!-- /TMPL_IF -->	398	<!-- /TMPL_IF -->
327		399
328	<!-- TMPL_IF NAME="CARD_LOST" -->	400	<!-- TMPL_IF NAME="CARD_LOST" -->
329	<li>Patron's card is lost</li>	401	<li>Patron's card is lost<!-- TMPL_IF NAME="lostcomment" -->: <!-- TMPL_VAR NAME="lostcomment" --><!-- /TMPL_IF --></li>
330	<!-- /TMPL_IF -->
331
332	<!-- TMPL_IF NAME="DEBARRED" -->
333	<li>Patron is restricted</li>
334	<!-- /TMPL_IF -->	402	<!-- /TMPL_IF -->
335		403
336	<!-- TMPL_IF NAME="NO_MORE_RENEWALS" -->	404	<!-- TMPL_IF NAME="NO_MORE_RENEWALS" -->
Lines 359-365 function refocus(calendar) { Link Here
359	<!-- /TMPL_IF -->	427	<!-- /TMPL_IF -->
360		428
361	</div></div>	429	</div></div>
362	<!-- TMPL_ELSE -->
363	<!-- TMPL_IF NAME="soundon" -->	430	<!-- TMPL_IF NAME="soundon" -->
364	<audio src="/intranet-tmpl/prog/sound/beep.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>	431	<audio src="/intranet-tmpl/prog/sound/beep.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
365	<!-- /TMPL_IF -->	432	<!-- /TMPL_IF -->
Lines 435-474 No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> Link Here
435	<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="CalendarDueDate" style="cursor: pointer;" />	502	<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="CalendarDueDate" style="cursor: pointer;" />
436	<script language="JavaScript" type="text/javascript">	503	<script language="JavaScript" type="text/javascript">
437	//<![CDATA[	504	//<![CDATA[
438	function validate1(date) {
439	var today = new Date();
440	if ( date < today ) {
441	return true;
442	} else {
443	return false;
444	}
445	};
446	function refocus(calendar) {
447	$('#barcode').focus();
448	calendar.hide();
449	};
450	//#TODO - ADD syspref (AllowPostDatedCheckouts).	505	//#TODO - ADD syspref (AllowPostDatedCheckouts).
451	Calendar.setup(	506	Calendar.setup(
452	{	507	{
453	inputField : "duedatespec",	508	inputField : "duedatespec",
454	ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",	509	ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
455	button : "CalendarDueDate",	510	button : "CalendarDueDate",
456	// disableFunc : validate1,	511	dateStatusFunc : validate1,
457	// dateStatusFunc : validate1,
458	onClose : refocus	512	onClose : refocus
459	}	513	}
460	);	514	);
461	//]]>	515	//]]>
462	</script>	516	</script>
463		517	</p><p>
464	<label for="stickyduedate"> Remember for Session:</label>	518	<label for="stickyduedate"> Remember for Session:</label>
465	<!-- TMPL_IF NAME="stickyduedate" -->	519	<!-- TMPL_IF NAME="stickyduedate" -->
466	<input type="checkbox" id="stickyduedate" onclick="this.form.barcode.focus();" name="stickyduedate" checked="checked" />	520	<input type="checkbox" id="stickyduedate" onclick="this.form.barcode.focus();" name="stickyduedate" checked="checked" />
467	<!-- TMPL_ELSE -->	521	<!-- TMPL_ELSE -->
468	<input type="checkbox" id="stickyduedate" onclick="this.form.barcode.focus();" name="stickyduedate" />	522	<input type="checkbox" id="stickyduedate" onclick="this.form.barcode.focus();" name="stickyduedate" />
		523	<!-- /TMPL_IF -->
		524	<input type="button" class="action" id="cleardate" value="Clear" name="cleardate" onclick="this.checked = false; this.form.duedatespec.value = ''; this.form.stickyduedate.checked = false; this.form.barcode.focus(); return false;" />
		525	</p>
		526	</div>
469	<!-- /TMPL_IF -->	527	<!-- /TMPL_IF -->
470	<input type="button" class="action" id="cleardate" value="Clear" name="cleardate" onclick="this.checked = false; this.form.duedatespec.value = ''; this.form.stickyduedate.checked = false; this.form.barcode.focus(); return false;" />
471	</div><!-- /TMPL_IF -->
472	<input type="hidden" name="borrowernumber" id="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />	528	<input type="hidden" name="borrowernumber" id="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
473	<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />	529	<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
474	<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />	530	<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
Lines 491-499 No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> Link Here
491	<div id="circmessages" class="circmessage attention">	547	<div id="circmessages" class="circmessage attention">
492	<!-- /TMPL_IF -->	548	<!-- /TMPL_IF -->
493		549
494	<h3><!-- TMPL_IF NAME="noissues" -->	550	<h3><!-- TMPL_IF NAME="noissues" -->Cannot Check Out!<!-- TMPL_ELSE -->
495	Cannot check out!	551	<!-- TMPL_IF NAME="warning" -->Attention:<!-- /TMPL_IF --><!-- /TMPL_IF --></h3>
496	<!-- TMPL_ELSE -->Attention:<!-- /TMPL_IF --></h3>
497	<ul>	552	<ul>
498		553
499	<!-- TMPL_IF NAME = "warndeparture" -->	554	<!-- TMPL_IF NAME = "warndeparture" -->
Lines 517-532 No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> Link Here
517	<!-- /TMPL_IF -->	572	<!-- /TMPL_IF -->
518		573
519	<!-- TMPL_IF NAME="gna" -->	574	<!-- TMPL_IF NAME="gna" -->
520	<li class="blocker"><span class="circ-hlt">Address:</span> Patron's address in doubt</li>	575	<li class="blocker"><span class="circ-hlt">Address: </span>Patron's address is in doubt<!-- TMPL_IF NAME="gonenoaddresscomment" --> (<!-- TMPL_VAR NAME="gonenoaddresscomment" -->)<!-- /TMPL_IF --></li>
521	<!-- /TMPL_IF -->	576	<!-- /TMPL_IF -->
522		577
523	<!-- TMPL_IF NAME="lost" -->	578	<!-- TMPL_IF NAME="lost" -->
524	<li class="blocker"><span class="circ-hlt">Lost: </span>Patron's card is lost</li>	579	<li class="blocker"><span class="circ-hlt">Lost: </span>Patron's card is lost<!-- TMPL_IF NAME="lostcomment" --> (<!-- TMPL_VAR NAME="lostcomment" -->)<!-- /TMPL_IF --></li>
525	<!-- /TMPL_IF -->	580	<!-- /TMPL_IF -->
526		581
527	<!-- TMPL_IF NAME="dbarred" --><li class="blocker">	582	<!-- TMPL_IF NAME="userdebarred" --><li class="blocker">
528	<span class="circ-hlt"> Restricted:</span> Patron's account is restricted <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&destination=circ&status=0">Lift restriction</a>	583	<span class="circ-hlt"> Restricted:</span> Patron's account is restricted<!-- TMPL_IF NAME="userdebarreddate" --> until <!-- TMPL_VAR NAME="userdebarreddate" --> <!--/TMPL_IF--> <!-- TMPL_IF NAME="debarredcomment"-->(<!-- TMPL_VAR NAME="debarredcomment" -->)<!-- /TMPL_IF -->
529	</li><!-- /TMPL_IF -->	584	<form class="inline compact" action="/cgi-bin/koha/members/setstatus.pl" method="post">
		585	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
		586	<input type="hidden" name="destination" value="circ" />
		587	<input type="submit" value="Lift Debarment" />
		588	</form>
		589	</li><!-- /TMPL_IF -->
530		590
531	<!-- TMPL_IF name="odues" --><li><!-- TMPL_IF name="nonreturns" --><span class="circ-hlt">Overdues:</span> Patron has <span class="circ-hlt">ITEMS OVERDUE</span>. See highlighted items <a href="#checkouts">below</a><!-- /TMPL_IF --></li>	591	<!-- TMPL_IF name="odues" --><li><!-- TMPL_IF name="nonreturns" --><span class="circ-hlt">Overdues:</span> Patron has <span class="circ-hlt">ITEMS OVERDUE</span>. See highlighted items <a href="#checkouts">below</a><!-- /TMPL_IF --></li>
532	<!-- /TMPL_IF -->	592	<!-- /TMPL_IF -->
Lines 556-562 No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> Link Here
556	<h4>Holds waiting:</h4>	616	<h4>Holds waiting:</h4>
557	<!-- TMPL_LOOP NAME="WaitingReserveLoop" -->	617	<!-- TMPL_LOOP NAME="WaitingReserveLoop" -->
558	<ul>	618	<ul>
559	<li> <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a> (<!-- TMPL_VAR NAME="itemtype"-->), <!-- TMPL_IF NAME="author" -->by <!-- TMPL_VAR NAME="author"--><!-- /TMPL_IF --> Hold placed on <!-- TMPL_VAR NAME="reservedate"-->.	619	<li> <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a> (<!-- TMPL_VAR NAME="itemtype"-->), <!-- TMPL_IF NAME="author" -->by <!-- TMPL_VAR NAME="author"--><!-- /TMPL_IF --> Hold placed on <!-- TMPL_VAR NAME="reservedate"--> waiting until <!-- TMPL_VAR NAME="formattedwaitingdate" -->
560	<!-- TMPL_IF NAME="waitingat" -->	620	<!-- TMPL_IF NAME="waitingat" -->
561	<br /><!-- TMPL_IF NAME="waitinghere" --><strong class="waitinghere"><!-- TMPL_ELSE --><strong><!-- /TMPL_IF -->Waiting at <!-- TMPL_VAR NAME="waitingat" --></strong>	621	<br /><!-- TMPL_IF NAME="waitinghere" --><strong class="waitinghere"><!-- TMPL_ELSE --><strong><!-- /TMPL_IF -->Waiting at <!-- TMPL_VAR NAME="waitingat" --></strong>
562	<!-- /TMPL_IF -->	622	<!-- /TMPL_IF -->
Lines 632-651 No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> Link Here
632	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />	692	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
633	<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />	693	<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
634	<table id="issuest">	694	<table id="issuest">
635	<thead><tr>	695	<thead>
		696	<tr>
636	<th scope="col">Due date</th>	697	<th scope="col">Due date</th>
637	<th scope="col">Title</th>	698	<th scope="col">Title</th>
638	<th scope="col">Item Type</th>	699	<th scope="col">Item Type</th>
		700	<th scope="col">Branch</th>
639	<th scope="col">Checked out on</th>	701	<th scope="col">Checked out on</th>
640	<th scope="col">Call no</th>	702	<!-- TMPL_IF NAME="multiple_borrowers" --><th scope="col">Borrower</th><!-- /TMPL_IF -->
641	<th scope="col">Charge</th>	703	<th scope="col">Charge</th>
642	<th scope="col">Price</th>	704	<th scope="col">Material</th>
643	<th scope="col">Renew <p class="column-tool"><a href="#" id="CheckAllitems">select all</a> \| <a href="#" id="CheckNoitems">none</a></p></th>	705	<th scope="col">Renew <p class="column-tool"><a href="#" id="CheckAllitems">select all</a> \| <a href="#" id="CheckNoitems">none</a></p></th>
644	<th scope="col">Check in <p class="column-tool"><a href="#" id="CheckAllreturns">select all</a> \| <a href="#" id="CheckNoreturns">none</a></p></th>	706	<th scope="col">Check in <p class="column-tool"><a href="#" id="CheckAllreturns">select all</a> \| <a href="#" id="CheckNoreturns">none</a></p></th>
645	</tr>	707	</tr>
646	<!-- TMPL_IF NAME="todayissues" --></thead>	708	</thead>
647	<!-- TMPL_INCLUDE NAME="checkouts-table-footer.inc" -->	709	<tfoot>
648	<tbody>	710	<tr>
		711	<td colspan="<!-- TMPL_IF NAME="multiple_borrowers" -->6<!-- TMPL_ELSE -->5<!-- /TMPL_IF -->" style="text-align: right; font-weight:bold;">Totals:</td>
		712	<td><!-- TMPL_VAR NAME="totaldue" --></td>
		713	<td><!-- TMPL_VAR NAME="totalprice" --></td>
		714	<td colspan="2">
		715	<p>
		716	Renewal due date: <input type="text" size="8" id="newduedate" name="newduedate" value="<!-- TMPL_VAR Name="newduedate" -->" />
		717	<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="newduedate_button" alt="Show Calendar" />
		718	<script type="text/javascript"> //<![CDATA[
		719	//#TODO - ADD syspref (AllowPostDatedCheckouts).
		720	Calendar.setup(
		721	{
		722	inputField : "newduedate",
		723	ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
		724	button : "newduedate_button",
		725	dateStatusFunc : validate1,
		726	onClose : refocus
		727	}
		728	);
		729	//]]>
		730	</script>
		731	</p>
		732	<p>
		733	<label for="exemptfine">Forgive fines on return: </label><input type="checkbox" name="exemptfine" value="1" />
		734	</p>
		735	<!-- TMPL_IF NAME="CAN_user_circulate_override_renewals" -->
		736	<!-- TMPL_IF NAME="AllowRenewalLimitOverride" -->
		737	<p>
		738	<label for="override_limit">Override Renewal Limit:</label>
		739	<input type="checkbox" name="override_limit" id="override_limit" value="1" />
		740	</p>
		741	<!-- /TMPL_IF -->
		742	<!-- /TMPL_IF -->
		743	</td>
		744	</tr>
		745	</tfoot>
		746	<!-- TMPL_IF NAME="todayissues" --> <tbody>
649		747
650	<!-- TMPL_LOOP NAME="todayissues" -->	748	<!-- TMPL_LOOP NAME="todayissues" -->
651	<!-- TMPL_IF NAME="__odd__" -->	749	<!-- TMPL_IF NAME="__odd__" -->
Lines 653-773 No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> Link Here
653	<!-- TMPL_ELSE -->	751	<!-- TMPL_ELSE -->
654	<tr class="highlight">	752	<tr class="highlight">
655	<!-- /TMPL_IF -->	753	<!-- /TMPL_IF -->
656	<!-- TMPL_IF NAME="od" --><td class="od"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->	754	<!-- TMPL_IF NAME="overdue" --><td class="od"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
657	<!-- TMPL_VAR NAME="dd" -->	755	<!-- TMPL_VAR NAME="dd" --></td>
658	</td>
659	<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&type=intra"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="itemnotes" -->- <span class="circ-hlt"><!-- TMPL_VAR name="itemnotes" --></span><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>	756	<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&type=intra"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="itemnotes" -->- <span class="circ-hlt"><!-- TMPL_VAR name="itemnotes" --></span><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
660	<td><!-- TMPL_UNLESS NAME="noItemTypeImages" --> <!-- TMPL_IF NAME="itemtype_image" --><img src="<!-- TMPL_VAR NAME="itemtype_image" -->" alt="" /><!-- /TMPL_IF --><!-- /TMPL_UNLESS --><!-- TMPL_VAR NAME="itemtype" --></td>	757	<td><!-- TMPL_UNLESS NAME="noItemTypeImages" --> <!-- TMPL_IF NAME="itemtype_image" --><img src="<!-- TMPL_VAR NAME="itemtype_image" -->" alt="" /><!-- /TMPL_IF --><!-- /TMPL_UNLESS --><!-- TMPL_VAR NAME="itemtype" --></td>
661	<td><!-- TMPL_VAR NAME="checkoutdate" --></td>	758	<td><!-- TMPL_VAR NAME="branchdisplay" -->
662	<td><!-- TMPL_VAR NAME="itemcallnumber" --></td>	759	<!--TMPL_IF Name="itemcallnumber"-->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!--/TMPL_IF--></td>
		760	<td><!-- TMPL_VAR NAME="displaydate" --></td>
		761	<!-- TMPL_IF NAME="multiple_borrowers" --><td><!-- TMPL_VAR NAME="borrowername" --></td><!-- /TMPL_IF -->
663	<td><!-- TMPL_VAR NAME="charge" --></td>	762	<td><!-- TMPL_VAR NAME="charge" --></td>
664	<td><!-- TMPL_VAR NAME="replacementprice" --></td>	763	<td><!-- TMPL_VAR NAME="materials" --></td>
665	<!-- TMPL_IF NAME="renew_failed" -->	764	<td><span style="padding: 0 1em;">
666	<td class="problem">Renewal Failed</td>	765	<!-- TMPL_IF Name="renew_error_too_many"--><span class="problem"><!-- /TMPL_IF -->
667	<!-- TMPL_ELSE -->	766	<!-- TMPL_VAR NAME="renewals" -->/<!-- TMPL_VAR NAME="renewalsallowed" -->
668	<td><span style="padding: 0 1em;"><!-- TMPL_IF NAME="renewals" --><!-- TMPL_VAR NAME="renewals" --><!-- TMPL_ELSE -->0<!-- /TMPL_IF --></span>	767	<!-- TMPL_IF NAME="renew_error_too_many"--></span><!-- /TMPL_IF -->
669	<!-- TMPL_IF NAME="can_renew" -->
670	<input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
671	<!-- TMPL_IF NAME="od" -->
672	<input type="checkbox" class="radio" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
673	<!-- TMPL_ELSE -->
674	<input type="checkbox" class="radio" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
675	<!-- /TMPL_IF -->
676	<!-- TMPL_ELSE -->
677	<!-- TMPL_IF NAME="can_confirm" --><span class="renewals-allowed" style="display: none">
678	<input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
679	<!-- TMPL_IF NAME="od" -->
680	<input type="checkbox" class="radio" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
681	<!-- TMPL_ELSE -->
682	<input type="checkbox" class="radio" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
683	<!-- /TMPL_IF -->
684	</span>
685	<span class="renewals-disabled">
686	<!-- /TMPL_IF -->
687	<!-- TMPL_IF NAME="renew_error_on_reserve" -->
688	On Hold
689	<!-- /TMPL_IF -->
690	<!-- TMPL_IF NAME="renew_error_too_many" -->
691	Not Renewable
692	<!-- /TMPL_IF -->
693	<!-- TMPL_IF NAME="can_confirm" -->
694	</span>	768	</span>
		769	<!-- TMPL_UNLESS NAME="can_renew" -->
		770	<span class="renewals-allowed" style="display: none">
		771	<!-- /TMPL_UNLESS -->
		772	<input type="checkbox" id="renew_<!--TMPL_VAR NAME="itemnumber"-->" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
		773	<!-- TMPL_UNLESS NAME="can_renew" -->
		774	</span>
		775	<!-- /TMPL_UNLESS -->
		776
		777	<!-- TMPL_IF NAME="renew_error"-->
		778	<br/>
		779	<span class="renewals-disabled problem">
		780	<!-- TMPL_IF NAME="renew_error_on_reserve" --> On Hold <!-- /TMPL_IF -->
		781	<!-- TMPL_IF NAME="renew_error_overdue" --> Overdue <!-- /TMPL_IF -->
		782	<!-- TMPL_IF NAME="renew_error_too_many" --> Not Renewable <!-- /TMPL_IF -->
		783	</span>
695	<!-- /TMPL_IF -->	784	<!-- /TMPL_IF -->
696	<!-- /TMPL_IF -->
697	</td>	785	</td>
698	<!-- /TMPL_IF -->
699	<!-- TMPL_IF NAME="return_failed" -->	786	<!-- TMPL_IF NAME="return_failed" -->
700	<td class="problem">Checkin Failed</td>	787	<td class="problem">Checkin Failed</td>
701	<!--TMPL_ELSE-->	788	<!--TMPL_ELSE-->
702	<td><input type="checkbox" class="radio" name="barcodes[]" value="<!-- TMPL_VAR NAME="barcode" -->" />	789	<td style="text-align:center;"><input type="checkbox" id="return_<!--TMPL_VAR NAME="itemnumber"-->" name="barcodes[]" value="<!-- TMPL_VAR NAME="barcode" -->" />
703	<input type="checkbox" name="all_barcodes[]" value="<!-- TMPL_VAR NAME="barcode" -->" checked="checked" style="display: none;" />	790	<!-- TMPL_IF Name="reserved"--><br/><a href="javascript:void(0);" onclick="window.open('/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')">On Hold</a><!-- /TMPL_IF -->
704	</td>	791	</td>
705	<!-- /TMPL_IF -->	792	<!-- /TMPL_IF -->
706	</tr>	793	</tr>
707	<!-- /TMPL_LOOP --> <!-- /loop todayissues -->	794	<!-- /TMPL_LOOP --> <!-- /loop todayissues -->
708	<!-- /if todayissues --><!-- /TMPL_IF -->	795	<!-- /if todayissues --><!-- /TMPL_IF -->
709	<!-- TMPL_IF NAME="previssues" -->	796	<!-- TMPL_IF NAME="previssues" -->
710	<!-- TMPL_IF NAME="todayissues" --><tr><th colspan="10"><a name="previous" id="previous"></a>Previous checkouts</th></tr><!-- TMPL_ELSE -->	797	<tr><th class="{sorter: false}" colspan="<!-- TMPL_IF NAME="multiple_borrowers"-->10<!-- TMPL_ELSE -->9<!-- /TMPL_IF -->"><a name="previous" id="previous"></a>Previous checkouts</th></tr>
711	<tr><th class="{sorter: false}" colspan="10"><a name="previous" id="previous"></a>Previous checkouts</th></tr></thead>
712	<!-- TMPL_INCLUDE NAME="checkouts-table-footer.inc" -->
713	<tbody>
714	<!-- /TMPL_IF -->
715	<!-- TMPL_LOOP NAME="previssues" -->	798	<!-- TMPL_LOOP NAME="previssues" -->
716	<!-- TMPL_IF NAME="__odd__" -->	799	<!-- TMPL_IF NAME="__odd__" -->
717	<tr>	800	<tr>
718	<!-- TMPL_ELSE -->	801	<!-- TMPL_ELSE -->
719	<tr class="highlight">	802	<tr class="highlight">
720	<!-- /TMPL_IF -->	803	<!-- /TMPL_IF -->
721	<!-- TMPL_IF NAME="od" --><td class="od"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->	804	<!-- TMPL_IF NAME="overdue" --><td class="od"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
722	<!-- TMPL_VAR NAME="dd" -->	805	<!-- TMPL_VAR NAME="dd" -->
723	</td>	806	</td>
724	<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&type=intra"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="itemnotes" -->- <!-- TMPL_VAR name="itemnotes" --><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>	807	<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&type=intra"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="itemnotes" -->- <!-- TMPL_VAR name="itemnotes" --><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
725	<td>	808	<td>
726	<!-- TMPL_VAR NAME="itemtype" -->	809	<!-- TMPL_VAR NAME="itemtype" -->
727	</td>	810	</td>
		811	<td><!-- TMPL_VAR NAME="branchdisplay" -->
		812	<!--TMPL_IF NAME="itemcallnumber"-->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!--/TMPL_IF--></td>
728	<td><!-- TMPL_VAR NAME="displaydate" --></td>	813	<td><!-- TMPL_VAR NAME="displaydate" --></td>
729	<td><!-- TMPL_VAR NAME="itemcallnumber" --></td>	814	<!-- TMPL_IF NAME="multiple_borrowers" --><td><!-- TMPL_VAR NAME="borrowername" --></td><!-- /TMPL_IF -->
730	<td><!-- TMPL_VAR NAME="charge" --></td>	815	<td><!-- TMPL_VAR NAME="charge" --></td>
731	<td><!-- TMPL_VAR NAME="replacementprice" --></td>	816	<td><!-- TMPL_VAR NAME="materials" --></td>
732	<!-- TMPL_IF NAME="renew_failed" -->	817	<td style="text-align : center;"><span style="padding: 0 1em;">
733	<td class="problem">Renewal Failed</td>	818	<!-- TMPL_IF Name="renew_error_too_many"--><span class="problem"><!-- /TMPL_IF -->
734	<!-- TMPL_ELSE -->	819	<!-- TMPL_VAR NAME="renewals" -->/<!-- TMPL_VAR NAME="renewalsallowed" -->
735	<td><span style="padding: 0 1em;"><!-- TMPL_IF NAME="renewals" --><!-- TMPL_VAR NAME="renewals" --><!-- TMPL_ELSE -->0<!-- /TMPL_IF --></span>	820	<!-- TMPL_IF Name="renew_error_too_many"--></span><!-- /TMPL_IF -->
736	<!-- TMPL_IF NAME="can_renew" -->	821	</span>
737	<input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />	822	<!-- TMPL_UNLESS NAME="can_renew" -->
738	<!-- TMPL_IF NAME="od" -->	823	<span class="renewals-allowed" style="display: none">
739	<input type="checkbox" class="radio" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />	824	<!-- /TMPL_UNLESS -->
740	<!-- TMPL_ELSE -->	825	<input type="checkbox" id="renew_<!--TMPL_VAR NAME="itemnumber"-->" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
741	<input type="checkbox" class="radio" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />	826	<!-- TMPL_UNLESS NAME="can_renew" -->
742	<!-- /TMPL_IF -->	827	</span>
743	<!-- TMPL_ELSE -->	828	<!-- /TMPL_UNLESS -->
744	<!-- TMPL_IF NAME="can_confirm" --><span class="renewals-allowed" style="display: none">	829	<!-- TMPL_IF NAME="renew_error"-->
745	<input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />	830	<br/>
746	<!-- TMPL_IF NAME="od" -->	831	<span class="renewals-disabled problem">
747	<input type="checkbox" class="radio" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />	832	<!-- TMPL_IF NAME="renew_error_on_reserve" --> On Hold <!-- /TMPL_IF -->
748	<!-- TMPL_ELSE -->	833	<!-- TMPL_IF NAME="renew_error_overdue" --> Overdue <!-- /TMPL_IF -->
749	<input type="checkbox" class="radio" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />	834	<!-- TMPL_IF NAME="renew_error_too_many" --> Not Renewable <!-- /TMPL_IF -->
750	<!-- /TMPL_IF -->	835	</span>
751	</span>
752	<span class="renewals-disabled">
753	<!-- /TMPL_IF -->
754	<!-- TMPL_IF NAME="renew_error_on_reserve" -->
755	On Hold
756	<!-- /TMPL_IF -->
757	<!-- TMPL_IF NAME="renew_error_too_many" -->
758	Not Renewable
759	<!-- /TMPL_IF -->
760	<!-- TMPL_IF NAME="can_confirm" -->
761	</span>
762	<!-- /TMPL_IF -->	836	<!-- /TMPL_IF -->
763	<!-- /TMPL_IF -->
764	</td>	837	</td>
765	<!-- /TMPL_IF -->
766	<!-- TMPL_IF NAME="return_failed" -->	838	<!-- TMPL_IF NAME="return_failed" -->
767	<td class="problem">Checkin Failed</td>	839	<td class="problem">Checkin Failed</td>
768	<!--TMPL_ELSE-->	840	<!--TMPL_ELSE-->
769	<td><input type="checkbox" class="radio" name="barcodes[]" value="<!-- TMPL_VAR NAME="barcode" -->" />	841	<td style="text-align : center;"><input type="checkbox" id="return_<!--TMPL_VAR NAME="itemnumber"-->" name="barcodes[]" value="<!-- TMPL_VAR NAME="barcode" -->" onclick="uncheck_sibling(this);" />
770	<input type="checkbox" name="all_barcodes[]" value="<!-- TMPL_VAR NAME="barcode" -->" checked="checked" style="display: none;" />	842	<!-- TMPL_IF Name="reserved"--><br/><a href="javascript:void(0);" onclick="window.open('/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')">On Hold</a><!-- /TMPL_IF -->
771	</td>	843	</td>
772	<!-- /TMPL_IF -->	844	<!-- /TMPL_IF -->
773	</tr>	845	</tr>
Lines 777-796 No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> Link Here
777	</table>	849	</table>
778	<!--TMPL_IF NAME="issuecount"-->	850	<!--TMPL_IF NAME="issuecount"-->
779	<fieldset class="action">	851	<fieldset class="action">
780	<!-- TMPL_IF NAME="CAN_user_circulate_override_renewals" -->
781	<!-- TMPL_IF NAME="AllowRenewalLimitOverride" -->
782	<label for="override_limit">Override Renewal Limit:</label>
783	<input type="checkbox" name="override_limit" id="override_limit" value="1" />
784	<!-- /TMPL_IF -->
785	<!-- /TMPL_IF -->
786	<input type="submit" name="renew_checked" value="Renew or Return checked items" />	852	<input type="submit" name="renew_checked" value="Renew or Return checked items" />
787	<input type="submit" id="renew_all" name="renew_all" value="Renew all" />
788	</fieldset>	853	</fieldset>
789	<!-- /TMPL_IF -->	854	<!-- /TMPL_IF -->
790	</form>	855	</form>
791	<!-- TMPL_ELSE -->	856	<!-- TMPL_ELSE -->
792	<p>Patron has nothing checked out.</p>	857	<p>Patron has nothing checked out.</p>
793	<!-- /TMPL_IF -->	858	<!-- /TMPL_IF -->
		859
		860
		861	<!-- TMPL_IF NAME="displayrelissues" -->
		862	<h2>Relatives issues</h2>
		863	<table id="relissuest">
		864	<thead>
		865	<tr>
		866	<th scope="col">Due date</th>
		867	<th scope="col">Title</th>
		868	<th scope="col">Item Type</th>
		869	<th scope="col">Branch</th>
		870	<th scope="col">Checked out on</th>
		871	<th scope="col">Charge</th>
		872	<th scope="col">Borrower</th>
		873	<th scope="col">Material</th>
		874	</tr>
		875	</thead>
		876	<!-- TMPL_IF NAME="relissues" --> <tbody>
		877
		878	<!-- TMPL_LOOP NAME="relissues" -->
		879	<!-- TMPL_IF NAME="__odd__" -->
		880	<tr>
		881	<!-- TMPL_ELSE -->
		882	<tr class="highlight">
		883	<!-- /TMPL_IF -->
		884	<!-- TMPL_IF NAME="overdue" --><td class="od"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
		885	<!-- TMPL_VAR NAME="dd" --></td>
		886	<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&type=intra"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="itemnotes" -->- <span class="circ-hlt"><!-- TMPL_VAR name="itemnotes" --></span><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
		887	<td><!-- TMPL_UNLESS NAME="noItemTypeImages" --> <!-- TMPL_IF NAME="itemtype_image" --><img src="<!-- TMPL_VAR NAME="itemtype_image" -->" alt="" /><!-- /TMPL_IF --><!-- /TMPL_UNLESS --><!-- TMPL_VAR NAME="itemtype" --></td>
		888	<td><!-- TMPL_VAR NAME="branchdisplay" -->
		889	<!--TMPL_IF Name="itemcallnumber"-->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!--/TMPL_IF--></td>
		890	<td><!-- TMPL_VAR NAME="displaydate" --></td>
		891	<td><!-- TMPL_VAR NAME="charge" --></td>
		892	<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="borrowername" --></a></td>
		893	<td><!-- TMPL_VAR NAME="materials" --></td>
		894	</tr>
		895	<!-- /TMPL_LOOP --> <!-- /loop todayissues -->
		896	<!-- /if todayissues --><!-- /TMPL_IF -->
		897	<!-- TMPL_IF NAME="relprevissues" -->
		898	<tr><th class="{sorter: false}" colspan="10"><a name="relprevious" id="relprevious"></a>Previous checkouts</th></tr>
		899	<!-- TMPL_LOOP NAME="relprevissues" -->
		900	<!-- TMPL_IF NAME="__odd__" -->
		901	<tr>
		902	<!-- TMPL_ELSE -->
		903	<tr class="highlight">
		904	<!-- /TMPL_IF -->
		905	<!-- TMPL_IF NAME="overdue" --><td class="od"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
		906	<!-- TMPL_VAR NAME="dd" -->
		907	</td>
		908	<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&type=intra"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="itemnotes" -->- <!-- TMPL_VAR name="itemnotes" --><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
		909	<td>
		910	<!-- TMPL_VAR NAME="itemtype" -->
		911	</td>
		912	<td><!-- TMPL_VAR NAME="branchdisplay" -->
		913	<!--TMPL_IF NAME="itemcallnumber"-->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!--/TMPL_IF--></td>
		914	<td><!-- TMPL_VAR NAME="displaydate" --></td>
		915	<!-- TMPL_IF NAME="multiple_borrowers" --><td><!-- TMPL_VAR NAME="borrowername" --></td><!-- /TMPL_IF -->
		916	<td><!-- TMPL_VAR NAME="charge" --></td>
		917	<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="borrowername" --></a></td>
		918	<td><!-- TMPL_VAR NAME="materials" --></td>
		919	</tr>
		920	<!-- /loop previssues --><!-- /TMPL_LOOP -->
		921	<!--/if previssues --><!-- /TMPL_IF -->
		922	</tbody>
923	</table>
924	</form>
925	<!-- /TMPL_IF --><!-- end displayrelissues -->
926
794	</div>	927	</div>
795		928
796		929
Lines 814-820 No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> Link Here
814	<td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --></td>	947	<td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --></td>
815	<td><!-- TMPL_VAR NAME="itemcallnumber" --></td>	948	<td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
816	<td><em><!-- TMPL_IF name="barcodereserv" -->Item <!-- TMPL_VAR NAME="barcodereserv" -->	949	<td><em><!-- TMPL_IF name="barcodereserv" -->Item <!-- TMPL_VAR NAME="barcodereserv" -->
817	<!-- /TMPL_IF --><!-- TMPL_IF name="waiting" --> <strong>waiting at <!-- TMPL_VAR NAME="waitingat" --></strong>	950	<!-- /TMPL_IF --><!-- TMPL_IF name="waiting" --> <strong>waiting at <!-- TMPL_VAR NAME="waitingat" --> <!-- TMPL_IF name="formattedwaitingdate" --> until <!-- TMPL_VAR NAME="formattedwaitingdate" --><!--/TMPL_IF--></strong>
818	<!-- /TMPL_IF -->	951	<!-- /TMPL_IF -->
819	<!-- TMPL_IF name="transfered" --> <strong>in transit</strong> from	952	<!-- TMPL_IF name="transfered" --> <strong>in transit</strong> from
820	<!-- TMPL_VAR NAME="frombranch" --> since <!-- TMPL_VAR NAME="datesent" -->	953	<!-- TMPL_VAR NAME="frombranch" --> since <!-- TMPL_VAR NAME="datesent" -->

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl (-54 / +97 lines)
1	<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->	1	<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
2	<title>Koha &rsaquo; Circulation &rsaquo; Check In <!-- TMPL_VAR Name="title" escape="html" --></title>	2	<title>Koha &rsaquo; Circulation &rsaquo; Check In <!-- TMPL_VAR Name="title" escape="html" --></title>
3	<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->	3	<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
		4	<style type="text/css">
		5	background-color: red;
		6	</style>
4	<script type="text/javascript">	7	<script type="text/javascript">
5	//<![CDATA[	8	//<![CDATA[
6	function Dopop(link) {	9	function Dopop(link) {
Lines 46-52 function Dopop(link) { Link Here
46	<!-- TMPL_INCLUDE NAME="checkin-search.inc" -->	49	<!-- TMPL_INCLUDE NAME="checkin-search.inc" -->
47		50
48	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Check In</div>	51	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Check In</div>
49
50	<div id="doc" class="yui-t7">	52	<div id="doc" class="yui-t7">
51		53
52	<div id="bd">	54	<div id="bd">
Lines 54-61 function Dopop(link) { Link Here
54		56
55	<div class="yui-g">	57	<div class="yui-g">
56		58
57	<!-- TMPL_IF Name="collectionItemNeedsTransferred" -->	59	<!-- TMPL_IF name="circnote" -->
58	<div class="dialog message">This item is part of a Rotating Collection and needs to be Transferred to <!-- TMPL_VAR NAME="collectionBranch" --></div>	60	<div id="circnote" class="dialog alert">
		61	<h3>Circulation note:</h2>
		62	<!-- TMPL_VAR name="circnote" -->
		63	</div>
59	<!-- /TMPL_IF -->	64	<!-- /TMPL_IF -->
60		65
61	<!-- Patron has fines -->	66	<!-- Patron has fines -->
Lines 68-76 function Dopop(link) { Link Here
68		73
69		74
70	<!-- TMPL_IF NAME="wrongbranch" -->	75	<!-- TMPL_IF NAME="wrongbranch" -->
71	<div class="dialog alert"><h3>Cannot Check In</h3><p>This item must be checked in at its home library. <strong>NOT CHECKED IN</strong></p>	76	<div class="dialog alert"><h3>Cannot Check In</h3><p>This item must be checked in at its home library: <!-- TMPL_VAR Name="rightbranch" -->. <strong>NOT CHECKED IN</strong></p>
		77	<form method="post" action="returns.pl" class="confirm">
		78
		79	<input type="hidden" name="barcode" value="<!-- TMPL_VAR Name="barcode" -->" />
		80	<input type="hidden" name="exemptfine" value="<!-- TMPL_VAR Name="exemptfine" -->" />
		81	<input type="hidden" name="dropboxmode" value="<!-- TMPL_VAR Name="dropboxmode" -->" />
		82	<input type="submit" name="override" value="Check-In" class="submit" />
		83	<input type="submit" name="cancel" value="Cancel" class="submit" />
		84	</form>
72	</div>	85	</div>
73	<!-- /TMPL_IF -->	86	<!-- /TMPL_IF -->
		87
74	<!-- case of a mistake in transfer loop -->	88	<!-- case of a mistake in transfer loop -->
75	<!-- TMPL_IF Name="WrongTransfer" --><div class="dialog message"><!-- WrongTransfer --><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="title" escape="html" --></a> to <!-- TMPL_VAR Name="TransferWaitingAt" --></h3>	89	<!-- TMPL_IF Name="WrongTransfer" --><div class="dialog message"><!-- WrongTransfer --><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="title" escape="html" --></a> to <!-- TMPL_VAR Name="TransferWaitingAt" --></h3>
76	<!-- TMPL_IF Name="wborcnum"--><h5>Hold for:</h5>	90	<!-- TMPL_IF Name="wborcnum"--><h5>Hold for:</h5>
Lines 98-108 function Dopop(link) { Link Here
98	<!-- case of a reservation found, and display info -->	112	<!-- case of a reservation found, and display info -->
99	<!-- TMPL_IF Name="waiting" -->	113	<!-- TMPL_IF Name="waiting" -->
100	<!-- waiting -->	114	<!-- waiting -->
101
102	<!-- TMPL_IF NAME="soundon" -->
103	<audio src="/intranet-tmpl/prog/sound/ending.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
104	<!-- /TMPL_IF -->
105
106	<div class="dialog message">	115	<div class="dialog message">
107	<h3>Hold Found (item is already waiting): <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="title" escape="html" --></a></h3>	116	<h3>Hold Found (item is already waiting): <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="title" escape="html" --></a></h3>
108	<!-- TMPL_IF NAME="reservenotes" --><h4>Notes: <!-- TMPL_VAR Name="reservenotes" --></h4><!-- /TMPL_IF -->	117	<!-- TMPL_IF NAME="reservenotes" --><h4>Notes: <!-- TMPL_VAR Name="reservenotes" --></h4><!-- /TMPL_IF -->
Lines 114-121 function Dopop(link) { Link Here
114	<!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>	123	<!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
115	<!-- TMPL_IF NAME="borphone" --><li> <!-- TMPL_VAR Name="borphone" --></li><!-- /TMPL_IF -->	124	<!-- TMPL_IF NAME="borphone" --><li> <!-- TMPL_VAR Name="borphone" --></li><!-- /TMPL_IF -->
116	<!-- TMPL_IF NAME="boremail" --><li><a id="boremail" href="mailto:<!-- TMPL_VAR NAME="boremail" -->"><!-- TMPL_VAR NAME="boremail" --></a></li><!-- /TMPL_IF -->	125	<!-- TMPL_IF NAME="boremail" --><li><a id="boremail" href="mailto:<!-- TMPL_VAR NAME="boremail" -->"><!-- TMPL_VAR NAME="boremail" --></a></li><!-- /TMPL_IF -->
117	<!-- TMPL_IF NAME="debarred" --><li class="error">Patron is RESTRICTED</li><!-- /TMPL_IF -->	126	<!-- TMPL_IF NAME="lost" --><li class="error">Patron's card is lost <!-- TMPL_IF Name="lostcomment" -->(<!-- TMPL_VAR NAME="lostcomment" -->)<!-- /TMPL_IF --></li><!-- /TMPL_IF -->
118	<!-- TMPL_IF NAME="gonenoaddress" --><li class="error">Patron's address is in doubt</li><!-- /TMPL_IF --></ul>	127	<!-- TMPL_IF NAME="debarred" --><li class="error">Patron is RESTRICTED <!-- TMPL_IF Name="debarredcomment" -->(<!-- TMPL_VAR NAME="debarredcomment" -->)<!-- /TMPL_IF --></li><!-- /TMPL_IF -->
		128	<!-- TMPL_IF NAME="gonenoaddress" --><li class="error">Patron's address is in doubt<!-- TMPL_IF Name="gonenoaddresscomment" -->(<!-- TMPL_VAR NAME="gonenoaddresscomment" -->)<!-- /TMPL_IF --></li><!-- /TMPL_IF --></ul>
119	<!-- TMPL_IF name="transfertodo" -->	129	<!-- TMPL_IF name="transfertodo" -->
120	<h4><strong>Transfer to:</strong> <!-- TMPL_VAR Name="destbranchname" --></h4>	130	<h4><strong>Transfer to:</strong> <!-- TMPL_VAR Name="destbranchname" --></h4>
121	<!-- TMPL_ELSE -->	131	<!-- TMPL_ELSE -->
Lines 136-143 function Dopop(link) { Link Here
136	<input type="hidden" name="diffBranch" value="<!-- TMPL_VAR Name="destbranch" -->" />	146	<input type="hidden" name="diffBranch" value="<!-- TMPL_VAR Name="destbranch" -->" />
137	<input type="hidden" name="exemptfine" value="<!-- TMPL_VAR Name="exemptfine" -->" />	147	<input type="hidden" name="exemptfine" value="<!-- TMPL_VAR Name="exemptfine" -->" />
138	<input type="hidden" name="dropboxmode" value="<!-- TMPL_VAR Name="dropboxmode" -->" />	148	<input type="hidden" name="dropboxmode" value="<!-- TMPL_VAR Name="dropboxmode" -->" />
		149	<input type="hidden" name="reservenumber" value="<!-- TMPL_VAR Name="reservenumber" -->" />
139	</form>	150	</form>
140	</div>	151	</div>
		152	<!-- /waiting -->
141	<!-- /TMPL_IF -->	153	<!-- /TMPL_IF -->
142		154
143	<!-- TMPL_IF Name="diffbranch" -->	155	<!-- TMPL_IF Name="diffbranch" -->
Lines 152-159 function Dopop(link) { Link Here
152	<!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>	164	<!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
153	<!-- TMPL_IF NAME="borphone" --><li><!-- TMPL_VAR Name="borphone" --></li><!-- /TMPL_IF -->	165	<!-- TMPL_IF NAME="borphone" --><li><!-- TMPL_VAR Name="borphone" --></li><!-- /TMPL_IF -->
154	<!-- TMPL_IF NAME="boremail" --><li><!-- TMPL_IF name="transfertodo" --><!-- TMPL_VAR NAME="boremail" --><!-- TMPL_ELSE --><a id="boremail" href="mailto:<!-- TMPL_VAR NAME="boremail" -->"><!-- TMPL_VAR NAME="boremail" --></a><!-- /TMPL_IF --></li><!-- /TMPL_IF -->	166	<!-- TMPL_IF NAME="boremail" --><li><!-- TMPL_IF name="transfertodo" --><!-- TMPL_VAR NAME="boremail" --><!-- TMPL_ELSE --><a id="boremail" href="mailto:<!-- TMPL_VAR NAME="boremail" -->"><!-- TMPL_VAR NAME="boremail" --></a><!-- /TMPL_IF --></li><!-- /TMPL_IF -->
155	<!-- TMPL_IF NAME="debarred" --><li class="error">Patron is RESTRICTED</li><!-- /TMPL_IF -->	167	<!-- TMPL_IF NAME="lost" --><li class="error">Patron's card is lost <!-- TMPL_IF Name="lostcomment" -->(<!-- TMPL_VAR NAME="lostcomment" -->)<!-- /TMPL_IF --></li><!-- /TMPL_IF -->
156	<!-- TMPL_IF NAME="gonenoaddress" --><li class="error">Patron's address is in doubt</li><!-- /TMPL_IF -->	168	<!-- TMPL_IF NAME="debarred" --><li class="error">Patron is RESTRICTED <!-- TMPL_IF Name="debarredcomment" -->(<!-- TMPL_VAR NAME="debarredcomment" -->)<!-- /TMPL_IF --></li><!-- /TMPL_IF -->
		169	<!-- TMPL_IF NAME="gonenoaddress" --><li class="error">Patron's address is in doubt<!-- TMPL_IF Name="gonenoaddresscomment" -->(<!-- TMPL_VAR NAME="gonenoaddresscomment" -->)<!-- /TMPL_IF --></li><!-- /TMPL_IF --></ul>
157	</ul>	170	</ul>
158	<!-- TMPL_IF name="transfertodo" -->	171	<!-- TMPL_IF name="transfertodo" -->
159	<h4><strong>Transfer to:</strong> <!-- TMPL_VAR Name="destbranchname" --></h4>	172	<h4><strong>Transfer to:</strong> <!-- TMPL_VAR Name="destbranchname" --></h4>
Lines 180-186 function Dopop(link) { Link Here
180	<!-- TMPL_IF Name="transfer" -->	193	<!-- TMPL_IF Name="transfer" -->
181	<!-- transfer: item with no reservation, must be returned to its homebranch -->	194	<!-- transfer: item with no reservation, must be returned to its homebranch -->
182	<div class="dialog message">	195	<div class="dialog message">
183	<h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" DEFAULT="item" --></a> to <!-- TMPL_VAR NAME="homebranchname" --></h3></div><!-- /TMPL_IF -->	196	<h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" DEFAULT="item" --></a> to <!-- TMPL_VAR NAME="homebranch" DEFAULT="homebranch" --></h3></div><!-- /TMPL_IF -->
184		197
185	<!-- TMPL_IF Name="needstransfer" -->	198	<!-- TMPL_IF Name="needstransfer" -->
186	<!-- needstransfer -->	199	<!-- needstransfer -->
Lines 228-238 function Dopop(link) { Link Here
228	<!-- case of simple return no issue or transfer but with a reservation -->	241	<!-- case of simple return no issue or transfer but with a reservation -->
229	<!-- TMPL_IF Name="reserved" -->	242	<!-- TMPL_IF Name="reserved" -->
230	<!-- reserved -->	243	<!-- reserved -->
231
232	<!-- TMPL_IF NAME="soundon" -->
233	<audio src="/intranet-tmpl/prog/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
234	<!-- /TMPL_IF -->
235
236	<div class="dialog message">	244	<div class="dialog message">
237	<h3>Hold Found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="title" escape="html" --></a></h3>	245	<h3>Hold Found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="title" escape="html" --></a></h3>
238	<!-- TMPL_IF NAME="reservenotes" --><h4>Notes: <!-- TMPL_VAR Name="reservenotes" --></h4><!-- /TMPL_IF -->	246	<!-- TMPL_IF NAME="reservenotes" --><h4>Notes: <!-- TMPL_VAR Name="reservenotes" --></h4><!-- /TMPL_IF -->
Lines 246-253 function Dopop(link) { Link Here
246	<!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>	254	<!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
247	<!-- TMPL_IF NAME="borphone" --><li><!-- TMPL_VAR Name="borphone" --></li><!-- /TMPL_IF -->	255	<!-- TMPL_IF NAME="borphone" --><li><!-- TMPL_VAR Name="borphone" --></li><!-- /TMPL_IF -->
248	<!-- TMPL_IF NAME="boremail" --><li><!-- TMPL_IF name="transfertodo" --><!-- TMPL_VAR NAME="boremail" --><!-- TMPL_ELSE --><a id="boremail" href="mailto:<!-- TMPL_VAR NAME="boremail" -->"><!-- TMPL_VAR NAME="boremail" --></a><!-- /TMPL_IF --></li><!-- /TMPL_IF -->	256	<!-- TMPL_IF NAME="boremail" --><li><!-- TMPL_IF name="transfertodo" --><!-- TMPL_VAR NAME="boremail" --><!-- TMPL_ELSE --><a id="boremail" href="mailto:<!-- TMPL_VAR NAME="boremail" -->"><!-- TMPL_VAR NAME="boremail" --></a><!-- /TMPL_IF --></li><!-- /TMPL_IF -->
249	<!-- TMPL_IF NAME="debarred" --><li class="error">Patron is RESTRICTED</li><!-- /TMPL_IF -->	257	<!-- TMPL_IF NAME="lost" --><li class="error">Patron's card is lost <!-- TMPL_IF Name="lostcomment" -->(<!-- TMPL_VAR NAME="lostcomment" -->)<!-- /TMPL_IF --></li><!-- /TMPL_IF -->
250	<!-- TMPL_IF NAME="gonenoaddress" --><li class="error">Patron's address is in doubt</li><!-- /TMPL_IF -->	258	<!-- TMPL_IF NAME="debarred" --><li class="error">Patron is RESTRICTED <!-- TMPL_IF Name="debarredcomment" -->(<!-- TMPL_VAR NAME="debarredcomment" -->)<!-- /TMPL_IF --></li><!-- /TMPL_IF -->
		259	<!-- TMPL_IF NAME="gonenoaddress" --><li class="error">Patron's address is in doubt<!-- TMPL_IF Name="gonenoaddresscomment" -->(<!-- TMPL_VAR NAME="gonenoaddresscomment" -->)<!-- /TMPL_IF --></li><!-- /TMPL_IF --></ul>
251	</ul>	260	</ul>
252	<!-- TMPL_IF name="transfertodo" -->	261	<!-- TMPL_IF name="transfertodo" -->
253	<h4><strong>Transfer to:</strong> <!-- TMPL_VAR Name="destbranchname" --></h4>	262	<h4><strong>Transfer to:</strong> <!-- TMPL_VAR Name="destbranchname" --></h4>
Lines 273-285 function Dopop(link) { Link Here
273	<input type="hidden" name="diffBranch" value="<!-- TMPL_VAR Name="destbranch" -->" />	282	<input type="hidden" name="diffBranch" value="<!-- TMPL_VAR Name="destbranch" -->" />
274	<input type="hidden" name="exemptfine" value="<!-- TMPL_VAR Name="exemptfine" -->" />	283	<input type="hidden" name="exemptfine" value="<!-- TMPL_VAR Name="exemptfine" -->" />
275	<input type="hidden" name="dropboxmode" value="<!-- TMPL_VAR Name="dropboxmode" -->" />	284	<input type="hidden" name="dropboxmode" value="<!-- TMPL_VAR Name="dropboxmode" -->" />
		285	<input type="hidden" name="reservenumber" value="<!-- TMPL_VAR Name="reservenumber" -->" />
276	</form>	286	</form>
277	</div>	287	</div>
		288	<!-- /reserved -->
278	<!-- /TMPL_IF -->	289	<!-- /TMPL_IF -->
279	<!-- TMPL_ELSE -->	290	<!--/found-->
		291	<!-- /TMPL_IF -->
280		292
281	<!-- TMPL_IF NAME="errmsgloop" -->	293	<!-- TMPL_IF NAME="errmsgloop" -->
282	<div class="dialog alert">	294	<div class="dialog message">
283	<!-- TMPL_LOOP Name="errmsgloop" -->	295	<!-- TMPL_LOOP Name="errmsgloop" -->
284	<!-- TMPL_IF Name="badbarcode" -->	296	<!-- TMPL_IF Name="badbarcode" -->
285	<p class="problem">No Item with barcode: <!-- TMPL_VAR Name="msg" --></p>	297	<p class="problem">No Item with barcode: <!-- TMPL_VAR Name="msg" --></p>
Lines 293-310 function Dopop(link) { Link Here
293	<!-- TMPL_IF Name="waslost" -->	305	<!-- TMPL_IF Name="waslost" -->
294	<p class="problem">Item was lost, now found.</p>	306	<p class="problem">Item was lost, now found.</p>
295	<!-- /TMPL_IF -->	307	<!-- /TMPL_IF -->
		308	<!-- TMPL_IF Name="havefines" -->
		309	<p class="problem"><!-- TMPL_VAR NAME="finename" --> (<!-- TMPL_VAR NAME="finecardnumber" -->) has an outstanding fine of <!-- TMPL_VAR NAME="havefines" --> for books returned late.</p>
		310	<!-- /TMPL_IF -->
296	<!-- TMPL_IF Name="withdrawn" -->	311	<!-- TMPL_IF Name="withdrawn" -->
297	<p class="problem">Item is withdrawn.</p>	312	<p class="problem">Item is withdrawn.</p>
298	<!-- /TMPL_IF -->	313	<!-- /TMPL_IF -->
		314	<!-- TMPL_IF Name="notforloan" -->
		315	<p class="problem">Item was not for loan: <!-- TMPL_VAR NAME="notforloan" -->.</p>
		316	<!-- /TMPL_IF -->
		317	<!-- TMPL_IF Name="damaged" -->
		318	<p class="problem">Item is considered damaged (<!-- TMPL_VAR NAME="damaged" -->).</p>
		319	<!-- /TMPL_IF -->
		320	<!-- TMPL_IF Name="debarred" -->
		321	<p class="problem"><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=<!-- TMPL_VAR NAME="debarborrowernumber" -->"><!-- TMPL_VAR NAME="debarname" -->(<!-- TMPL_VAR NAME="debarcardnumber" -->)</a> is now debarred until <!-- TMPL_VAR NAME="debarred" --> <!-- TMPL_IF Name="debarredcomment"-->(<!-- TMPL_VAR NAME="debarredcomment" -->)<!-- /TMPL_IF -->.</p>
		322	<!-- /TMPL_IF -->
299	<!-- /TMPL_LOOP -->	323	<!-- /TMPL_LOOP -->
300	<!-- TMPL_IF NAME="soundon" -->
301	<audio src="/intranet-tmpl/prog/sound/critical.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
302	<!-- /TMPL_IF -->
303	<!-- TMPL_ELSE -->
304	<!-- TMPL_IF NAME="soundon" -->
305	<audio src="/intranet-tmpl/prog/sound/beep.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
306	<!-- /TMPL_IF -->
307	<!-- /TMPL_IF -->
308	</div>	324	</div>
309	<!-- /TMPL_IF -->	325	<!-- /TMPL_IF -->
310		326
Lines 366-395 function Dopop(link) { Link Here
366	</div>	382	</div>
367	</form>	383	</form>
368	</div>	384	</div>
		385	<!-- TMPL_IF Name="flagloop" -->
		386	<div class="yui-g dialog message">
		387
		388	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR Name="riborrowernumber" -->"><!-- TMPL_VAR Name="riborsurname" -->, <!-- TMPL_VAR Name="ribortitle" --> <!-- TMPL_VAR Name="riborfirstname" --></a> (<!-- TMPL_VAR Name="riborcnum" -->)
		389	<!-- TMPL_IF NAME="flagloop"-->
		390	<ul>
		391	<!-- TMPL_LOOP Name="flagloop" -->
		392	<!-- TMPL_IF NAME="gonenoaddress" -->
		393	<li>Patron's address is in doubt<!-- TMPL_IF NAME="gonenoaddresscomment" -->: <!-- TMPL_VAR NAME="gonenoaddresscomment" --><!-- /TMPL_IF --></li>
		394	<!-- /TMPL_IF -->
369		395
370	<!-- TMPL_IF Name="returned" -->	396	<!-- TMPL_IF NAME="lost" -->
371	<div class="yui-g"> <table>	397	<li>Patron's card is lost<!-- TMPL_IF NAME="lostcomment" -->: <!-- TMPL_VAR NAME="lostcomment" --><!-- /TMPL_IF --></li>
372	<tr><th>Item Information</th><th>Patron Information</th></tr>	398	<!-- /TMPL_IF -->
373	<tr>
374	<td><!-- TMPL_VAR Name="title" escape="html" --></td>
375	<td>
376		399
377	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR Name="riborrowernumber" -->"><!-- TMPL_VAR Name="riborsurname" -->, <!-- TMPL_VAR Name="ribortitle" --> <!-- TMPL_VAR Name="riborfirstname" --></a> (<!-- TMPL_VAR Name="riborcnum" -->)	400	<!-- TMPL_IF NAME="debarred" -->
378	<!-- TMPL_IF Name="flagset" -->	401	<li>Patron is restricted <!--TMPL_IF NAME="dateend"-->until <!--TMPL_VAR Name="dateend"--><!--/TMPL_IF--><!-- TMPL_IF NAME="debarredcomment" -->: <!-- TMPL_VAR NAME="debarredcomment" --><!-- /TMPL_IF --></li>
379	(<!-- TMPL_LOOP Name="flagloop" -->	402	<!-- /TMPL_IF -->
380	<!-- TMPL_VAR Name="flag" -->	403
381	<!-- TMPL_IF NAME="charges" --> of <!-- TMPL_VAR NAME="chargeamount" --> <!-- /TMPL_IF -->	404	<!-- TMPL_IF Name="waiting"-->
382	,	405	<li><div id="holdswaiting" class="circmessage">
383	<!-- /TMPL_LOOP -->)<!-- /TMPL_IF -->	406	<h4>Holds waiting:</h4>
384	</td>	407	<!-- TMPL_LOOP NAME="itemloop" -->
385	</tr>	408	<ul>
386	</table>	409	<li> <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a> (<!-- TMPL_VAR NAME="itemtype"-->), <!-- TMPL_IF NAME="author" -->by <!-- TMPL_VAR NAME="author"--><!-- /TMPL_IF --> Hold placed on <!-- TMPL_VAR NAME="reservedate"--> available since <!-- TMPL_VAR NAME="waitingdate" --> until <!-- TMPL_VAR NAME="maxpickupdate" -->.
		410	<!-- TMPL_IF NAME="brname" -->
		411	<br /><!-- TMPL_IF NAME="waitinghere" --><strong class="waitinghere"><!-- TMPL_ELSE --><strong><!-- /TMPL_IF -->Waiting at <!-- TMPL_VAR NAME="brname" --></strong>
		412	<!-- /TMPL_IF -->
		413	</li>
		414	</ul>
		415	<!-- /TMPL_LOOP -->
		416	</div></li>
		417	<!-- /If waiting --><!-- /TMPL_IF -->
		418
		419	<!-- TMPL_IF Name="flag"-->
		420	<li><!-- TMPL_VAR Name="flag" --> <!-- TMPL_IF NAME="charges" --> of <!-- TMPL_VAR NAME="chargeamount" --> <!-- /TMPL_IF --> </li>
		421	<!-- /TMPL_IF -->
		422	<!-- /TMPL_LOOP -->
		423	</ul>
		424	<!-- /TMPL_IF -->
		425	</div>
387	<!-- /TMPL_IF -->	426	<!-- /TMPL_IF -->
388	<!-- TMPL_IF Name="riloop" -->	427	<!-- TMPL_IF Name="riloop" -->
389	<h2>Checked-In items</h2>	428	<h2>Checked-In items</h2>
390	<table>	429	<table>
391	<tr><th>Due Date</th><th>Title</th> <th>Author</th> <th>Barcode</th><th>Type</th> <th>Patron</th><th>Note</th></tr>	430	<tr><th>Due Date</th><th>Title and Author</th> <th>Barcode (Type)</th><th>Home Branch</th><th>Holding Branch</th><th>Location</th><th>Callnumber</th><th>Patron</th><th>Note</th></tr>
392		431
393	<!-- TMPL_LOOP Name="riloop" -->	432	<!-- TMPL_LOOP Name="riloop" -->
394	<tr>	433	<tr>
395	<td><!-- TMPL_IF Name="duedate" -->	434	<td><!-- TMPL_IF Name="duedate" -->
Lines 401-412 function Dopop(link) { Link Here
401	<!-- /TMPL_IF -->	440	<!-- /TMPL_IF -->
402	</td>	441	</td>
403	<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR Name="itembiblionumber" -->">	442	<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR Name="itembiblionumber" -->">
404	<!-- TMPL_VAR Name="itemtitle" escape="html" --></a></td>	443	<!-- TMPL_VAR Name="itemtitle" escape="html" --></a>
405	<td><!-- TMPL_VAR Name="itemauthor" --></td>	444	<!-- TMPL_VAR Name="itemauthor" --></td>
406	<td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR Name="barcode" --></a></td>	445	<td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR Name="barcode" --></a>
407	<td><!-- TMPL_VAR Name="itemtype" --> <!-- TMPL_VAR Name="ccode" --></td>	446	<!-- TMPL_IF name="itemtype"-->(<!-- TMPL_VAR Name="itemtype" -->) <!-- /TMPL_IF --><!-- TMPL_IF Name="ccode"-->(<!-- TMPL_VAR Name="ccode" -->)<!-- /TMPL_IF --></td>
		447	<td><!-- TMPL_VAR NAME="homebranch" --></td>
		448	<td><!-- TMPL_VAR NAME="holdingbranch" --></td>
		449	<td><!-- TMPL_VAR NAME="itemlocation" --></td>
		450	<td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
408	<td><!-- TMPL_IF Name="duedate" -->	451	<td><!-- TMPL_IF Name="duedate" -->
409	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR Name="borrowernumber" -->">	452	<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=<!-- TMPL_VAR Name="borrowernumber" -->">
410	<!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> (<!-- TMPL_VAR name="borcategorycode" -->)	453	<!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> (<!-- TMPL_VAR name="borcategorycode" -->)
411	</a>	454	</a>
412	<!-- TMPL_ELSE -->Not checked out<!-- /TMPL_IF --></td>	455	<!-- TMPL_ELSE -->Not checked out<!-- /TMPL_IF --></td>




	var msg = "";
	var count_reserv = 0;
	var alreadyreserved = 0;
    var hold_type="";
    // check if we have checkitem form
    if (document.form.checkitem){
        for (i=0;i<document.form.checkitem.length;i++){
            if (document.form.checkitem[i].checked == true) {
                if (hold_type=="" || hold_type=="single"){
                    hold_type=document.form.hold_type[i].value;
                }
				count_reserv++ ;
			}
        }

    if (count_reserv == "0"){
		msg += (_("- Please select an item to place a hold") + "\n");
    }
    if (count_reserv >= "2" && hold_type != "multiple"){
		msg += (_("- You may only place a hold on one item at a time") + "\n");
    }

    if (alreadyreserved > "0" && hold_type != "multiple"){
		msg += (_("- This patron had already placed a hold on this item") + "\n" + _("Please cancel the previous hold first") + "\n");
    }


    <!-- TMPL_LOOP Name="itemloop" -->
        <tr class="<!-- TMPL_VAR NAME="backgroundcolor" -->">
            <td>
		
            <!-- TMPL_IF NAME="canholdmultiple" -->
                <input type="hidden" name="hold_type" value="multiple" />
            <!-- TMPL_ELSIF NAME="available" -->
                <input type="hidden" name="hold_type" value="single" />
            <!-- TMPL_ELSIF NAME="override" -->
                <input type="hidden" name="hold_type" value="single" />
            <!-- /TMPL_IF -->
	    <!-- TMPL_IF NAME="cannothold" -->
		<input disabled="disabled" type="radio" name="checkitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" />                            
		<img src="/intranet-tmpl/<!-- TMPL_VAR NAME="theme" -->/img/famfamfam/silk/cross.png" alt="Cannot be put on hold" />               
	    <!-- TMPL_ELSE -->
            <!-- TMPL_IF NAME="canholdmultiple" -->
                <input type="checkbox" name="checkitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
		<!-- TMPL_ELSIF NAME="available" -->                                                                                                   
                <input type="radio" name="checkitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
            <!-- TMPL_ELSIF NAME="override" -->
                <input type="radio" name="checkitem" class="needsoverride" value="<!-- TMPL_VAR NAME="itemnumber" -->" />

                <input disabled="disabled" type="radio" name="checkitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
                <img src="/intranet-tmpl/<!-- TMPL_VAR NAME="theme" -->/img/famfamfam/silk/cross.png" alt="Cannot be put on hold" />
            <!-- /TMPL_IF -->
	    <!-- TMPL_ELSE -->
		<input disabled="disabled" type="radio" name="checkitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
		<img src="/intranet-tmpl/<!-- TMPL_VAR NAME="theme" -->/img/famfamfam/silk/cross.png" alt="Cannot be put on hold" />
	    <!-- /TMPL_IF -->
            </td>
            <!-- TMPL_IF NAME="item_level_itypes" -->
                <td>

  <!-- TMPL_LOOP Name="reserveloop" -->
  <!-- TMPL_UNLESS Name="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->
        <td>
          <input type="hidden" name="reservenumber" value="<!-- TMPL_VAR NAME="reservenumber" -->" />
          <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
          <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
          <select name="rank-request">




        var badBib = null;
        $(".confirmjs:checked").each(function() {
            var biblioNum = $(this).val();
            var separator="/";
            biblionumbers += biblioNum + separator;

            // Add the pickup location
            var branchSel = $("#branch_" + biblioNum);
            var branch = "";
            if (branchSel.size() > 0) {
                 branch = $(branchSel).val();
            }

            // If the 'specific copy' radio button is checked
            if ($("#reqspecific_" + biblioNum + ":checked").size() > 0) {
                // Find the selected copy
                var items = $(".checkitem_" + biblioNum + ":checked");
                if ($(items).size() == 0) {
                    badBib = biblioNum;
                    return false;
                } else {
                  $(items).each( function(idx,item){
                    selections+=biblioNum+separator+item.value+separator+branch+separator;
                  });
                }
            }
            else {
                selections=biblioNum+separator+separator+branch+separator;
            // Add the pickup location
            var branchSel = $("#branch_" + biblioNum);
            if (branchSel.size() > 0) {
                selections += $(branchSel).val();
            }

            return true;
        });


                      <input class="single_bib" name="single_bib" type="hidden" value="<!-- TMPL_VAR NAME="biblionumber" -->"/>
                        <span class="confirmjs_hold" title="<!-- TMPL_VAR NAME="biblionumber" -->"></span>
                        <span class="confirm_nonjs">
                          <!-- TMPL_IF Name="multi"-->
                          <input type="checkbox" class="confirmbox checkitem <!-- TMPL_VAR NAME="checkitem_bib" -->"
                                 name="<!-- TMPL_VAR NAME="checkitem_bib" -->" checked="checked"
                                 id="<!-- TMPL_VAR NAME="checkitem_bib" -->"
                                 value="any" />
                          <!--TMPL_ELSE-->
                          <input type="radio" class="confirmbox checkitem <!-- TMPL_VAR NAME="checkitem_bib" -->"
                                 name="<!-- TMPL_VAR NAME="checkitem_bib" -->" checked="checked"
                                 id="<!-- TMPL_VAR NAME="checkitem_bib" -->"
                                 value="any" />
                           <!-- /TMPL_IF -->
                          <label class="confirm_label" for="<!-- TMPL_VAR NAME="checkitem_bib" -->">Next available copy</label>
                        </span>
					</td>

                    <!-- TMPL_IF NAME="holdable" -->
                    <!-- TMPL_IF NAME="showpriority" -->
                    <td>
                      <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --><!-- TMPL_IF NAME="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!--TMPL VAR Name="subfield"--><!--/TMPL_LOOP--><!-- /TMPL_IF --></a>
                      <!-- TMPL_IF NAME="author" -->,  by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
                    </td>
                    <!-- TMPL_UNLESS NAME="item-level_itypes" -->
                      <td>
                        <!-- TMPL_UNLESS NAME="noItemTypeImages" -->
                        <!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="" /><!-- /TMPL_IF -->
                        <!-- /TMPL_UNLESS -->
						<!-- TMPL_VAR NAME="description" -->
                      </td>
                    <!-- /TMPL_UNLESS -->
                    <!-- TMPL_IF NAME="showpriority" --><td>You are number <!-- TMPL_VAR name="rank" --> in line</td><!-- /TMPL_IF -->
		    <!-- TMPL_IF NAME="reserve_in_future" -->
		    <!-- TMPL_IF NAME="holdable" --><td>
              <input name="reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->" id="reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->" size="10">

                                        <!-- /TMPL_IF --><!-- /TMPL_IF -->

                    <!-- TMPL_UNLESS NAME="singleBranchMode" -->
                      <td>
                    <!-- TMPL_IF NAME="OPACPickupLocation" -->
                        <select name="branch" id="branch_<!-- TMPL_VAR NAME="biblionumber" -->"
                          <!-- TMPL_UNLESS NAME="holdable" -->disabled="disabled"<!-- /TMPL_UNLESS --> >
                          <!-- TMPL_LOOP NAME="branchChoicesLoop" -->
                            <!-- TMPL_IF name="selected" -->
                              <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
                            <!-- TMPL_ELSE -->
                              <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option>
                            <!-- /TMPL_IF -->
                          <!-- /TMPL_LOOP -->
                        </select>
                    <!-- TMPL_ELSE -->
                        <input type="hidden" name="branch" id="branch_<!-- TMPL_VAR NAME="biblionumber" -->" value="<!--TMPL_VAR Name="branch"-->" /> <!-- TMPL_VAR NAME="branchname" -->
                    <!-- /TMPL_IF -->
                      </td>
                    <!-- /TMPL_UNLESS -->
                  </tr>


                            <tr class="<!-- TMPL_VAR NAME="backgroundcolor" -->">
                              <td>
                                <!-- TMPL_IF NAME="available" -->
				  <!-- TMPL_UNLESS NAME="ReservedForThisBorrower" -->
                                      <!-- TMPL_IF Name="canholdmultiple"-->
	                                  <input type="checkbox" class="checkitem checkitem_<!-- TMPL_VAR NAME="biblionumber" -->" name="checkitem_<!-- TMPL_VAR NAME="biblionumber" -->"
        	                                 value="<!-- TMPL_VAR NAME="itemnumber" -->" />
                                      <!--TMPL_ELSE-->
	                                  <input type="radio" class="checkitem checkitem_<!-- TMPL_VAR NAME="biblionumber" -->" name="checkitem_<!-- TMPL_VAR NAME="biblionumber" -->"
        	                                 value="<!-- TMPL_VAR NAME="itemnumber" -->" />
                                      <!-- /TMPL_IF -->
				  <!-- /TMPL_UNLESS -->
                                <!-- TMPL_ELSE -->
                                  <input disabled="disabled" type="radio" class="checkitem" name="checkitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
                                  <img src="/opac-tmpl/<!-- TMPL_VAR NAME="theme" -->/famfamfam/silk/cross.png" alt="Cannot be put on hold" title="Cannot be put on hold" />





my @searchpatron;
push @searchpatron, $member if ($member);
push @searchpatron, $patron if ( keys %$patron );
my $from = ( $startfrom - 1 ) * $resultsperpage;
my $to   = $from + $resultsperpage;

#($results)=Search(\@searchpatron,{surname=>1,firstname=>1},[$from,$to],undef,["firstname","surname","email","othernames"]  ) if (@searchpatron);
my $search_scope = ( $quicksearch ? "field_start_with" : "start_with" );
($results) = Search( \@searchpatron, \@orderby, undef, undef, [ "firstname", "surname", "othernames", "cardnumber", "userid" ], $search_scope ) if (@searchpatron);

if ($results) {
	for my $field ('categorycode','branchcode'){
		next unless ($patron->{$field});
		@$results = grep { $_->{$field} eq $patron->{$field} } @$results; 
	}
    $count = scalar(@$results);
}
my @resultsdata;
$to=($count>$to?$to:$count);

Lines 42-48 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-modrequest.pl (-1 / +3 lines)
42	);	42	);
43		43
44	my $biblionumber = $query->param('biblionumber');	44	my $biblionumber = $query->param('biblionumber');
		45	my $reservenumber = $query->param('reservenumber');
		46
45	if ($biblionumber and $borrowernumber) {	47	if ($biblionumber and $borrowernumber) {
46	CancelReserve($biblionumber, '', $borrowernumber);	48	CancelReserve( $reservenumber, $biblionumber );
47	}	49	}
48	print $query->redirect("/cgi-bin/koha/opac-user.pl#opac-user-holds");	50	print $query->redirect("/cgi-bin/koha/opac-user.pl#opac-user-holds");

Lines 1-5 Link Here

(-)a/opac/opac-reserve.pl (-25 / +38 lines)
1	#!/usr/bin/perl	1	#!/usr/bin/perl
2		2
		3	# Parts Copyright Biblibre 2010
		4
3	# This file is part of Koha.	5	# This file is part of Koha.
4	#	6	#
5	# Koha is free software; you can redistribute it and/or modify it under the	7	# Koha is free software; you can redistribute it and/or modify it under the
Lines 28-38 use C4::Output; Link Here
28	use C4::Dates qw/format_date/;	30	use C4::Dates qw/format_date/;
29	use C4::Context;	31	use C4::Context;
30	use C4::Members;	32	use C4::Members;
		33	use C4::Overdues;
31	use C4::Branch; # GetBranches	34	use C4::Branch; # GetBranches
32	use C4::Debug;	35	use C4::Debug;
		36	use C4::Items;
33	# use Data::Dumper;	37	# use Data::Dumper;
34		38
35	my $MAXIMUM_NUMBER_OF_RESERVES = C4::Context->preference("maxreserves");
36		39
37	my $query = new CGI;	40	my $query = new CGI;
38	my ( $template, $borrowernumber, $cookie ) = get_template_and_user(	41	my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
Lines 77-83 if ((! $biblionumbers) && (! $query->param('place_reserve'))) { Link Here
77		80
78	# Pass the numbers to the page so they can be fed back	81	# Pass the numbers to the page so they can be fed back
79	# when the hold is confirmed. TODO: Not necessary?	82	# when the hold is confirmed. TODO: Not necessary?
80	$template->param( biblionumbers => $biblionumbers );	83	$template->param( biblionumbers => $biblionumbers,
		84	OPACPickupLocation => "" . C4::Context->preference("OPACPickupLocation"),
		85	);
81		86
82	# Each biblio number is suffixed with '/', e.g. "1/2/3/"	87	# Each biblio number is suffixed with '/', e.g. "1/2/3/"
83	my @biblionumbers = split /\//, $biblionumbers;	88	my @biblionumbers = split /\//, $biblionumbers;
Lines 91-96 if (($#biblionumbers < 0) && (! $query->param('place_reserve'))) { Link Here
91	my $branch = $query->param('branch') \|\| $borr->{'branchcode'} \|\| C4::Context->userenv->{branch} \|\| '' ;	96	my $branch = $query->param('branch') \|\| $borr->{'branchcode'} \|\| C4::Context->userenv->{branch} \|\| '' ;
92	($branches->{$branch}) or $branch = ""; # Confirm branch is real	97	($branches->{$branch}) or $branch = ""; # Confirm branch is real
93	$template->param( branch => $branch );	98	$template->param( branch => $branch );
		99	$template->param( branchname => $branches->{$branch}->{branchname} );
94		100
95	# make branch selection options...	101	# make branch selection options...
96	my $CGIbranchloop = GetBranchesLoop($branch);	102	my $CGIbranchloop = GetBranchesLoop($branch);
Lines 252-258 if ( $borr->{lost} && ($borr->{lost} eq 1) ) { Link Here
252	lost => 1	258	lost => 1
253	);	259	);
254	}	260	}
255	if ( $borr->{debarred} && ($borr->{debarred} eq 1) ) {	261	if ( CheckBorrowerDebarred($borrowernumber) ) {
256	$noreserves = 1;	262	$noreserves = 1;
257	$template->param(	263	$template->param(
258	message => 1,	264	message => 1,
Lines 262-272 if ( $borr->{debarred} && ($borr->{debarred} eq 1) ) { Link Here
262		268
263	my @reserves = GetReservesFromBorrowernumber( $borrowernumber );	269	my @reserves = GetReservesFromBorrowernumber( $borrowernumber );
264	$template->param( RESERVES => \@reserves );	270	$template->param( RESERVES => \@reserves );
265	if ( $MAXIMUM_NUMBER_OF_RESERVES && (scalar(@reserves) >= $MAXIMUM_NUMBER_OF_RESERVES) ) {
266	$template->param( message => 1 );
267	$noreserves = 1;
268	$template->param( too_many_reserves => scalar(@reserves));
269	}
270	foreach my $res (@reserves) {	271	foreach my $res (@reserves) {
271	foreach my $biblionumber (@biblionumbers) {	272	foreach my $biblionumber (@biblionumbers) {
272	if ( $res->{'biblionumber'} == $biblionumber && $res->{'borrowernumber'} == $borrowernumber) {	273	if ( $res->{'biblionumber'} == $biblionumber && $res->{'borrowernumber'} == $borrowernumber) {
Lines 342-351 foreach my $biblioNum (@biblionumbers) { Link Here
342	}	343	}
343	}	344	}
344		345
		346	$biblioLoopIter{itemtype} = $biblioData->{itemtype};
		347	$biblioLoopIter{itemTypeDescription} = $itemTypes->{ $biblioData->{itemtype} }{description};
345	$biblioLoopIter{itemLoop} = [];	348	$biblioLoopIter{itemLoop} = [];
346	my $numCopiesAvailable = 0;	349	my $numCopiesAvailable = 0;
347	foreach my $itemInfo (@{$biblioData->{itemInfos}}) {	350
348	my $itemNum = $itemInfo->{itemnumber};	351	# $canReserveMultiple is set to "yes" ( >0 ) if multiple items can be reserved
		352	# it is set to 0 otherwise. depends on item-level_itypes syspref
		353	# and the list of itypes that can be multiple reserved
		354	my $canReserveMultiple = 0;
		355	unless ( C4::Context->preference("item-level_itypes") ) {
		356	$canReserveMultiple = CanHoldMultipleItems( $biblioLoopIter{itemtype} );
		357	}
		358	foreach my $itemInfo ( @{ $biblioData->{itemInfos} } ) {
		359	my $itemNum = $itemInfo->{itemnumber};
349	my $itemLoopIter = {};	360	my $itemLoopIter = {};
350		361
351	$itemLoopIter->{itemnumber} = $itemNum;	362	$itemLoopIter->{itemnumber} = $itemNum;
Lines 359-364 foreach my $biblioNum (@biblionumbers) { Link Here
359	$itemLoopIter->{imageurl} = $itemInfo->{imageurl};	370	$itemLoopIter->{imageurl} = $itemInfo->{imageurl};
360	}	371	}
361		372
		373	# check if the itype is one that can be multiple reserved
		374	if ( C4::Context->preference("item-level_itypes") ) {
		375
		376	# sum canReserveMultiple : if at least one item can be multiple reserved, then the flag will be >0
		377	# FIXME : there can be complex & strange cases, where some items can be multiple reserved, and some can't
		378	# this case is not managed. Note it may be only theoric, and have no real case
		379	$itemLoopIter->{canholdmultiple} = CanHoldMultipleItems( $itemInfo->{itype} );
		380	$canReserveMultiple = $canReserveMultiple + CanHoldMultipleItems( $itemInfo->{itype} );
		381	}
		382
362	# If the holdingbranch is different than the homebranch, we show the	383	# If the holdingbranch is different than the homebranch, we show the
363	# holdingbranch of the document too.	384	# holdingbranch of the document too.
364	if ( $itemInfo->{homebranch} ne $itemInfo->{holdingbranch} ) {	385	if ( $itemInfo->{homebranch} ne $itemInfo->{holdingbranch} ) {
Lines 375-383 foreach my $biblioNum (@biblionumbers) { Link Here
375	}	396	}
376		397
377	# checking reserve	398	# checking reserve
378	my ($reservedate,$reservedfor,$expectedAt) = GetReservesFromItemnumber($itemNum);	399	my ( $reservedate, $reservedfor, $expectedAt ) = GetReservesFromItemnumber($itemNum);
379	my $ItemBorrowerReserveInfo = GetMemberDetails( $reservedfor, 0);	400	my $ItemBorrowerReserveInfo = GetMemberDetails( $reservedfor, 0 );
380
381	if ( defined $reservedate ) {	401	if ( defined $reservedate ) {
382	$itemLoopIter->{backgroundcolor} = 'reserved';	402	$itemLoopIter->{backgroundcolor} = 'reserved';
383	$itemLoopIter->{reservedate} = format_date($reservedate);	403	$itemLoopIter->{reservedate} = format_date($reservedate);
Lines 385-390 foreach my $biblioNum (@biblionumbers) { Link Here
385	$itemLoopIter->{ReservedForSurname} = $ItemBorrowerReserveInfo->{'surname'};	405	$itemLoopIter->{ReservedForSurname} = $ItemBorrowerReserveInfo->{'surname'};
386	$itemLoopIter->{ReservedForFirstname} = $ItemBorrowerReserveInfo->{'firstname'};	406	$itemLoopIter->{ReservedForFirstname} = $ItemBorrowerReserveInfo->{'firstname'};
387	$itemLoopIter->{ExpectedAtLibrary} = $expectedAt;	407	$itemLoopIter->{ExpectedAtLibrary} = $expectedAt;
		408	$itemLoopIter->{ReservedForThisBorrower} = ( $reservedfor eq $borrowernumber );
		409	warn "ReservedForThisBorrower: " . $itemLoopIter->{ReservedForThisBorrower};
388	}	410	}
389		411
390	$itemLoopIter->{notforloan} = $itemInfo->{notforloan};	412	$itemLoopIter->{notforloan} = $itemInfo->{notforloan};
Lines 422-438 foreach my $biblioNum (@biblionumbers) { Link Here
422	# If there is no loan, return and transfer, we show a checkbox.	444	# If there is no loan, return and transfer, we show a checkbox.
423	$itemLoopIter->{notforloan} = $itemLoopIter->{notforloan} \|\| 0;	445	$itemLoopIter->{notforloan} = $itemLoopIter->{notforloan} \|\| 0;
424		446
425	my $branch = C4::Circulation::_GetCircControlBranch($itemLoopIter, $borr);	447	if (IsAvailableForItemLevelRequest($itemNum) and CanItemBeReserved($borrowernumber,$itemNum)) {
426
427	my $branchitemrule = GetBranchItemRule( $branch, $itemInfo->{'itype'} );
428	my $policy_holdallowed = 1;
429
430	if ( $branchitemrule->{'holdallowed'} == 0 \|\|
431	( $branchitemrule->{'holdallowed'} == 1 && $borr->{'branchcode'} ne $itemInfo->{'homebranch'} ) ) {
432	$policy_holdallowed = 0;
433	}
434
435	if (IsAvailableForItemLevelRequest($itemNum) and $policy_holdallowed and CanItemBeReserved($borrowernumber,$itemNum)) {
436	$itemLoopIter->{available} = 1;	448	$itemLoopIter->{available} = 1;
437	$numCopiesAvailable++;	449	$numCopiesAvailable++;
438	}	450	}
Lines 461-467 foreach my $biblioNum (@biblionumbers) { Link Here
461	$biblioLoopIter{holdable} = 1;	473	$biblioLoopIter{holdable} = 1;
462	$anyholdable = 1;	474	$anyholdable = 1;
463	}	475	}
464	if ($biblioLoopIter{already_reserved}) {	476	# $biblioLoopIter{multi} = $canReserveMultiple;
		477	if ( $biblioLoopIter{already_reserved} && !$canReserveMultiple ) {
465	$biblioLoopIter{holdable} = undef;	478	$biblioLoopIter{holdable} = undef;
466	$anyholdable = undef;	479	$anyholdable = undef;
467	}	480	}




    }
);

my @rank          = $query->param('rank-request');
my @reservenumber = $query->param('reservenumber');
my @biblionumber  = $query->param('biblionumber');
my @borrower      = $query->param('borrowernumber');
my @branch        = $query->param('pickup');
my @itemnumber    = $query->param('itemnumber');
my $multi_hold    = $query->param('multi_hold');
my $biblionumbers = $query->param('biblionumbers');
my $count=@rank;


my $CancelBorrowerNumber=$query->param('CancelBorrowerNumber');
my $CancelItemnumber=$query->param('CancelItemnumber');

# 2 possibilitys : cancel an item reservation, or modify or cancel the queued list

# 1) cancel an item reservation by function ModReserveCancelAll (in reserves.pm)
if ($CancelBorrowerNumber) {
    ModReserveCancelAll($CancelItemnumber, $CancelBorrowerNumber);
    $biblionumber[0] = $CancelBiblioNumber,

else {
    for (my $i=0;$i<$count;$i++){
        undef $itemnumber[$i] unless $itemnumber[$i] ne '';
        ModReserve($rank[$i],$biblionumber[$i],$borrower[$i],$branch[$i],$itemnumber[$i],$reservenumber[$i]); #from C4::Reserves
    }
}
my $from=$query->param('from');




#script to place reserves/requests
#writen 2/1/00 by chris@katipo.oc.nz


# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.


my ($user, $cookie, $sesion_id, $flags) = checkauth($input, 0, { reserveforothers => 'place_holds' }, 'intranet');

my @bibitems = $input->param('biblioitem');
# FIXME I think reqbib does not exist anymore, it's used in line 82, to AddReserve of contraint type 'o'
#       I bet it's a 2.x feature, reserving a given biblioitem, that is useless in Koha 3.0
#       we can remove this line, the AddReserve of constrainttype 'o',
#       and probably remove the reserveconstraint table as well, I never could fill anything in this table.
#my @reqbib         = $input->param('reqbib');
my $biblionumber   = $input->param('biblionumber');
my $borrower       = $input->param('member');
my $notes          = $input->param('notes');
my $branch         = $input->param('pickup');
my $startdate      = $input->param('reserve_date') || '';
my @rank           = $input->param('rank-request');
my $type           = $input->param('type');
my $title          = $input->param('title');
my $borrowernumber = GetMember( 'cardnumber' => $borrower );
my @checkitems     = $input->param('checkitem');
my $expirationdate = $input->param('expiration_date');

my $multi_hold    = $input->param('multi_hold');
my $biblionumbers = $multi_hold ? $input->param('biblionumbers') : ( $biblionumber . '/' );
my $bad_bibs      = $input->param('bad_bibs');

my %bibinfos = ();
my @biblionumbers = split '/', $biblionumbers;
foreach my $bibnum (@biblionumbers) {
    my %bibinfo = ();
    $bibinfo{title}    = $input->param("title_$bibnum");
    $bibinfo{rank}     = $input->param("rank_$bibnum");
    $bibinfos{$bibnum} = \%bibinfo;
}



# 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 .
for my $item (@checkitems){
    if ( $item ne '' ) {
        $rank[0] = '0' unless C4::Context->preference('ReservesNeedReturns');
        my $itemdata = GetItem($item);
        if ( $itemdata->{'holdingbranch'} eq $branch ) {
            $found = 'W' unless C4::Context->preference('ReservesNeedReturns');
        }
    }
}

if ( $type eq 'str8' && $borrowernumber ne '' ) {

    foreach my $biblionumber ( keys %bibinfos ) {
        my $count = @bibitems;
        @bibitems = sort @bibitems;
        my $i2 = 1;
        my @realbi;
        $realbi[0] = $bibitems[0];
        for ( my $i = 1 ; $i < $count ; $i++ ) {
            my $i3 = $i2 - 1;
            if ( $realbi[$i3] ne $bibitems[$i] ) {
                $realbi[$i2] = $bibitems[$i];
                $i2++;
            }
        }

        if ($multi_hold) {
            my $bibinfo = $bibinfos{$biblionumber};
            AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',[$biblionumber],
                       $bibinfo->{rank},$startdate,$expirationdate,$notes,$bibinfo->{title},$checkitems[0],$found);
        } else {
            if ( lc($input->param('request')) eq 'any' ) {
                # place a request on 1st available
                AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,undef,$found);
            } elsif ($reqbib[0] ne ''){
                # FIXME : elsif probably never reached, (see top of the script)
                # place a request on a given item
                AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'o',\@reqbib,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem, $found);
            } else {
                for my $item (@checkitems){
                AddReserve( $branch, $borrowernumber->{'borrowernumber'},
                    $biblionumber, 'a', \@realbi, $rank[0], $startdate, $expirationdate, $notes, $title, $item, $found );
                $rank[0]++;
                }
            }
        }
    }

    } else {
        print $input->redirect("request.pl?biblionumber=$biblionumber");
    }
} elsif ( $borrowernumber eq '' ) {
    print $input->header();
    print "Invalid card number please try again";
    print $input->Dump;
}

Lines 28-33 use C4::Circulation; Link Here

(-)a/reserve/renewscript.pl (-4 / +53 lines)
28	use C4::Auth;	28	use C4::Auth;
29	use URI::Escape;	29	use URI::Escape;
30	use C4::Dates qw/format_date_in_iso/;	30	use C4::Dates qw/format_date_in_iso/;
		31	use C4::Context;
		32	use C4::Overdues; #CheckBorrowerDebarred
		33	use C4::Members; #GetMemberDetail
		34	use C4::Items;
		35	use C4::Branch;
		36	use JSON;
		37	use C4::Reserves;
31	my $input = new CGI;	38	my $input = new CGI;
32		39
33	#Set Up User_env	40	#Set Up User_env
Lines 48-53 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
48	# find items to renew, all items or a selection of items	55	# find items to renew, all items or a selection of items
49	#	56	#
50		57
		58	my $branches = GetBranches();
51	my @data;	59	my @data;
52	if ($input->param('renew_all')) {	60	if ($input->param('renew_all')) {
53	@data = $input->param('all_items[]');	61	@data = $input->param('all_items[]');
Lines 80-91 my $override_limit = $input->param("override_limit") \|\| 0; Link Here
80	my $failedrenews = q{};	88	my $failedrenews = q{};
81	foreach my $itemno (@data) {	89	foreach my $itemno (@data) {
82	# check status before renewing issue	90	# check status before renewing issue
83	my ($renewokay,$error) = CanBookBeRenewed($borrowernumber,$itemno,$override_limit);	91	my ($renewokay,$error) = CanBookBeRenewed($borrowernumber,$itemno);
84	if ($renewokay){	92	if ($renewokay\|\|$override_limit){
85	AddRenewal($borrowernumber,$itemno,$branch,$datedue);	93	AddRenewal($borrowernumber,$itemno,$branch,$datedue);
86	}	94	}
87	else {	95	else {
88	$failedrenews.="&failedrenew=$itemno";	96	$failedrenews.="&failedrenew=$itemno&renewerror=".encode_json($error);
89	}	97	}
90	}	98	}
91	my $failedreturn = q{};	99	my $failedreturn = q{};
Lines 93-99 foreach my $barcode (@barcodes) { Link Here
93	# check status before renewing issue	101	# check status before renewing issue
94	my ( $returned, $messages, $issueinformation, $borrower ) =	102	my ( $returned, $messages, $issueinformation, $borrower ) =
95	AddReturn($barcode, $branch, $exemptfine);	103	AddReturn($barcode, $branch, $exemptfine);
96	$failedreturn.="&failedreturn=$barcode" unless ($returned);	104	my $itemnumber=GetItemnumberFromBarcode($barcode);
		105	if ($returned){
		106	if (my ($reservetype,$reserve)=C4::Reserves::CheckReserves(undef,$barcode)){
		107	if ($reservetype eq "Waiting" \|\| $reservetype eq "Reserved"){
		108	my $transfer=C4::Context->userenv->{branch} ne $reserve->{branchcode};
		109	ModReserveAffect( $itemnumber, $reserve->{borrowernumber}, $transfer, $reserve->{"reservenumber"} );
		110	my ( $message_reserve, $nextreservinfo ) = GetOtherReserves($itemnumber);
		111
		112	my ($borr) = GetMemberDetails( $nextreservinfo, 0 );
		113	$messages->{reservesdata}={
		114	found => 1,
		115	currentbranch => $branches->{C4::Context->userenv->{branch}}->{'branchname'},
		116	destbranchname => $branches->{ $reserve->{'branchcode'} }->{'branchname'},
		117	name => $borr->{'surname'} . ", " . $borr->{'title'} . " " . $borr->{'firstname'},
		118	borfirstname => $borr->{'firstname'},
		119	borsurname => $borr->{'surname'},
		120	bortitle => $borr->{'title'},
		121	borphone => $borr->{'phone'},
		122	boremail => $borr->{'email'},
		123	boraddress => $borr->{'address'},
		124	boraddress2 => $borr->{'address2'},
		125	borcity => $borr->{'city'},
		126	borzip => $borr->{'zipcode'},
		127	borcnum => $borr->{'cardnumber'},
		128	debarred => CheckBorrowerDebarred($borr->{borrowernumber}),
		129	gonenoaddress => $borr->{'gonenoaddress'},
		130	barcode => $barcode,
		131	transfertodo => $transfer,
		132	destbranch => $reserve->{'branchcode'},
		133	reservenumber => $reserve->{'reservenumber'},
		134	borrowernumber => $reserve->{'borrowernumber'},
		135	itemnumber => $reserve->{'itemnumber'},
		136	biblionumber => $reserve->{'biblionumber'},
		137	reservenotes => $reserve->{'reservenotes'},
		138	};
		139
		140	}
		141	}
		142	}
		143	if (!$returned \|\|$messages){
		144	$failedreturn.="&failedreturn=$barcode&returnerror=".encode_json($messages);
		145	}
97	}	146	}
98		147
99	#	148	#




use C4::Items;
use C4::Koha;
use C4::Circulation;
use C4::IssuingRules;
use C4::Dates qw/format_date/;
use C4::Members;
use C4::Search;		# enabled_staff_search_views

    my $number_reserves =
      GetReserveCount( $borrowerinfo->{'borrowernumber'} );

    if ( not CanBookBeReserved( $borrowerinfo->{borrowernumber}, $input->param('biblionumber') ) ) {
 		$warnings = 1;
        $maxreserves = 1;
    }


    my $expiry_date = $borrowerinfo->{dateexpiry};
    my $expiry = 0; # flag set if patron account has expired
    if ($expiry_date and $expiry_date ne '0000-00-00' and
            Date_to_Days(split (/-/,$date)) > Date_to_Days(split (/-/,$expiry_date))) {
		$messages = $expiry = 1;
    }
     

my @biblionumbers = ();
my $biblionumbers = $input->param('biblionumbers');
if ($multihold) {
    @biblionumbers = split ('/', $biblionumbers);
} else {
    push @biblionumbers, $input->param('biblionumber');
}

        if ( defined $res->{found} && $res->{found} eq 'W' ) {
            $count--;
        }
        if ($res->{itemnumber} && not $res->{itemtype}){
            $res->{itemtype}=GetItem($res->{itemnumber},$res->{biblionumber})->{itype};
        }
        next if CanHoldMultipleItems($res->{itemtype});
        if ( defined $borrowerinfo && ($borrowerinfo->{borrowernumber} eq $res->{borrowernumber}) && !CanHoldMultipleItems($res->{itemtype}) ) {
            $warnings = 1;
            $alreadyreserved = 1;
            $biblioloopiter{warn} = 1;

                    }
                }
            }
            
            my $branch = C4::Circulation::_GetCircControlBranch($item, $borrowerinfo);

            my $branchitemrule = GetIssuingRule( $borrowerinfo->{categorycode}, $item->{'itype'}, GetReservesControlBranch( $borrowerinfo, $item ) );
            my $policy_holdrestricted = $branchitemrule->{'reservesallowed'};
            $item->{'holdrestricted'} = $branchitemrule->{'holdrestricted'};
            $item->{'holdallowed'} = $branchitemrule->{'holdallowed'};
            
            if ( $branchitemrule->{'holdallowed'} == 0 ||
                 ( $branchitemrule->{'holdallowed'} == 1 && $borrowerinfo->{'branchcode'} ne $item->{'homebranch'} ) ) {
                $policy_holdallowed = 0;
            }
            
            if (IsAvailableForItemLevelRequest($itemnumber) and not $item->{cantreserve} and CanItemBeReserved($borrowerinfo->{borrowernumber}, $itemnumber) ) {
                if ( not $policy_holdrestricted and C4::Context->preference( 'AllowHoldPolicyOverride' ) ) {
                    $item->{override} = 1;
                    $num_override++;
                } elsif ( $policy_holdrestricted ) {
                    $item->{available} = 1;
                    $num_available++;
                }

            while (my $wait_hashref = $sth2->fetchrow_hashref) {
                $item->{waitingdate} = format_date($wait_hashref->{waitingdate});
            }
            
            if ( BorrowerHasReserve( $borrowerinfo->{'borrowernumber'}, '', $itemnumber ) ) {
              $item->{available} = 0;
              $item->{override} = 0;
            }
            $item->{canholdmultiple}=CanHoldMultipleItems($item->{itype}) && $item->{available};
	    $item->{cannothold}=!CanHoldMultipleItems($item->{itype});
            
            push @{ $biblioitem->{itemloop} }, $item;
        }
        if ( $num_override > 0) { 
        if ( $num_override == scalar( @{ $biblioitem->{itemloop} } ) ) { # That is, if all items require an override
            $template->param( override_required => 1 );
        } elsif ( $num_available == 0 ) {
            $template->param( none_available => 1 );

            $a_found cmp $b_found; 
        } @$reserves ) {
        my %reserve;

        $reserve{'reservenumber'}   = $res->{'reservenumber'};

        my @optionloop;
        for ( my $i = 1 ; $i <= $totalcount ; $i++ ) {
            push(

Lines 20-27 sub methods : Test( 1 ) { Link Here

(-)a/t/db_dependent/lib/KohaTest/Circulation.pm (-2 lines)
20	CanBookBeIssued	20	CanBookBeIssued
21	AddIssue	21	AddIssue
22	GetLoanLength	22	GetLoanLength
23	GetIssuingRule
24	GetBranchBorrowerCircRule
25	AddReturn	23	AddReturn
26	MarkIssueReturned	24	MarkIssueReturned
27	_FixOverduesOnReturn	25	_FixOverduesOnReturn




    $description = 'Test account';
    $type        = 'M';
    $amount      = 5.00;
    $note        = '';

    my $acct_added =
      C4::Accounts::manualinvoice( $borrowernumber, undef, $description, $type, $amount, $note );
        $user );

    ok( $acct_added == 0, 'added account for borrower' );

    $self->{amountoutstanding} = $amount;

Lines 23-29 sub methods : Test( 1 ) { Link Here

(-)a/t/db_dependent/lib/KohaTest/Overdues.pm (-2 lines)
23	BorType	23	BorType
24	ReplacementCost	24	ReplacementCost
25	GetFine	25	GetFine
26	GetIssuingRules
27	ReplacementCost2	26	ReplacementCost2
28	GetNextIdNotify	27	GetNextIdNotify
29	NumberNotifyId	28	NumberNotifyId
30	-

Return to bug 5872

Lines 23-28 use strict; Link Here

(-)a/C4/Overdues.pm (-59 / +22 lines)
23	use Date::Calc qw/Today Date_to_Days/;	23	use Date::Calc qw/Today Date_to_Days/;
24	use Date::Manip qw/UnixDate/;	24	use Date::Manip qw/UnixDate/;
25	use C4::Circulation;	25	use C4::Circulation;
		26	use C4::IssuingRules;
26	use C4::Context;	27	use C4::Context;
27	use C4::Accounts;	28	use C4::Accounts;
28	use C4::Log; # logaction	29	use C4::Log; # logaction
Lines 71-79 BEGIN { Link Here
71	push @EXPORT, qw(	72	push @EXPORT, qw(
72	&GetIssuesIteminfo	73	&GetIssuesIteminfo
73	);	74	);
74	#
75	# &GetIssuingRules - delete.
76	# use C4::Circulation::GetIssuingRule instead.
77		75
78	# subs to move to Members.pm	76	# subs to move to Members.pm
79	push @EXPORT, qw(	77	push @EXPORT, qw(
Lines 124-130 sub Getoverdues { Link Here
124	SELECT issues.*, items.itype as itemtype, items.homebranch, items.barcode	122	SELECT issues.*, items.itype as itemtype, items.homebranch, items.barcode
125	FROM issues	123	FROM issues
126	LEFT JOIN items USING (itemnumber)	124	LEFT JOIN items USING (itemnumber)
127	WHERE date_due < CURDATE()	125	WHERE DATE(date_due) < CURDATE()
128	";	126	";
129	} else {	127	} else {
130	$statement = "	128	$statement = "
Lines 132-138 LEFT JOIN items USING (itemnumber) Link Here
132	FROM issues	130	FROM issues
133	LEFT JOIN items USING (itemnumber)	131	LEFT JOIN items USING (itemnumber)
134	LEFT JOIN biblioitems USING (biblioitemnumber)	132	LEFT JOIN biblioitems USING (biblioitemnumber)
135	WHERE date_due < CURDATE()	133	WHERE DATE(date_due) < CURDATE()
136	";	134	";
137	}	135	}
138		136
Lines 170-176 sub checkoverdues { Link Here
170	LEFT JOIN biblio ON items.biblionumber = biblio.biblionumber	168	LEFT JOIN biblio ON items.biblionumber = biblio.biblionumber
171	LEFT JOIN biblioitems ON items.biblioitemnumber = biblioitems.biblioitemnumber	169	LEFT JOIN biblioitems ON items.biblioitemnumber = biblioitems.biblioitemnumber
172	WHERE issues.borrowernumber = ?	170	WHERE issues.borrowernumber = ?
173	AND issues.date_due < CURDATE()"	171	AND DATE(issues.date_due) < CURDATE()"
174	);	172	);
175	# FIXME: SELECT * across 4 tables? do we really need the marc AND marcxml blobs??	173	# FIXME: SELECT * across 4 tables? do we really need the marc AND marcxml blobs??
176	$sth->execute($borrowernumber);	174	$sth->execute($borrowernumber);
Lines 245-251 sub CalcFine { Link Here
245	my $daystocharge;	243	my $daystocharge;
246	# get issuingrules (fines part will be used)	244	# get issuingrules (fines part will be used)
247	$debug and warn sprintf("CalcFine calling GetIssuingRule(%s, %s, %s)", $bortype, $item->{'itemtype'}, $branchcode);	245	$debug and warn sprintf("CalcFine calling GetIssuingRule(%s, %s, %s)", $bortype, $item->{'itemtype'}, $branchcode);
248	my $data = C4::Circulation::GetIssuingRule($bortype, $item->{'itemtype'}, $branchcode);	246	my $data = GetIssuingRule($bortype, $item->{'itemtype'}, $branchcode);
249	if($difference) {	247	if($difference) {
250	# if $difference is supplied, the difference has already been calculated, but we still need to adjust for the calendar.	248	# if $difference is supplied, the difference has already been calculated, but we still need to adjust for the calendar.
251	# use copy-pasted functions from calendar module. (deprecated -- these functions will be removed from C4::Overdues ).	249	# use copy-pasted functions from calendar module. (deprecated -- these functions will be removed from C4::Overdues ).
Lines 269-275 sub CalcFine { Link Here
269	} else {	267	} else {
270	# a zero (or null) chargeperiod means no charge.	268	# a zero (or null) chargeperiod means no charge.
271	}	269	}
272	$amount = C4::Context->preference('maxFine') if(C4::Context->preference('maxFine') && ( $amount > C4::Context->preference('maxFine')));	270	$amount = C4::Context->preference('MaxFine') if ( C4::Context->preference('MaxFine') && ( $amount > C4::Context->preference('MaxFine') ) );
273	$debug and warn sprintf("CalcFine returning (%s, %s, %s, %s)", $amount, $data->{'chargename'}, $days_minus_grace, $daystocharge);	271	$debug and warn sprintf("CalcFine returning (%s, %s, %s, %s)", $amount, $data->{'chargename'}, $days_minus_grace, $daystocharge);
274	return ($amount, $data->{'chargename'}, $days_minus_grace, $daystocharge);	272	return ($amount, $data->{'chargename'}, $days_minus_grace, $daystocharge);
275	# FIXME: chargename is NEVER populated anywhere.	273	# FIXME: chargename is NEVER populated anywhere.
Lines 585-591 Returns the replacement cost of the item with the given item number. Link Here
585		583
586	=cut	584	=cut
587		585
588	#'	586
589	sub ReplacementCost {	587	sub ReplacementCost {
590	my ($itemnum) = @_;	588	my ($itemnum) = @_;
591	my $dbh = C4::Context->dbh;	589	my $dbh = C4::Context->dbh;
Lines 604-663 sub ReplacementCost { Link Here
604		602
605	return the total of fine	603	return the total of fine
606		604
607	C<$itemnum> is item number
608
609	C<$borrowernumber> is the borrowernumber	605	C<$borrowernumber> is the borrowernumber
610		606
611	=cut	607	=cut
612
613		608
614	sub GetFine {	609	sub GetFine {
615	my ( $itemnum, $borrowernumber ) = @_;	610	my ( $borrowernumber ) = @_;
616	my $dbh = C4::Context->dbh();	611	my $dbh = C4::Context->dbh();
617	my $query = "SELECT sum(amountoutstanding) FROM accountlines	612	my $query = "SELECT sum(amountoutstanding) FROM accountlines
618	where accounttype like 'F%'	613	where accounttype like 'F%'
619	AND amountoutstanding > 0 AND itemnumber = ? AND borrowernumber=?";	614	AND amountoutstanding > 0 AND borrowernumber=?";
620	my $sth = $dbh->prepare($query);	615	my $sth = $dbh->prepare($query);
621	$sth->execute( $itemnum, $borrowernumber );	616	$sth->execute( $borrowernumber );
622	my $data = $sth->fetchrow_hashref();	617	my $data = $sth->fetchrow_hashref();
623	return ( $data->{'sum(amountoutstanding)'} );	618	return ( $data->{'sum(amountoutstanding)'} );
624	}	619	}
625		620
626
627	=head2 GetIssuingRules
628
629	FIXME - This sub should be deprecated and removed.
630	It ignores branch and defaults.
631
632	$data = &GetIssuingRules($itemtype,$categorycode);
633
634	Looks up for all issuingrules an item info
635
636	C<$itemnumber> is a reference-to-hash whose keys are all of the fields
637	from the borrowers and categories tables of the Koha database. Thus,
638
639	C<$categorycode> contains information about borrowers category
640
641	C<$data> contains all information about both the borrower and
642	category he or she belongs to.
643	=cut
644
645	sub GetIssuingRules {
646	warn "GetIssuingRules is deprecated: use GetIssuingRule from C4::Circulation instead.";
647	my ($itemtype,$categorycode)=@_;
648	my $dbh = C4::Context->dbh();
649	my $query=qq\|SELECT *
650	FROM issuingrules
651	WHERE issuingrules.itemtype=?
652	AND issuingrules.categorycode=?
653	\|;
654	my $sth = $dbh->prepare($query);
655	# print $query;
656	$sth->execute($itemtype,$categorycode);
657	return $sth->fetchrow_hashref;
658	}
659
660
661	sub ReplacementCost2 {	621	sub ReplacementCost2 {
662	my ( $itemnum, $borrowernumber ) = @_;	622	my ( $itemnum, $borrowernumber ) = @_;
663	my $dbh = C4::Context->dbh();	623	my $dbh = C4::Context->dbh();
Lines 956-962 returns a list of branch codes for branches with overdue rules defined. Link Here
956		916
957	sub GetBranchcodesWithOverdueRules {	917	sub GetBranchcodesWithOverdueRules {
958	my $dbh = C4::Context->dbh;	918	my $dbh = C4::Context->dbh;
959	my $rqoverduebranches = $dbh->prepare("SELECT DISTINCT branchcode FROM overduerules WHERE delay1 IS NOT NULL AND branchcode <> ''");	919	my $rqoverduebranches = $dbh->prepare("SELECT DISTINCT branchcode FROM overduerules WHERE delay1 IS NOT NULL ");
960	$rqoverduebranches->execute;	920	$rqoverduebranches->execute;
961	my @branches = map { shift @$_ } @{ $rqoverduebranches->fetchall_arrayref };	921	my @branches = map { shift @$_ } @{ $rqoverduebranches->fetchall_arrayref };
962	return @branches;	922	return @branches;
Lines 1029-1035 sub GetOverduerules { Link Here
1029		989
1030	Check if the borrowers is already debarred	990	Check if the borrowers is already debarred
1031		991
1032	C<$debarredstatus> return 0 for not debarred and return 1 for debarred	992	C<$debarredstatus> return undef for not debarred and return end of debar date for debarred
1033		993
1034	C<$borrowernumber> contains the borrower number	994	C<$borrowernumber> contains the borrower number
1035		995
Lines 1043-1074 sub CheckBorrowerDebarred { Link Here
1043	SELECT debarred	1003	SELECT debarred
1044	FROM borrowers	1004	FROM borrowers
1045	WHERE borrowernumber=?	1005	WHERE borrowernumber=?
		1006	AND debarred > NOW()
1046	\|;	1007	\|;
1047	my $sth = $dbh->prepare($query);	1008	my $sth = $dbh->prepare($query);
1048	$sth->execute($borrowernumber);	1009	$sth->execute($borrowernumber);
1049	my ($debarredstatus) = $sth->fetchrow;	1010	my $debarredstatus= $sth->fetchrow;
1050	return ( $debarredstatus eq '1' ? 1 : 0 );	1011	return $debarredstatus;
		1012
1051	}	1013	}
1052		1014
1053	=head2 UpdateBorrowerDebarred	1015	=head2 UpdateBorrowerDebarred
1054		1016
1055	($borrowerstatut) = &UpdateBorrowerDebarred($borrowernumber);	1017	($borrowerstatut) = &UpdateBorrowerDebarred($borrowernumber, $todate);
1056		1018
1057	update status of borrowers in borrowers table (field debarred)	1019	update status of borrowers in borrowers table (field debarred)
1058		1020
1059	C<$borrowernumber> borrower number	1021	C<$borrowernumber> borrower number
		1022	C<$todate> end of bare
1060		1023
1061	=cut	1024	=cut
1062		1025
1063	sub UpdateBorrowerDebarred{	1026	sub UpdateBorrowerDebarred{
1064	my($borrowernumber) = @_;	1027	my($borrowernumber, $todate) = @_;
1065	my $dbh = C4::Context->dbh;	1028	my $dbh = C4::Context->dbh;
1066	my $query=qq\|UPDATE borrowers	1029	my $query=qq\|UPDATE borrowers
1067	SET debarred='1'	1030	SET debarred=?
1068	WHERE borrowernumber=?	1031	WHERE borrowernumber=?
1069	\|;	1032	\|;
1070	my $sth=$dbh->prepare($query);	1033	my $sth=$dbh->prepare($query);
1071	$sth->execute($borrowernumber);	1034	$sth->execute($todate, $borrowernumber);
1072	$sth->finish;	1035	$sth->finish;
1073	return 1;	1036	return 1;
1074	}	1037	}

Lines 91-103 while ( my $row = $sth->fetchrow_hashref ) { Link Here

(-)a/admin/branch_transfer_limits.pl (-11 / +11 lines)
91		91
92	## If Form Data Passed, Update the Database	92	## If Form Data Passed, Update the Database
93	if ( $input->param('updateLimits') ) {	93	if ( $input->param('updateLimits') ) {
94	DeleteBranchTransferLimits();	94	DeleteBranchTransferLimits($branchcode);
95		95
96	foreach my $code ( @codes ) {	96	foreach my $code ( @codes ) {
97	foreach my $toBranch ( @branchcodes ) {	97	foreach my $fromBranch ( @branchcodes ) {
98	my $isSet = not $input->param( $code . "_" . $toBranch);	98	my $isSet = not $input->param( $code . "_" . $fromBranch);
99	if ( $isSet ) {	99	if ( $isSet ) {
100	CreateBranchTransferLimit( $toBranch, $branchcode, $code );	100	CreateBranchTransferLimit( $branchcode, $fromBranch, $code );
101	}	101	}
102	}	102	}
103	}	103	}
Lines 115-132 my $branchcount = scalar(@branchcode_loop); Link Here
115	## Build the default data	115	## Build the default data
116	my @codes_loop;	116	my @codes_loop;
117	foreach my $code ( @codes ) {	117	foreach my $code ( @codes ) {
118	my @to_branch_loop;	118	my @from_branch_loop;
119	my %row_data;	119	my %row_data;
120	$row_data{ code } = $code;	120	$row_data{ code } = $code;
121	$row_data{ to_branch_loop } = \@to_branch_loop;	121	$row_data{ from_branch_loop } = \@from_branch_loop;
122	foreach my $toBranch ( @branchcodes ) {	122	foreach my $fromBranch ( @branchcodes ) {
123	my %row_data;	123	my %row_data;
124	my $isChecked = IsBranchTransferAllowed( $toBranch, $branchcode, $code );	124	my $isChecked = IsBranchTransferAllowed( $branchcode, $fromBranch, $code );
125	$row_data{ code } = $code;	125	$row_data{ code } = $code;
126	$row_data{ toBranch } = $toBranch;	126	$row_data{ fromBranch } = $fromBranch;
127	$row_data{ isChecked } = $isChecked;	127	$row_data{ isChecked } = $isChecked;
128	$row_data{ toBranchname } = GetBranchName($toBranch);	128	$row_data{ fromBranchname } = GetBranchName($fromBranch);
129	push( @to_branch_loop, \%row_data );	129	push( @from_branch_loop, \%row_data );
130	}	130	}
131		131
132	push( @codes_loop, \%row_data );	132	push( @codes_loop, \%row_data );

Lines 36-51 use C4::Circulation; Link Here

(-)a/circ/returns.pl (-30 / +107 lines)
36	use C4::Dates qw/format_date/;	36	use C4::Dates qw/format_date/;
37	use Date::Calc qw/Add_Delta_Days/;	37	use Date::Calc qw/Add_Delta_Days/;
38	use C4::Calendar;	38	use C4::Calendar;
		39	use C4::Budgets qw/GetCurrency/;
39	use C4::Print;	40	use C4::Print;
40	use C4::Reserves;	41	use C4::Reserves;
41	use C4::Biblio;	42	use C4::Biblio;
42	use C4::Items;	43	use C4::Items;
43	use C4::Members;	44	use C4::Members;
		45	use C4::Overdues qw/CheckBorrowerDebarred/;
44	use C4::Branch; # GetBranches GetBranchName	46	use C4::Branch; # GetBranches GetBranchName
45	use C4::Koha; # FIXME : is it still useful ?	47	use C4::Koha; # FIXME : is it still useful ?
46	use C4::RotatingCollections;	48	use C4::RotatingCollections;
		49	use C4::Debug;
47		50
48	my $query = new CGI;	51	my $query = new CGI;
		52	my $remotehost = $query->remote_host();
49		53
50	if (!C4::Context->userenv){	54	if (!C4::Context->userenv){
51	my $sessionID = $query->cookie("CGISESSID");	55	my $sessionID = $query->cookie("CGISESSID");
Lines 133-138 if ( $query->param('resbarcode') ) { Link Here
133	my $item = $query->param('itemnumber');	137	my $item = $query->param('itemnumber');
134	my $borrowernumber = $query->param('borrowernumber');	138	my $borrowernumber = $query->param('borrowernumber');
135	my $resbarcode = $query->param('resbarcode');	139	my $resbarcode = $query->param('resbarcode');
		140	my $reservenumber = $query->param('reservenumber');
136	my $diffBranchReturned = $query->param('diffBranch');	141	my $diffBranchReturned = $query->param('diffBranch');
137	my $iteminfo = GetBiblioFromItemNumber($item);	142	my $iteminfo = GetBiblioFromItemNumber($item);
138	# fix up item type for display	143	# fix up item type for display
Lines 140-157 if ( $query->param('resbarcode') ) { Link Here
140	my $diffBranchSend = ($userenv_branch ne $diffBranchReturned) ? $diffBranchReturned : undef;	145	my $diffBranchSend = ($userenv_branch ne $diffBranchReturned) ? $diffBranchReturned : undef;
141	# diffBranchSend tells ModReserveAffect whether document is expected in this library or not,	146	# diffBranchSend tells ModReserveAffect whether document is expected in this library or not,
142	# i.e., whether to apply waiting status	147	# i.e., whether to apply waiting status
143	ModReserveAffect( $item, $borrowernumber, $diffBranchSend);	148	ModReserveAffect( $item, $borrowernumber, $diffBranchSend, $reservenumber );
		149
144	# check if we have other reserves for this document, if we have a return send the message of transfer	150	# check if we have other reserves for this document, if we have a return send the message of transfer
145	my ( $messages, $nextreservinfo ) = GetOtherReserves($item);	151	my ( $reservemessages, $nextreservinfo ) = GetOtherReserves($item);
146		152
147	my ($borr) = GetMemberDetails( $nextreservinfo, 0 );	153	my ($borr) = GetMemberDetails( $nextreservinfo, 0 );
148	my $name = $borr->{'surname'} . ", " . $borr->{'title'} . " " . $borr->{'firstname'};	154	my $name = $borr->{'surname'} . ", " . $borr->{'title'} . " " . $borr->{'firstname'};
149	if ( $messages->{'transfert'} ) {	155	if ( $reservemessages->{'transfert'} ) {
150	$template->param(	156	$template->param(
151	itemtitle => $iteminfo->{'title'},	157	itemtitle => $iteminfo->{'title'},
152	itembiblionumber => $iteminfo->{'biblionumber'},	158	itembiblionumber => $iteminfo->{'biblionumber'},
153	iteminfo => $iteminfo->{'author'},	159	iteminfo => $iteminfo->{'author'},
154	tobranchname => GetBranchName($messages->{'transfert'}),	160	tobranchname => GetBranchName($reservemessages->{'transfert'}),
155	name => $name,	161	name => $name,
156	borrowernumber => $borrowernumber,	162	borrowernumber => $borrowernumber,
157	borcnum => $borr->{'cardnumber'},	163	borcnum => $borr->{'cardnumber'},
Lines 167-176 my $returned = 0; Link Here
167	my $messages;	173	my $messages;
168	my $issueinformation;	174	my $issueinformation;
169	my $itemnumber;	175	my $itemnumber;
		176	my $biblio;
170	my $barcode = $query->param('barcode');	177	my $barcode = $query->param('barcode');
171	my $exemptfine = $query->param('exemptfine');	178	my $exemptfine = $query->param('exemptfine');
172	my $dropboxmode = $query->param('dropboxmode');	179	my $dropboxmode = $query->param('dropboxmode');
173	my $dotransfer = $query->param('dotransfer');	180	my $dotransfer = $query->param('dotransfer');
		181	my $override = $query->param('override');
174	my $calendar = C4::Calendar->new( branchcode => $userenv_branch );	182	my $calendar = C4::Calendar->new( branchcode => $userenv_branch );
175	#dropbox: get last open day (today - 1)	183	#dropbox: get last open day (today - 1)
176	my $today = C4::Dates->new();	184	my $today = C4::Dates->new();
Lines 184-190 if ($dotransfer){ Link Here
184	}	192	}
185		193
186	# actually return book and prepare item table.....	194	# actually return book and prepare item table.....
187	if ($barcode) {	195	if ($barcode and not $query->param('cancel')) {
188	$barcode =~ s/^\s\|\s$//g; # remove leading/trailing whitespace	196	$barcode =~ s/^\s\|\s$//g; # remove leading/trailing whitespace
189	$barcode = barcodedecode($barcode) if C4::Context->preference('itemBarcodeInputFilter');	197	$barcode = barcodedecode($barcode) if C4::Context->preference('itemBarcodeInputFilter');
190	$itemnumber = GetItemnumberFromBarcode($barcode);	198	$itemnumber = GetItemnumberFromBarcode($barcode);
Lines 207-217 if ($barcode) { Link Here
207	# save the return	215	# save the return
208	#	216	#
209	( $returned, $messages, $issueinformation, $borrower ) =	217	( $returned, $messages, $issueinformation, $borrower ) =
210	AddReturn( $barcode, $userenv_branch, $exemptfine, $dropboxmode); # do the return	218	AddReturn( $barcode, $userenv_branch, $exemptfine, $dropboxmode,$override); # do the return
211	my $homeorholdingbranchreturn = C4::Context->preference('HomeOrHoldingBranchReturn') or 'homebranch';	219	my $homeorholdingbranchreturn = C4::Context->preference('HomeOrHoldingBranchReturn') or 'homebranch';
212		220
		221	my @ips=split /,\|\\|/, C4::Context->preference("CI-3M:AuthorizedIPs");
		222	#my $pid=fork();
		223	#unless($pid && $remotehost=~qr(^$ips$)){
		224	#if (!$pid && any{ $remotehost eq $_ }@ips ){
		225	if (any{ $remotehost eq $_ }@ips ){
		226	system("../services/magnetise.pl $remotehost in");
		227	#die 0;
		228	}
213	# get biblio description	229	# get biblio description
214	my $biblio = GetBiblioFromItemNumber($itemnumber);	230	$biblio = GetBiblioFromItemNumber($itemnumber);
215	# fix up item type for display	231	# fix up item type for display
216	$biblio->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $biblio->{'itype'} : $biblio->{'itemtype'};	232	$biblio->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $biblio->{'itype'} : $biblio->{'itemtype'};
217		233
Lines 249-255 if ($barcode) { Link Here
249	}	265	}
250		266
251	}	267	}
252	elsif ( !$messages->{'BadBarcode'} ) {	268	elsif ( !$messages->{'BadBarcode'} and ! $messages->{'Wrongbranch'} ) {
253	$input{duedate} = 0;	269	$input{duedate} = 0;
254	$returneditems{0} = $barcode;	270	$returneditems{0} = $barcode;
255	$riduedate{0} = 0;	271	$riduedate{0} = 0;
Lines 267-272 if ($barcode) { Link Here
267	}	283	}
268	$template->param( inputloop => \@inputloop );	284	$template->param( inputloop => \@inputloop );
269		285
		286
		287	# Is there a circulation note?
		288	my $itemnumber = GetItemnumberFromBarcode($barcode);
		289	my $biblionumber = GetBiblionumberFromItemnumber($itemnumber);
		290	my $record = GetMarcBiblio($biblionumber);
		291	my $frameworkcode = GetFrameworkCode($biblionumber);
		292	my $circnotefield = GetRecordValue('circnote', $record, $frameworkcode);
		293	if (defined @$circnotefield[0]) {
		294	$template->param(circnote => @$circnotefield[0]->{'subfield'});
		295	}
		296
		297
270	my $found = 0;	298	my $found = 0;
271	my $waiting = 0;	299	my $waiting = 0;
272	my $reserved = 0;	300	my $reserved = 0;
Lines 290-298 if ( $messages->{'NeedsTransfer'} ){ Link Here
290	}	318	}
291		319
292	if ( $messages->{'Wrongbranch'} ){	320	if ( $messages->{'Wrongbranch'} ){
293	$template->param(	321	$template->param(
294	wrongbranch => 1,	322	wrongbranch => $branches->{$messages->{'Wrongbranch'}->{'Wrongbranch'}}->{'branchname'},
295	);	323	rightbranch => $branches->{$messages->{'Wrongbranch'}->{'Rightbranch'}}->{'branchname'},
		324	barcode => $barcode,
		325	exemptfine => $exemptfine,
		326	dropboxmode => $dropboxmode,
		327	);
296	}	328	}
297		329
298	# case of wrong transfert, if the document wasn't transfered to the right library (according to branchtransfer (tobranch) BDD)	330	# case of wrong transfert, if the document wasn't transfered to the right library (according to branchtransfer (tobranch) BDD)
Lines 347-353 if ( $messages->{'ResFound'}) { Link Here
347	reserved => 1,	379	reserved => 1,
348	);	380	);
349	}	381	}
350		382	my $debarred = CheckBorrowerDebarred($reserve->{borrowernumber});
351	# same params for Waiting or Reserved	383	# same params for Waiting or Reserved
352	$template->param(	384	$template->param(
353	found => 1,	385	found => 1,
Lines 364-380 if ( $messages->{'ResFound'}) { Link Here
364	borcity => $borr->{'city'},	396	borcity => $borr->{'city'},
365	borzip => $borr->{'zipcode'},	397	borzip => $borr->{'zipcode'},
366	borcnum => $borr->{'cardnumber'},	398	borcnum => $borr->{'cardnumber'},
367	debarred => $borr->{'debarred'},	399	debarred => $debarred,
368	gonenoaddress => $borr->{'gonenoaddress'},	400	gonenoaddress => $borr->{'gonenoaddress'},
369	barcode => $barcode,	401	barcode => $barcode,
370	destbranch => $reserve->{'branchcode'},	402	reservenumber => $reserve->{'reservenumber'},
		403	destbranch => $reserve->{'branchcode'},
371	borrowernumber => $reserve->{'borrowernumber'},	404	borrowernumber => $reserve->{'borrowernumber'},
372	itemnumber => $reserve->{'itemnumber'},	405	itemnumber => $reserve->{'itemnumber'},
373	reservenotes => $reserve->{'reservenotes'},	406	reservenotes => $reserve->{'reservenotes'},
374	);	407	);
375	} # else { ; } # error?	408	} # else { ; } # error?
376	}	409	}
377		410	$borrower->{'flags'}= C4::Members::patronflags($borrower);
378	# Error Messages	411	# Error Messages
379	my @errmsgloop;	412	my @errmsgloop;
380	foreach my $code ( keys %$messages ) {	413	foreach my $code ( keys %$messages ) {
Lines 400-405 foreach my $code ( keys %$messages ) { Link Here
400	elsif ( $code eq 'WasTransfered' ) {	433	elsif ( $code eq 'WasTransfered' ) {
401	; # FIXME... anything to do here?	434	; # FIXME... anything to do here?
402	}	435	}
		436	elsif ( $code eq 'NotForLoan' ) {
		437	my $fw = GetFrameworkCode($biblio->{'biblionumber'});
		438	my $category = GetAuthValCode('items.notforloan',$fw);
		439	my $authorizedvalues = GetAuthorisedValues($category, $messages->{$code});
		440
		441	foreach my $authvalue (@$authorizedvalues){
		442	$err{notforloan} = $authvalue->{lib} if $authvalue->{'authorised_value'} eq $messages->{$code};
		443	}
		444	}
		445	elsif ( $code eq 'Damaged' ) {
		446	my $fw = GetFrameworkCode($biblio->{'biblionumber'});
		447	my $category = GetAuthValCode('items.damaged',$fw);
		448	my $authorizedvalues = GetAuthorisedValues($category, $messages->{$code});
		449
		450	foreach my $authvalue (@$authorizedvalues){
		451	$err{damaged} = $authvalue->{lib} if $authvalue->{'authorised_value'} eq $messages->{$code};
		452	}
		453	}
		454	elsif( $code eq 'Debarred' ){
		455	$err{debarred} = format_date($messages->{'Debarred'});
		456	$err{debarcardnumber} = $borrower->{cardnumber};
		457	$err{debarborrowernumber} = $borrower->{borrowernumber};
		458	$err{debarname} = "$borrower->{firstname} $borrower->{surname}";
		459	}
		460	elsif( $code eq 'HaveFines' ){
		461	$err{havefines} = $borrower->{'flags'}->{'CHARGES'}->{'amount'} . %{GetCurrency()}->{symbol};
		462	$err{finecardnumber} = $borrower->{cardnumber};
		463	$err{finename} = "$borrower->{firstname} $borrower->{surname}";
		464	}
403	elsif ( $code eq 'wthdrawn' ) {	465	elsif ( $code eq 'wthdrawn' ) {
404	$err{withdrawn} = 1;	466	$err{withdrawn} = 1;
405	$exit_required_p = 1;	467	$exit_required_p = 1;
Lines 421-427 foreach my $code ( keys %$messages ) { Link Here
421	}	483	}
422	elsif ( $code eq 'Wrongbranch' ) {	484	elsif ( $code eq 'Wrongbranch' ) {
423	}	485	}
424
425	else {	486	else {
426	die "Unknown error code $code"; # note we need all the (empty) elsif's above, or we die.	487	die "Unknown error code $code"; # note we need all the (empty) elsif's above, or we die.
427	# This forces the issue of staying in sync w/ Circulation.pm	488	# This forces the issue of staying in sync w/ Circulation.pm
Lines 435-448 $template->param( errmsgloop => \@errmsgloop ); Link Here
435		496
436	# patrontable ....	497	# patrontable ....
437	if ($borrower) {	498	if ($borrower) {
438	my $flags = $borrower->{'flags'};
439	my @flagloop;	499	my @flagloop;
440	my $flagset;	500	my $flags=$borrower->{flags};
441	foreach my $flag ( sort keys %$flags ) {	501	foreach my $flag ( sort keys %$flags ) {
442	my %flaginfo;	502	my %flaginfo;
443	unless ($flagset) { $flagset = 1; }
444	$flaginfo{redfont} = ( $flags->{$flag}->{'noissues'} );
445	$flaginfo{flag} = $flag;
446	if ( $flag eq 'CHARGES' ) {	503	if ( $flag eq 'CHARGES' ) {
447	$flaginfo{msg} = $flag;	504	$flaginfo{msg} = $flag;
448	$flaginfo{charges} = 1;	505	$flaginfo{charges} = 1;
Lines 457-470 if ($borrower) { Link Here
457	foreach my $item (@$items) {	514	foreach my $item (@$items) {
458	my $biblio = GetBiblioFromItemNumber( $item->{'itemnumber'});	515	my $biblio = GetBiblioFromItemNumber( $item->{'itemnumber'});
459	push @waitingitemloop, {	516	push @waitingitemloop, {
460	biblionum => $biblio->{'biblionumber'},	517	biblionumber=> $biblio->{'biblionumber'},
461	barcode => $biblio->{'barcode'},	518	author => $biblio->{'author'},
462	title => $biblio->{'title'},	519	itemtype => $item->{'ccode'},
463	brname => $branches->{ $biblio->{'holdingbranch'} }->{'branchname'},	520	reservedate => format_date($item->{'reservedate'}),
		521	waitingdate => format_date($item->{'waitingdate'}),
		522	barcode => $item->{'barcode'},
		523	maxpickupdate=> format_date( sprintf("%d-%02d-%02d",GetMaxPickupDate($item->{'waitingdate'}, $borrower->{borrowernumber},$item ))),
		524	title => $biblio->{'title'},
		525	brname => $branches->{ $item->{'branchcode'} }->{'branchname'},
		526	waitinghere => ($item->{'branchcode'} eq $userenv_branch)
464	};	527	};
465	}	528	}
466	$flaginfo{itemloop} = \@waitingitemloop;	529	$flaginfo{itemloop} = \@waitingitemloop;
467	}	530	}
		531	elsif ( $flag =~ /DEBARRED\|LOST\|GNA/ ) {
		532	if ($flag ne "GNA"){
		533	$flag=lc($flag);
		534	}
		535	else{
		536	$flag="gonenoaddress";
		537	}
		538	%flaginfo=( $flag =>1, $flag."comment"=>$borrower->{$flag."comment"},dateend=>$flags->{uc($flag)}->{dateend});
		539	}
468	elsif ( $flag eq 'ODUES' ) {	540	elsif ( $flag eq 'ODUES' ) {
469	my $items = $flags->{$flag}->{'itemlist'};	541	my $items = $flags->{$flag}->{'itemlist'};
470	my @itemloop;	542	my @itemloop;
Lines 490-496 if ($borrower) { Link Here
490	push( @flagloop, \%flaginfo );	562	push( @flagloop, \%flaginfo );
491	}	563	}
492	$template->param(	564	$template->param(
493	flagset => $flagset,
494	flagloop => \@flagloop,	565	flagloop => \@flagloop,
495	riborrowernumber => $borrower->{'borrowernumber'},	566	riborrowernumber => $borrower->{'borrowernumber'},
496	riborcnum => $borrower->{'cardnumber'},	567	riborcnum => $borrower->{'cardnumber'},
Lines 501-507 if ($borrower) { Link Here
501	}	572	}
502		573
503	#set up so only the last 8 returned items display (make for faster loading pages)	574	#set up so only the last 8 returned items display (make for faster loading pages)
504	my $returned_counter = ( C4::Context->preference('numReturnedItemsToShow') ) ? C4::Context->preference('numReturnedItemsToShow') : 8;	575	my $returned_counter = ( C4::Context->preference('numReturnedItemsToShow') ) ? C4::Context->preference('numReturnedItemsToShow') : 10;
505	my $count = 0;	576	my $count = 0;
506	my @riloop;	577	my @riloop;
507	foreach ( sort { $a <=> $b } keys %returneditems ) {	578	foreach ( sort { $a <=> $b } keys %returneditems ) {
Lines 528-546 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here
528	else {	599	else {
529	$ri{borrowernumber} = $riborrowernumber{$_};	600	$ri{borrowernumber} = $riborrowernumber{$_};
530	}	601	}
531
532	# my %ri;	602	# my %ri;
533	my $biblio = GetBiblioFromItemNumber(GetItemnumberFromBarcode($bar_code));	603	my $biblio = GetBiblioFromItemNumber(GetItemnumberFromBarcode($bar_code));
		604	my $item = GetItem(GetItemnumberFromBarcode($bar_code));
534	# fix up item type for display	605	# fix up item type for display
535	$biblio->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $biblio->{'itype'} : $biblio->{'itemtype'};	606	$biblio->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $biblio->{'itype'} : $biblio->{'itemtype'};
536	$ri{itembiblionumber} = $biblio->{'biblionumber'};	607	$ri{itembiblionumber} = $biblio->{'biblionumber'};
537	$ri{itemtitle} = $biblio->{'title'};	608	$ri{itemtitle} = $biblio->{'title'};
538	$ri{itemauthor} = $biblio->{'author'};	609	$ri{itemauthor} = $biblio->{'author'};
539	$ri{itemtype} = $biblio->{'itemtype'};
540	$ri{itemnote} = $biblio->{'itemnotes'};	610	$ri{itemnote} = $biblio->{'itemnotes'};
541	$ri{ccode} = $biblio->{'ccode'};
542	$ri{itemnumber} = $biblio->{'itemnumber'};	611	$ri{itemnumber} = $biblio->{'itemnumber'};
		612	$ri{itemtype} = $item->{'itype'};
		613	$ri{ccode} = $item->{'ccode'};
		614	$ri{itemcallnumber} = $item->{'itemcallnumber'};
		615	$ri{homebranch} = $item->{'homebranch'};
		616	$ri{holdingbranch} = $item->{'holdingbranch'};
543	$ri{barcode} = $bar_code;	617	$ri{barcode} = $bar_code;
		618	my $shelflocations = GetKohaAuthorisedValues('items.location','');
		619	$ri{itemlocation} = $shelflocations->{$biblio->{'location'}};
		620
544	}	621	}
545	else {	622	else {
546	last;	623	last;

Lines 22-32 function check() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl (-4 / +26 lines)
22	var msg = "";	22	var msg = "";
23	var count_reserv = 0;	23	var count_reserv = 0;
24	var alreadyreserved = 0;	24	var alreadyreserved = 0;
25		25	var hold_type="";
26	// check if we have checkitem form	26	// check if we have checkitem form
27	if (document.form.checkitem){	27	if (document.form.checkitem){
28	for (i=0;i<document.form.checkitem.length;i++){	28	for (i=0;i<document.form.checkitem.length;i++){
29	if (document.form.checkitem[i].checked == true) {	29	if (document.form.checkitem[i].checked == true) {
		30	if (hold_type=="" \|\| hold_type=="single"){
		31	hold_type=document.form.hold_type[i].value;
		32	}
30	count_reserv++ ;	33	count_reserv++ ;
31	}	34	}
32	}	35	}
Lines 49-59 function check() { Link Here
49	if (count_reserv == "0"){	52	if (count_reserv == "0"){
50	msg += (_("- Please select an item to place a hold") + "\n");	53	msg += (_("- Please select an item to place a hold") + "\n");
51	}	54	}
52	if (count_reserv >= "2"){	55	if (count_reserv >= "2" && hold_type != "multiple"){
53	msg += (_("- You may only place a hold on one item at a time") + "\n");	56	msg += (_("- You may only place a hold on one item at a time") + "\n");
54	}	57	}
55		58
56	if (alreadyreserved > "0"){	59	if (alreadyreserved > "0" && hold_type != "multiple"){
57	msg += (_("- This patron had already placed a hold on this item") + "\n" + _("Please cancel the previous hold first") + "\n");	60	msg += (_("- This patron had already placed a hold on this item") + "\n" + _("Please cancel the previous hold first") + "\n");
58	}	61	}
59		62
Lines 393-399 function checkMultiHold() { Link Here
393	<!-- TMPL_LOOP Name="itemloop" -->	396	<!-- TMPL_LOOP Name="itemloop" -->
394	<tr class="<!-- TMPL_VAR NAME="backgroundcolor" -->">	397	<tr class="<!-- TMPL_VAR NAME="backgroundcolor" -->">
395	<td>	398	<td>
396	<!-- TMPL_IF NAME="available" -->	399
		400	<!-- TMPL_IF NAME="canholdmultiple" -->
		401	<input type="hidden" name="hold_type" value="multiple" />
		402	<!-- TMPL_ELSIF NAME="available" -->
		403	<input type="hidden" name="hold_type" value="single" />
		404	<!-- TMPL_ELSIF NAME="override" -->
		405	<input type="hidden" name="hold_type" value="single" />
		406	<!-- /TMPL_IF -->
		407	<!-- TMPL_IF NAME="cannothold" -->
		408	<input disabled="disabled" type="radio" name="checkitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
		409	<img src="/intranet-tmpl/<!-- TMPL_VAR NAME="theme" -->/img/famfamfam/silk/cross.png" alt="Cannot be put on hold" />
		410	<!-- TMPL_ELSE -->
		411	<!-- TMPL_IF NAME="canholdmultiple" -->
		412	<input type="checkbox" name="checkitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
		413	<!-- TMPL_ELSIF NAME="available" -->
397	<input type="radio" name="checkitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" />	414	<input type="radio" name="checkitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
398	<!-- TMPL_ELSIF NAME="override" -->	415	<!-- TMPL_ELSIF NAME="override" -->
399	<input type="radio" name="checkitem" class="needsoverride" value="<!-- TMPL_VAR NAME="itemnumber" -->" />	416	<input type="radio" name="checkitem" class="needsoverride" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
Lines 402-407 function checkMultiHold() { Link Here
402	<input disabled="disabled" type="radio" name="checkitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" />	419	<input disabled="disabled" type="radio" name="checkitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
403	<img src="/intranet-tmpl/<!-- TMPL_VAR NAME="theme" -->/img/famfamfam/silk/cross.png" alt="Cannot be put on hold" />	420	<img src="/intranet-tmpl/<!-- TMPL_VAR NAME="theme" -->/img/famfamfam/silk/cross.png" alt="Cannot be put on hold" />
404	<!-- /TMPL_IF -->	421	<!-- /TMPL_IF -->
		422	<!-- TMPL_ELSE -->
		423	<input disabled="disabled" type="radio" name="checkitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
		424	<img src="/intranet-tmpl/<!-- TMPL_VAR NAME="theme" -->/img/famfamfam/silk/cross.png" alt="Cannot be put on hold" />
		425	<!-- /TMPL_IF -->
405	</td>	426	</td>
406	<!-- TMPL_IF NAME="item_level_itypes" -->	427	<!-- TMPL_IF NAME="item_level_itypes" -->
407	<td>	428	<td>
Lines 584-589 function checkMultiHold() { Link Here
584	<!-- TMPL_LOOP Name="reserveloop" -->	605	<!-- TMPL_LOOP Name="reserveloop" -->
585	<!-- TMPL_UNLESS Name="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->	606	<!-- TMPL_UNLESS Name="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->
586	<td>	607	<td>
		608	<input type="hidden" name="reservenumber" value="<!-- TMPL_VAR NAME="reservenumber" -->" />
587	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />	609	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
588	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />	610	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
589	<select name="rank-request">	611	<select name="rank-request">

Lines 113-140 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl (-32 / +61 lines)
113	var badBib = null;	113	var badBib = null;
114	$(".confirmjs:checked").each(function() {	114	$(".confirmjs:checked").each(function() {
115	var biblioNum = $(this).val();	115	var biblioNum = $(this).val();
116	biblionumbers += biblioNum + "/";	116	var separator="/";
117	selections += biblioNum + "/";	117	biblionumbers += biblioNum + separator;
		118
		119	// Add the pickup location
		120	var branchSel = $("#branch_" + biblioNum);
		121	var branch = "";
		122	if (branchSel.size() > 0) {
		123	branch = $(branchSel).val();
		124	}
118		125
119	// If the 'specific copy' radio button is checked	126	// If the 'specific copy' radio button is checked
120	if ($("#reqspecific_" + biblioNum + ":checked").size() > 0) {	127	if ($("#reqspecific_" + biblioNum + ":checked").size() > 0) {
121	// Find the selected copy	128	// Find the selected copy
122	var item = $(".checkitem_" + biblioNum + ":checked");	129	var items = $(".checkitem_" + biblioNum + ":checked");
123	if ($(item).size() == 0) {	130	if ($(items).size() == 0) {
124	badBib = biblioNum;	131	badBib = biblioNum;
125	return false;	132	return false;
126	} else {	133	} else {
127	selections += $(item).val();	134	$(items).each( function(idx,item){
		135	selections+=biblioNum+separator+item.value+separator+branch+separator;
		136	});
128	}	137	}
129	}	138	}
130	selections += "/";	139	else {
131		140	selections=biblioNum+separator+separator+branch+separator;
132	// Add the pickup location
133	var branchSel = $("#branch_" + biblioNum);
134	if (branchSel.size() > 0) {
135	selections += $(branchSel).val();
136	}	141	}
137	selections += "/";	142
138	return true;	143	return true;
139	});	144	});
140		145
Lines 259-268 Link Here
259	<input class="single_bib" name="single_bib" type="hidden" value="<!-- TMPL_VAR NAME="biblionumber" -->"/>	264	<input class="single_bib" name="single_bib" type="hidden" value="<!-- TMPL_VAR NAME="biblionumber" -->"/>
260	<span class="confirmjs_hold" title="<!-- TMPL_VAR NAME="biblionumber" -->"></span>	265	<span class="confirmjs_hold" title="<!-- TMPL_VAR NAME="biblionumber" -->"></span>
261	<span class="confirm_nonjs">	266	<span class="confirm_nonjs">
		267	<!-- TMPL_IF Name="multi"-->
		268	<input type="checkbox" class="confirmbox checkitem <!-- TMPL_VAR NAME="checkitem_bib" -->"
		269	name="<!-- TMPL_VAR NAME="checkitem_bib" -->" checked="checked"
		270	id="<!-- TMPL_VAR NAME="checkitem_bib" -->"
		271	value="any" />
		272	<!--TMPL_ELSE-->
262	<input type="radio" class="confirmbox checkitem <!-- TMPL_VAR NAME="checkitem_bib" -->"	273	<input type="radio" class="confirmbox checkitem <!-- TMPL_VAR NAME="checkitem_bib" -->"
263	name="<!-- TMPL_VAR NAME="checkitem_bib" -->" checked="checked"	274	name="<!-- TMPL_VAR NAME="checkitem_bib" -->" checked="checked"
264	id="<!-- TMPL_VAR NAME="checkitem_bib" -->"	275	id="<!-- TMPL_VAR NAME="checkitem_bib" -->"
265	value="any" />	276	value="any" />
		277	<!-- /TMPL_IF -->
266	<label class="confirm_label" for="<!-- TMPL_VAR NAME="checkitem_bib" -->">Next available copy</label>	278	<label class="confirm_label" for="<!-- TMPL_VAR NAME="checkitem_bib" -->">Next available copy</label>
267	</span>	279	</span>
268	</td>	280	</td>
Lines 298-305 Link Here
298	<!-- TMPL_IF NAME="holdable" -->	310	<!-- TMPL_IF NAME="holdable" -->
299	<!-- TMPL_IF NAME="showpriority" -->	311	<!-- TMPL_IF NAME="showpriority" -->
300	<td>	312	<td>
301	<!-- TMPL_VAR name="rank" --> out of <!-- TMPL_VAR NAME="reservecount" -->	313	<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --><!-- TMPL_IF NAME="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!--TMPL VAR Name="subfield"--><!--/TMPL_LOOP--><!-- /TMPL_IF --></a>
302	</td><!-- /TMPL_IF --><!-- /TMPL_IF -->	314	<!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
		315	</td>
		316	<!-- TMPL_UNLESS NAME="item-level_itypes" -->
		317	<td>
		318	<!-- TMPL_UNLESS NAME="noItemTypeImages" -->
		319	<!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="" /><!-- /TMPL_IF -->
		320	<!-- /TMPL_UNLESS -->
		321	<!-- TMPL_VAR NAME="description" -->
		322	</td>
		323	<!-- /TMPL_UNLESS -->
		324	<!-- TMPL_IF NAME="showpriority" --><td>You are number <!-- TMPL_VAR name="rank" --> in line</td><!-- /TMPL_IF -->
303	<!-- TMPL_IF NAME="reserve_in_future" -->	325	<!-- TMPL_IF NAME="reserve_in_future" -->
304	<!-- TMPL_IF NAME="holdable" --><td>	326	<!-- TMPL_IF NAME="holdable" --><td>
305	<input name="reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->" id="reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->" size="10">	327	<input name="reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->" id="reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->" size="10">
Lines 418-439 Link Here
418	<!-- /TMPL_IF --><!-- /TMPL_IF -->	440	<!-- /TMPL_IF --><!-- /TMPL_IF -->
419		441
420	<!-- TMPL_UNLESS NAME="singleBranchMode" -->	442	<!-- TMPL_UNLESS NAME="singleBranchMode" -->
421	<!-- TMPL_IF NAME="holdable" -->	443	<td>
422	<!-- TMPL_IF NAME="choose_branch" -->	444	<!-- TMPL_IF NAME="OPACPickupLocation" -->
423	<td>	445	<select name="branch" id="branch_<!-- TMPL_VAR NAME="biblionumber" -->"
424	<select name="branch" id="branch_<!-- TMPL_VAR NAME="biblionumber" -->"	446	<!-- TMPL_UNLESS NAME="holdable" -->disabled="disabled"<!-- /TMPL_UNLESS --> >
425	<!-- TMPL_UNLESS NAME="holdable" -->disabled="disabled"<!-- /TMPL_UNLESS --> >	447	<!-- TMPL_LOOP NAME="branchChoicesLoop" -->
426	<!-- TMPL_LOOP NAME="branchChoicesLoop" -->	448	<!-- TMPL_IF name="selected" -->
427	<!-- TMPL_IF name="selected" -->	449	<option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
428	<option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>	450	<!-- TMPL_ELSE -->
429	<!-- TMPL_ELSE -->	451	<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option>
430	<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option>	452	<!-- /TMPL_IF -->
431	<!-- /TMPL_IF -->	453	<!-- /TMPL_LOOP -->
432	<!-- /TMPL_LOOP -->	454	</select>
433	</select>	455	<!-- TMPL_ELSE -->
434	</td>	456	<input type="hidden" name="branch" id="branch_<!-- TMPL_VAR NAME="biblionumber" -->" value="<!--TMPL_VAR Name="branch"-->" /> <!-- TMPL_VAR NAME="branchname" -->
435	<!-- /TMPL_IF -->	457	<!-- /TMPL_IF -->
436	<!-- /TMPL_IF -->	458	</td>
437	<!-- /TMPL_UNLESS -->	459	<!-- /TMPL_UNLESS -->
438	</tr>	460	</tr>
439		461
Lines 466-473 Link Here
466	<tr class="<!-- TMPL_VAR NAME="backgroundcolor" -->">	488	<tr class="<!-- TMPL_VAR NAME="backgroundcolor" -->">
467	<td>	489	<td>
468	<!-- TMPL_IF NAME="available" -->	490	<!-- TMPL_IF NAME="available" -->
469	<input type="radio" class="checkitem checkitem_<!-- TMPL_VAR NAME="biblionumber" -->" name="checkitem_<!-- TMPL_VAR NAME="biblionumber" -->"	491	<!-- TMPL_UNLESS NAME="ReservedForThisBorrower" -->
470	value="<!-- TMPL_VAR NAME="itemnumber" -->" />	492	<!-- TMPL_IF Name="canholdmultiple"-->
		493	<input type="checkbox" class="checkitem checkitem_<!-- TMPL_VAR NAME="biblionumber" -->" name="checkitem_<!-- TMPL_VAR NAME="biblionumber" -->"
		494	value="<!-- TMPL_VAR NAME="itemnumber" -->" />
		495	<!--TMPL_ELSE-->
		496	<input type="radio" class="checkitem checkitem_<!-- TMPL_VAR NAME="biblionumber" -->" name="checkitem_<!-- TMPL_VAR NAME="biblionumber" -->"
		497	value="<!-- TMPL_VAR NAME="itemnumber" -->" />
		498	<!-- /TMPL_IF -->
		499	<!-- /TMPL_UNLESS -->
471	<!-- TMPL_ELSE -->	500	<!-- TMPL_ELSE -->
472	<input disabled="disabled" type="radio" class="checkitem" name="checkitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" />	501	<input disabled="disabled" type="radio" class="checkitem" name="checkitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
473	<img src="/opac-tmpl/<!-- TMPL_VAR NAME="theme" -->/famfamfam/silk/cross.png" alt="Cannot be put on hold" title="Cannot be put on hold" />	502	<img src="/opac-tmpl/<!-- TMPL_VAR NAME="theme" -->/famfamfam/silk/cross.png" alt="Cannot be put on hold" title="Cannot be put on hold" />

Lines 99-112 my ($count,$results); Link Here

(-)a/members/member.pl (-8 / +14 lines)
99		99
100	my @searchpatron;	100	my @searchpatron;
101	push @searchpatron, $member if ($member);	101	push @searchpatron, $member if ($member);
102	push @searchpatron, $patron if (keys %$patron);	102	push @searchpatron, $patron if ( keys %$patron );
103	my $from= ($startfrom-1)*$resultsperpage;	103	my $from = ( $startfrom - 1 ) * $resultsperpage;
104	my $to=$from+$resultsperpage;	104	my $to = $from + $resultsperpage;
105	#($results)=Search(\@searchpatron,{surname=>1,firstname=>1},[$from,$to],undef,["firstname","surname","email","othernames"] ) if (@searchpatron);	105
106	my $search_scope=($quicksearch?"field_start_with":"contain");	106	#($results)=Search(\@searchpatron,{surname=>1,firstname=>1},[$from,$to],undef,["firstname","surname","email","othernames"] ) if (@searchpatron);
107	($results)=Search(\@searchpatron,\@orderby,undef,undef,["firstname","surname","email","othernames","cardnumber","userid"],$search_scope ) if (@searchpatron);	107	my $search_scope = ( $quicksearch ? "field_start_with" : "start_with" );
108	if ($results){	108	($results) = Search( \@searchpatron, \@orderby, undef, undef, [ "firstname", "surname", "othernames", "cardnumber", "userid" ], $search_scope ) if (@searchpatron);
109	$count =scalar(@$results);	109
		110	if ($results) {
		111	for my $field ('categorycode','branchcode'){
		112	next unless ($patron->{$field});
		113	@$results = grep { $_->{$field} eq $patron->{$field} } @$results;
		114	}
		115	$count = scalar(@$results);
110	}	116	}
111	my @resultsdata;	117	my @resultsdata;
112	$to=($count>$to?$to:$count);	118	$to=($count>$to?$to:$count);

Lines 41-52 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/reserve/modrequest.pl (-9 / +10 lines)
41	}	41	}
42	);	42	);
43		43
44	my @rank=$query->param('rank-request');	44	my @rank = $query->param('rank-request');
45	my @biblionumber=$query->param('biblionumber');	45	my @reservenumber = $query->param('reservenumber');
46	my @borrower=$query->param('borrowernumber');	46	my @biblionumber = $query->param('biblionumber');
47	my @branch=$query->param('pickup');	47	my @borrower = $query->param('borrowernumber');
48	my @itemnumber=$query->param('itemnumber');	48	my @branch = $query->param('pickup');
49	my $multi_hold = $query->param('multi_hold');	49	my @itemnumber = $query->param('itemnumber');
		50	my $multi_hold = $query->param('multi_hold');
50	my $biblionumbers = $query->param('biblionumbers');	51	my $biblionumbers = $query->param('biblionumbers');
51	my $count=@rank;	52	my $count=@rank;
52		53
Lines 54-62 my $CancelBiblioNumber=$query->param('CancelBiblioNumber'); Link Here
54	my $CancelBorrowerNumber=$query->param('CancelBorrowerNumber');	55	my $CancelBorrowerNumber=$query->param('CancelBorrowerNumber');
55	my $CancelItemnumber=$query->param('CancelItemnumber');	56	my $CancelItemnumber=$query->param('CancelItemnumber');
56		57
57	# 2 possibilitys : cancel an item reservation, or modify or cancel the queded list	58	# 2 possibilitys : cancel an item reservation, or modify or cancel the queued list
58		59
59	# 1) cancel an item reservation by fonction ModReserveCancelAll (in reserves.pm)	60	# 1) cancel an item reservation by function ModReserveCancelAll (in reserves.pm)
60	if ($CancelBorrowerNumber) {	61	if ($CancelBorrowerNumber) {
61	ModReserveCancelAll($CancelItemnumber, $CancelBorrowerNumber);	62	ModReserveCancelAll($CancelItemnumber, $CancelBorrowerNumber);
62	$biblionumber[0] = $CancelBiblioNumber,	63	$biblionumber[0] = $CancelBiblioNumber,
Lines 66-72 if ($CancelBorrowerNumber) { Link Here
66	else {	67	else {
67	for (my $i=0;$i<$count;$i++){	68	for (my $i=0;$i<$count;$i++){
68	undef $itemnumber[$i] unless $itemnumber[$i] ne '';	69	undef $itemnumber[$i] unless $itemnumber[$i] ne '';
69	ModReserve($rank[$i],$biblionumber[$i],$borrower[$i],$branch[$i],$itemnumber[$i]); #from C4::Reserves	70	ModReserve($rank[$i],$biblionumber[$i],$borrower[$i],$branch[$i],$itemnumber[$i],$reservenumber[$i]); #from C4::Reserves
70	}	71	}
71	}	72	}
72	my $from=$query->param('from');	73	my $from=$query->param('from');

Lines 3-9 Link Here

(-)a/reserve/placerequest.pl (-46 / +46 lines)
3	#script to place reserves/requests	3	#script to place reserves/requests
4	#writen 2/1/00 by chris@katipo.oc.nz	4	#writen 2/1/00 by chris@katipo.oc.nz
5		5
6
7	# Copyright 2000-2002 Katipo Communications	6	# Copyright 2000-2002 Katipo Communications
8	#	7	#
9	# This file is part of Koha.	8	# This file is part of Koha.
Lines 37-70 my $input = CGI->new(); Link Here
37		36
38	my ($user, $cookie, $sesion_id, $flags) = checkauth($input, 0, { reserveforothers => 'place_holds' }, 'intranet');	37	my ($user, $cookie, $sesion_id, $flags) = checkauth($input, 0, { reserveforothers => 'place_holds' }, 'intranet');
39		38
40	my @bibitems=$input->param('biblioitem');	39	my @bibitems = $input->param('biblioitem');
41	# FIXME I think reqbib does not exist anymore, it's used in line 82, to AddReserve of contraint type 'o'	40	# FIXME I think reqbib does not exist anymore, it's used in line 82, to AddReserve of contraint type 'o'
42	# I bet it's a 2.x feature, reserving a given biblioitem, that is useless in Koha 3.0	41	# I bet it's a 2.x feature, reserving a given biblioitem, that is useless in Koha 3.0
43	# we can remove this line, the AddReserve of constrainttype 'o',	42	# we can remove this line, the AddReserve of constrainttype 'o',
44	# and probably remove the reserveconstraint table as well, I never could fill anything in this table.	43	# and probably remove the reserveconstraint table as well, I never could fill anything in this table.
45	my @reqbib=$input->param('reqbib');	44	#my @reqbib = $input->param('reqbib');
46	my $biblionumber=$input->param('biblionumber');	45	my $biblionumber = $input->param('biblionumber');
47	my $borrower=$input->param('member');	46	my $borrower = $input->param('member');
48	my $notes=$input->param('notes');	47	my $notes = $input->param('notes');
49	my $branch=$input->param('pickup');	48	my $branch = $input->param('pickup');
50	my $startdate=$input->param('reserve_date') \|\| '';	49	my $startdate = $input->param('reserve_date') \|\| '';
51	my @rank=$input->param('rank-request');	50	my @rank = $input->param('rank-request');
52	my $type=$input->param('type');	51	my $type = $input->param('type');
53	my $title=$input->param('title');	52	my $title = $input->param('title');
54	my $borrowernumber=GetMember('cardnumber'=>$borrower);	53	my $borrowernumber = GetMember( 'cardnumber' => $borrower );
55	my $checkitem=$input->param('checkitem');	54	my @checkitems = $input->param('checkitem');
56	my $expirationdate = $input->param('expiration_date');	55	my $expirationdate = $input->param('expiration_date');
57		56
58	my $multi_hold = $input->param('multi_hold');	57	my $multi_hold = $input->param('multi_hold');
59	my $biblionumbers = $multi_hold ? $input->param('biblionumbers') : ($biblionumber . '/');	58	my $biblionumbers = $multi_hold ? $input->param('biblionumbers') : ( $biblionumber . '/' );
60	my $bad_bibs = $input->param('bad_bibs');	59	my $bad_bibs = $input->param('bad_bibs');
61		60
62	my %bibinfos = ();	61	my %bibinfos = ();
63	my @biblionumbers = split '/', $biblionumbers;	62	my @biblionumbers = split '/', $biblionumbers;
64	foreach my $bibnum (@biblionumbers) {	63	foreach my $bibnum (@biblionumbers) {
65	my %bibinfo = ();	64	my %bibinfo = ();
66	$bibinfo{title} = $input->param("title_$bibnum");	65	$bibinfo{title} = $input->param("title_$bibnum");
67	$bibinfo{rank} = $input->param("rank_$bibnum");	66	$bibinfo{rank} = $input->param("rank_$bibnum");
68	$bibinfos{$bibnum} = \%bibinfo;	67	$bibinfos{$bibnum} = \%bibinfo;
69	}	68	}
70		69
Lines 72-98 my $found; Link Here
72		71
73	# if we have an item selectionned, and the pickup branch is the same as the holdingbranch	72	# if we have an item selectionned, and the pickup branch is the same as the holdingbranch
74	# of the document, we force the value $rank and $found .	73	# of the document, we force the value $rank and $found .
75	if ($checkitem ne ''){	74	for my $item (@checkitems){
76	$rank[0] = '0' unless C4::Context->preference('ReservesNeedReturns');	75	if ( $item ne '' ) {
77	my $item = $checkitem;	76	$rank[0] = '0' unless C4::Context->preference('ReservesNeedReturns');
78	$item = GetItem($item);	77	my $itemdata = GetItem($item);
79	if ( $item->{'holdingbranch'} eq $branch ){	78	if ( $itemdata->{'holdingbranch'} eq $branch ) {
80	$found = 'W' unless C4::Context->preference('ReservesNeedReturns');	79	$found = 'W' unless C4::Context->preference('ReservesNeedReturns');
		80	}
81	}	81	}
82	}	82	}
83		83
84	if ($type eq 'str8' && $borrowernumber ne ''){	84	if ( $type eq 'str8' && $borrowernumber ne '' ) {
85		85
86	foreach my $biblionumber (keys %bibinfos) {	86	foreach my $biblionumber ( keys %bibinfos ) {
87	my $count=@bibitems;	87	my $count = @bibitems;
88	@bibitems=sort @bibitems;	88	@bibitems = sort @bibitems;
89	my $i2=1;	89	my $i2 = 1;
90	my @realbi;	90	my @realbi;
91	$realbi[0]=$bibitems[0];	91	$realbi[0] = $bibitems[0];
92	for (my $i=1;$i<$count;$i++) {	92	for ( my $i = 1 ; $i < $count ; $i++ ) {
93	my $i3=$i2-1;	93	my $i3 = $i2 - 1;
94	if ($realbi[$i3] ne $bibitems[$i]) {	94	if ( $realbi[$i3] ne $bibitems[$i] ) {
95	$realbi[$i2]=$bibitems[$i];	95	$realbi[$i2] = $bibitems[$i];
96	$i2++;	96	$i2++;
97	}	97	}
98	}	98	}
Lines 101-117 if ($type eq 'str8' && $borrowernumber ne ''){ Link Here
101	if ($multi_hold) {	101	if ($multi_hold) {
102	my $bibinfo = $bibinfos{$biblionumber};	102	my $bibinfo = $bibinfos{$biblionumber};
103	AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',[$biblionumber],	103	AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',[$biblionumber],
104	$bibinfo->{rank},$startdate,$expirationdate,$notes,$bibinfo->{title},$checkitem,$found);	104	$bibinfo->{rank},$startdate,$expirationdate,$notes,$bibinfo->{title},$checkitems[0],$found);
105	} else {	105	} else {
106	if ($input->param('request') eq 'any'){	106	if ( lc($input->param('request')) eq 'any' ) {
107	# place a request on 1st available	107	# place a request on 1st available
108	AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem,$found);	108	AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,undef,$found);
109	} elsif ($reqbib[0] ne ''){
110	# FIXME : elsif probably never reached, (see top of the script)
111	# place a request on a given item
112	AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'o',\@reqbib,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem, $found);
113	} else {	109	} else {
114	AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem, $found);	110	for my $item (@checkitems){
		111	AddReserve( $branch, $borrowernumber->{'borrowernumber'},
		112	$biblionumber, 'a', \@realbi, $rank[0], $startdate, $expirationdate, $notes, $title, $item, $found );
		113	$rank[0]++;
		114	}
115	}	115	}
116	}	116	}
117	}	117	}
Lines 124-131 if ($type eq 'str8' && $borrowernumber ne ''){ Link Here
124	} else {	124	} else {
125	print $input->redirect("request.pl?biblionumber=$biblionumber");	125	print $input->redirect("request.pl?biblionumber=$biblionumber");
126	}	126	}
127	} elsif ($borrowernumber eq ''){	127	} elsif ( $borrowernumber eq '' ) {
128	print $input->header();	128	print $input->header();
129	print "Invalid card number please try again";	129	print "Invalid card number please try again";
130	print $input->Dump;	130	print $input->Dump;
131	}	131	}

Lines 38-43 use C4::Biblio; Link Here

(-)a/reserve/request.pl (-21 / +27 lines)
38	use C4::Items;	38	use C4::Items;
39	use C4::Koha;	39	use C4::Koha;
40	use C4::Circulation;	40	use C4::Circulation;
		41	use C4::IssuingRules;
41	use C4::Dates qw/format_date/;	42	use C4::Dates qw/format_date/;
42	use C4::Members;	43	use C4::Members;
43	use C4::Search; # enabled_staff_search_views	44	use C4::Search; # enabled_staff_search_views
Lines 142-149 if ($cardnumber) { Link Here
142	my $number_reserves =	143	my $number_reserves =
143	GetReserveCount( $borrowerinfo->{'borrowernumber'} );	144	GetReserveCount( $borrowerinfo->{'borrowernumber'} );
144		145
145	if ( $number_reserves > C4::Context->preference('maxreserves') ) {	146	if ( not CanBookBeReserved( $borrowerinfo->{borrowernumber}, $input->param('biblionumber') ) ) {
146	$warnings = 1;	147	$warnings = 1;
147	$maxreserves = 1;	148	$maxreserves = 1;
148	}	149	}
149		150
Lines 151-157 if ($cardnumber) { Link Here
151	my $expiry_date = $borrowerinfo->{dateexpiry};	152	my $expiry_date = $borrowerinfo->{dateexpiry};
152	my $expiry = 0; # flag set if patron account has expired	153	my $expiry = 0; # flag set if patron account has expired
153	if ($expiry_date and $expiry_date ne '0000-00-00' and	154	if ($expiry_date and $expiry_date ne '0000-00-00' and
154	Date_to_Days(split /-/,$date) > Date_to_Days(split /-/,$expiry_date)) {	155	Date_to_Days(split (/-/,$date)) > Date_to_Days(split (/-/,$expiry_date))) {
155	$messages = $expiry = 1;	156	$messages = $expiry = 1;
156	}	157	}
157		158
Lines 224-230 my $borrowerinfo = GetMemberDetails( 0, $cardnumber ); Link Here
224	my @biblionumbers = ();	225	my @biblionumbers = ();
225	my $biblionumbers = $input->param('biblionumbers');	226	my $biblionumbers = $input->param('biblionumbers');
226	if ($multihold) {	227	if ($multihold) {
227	@biblionumbers = split '/', $biblionumbers;	228	@biblionumbers = split ('/', $biblionumbers);
228	} else {	229	} else {
229	push @biblionumbers, $input->param('biblionumber');	230	push @biblionumbers, $input->param('biblionumber');
230	}	231	}
Lines 250-257 foreach my $biblionumber (@biblionumbers) { Link Here
250	if ( defined $res->{found} && $res->{found} eq 'W' ) {	251	if ( defined $res->{found} && $res->{found} eq 'W' ) {
251	$count--;	252	$count--;
252	}	253	}
253		254	if ($res->{itemnumber} && not $res->{itemtype}){
254	if ( defined $borrowerinfo && ($borrowerinfo->{borrowernumber} eq $res->{borrowernumber}) ) {	255	$res->{itemtype}=GetItem($res->{itemnumber},$res->{biblionumber})->{itype};
		256	}
		257	next if CanHoldMultipleItems($res->{itemtype});
		258	if ( defined $borrowerinfo && ($borrowerinfo->{borrowernumber} eq $res->{borrowernumber}) && !CanHoldMultipleItems($res->{itemtype}) ) {
255	$warnings = 1;	259	$warnings = 1;
256	$alreadyreserved = 1;	260	$alreadyreserved = 1;
257	$biblioloopiter{warn} = 1;	261	$biblioloopiter{warn} = 1;
Lines 414-437 foreach my $biblionumber (@biblionumbers) { Link Here
414	}	418	}
415	}	419	}
416	}	420	}
417
418	my $branch = C4::Circulation::_GetCircControlBranch($item, $borrowerinfo);
419		421
420	my $branchitemrule = GetBranchItemRule( $branch, $item->{'itype'} );	422	my $branchitemrule = GetIssuingRule( $borrowerinfo->{categorycode}, $item->{'itype'}, GetReservesControlBranch( $borrowerinfo, $item ) );
421	my $policy_holdallowed = 1;	423	my $policy_holdrestricted = $branchitemrule->{'reservesallowed'};
422		424	$item->{'holdrestricted'} = $branchitemrule->{'holdrestricted'};
423	$item->{'holdallowed'} = $branchitemrule->{'holdallowed'};
424
425	if ( $branchitemrule->{'holdallowed'} == 0 \|\|
426	( $branchitemrule->{'holdallowed'} == 1 && $borrowerinfo->{'branchcode'} ne $item->{'homebranch'} ) ) {
427	$policy_holdallowed = 0;
428	}
429		425
430	if (IsAvailableForItemLevelRequest($itemnumber) and not $item->{cantreserve} and CanItemBeReserved($borrowerinfo->{borrowernumber}, $itemnumber) ) {	426	if (IsAvailableForItemLevelRequest($itemnumber) and not $item->{cantreserve} and CanItemBeReserved($borrowerinfo->{borrowernumber}, $itemnumber) ) {
431	if ( not $policy_holdallowed and C4::Context->preference( 'AllowHoldPolicyOverride' ) ) {	427	if ( not $policy_holdrestricted and C4::Context->preference( 'AllowHoldPolicyOverride' ) ) {
432	$item->{override} = 1;	428	$item->{override} = 1;
433	$num_override++;	429	$num_override++;
434	} elsif ( $policy_holdallowed ) {	430	} elsif ( $policy_holdrestricted ) {
435	$item->{available} = 1;	431	$item->{available} = 1;
436	$num_available++;	432	$num_available++;
437	}	433	}
Lines 447-456 foreach my $biblionumber (@biblionumbers) { Link Here
447	while (my $wait_hashref = $sth2->fetchrow_hashref) {	443	while (my $wait_hashref = $sth2->fetchrow_hashref) {
448	$item->{waitingdate} = format_date($wait_hashref->{waitingdate});	444	$item->{waitingdate} = format_date($wait_hashref->{waitingdate});
449	}	445	}
		446
		447	if ( BorrowerHasReserve( $borrowerinfo->{'borrowernumber'}, '', $itemnumber ) ) {
		448	$item->{available} = 0;
		449	$item->{override} = 0;
		450	}
		451	$item->{canholdmultiple}=CanHoldMultipleItems($item->{itype}) && $item->{available};
		452	$item->{cannothold}=!CanHoldMultipleItems($item->{itype});
		453
450	push @{ $biblioitem->{itemloop} }, $item;	454	push @{ $biblioitem->{itemloop} }, $item;
451	}	455	}
452		456	if ( $num_override > 0) {
453	if ( $num_override == scalar( @{ $biblioitem->{itemloop} } ) ) { # That is, if all items require an override
454	$template->param( override_required => 1 );	457	$template->param( override_required => 1 );
455	} elsif ( $num_available == 0 ) {	458	} elsif ( $num_available == 0 ) {
456	$template->param( none_available => 1 );	459	$template->param( none_available => 1 );
Lines 471-476 foreach my $biblionumber (@biblionumbers) { Link Here
471	$a_found cmp $b_found;	474	$a_found cmp $b_found;
472	} @$reserves ) {	475	} @$reserves ) {
473	my %reserve;	476	my %reserve;
		477
		478	$reserve{'reservenumber'} = $res->{'reservenumber'};
		479
474	my @optionloop;	480	my @optionloop;
475	for ( my $i = 1 ; $i <= $totalcount ; $i++ ) {	481	for ( my $i = 1 ; $i <= $totalcount ; $i++ ) {
476	push(	482	push(

Lines 50-61 sub startup_create_detailed_borrower : Test( startup => 2 ) { Link Here

(-)a/t/db_dependent/lib/KohaTest/Members/GetMemberDetails.pm (-4 / +2 lines)
50	$description = 'Test account';	50	$description = 'Test account';
51	$type = 'M';	51	$type = 'M';
52	$amount = 5.00;	52	$amount = 5.00;
53	$user = '';	53	$note = '';
54		54
55	my $acct_added =	55	my $acct_added =
56	C4::Accounts::manualinvoice( $borrowernumber, undef, $description, $type, $amount,	56	C4::Accounts::manualinvoice( $borrowernumber, undef, $description, $type, $amount, $note );
57	$user );
58
59	ok( $acct_added == 0, 'added account for borrower' );	57	ok( $acct_added == 0, 'added account for borrower' );
60		58
61	$self->{amountoutstanding} = $amount;	59	$self->{amountoutstanding} = $amount;