Attachment #4854 for bug #5872

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

Line 0 Link Here

(-)a/.gitmodules (+3 lines)
	1	[submodule "koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jeditable"]
	2	path = koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jeditable
	3	url = https://github.com/tuupola/jquery_jeditable.git




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
	);
	
}

=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' ), $itype, $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 GetHardDueDate

  my ($hardduedate,$hardduedatecompare) = &GetHardDueDate($borrowertype,$itemtype,branchcode)

Get the Hard Due Date and it's comparison for an itemtype, a borrower type and a branch

=cut

sub GetHardDueDate {
    my ( $borrowertype, $itemtype, $branchcode ) = @_;
    my $dbh = C4::Context->dbh;
    my $sth =
      $dbh->prepare(
"select hardduedate, hardduedatecompare from issuingrules where categorycode=? and itemtype=? and branchcode=?"
      );
    $sth->execute( $borrowertype, $itemtype, $branchcode );
    my $results = $sth->fetchrow_hashref;
    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
      if defined($results) && $results->{hardduedate} ne 'NULL';

    $sth->execute( $borrowertype, "*", $branchcode );
    $results = $sth->fetchrow_hashref;
    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
      if defined($results) && $results->{hardduedate} ne 'NULL';

    $sth->execute( "*", $itemtype, $branchcode );
    $results = $sth->fetchrow_hashref;
    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
      if defined($results) && $results->{hardduedate} ne 'NULL';

    $sth->execute( "*", "*", $branchcode );
    $results = $sth->fetchrow_hashref;
    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
      if defined($results) && $results->{hardduedate} ne 'NULL';

    $sth->execute( $borrowertype, $itemtype, "*" );
    $results = $sth->fetchrow_hashref;
    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
      if defined($results) && $results->{hardduedate} ne 'NULL';

    $sth->execute( $borrowertype, "*", "*" );
    $results = $sth->fetchrow_hashref;
    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
      if defined($results) && $results->{hardduedate} ne 'NULL';

    $sth->execute( "*", $itemtype, "*" );
    $results = $sth->fetchrow_hashref;
    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
      if defined($results) && $results->{hardduedate} ne 'NULL';

    $sth->execute( "*", "*", "*" );
    $results = $sth->fetchrow_hashref;
    return (C4::Dates->new($results->{hardduedate}, 'iso'),$results->{hardduedatecompare})
      if defined($results) && $results->{hardduedate} ne 'NULL';

    # if no rule is set => return undefined
    return (undef, undef);
}

=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 or $messages->{'NotIssued'}) 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};
    } else {

    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 );
        warn "RENEWALPERIOD : ".$loanlength->{renewalperiod};
        my $renewalperiod = $loanlength->{renewalperiod} || GetLoanLength( $borrower->{'categorycode'}, $itype, $controlbranch );

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

        $datedue = (C4::Context->preference('RenewalPeriodBase') eq 'date_due') ?
                                        C4::Dates->new($issuedata->{date_due}, 'iso') :
                                        C4::Dates->new();
        $datedue =  CalcDateDue($datedue,$itemtype,$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 );

C<$itemtype>  = itemtype code of item in question
C<$branch>  = location whose calendar to use
C<$borrower> = Borrower object
C<$renewalperiod> = if it's a renewal, give the duration of the renew. If empty, it will be set to initial checkout duration

=cut

sub CalcDateDue { 
	my ($startdate,$itemtype,$branch,$borrower,$renewalperiod) = @_;
	my $datedue;
        my $loanlength = GetLoanLength($borrower->{'categorycode'},$itemtype, $branch);

	# if globalDueDate ON the datedue is set to that date
    my $rule = GetIssuingRule($borrower->{'categorycode'},$itemtype, $branch);
	if ( C4::Context->preference('globalDueDate')
             && ( C4::Context->preference('globalDueDate') =~ C4::Dates->regexp('syspref') ) ) {
            $datedue = C4::Dates->new( C4::Context->preference('globalDueDate') );
	} else {
	# otherwise, calculate the datedue as normal
        my $loanlength = $renewalperiod || $rule->{issuelength};
		if(C4::Context->preference('useDaysMode') eq 'Days') {  # ignoring calendar
			my $timedue = time + ($loanlength) * 86400;
		#FIXME - assumes now even though we take a startdate 

		}
	}

    my ($hardduedate, $hardduedatecompare) = $rule->{qw(hardduedate hardduedatecompare)};
	if ( $hardduedate and $hardduedate ne '0000-00-00') {
	if ( $hardduedate && $hardduedate->output('iso') && $hardduedate->output('iso') ne '0000-00-00') {
            # if the calculated due date is after the 'before' Hard Due Date (ceiling), override
            if ( $datedue->output( 'iso' ) gt $hardduedate && $hardduedatecompare == -1) {
                $datedue = C4::Dates->new( $hardduedate );
            # if the calculated date is before the 'after' Hard Due Date (floor), override
            } elsif ( $datedue->output( 'iso' ) lt $hardduedate && $hardduedatecompare == 1) {
                $datedue = C4::Dates->new( $hardduedate );               
            # if the hard due date is set to 'exactly', overrride
            } elsif ( $hardduedatecompare == 0) {
                $datedue = C4::Dates->new( $hardduedate );
            }
            # in all other cases, keep the date due as it is
	}


=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);
}

1;
  1;

__END__





package C4::IssuingRules;

# Copyright 2009 BibLibre SARL
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use warnings;
use C4::Context;
use C4::Koha;
use C4::SQLHelper qw( SearchInTable InsertInTable UpdateInTable DeleteInTable );
eval {
   my $servers = C4::Context->config('memcached_servers');
   if ($servers) {
      require Memoize::Memcached;
      import Memoize::Memcached qw(memoize_memcached flush_cache);
      my $memcached = {
             servers    => [$servers],
             key_prefix => C4::Context->config('memcached_namespace') || 'koha',
      };
      memoize_memcached( 'GetIssuingRule',        memcached => $memcached, expire_time => 600000 );    #cache for 10 minutes
      memoize_memcached( 'GetIssuingRules',        memcached => $memcached, expire_time => 600000 );    #cache for 10 minutes
   }

};
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);

BEGIN {
	# set the version for version checking
	$VERSION = 3.0.5;
	@ISA    = qw(Exporter);
	@EXPORT = qw(
	    &GetIssuingRule
		&GetIssuingRulesByBranchCode
		&GetIssuingRules
		&AddIssuingRule
		&ModIssuingRule
		&DelIssuingRule
	);
}

=head1 NAME

C4::IssuingRules - Koha issuing rules module

=head1 SYNOPSIS

use C4::IssuingRules;

=head1 DESCRIPTION

The functions in this module deal with issuing rules.

=head1 FUNCTIONS

=head2 GetIssuingRule

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

my $rule = &GetIssuingRule($categorycode, $itemtype, $branchcode);

The rules are applied from most specific to less specific, using the first found in this order:
    * same library, same patron type, same item type
    * same library, same patron type, default item type
    * same library, default patron type, same item type
    * same library, default patron type, default item type
    * default library, same patron type, same item type
    * default library, same patron type, default item type
    * default library, default patron type, same item type
    * default library, default patron type, default item type

The values in the returned hashref are inherited from a more generic rules if undef.

=cut
#Caching GetIssuingRule

sub GetIssuingRule {
    my ( $categorycode, $itemtype, $branchcode ) = @_;
    $categorycode||="*";
    $itemtype||="*";
    $branchcode||="*";

    # This configuration table defines the order of inheritance. We'll loop over it.
    my @attempts = (
        [ "*"          , "*"      , "*"         ],
        [ "*"          , $itemtype, "*"         ],
        [ $categorycode, "*"      , "*"         ],
        [ $categorycode, $itemtype, "*"         ],
        [ "*"          , "*"      , $branchcode ],
        [ "*"          , $itemtype, $branchcode ],
        [ $categorycode, "*"      , $branchcode ],
        [ $categorycode, $itemtype, $branchcode ],
    );

    # This complex query returns a nested hashref, so we can access a rule using :
    # my $rule = $$rules{$categorycode}{$itemtype}{$branchcode};
    # this will be usefull in the inheritance computation code
    my $dbh = C4::Context->dbh;
    my $rules = $dbh->selectall_hashref(
        "SELECT * FROM issuingrules where branchcode IN ('*',?) and itemtype IN ('*', ?) and categorycode IN ('*',?)",
        ["branchcode", "itemtype", "categorycode"],
        undef,
        ( $branchcode, $itemtype, $categorycode )
    );

    # This block is for inheritance. It loops over rules returned by the 
    # previous query. If a value is found in a more specific rule, it replaces 
    # the old value from the more generic rule.
    my $oldrule;
    for my $attempt ( @attempts ) {
        if ( my $rule = $$rules{@$attempt[2]}{@$attempt[1]}{@$attempt[0]} ) {
            if ( $oldrule ) {
                for ( keys %$oldrule ) {
                    if ( defined $rule->{$_} ) {
                        $oldrule->{$_} = $rule->{$_};
                    }
                }
            } else {
                $oldrule = $rule;
            }
        }
    }
    if($oldrule){
        return $oldrule;
    }else{
        return {
            'itemtype'          => $itemtype,
            'categorycode'      => $categorycode,
            'branchcode'        => $branchcode,
            'holdspickupdelay'  => 0,
       #     'maxissueqty'       => 0,
            'renewalsallowed'   => 0,
            'firstremind'       => 0,
            'accountsent'       => 0,
            'reservecharge'     => 0,
            'fine'              => 0,
            'restrictedtype'    => 0,
            'rentaldiscount'    => 0,
            'chargename'        => 0,
            'finedays'          => 0,
            'holdrestricted'    => 0,
            'allowonshelfholds' => 0,
            'reservesallowed'   => 0,
            'chargeperiod'      => 0,
       #     'issuelength'       => 0,
            'renewalperiod'     => 0,
        };
    }
}

=head2 GetIssuingRulesByBranchCode
  
  my @issuingrules = &GetIssuingRulesByBranchCode($branchcode);

  Retruns a list of hashref from the issuingrules Koha table for a given 
  branchcode.
  Each hashref will contain data from issuingrules plus human readable names of 
  patron and item categories.

=cut

sub GetIssuingRulesByBranchCode {
    my $dbh = C4::Context->dbh;
    my $sth = $dbh->prepare("
        SELECT issuingrules.*, itemtypes.description AS humanitemtype, categories.description AS humancategorycode
        FROM issuingrules
        LEFT JOIN itemtypes
            ON (itemtypes.itemtype = issuingrules.itemtype)
        LEFT JOIN categories
            ON (categories.categorycode = issuingrules.categorycode)
        WHERE issuingrules.branchcode = ?
        ORDER BY humancategorycode, humanitemtype
    ");
    $sth->execute(shift);
    
    my $res = $sth->fetchall_arrayref({});
    
    return @$res;
}

=head2 GetIssuingRules
  
  my @issuingrules = &GetIssuingRules({
      branchcode   => $branch, 
      categorycode => $input->param('categorycode'), 
      itemtype     => $input->param('itemtype'),
  });

  Get an issuing rule from Koha database.
  An alias for SearchInTable, see C4::SQLHelper for more help.

=cut

sub GetIssuingRules {
    my $res = SearchInTable('issuingrules', shift);
    return @$res;
}

=head2 AddIssuingRule

  my $issuingrule = {
      branchcode      => $branch,
      categorycode    => $input->param('categorycode'),
      itemtype        => $input->param('itemtype'),
      maxissueqty     => $maxissueqty,
      renewalsallowed => $input->param('renewalsallowed'),
      reservesallowed => $input->param('reservesallowed'),
      issuelength     => $input->param('issuelength'),
      fine            => $input->param('fine'),
      finedays        => $input->param('finedays'),
      firstremind     => $input->param('firstremind'),
      chargeperiod    => $input->param('chargeperiod'),
  };
  
  &AddIssuingRule( $issuingrule );

  Adds an issuing rule to Koha database.
  An alias for InsertInTable, see C4::SQLHelper for more help.

=cut

sub AddIssuingRule { InsertInTable('issuingrules',shift); }

=head2 ModIssuingRule
  
  &ModIssuingRule( $issuingrule );

  Update an issuing rule of the Koha database.
  An alias for UpdateInTable, see C4::SQLHelper for more help.

=cut

sub ModIssuingRule { 
    if (C4::Context->config('memcached_servers')){
        flush_cache('GetIssuingRule');
        flush_cache('GetIssuingRules');
    }
    UpdateInTable('issuingrules',shift); 
}

=head2 DelIssuingRule
  
  DelIssuingRule({
      branchcode   => $branch, 
      categorycode => $input->param('categorycode'), 
      itemtype     => $input->param('itemtype'),
  });

  Delete an issuing rule from Koha database.
  An alias for DeleteInTable, see C4::SQLHelper for more help.

=cut

sub DelIssuingRule { DeleteInTable('issuingrules',shift); }

1;

=head1 AUTHOR

Koha Developement team <info@koha.org>

Jean-André Santoni <jeanandre.santoni@biblibre.com>

=cut

Lines 1041-1046 sub GetPendingIssues { Link Here

(-)a/C4/Members.pm (+2 lines)
1041	$bquery .= " OR" if ($i < (scalar(@borrowernumbers) - 1));	1041	$bquery .= " OR" if ($i < (scalar(@borrowernumbers) - 1));
1042	}	1042	}
1043		1043
		1044	$bquery="1" unless $bquery; # if nothing, set to 1 (true) to avoid a SQL error
		1045
1044	# must avoid biblioitems.* to prevent large marc and marcxml fields from killing performance	1046	# must avoid biblioitems.* to prevent large marc and marcxml fields from killing performance
1045	# FIXME: namespace collision: each table has "timestamp" fields. Which one is "timestamp" ?	1047	# FIXME: namespace collision: each table has "timestamp" fields. Which one is "timestamp" ?
1046	# FIXME: circ/ciculation.pl tries to sort by timestamp!	1048	# FIXME: circ/ciculation.pl tries to sort by timestamp!




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();


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 (-187 / +445 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-387 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
382	sub CanBookBeReserved{	430	sub CanBookBeReserved{
383	my ($borrowernumber, $biblionumber) = @_;	431	my ($borrowernumber, $biblionumber) = @_;
384
385	my @items = GetItemsInfo($biblionumber);	432	my @items = GetItemsInfo($biblionumber);
386	foreach my $item (@items){	433	foreach my $item (@items){
387	return 1 if CanItemBeReserved($borrowernumber, $item->{itemnumber});	434	return 1 if CanItemBeReserved($borrowernumber, $item->{itemnumber});
Lines 399-405 This function return 1 if an item can be issued by this borrower. Link Here
399		446
400	sub CanItemBeReserved{	447	sub CanItemBeReserved{
401	my ($borrowernumber, $itemnumber) = @_;	448	my ($borrowernumber, $itemnumber) = @_;
402
403	my $dbh = C4::Context->dbh;	449	my $dbh = C4::Context->dbh;
404	my $allowedreserves = 0;	450	my $allowedreserves = 0;
405		451
Lines 407-413 sub CanItemBeReserved{ Link Here
407	my $itype = C4::Context->preference('item-level_itypes') ? "itype" : "itemtype";	453	my $itype = C4::Context->preference('item-level_itypes') ? "itype" : "itemtype";
408		454
409	# we retrieve borrowers and items informations #	455	# we retrieve borrowers and items informations #
410	my $item = GetItem($itemnumber);	456	my $item = C4::Items::GetItem($itemnumber);
411	my $borrower = C4::Members::GetMember('borrowernumber'=>$borrowernumber);	457	my $borrower = C4::Members::GetMember('borrowernumber'=>$borrowernumber);
412		458
413	# we retrieve user rights on this itemtype and branchcode	459	# we retrieve user rights on this itemtype and branchcode
Lines 438-459 sub CanItemBeReserved{ Link Here
438	my $branchfield = "reserves.branchcode";	484	my $branchfield = "reserves.branchcode";
439		485
440	if( $controlbranch eq "ItemHomeLibrary" ){	486	if( $controlbranch eq "ItemHomeLibrary" ){
441	$branchfield = "items.homebranch";	487	my $field=C4::Context->preference("HomeOrHoldingBranch")\|\|"homebranch";
442	$branchcode = $item->{homebranch};	488	$branchfield = "items.$field";
		489	$branchcode = $item->{$field};
443	}elsif( $controlbranch eq "PatronLibrary" ){	490	}elsif( $controlbranch eq "PatronLibrary" ){
444	$branchfield = "borrowers.branchcode";	491	$branchfield = "borrowers.branchcode";
445	$branchcode = $borrower->{branchcode};	492	$branchcode = $borrower->{branchcode};
446	}	493	}
447		494
448	# we retrieve rights	495	# we retrieve user rights on this itemtype and branchcode
449	$sth->execute($categorycode, $itemtype, $branchcode);	496	my $issuingrule = GetIssuingRule($borrower->{categorycode}, $item->{$itype}, $branchcode);
450	if(my $rights = $sth->fetchrow_hashref()){	497	return 0 if( defined $issuingrule->{reservesallowed} && not $issuingrule->{reservesallowed} );
451	$itemtype = $rights->{itemtype};	498
452	$allowedreserves = $rights->{reservesallowed};	499	# We retrieve the count of reserves allowed for this category code
		500	$issuingrule = GetIssuingRule ($borrower->{categorycode}, "", "");
		501
		502	if($issuingrule){
		503	$itemtype = $issuingrule->{itemtype};
		504	$allowedreserves = $issuingrule->{reservesallowed};
453	}else{	505	}else{
454	$itemtype = '*';	506	$itemtype = '*';
455	}	507	}
456		508
		509	return 0 if ($issuingrule->{reservesallowed}==0 \|\|
		510	($issuingrule->{holdrestricted}== 1 && !($branchcode eq $borrower->{branchcode}))
		511	);
457	# we retrieve count	512	# we retrieve count
458		513
459	$querycount .= "AND $branchfield = ?";	514	$querycount .= "AND $branchfield = ?";
Lines 479-484 sub CanItemBeReserved{ Link Here
479	return 0;	534	return 0;
480	}	535	}
481	}	536	}
		537
		538	=item GetMaxPickupDelay
		539
		540	$resallowed = &GetMaxPickupDelay($borrowernumber, $itemnumber)
		541
		542	this function return the number of allowed reserves.
		543
		544	=cut
		545
		546	sub GetMaxPickupDelay {
		547	my ($borrowernumber, $itemnumber) = @_;
		548
		549	my $dbh = C4::Context->dbh;
		550	my $allowedreserves = 0;
		551
		552	my $itype = C4::Context->preference('item-level_itypes') ? "itype" : "itemtype";
		553
		554	# we retrieve borrowers and items informations #
		555	my $item = C4::Items::GetItem($itemnumber);
		556	my $borrower = C4::Members::GetMember('borrowernumber'=>$borrowernumber);
		557	my $controlbranch = GetReservesControlBranch($borrower,$item);
		558
		559	# we retrieve user rights on this itemtype and branchcode
		560	my $sth = $dbh->prepare("SELECT holdspickupdelay
		561	FROM issuingrules
		562	WHERE categorycode=?
		563	AND itemtype=?
		564	AND branchcode=?
		565	AND holdspickupdelay IS NOT NULL"
		566	);
		567
		568	my $itemtype = $item->{$itype};
		569	my $borrowertype = $borrower->{categorycode};
		570	my $branchcode = $controlbranch;
		571
		572	$sth->execute( $borrowertype, $itemtype, $branchcode );
		573	my $pickupdelay = $sth->fetchrow_hashref;
		574	return $pickupdelay->{holdspickupdelay}
		575	if defined($pickupdelay) && $pickupdelay->{holdspickupdelay} ne 'NULL';
		576
		577	$sth->execute( $borrowertype, "*", $branchcode );
		578	$pickupdelay = $sth->fetchrow_hashref;
		579	return $pickupdelay->{holdspickupdelay}
		580	if defined($pickupdelay) && $pickupdelay->{holdspickupdelay} ne 'NULL';
		581
		582	$sth->execute( "*", $itemtype, $branchcode );
		583	$pickupdelay = $sth->fetchrow_hashref;
		584	return $pickupdelay->{holdspickupdelay}
		585	if defined($pickupdelay) && $pickupdelay->{holdspickupdelay} ne 'NULL';
		586
		587	$sth->execute( "", "", $branchcode );
		588	$pickupdelay = $sth->fetchrow_hashref;
		589	return $pickupdelay->{holdspickupdelay}
		590	if defined($pickupdelay) && $pickupdelay->{holdspickupdelay} ne 'NULL';
		591
		592	$sth->execute( $borrowertype, $itemtype, "*" );
		593	$pickupdelay = $sth->fetchrow_hashref;
		594	return $pickupdelay->{holdspickupdelay}
		595	if defined($pickupdelay) && $pickupdelay->{holdspickupdelay} ne 'NULL';
		596
		597	$sth->execute( $borrowertype, "", "" );
		598	$pickupdelay = $sth->fetchrow_hashref;
		599	return $pickupdelay->{holdspickupdelay}
		600	if defined($pickupdelay) && $pickupdelay->{holdspickupdelay} ne 'NULL';
601
602	$sth->execute( "", $itemtype, "" );
603	$pickupdelay = $sth->fetchrow_hashref;
604	return $pickupdelay->{holdspickupdelay}
605	if defined($pickupdelay) && $pickupdelay->{holdspickupdelay} ne 'NULL';
606
607	$sth->execute( "", "", "*" );
608	$pickupdelay = $sth->fetchrow_hashref;
609	return $pickupdelay->{holdspickupdelay}
610	if defined($pickupdelay) && $pickupdelay->{holdspickupdelay} ne 'NULL';
611
612	# if nothing found, return no rights
613	return 0;
614	}
615
616	=item GetMaxPickupDate
617
618	$maxpickupdate = &GetMaxPickupDate($date);
619
620	this function return the max pickup date.
621	(e.g. : the date after which the hold will be considered cancelled)
622
623	=cut
624
625	sub GetMaxPickupDate{
626	my $inputdate=shift;
627	my $borrowernumber=shift;
628	my $item=shift;
629	return unless $inputdate;
630	my @date = split(/-/,$inputdate);
631	my $delay = GetMaxPickupDelay($borrowernumber, $item->{'itemnumber'});
632	( @date ) =
633	Add_Delta_Days( @date[0..2], $delay);
634	return @date;
635	}
636
482	#--------------------------------------------------------------------------------	637	#--------------------------------------------------------------------------------
483	=head2 GetReserveCount	638	=head2 GetReserveCount
484		639
Lines 518-538 sub GetOtherReserves { Link Here
518	my $nextreservinfo;	673	my $nextreservinfo;
519	my ( $restype, $checkreserves ) = CheckReserves($itemnumber);	674	my ( $restype, $checkreserves ) = CheckReserves($itemnumber);
520	if ($checkreserves) {	675	if ($checkreserves) {
521	my $iteminfo = GetItem($itemnumber);	676	my $iteminfo = C4::Items::GetItem($itemnumber);
522	if ( $iteminfo->{'holdingbranch'} ne $checkreserves->{'branchcode'} ) {	677	if ( $iteminfo->{'holdingbranch'} ne $checkreserves->{'branchcode'} ) {
523	$messages->{'transfert'} = $checkreserves->{'branchcode'};	678	$messages->{'transfert'} = $checkreserves->{'branchcode'};
524	#minus priorities of others reservs	679	#minus priorities of others reservs
525	ModReserveMinusPriority(	680	ModReserveMinusPriority(
526	$itemnumber,	681	$itemnumber,
527	$checkreserves->{'borrowernumber'},	682	$checkreserves->{'borrowernumber'},
528	$iteminfo->{'biblionumber'}	683	$iteminfo->{'biblionumber'},
		684	$checkreserves->{'reservenumber'}
529	);	685	);
530		686
531	#launch the subroutine dotransfer	687	#launch the subroutine dotransfer
532	C4::Items::ModItemTransfer(	688	C4::Items::ModItemTransfer(
533	$itemnumber,	689	$itemnumber,
534	$iteminfo->{'holdingbranch'},	690	$iteminfo->{'holdingbranch'},
535	$checkreserves->{'branchcode'}	691	$checkreserves->{'branchcode'},
536	),	692	),
537	;	693	;
538	}	694	}
Lines 543-549 sub GetOtherReserves { Link Here
543	ModReserveMinusPriority(	699	ModReserveMinusPriority(
544	$itemnumber,	700	$itemnumber,
545	$checkreserves->{'borrowernumber'},	701	$checkreserves->{'borrowernumber'},
546	$iteminfo->{'biblionumber'}	702	$iteminfo->{'biblionumber'},
		703	$checkreserves->{'reservenumber'}
547	);	704	);
548	ModReserveStatus($itemnumber,'W');	705	ModReserveStatus($itemnumber,'W');
549	}	706	}
Lines 657-662 sub GetReserveFee { Link Here
657	return $fee;	814	return $fee;
658	}	815	}
659		816
		817	=head2 GetReservesControlBranch
		818
		819	$branchcode = &GetReservesControlBranch($borrower, $item)
		820
		821	Returns the branchcode to consider to check hold rules against
		822
		823	=cut
		824	sub GetReservesControlBranch{
		825	my ($borrower, $item) = @_;
		826	my $controlbranch = C4::Context->preference('ReservesControlBranch');
		827	my $hbr = C4::Context->preference('HomeOrHoldingBranch')\|\|"homebranch";
		828	my $branchcode="*";
		829	if($controlbranch eq "ItemHomeLibrary"){
		830	$branchcode = $item->{$hbr};
		831	} elsif($controlbranch eq "PatronLibrary"){
		832	$branchcode = $borrower->{'branchcode'};
		833	}
		834	return $branchcode;
		835	}
		836
660	=head2 GetReservesToBranch	837	=head2 GetReservesToBranch
661		838
662	@transreserv = GetReservesToBranch( $frombranch );	839	@transreserv = GetReservesToBranch( $frombranch );
Lines 804-815 sub CheckReserves { Link Here
804	} else {	981	} else {
805	# See if this item is more important than what we've got so far	982	# See if this item is more important than what we've got so far
806	if ( $res->{'priority'} && $res->{'priority'} < $priority ) {	983	if ( $res->{'priority'} && $res->{'priority'} < $priority ) {
807	my $borrowerinfo=C4::Members::GetMemberDetails($res->{'borrowernumber'});
808	my $iteminfo=C4::Items::GetItem($itemnumber);
809	my $branch=C4::Circulation::_GetCircControlBranch($iteminfo,$borrowerinfo);
810	my $branchitemrule = C4::Circulation::GetBranchItemRule($branch,$iteminfo->{'itype'});
811	next if ($branchitemrule->{'holdallowed'} == 0);
812	next if (($branchitemrule->{'holdallowed'} == 1) && ($branch ne $borrowerinfo->{'branchcode'}));
813	$priority = $res->{'priority'};	984	$priority = $res->{'priority'};
814	$highest = $res;	985	$highest = $res;
815	}	986	}
Lines 846-868 sub CancelExpiredReserves { Link Here
846	$sth->execute();	1017	$sth->execute();
847		1018
848	while ( my $res = $sth->fetchrow_hashref() ) {	1019	while ( my $res = $sth->fetchrow_hashref() ) {
849	CancelReserve( $res->{'biblionumber'}, '', $res->{'borrowernumber'} );	1020	CancelReserve( $res->{'reservenumber'}, $res->{'biblionumber'} );
850	}	1021	}
851		1022
852	}	1023	}
853		1024
854	=head2 CancelReserve	1025	=head2 CancelReserve
855		1026
856	&CancelReserve($biblionumber, $itemnumber, $borrowernumber);	1027	&CancelReserve( $reservenumber, $biblionumber );
857		1028
858	Cancels a reserve.	1029	Cancels a reserve.
859		1030
860	Use either C<$biblionumber> or C<$itemnumber> to specify the item to	1031	C<$reservenumber> is the unique key for the reserve to be canceled.
861	cancel, but not both: if both are given, C<&CancelReserve> does
862	nothing.
863
864	C<$borrowernumber> is the borrower number of the patron on whose
865	behalf the book was reserved.
866		1032
867	If C<$biblionumber> was given, C<&CancelReserve> also adjusts the	1033	If C<$biblionumber> was given, C<&CancelReserve> also adjusts the
868	priorities of the other people who are waiting on the book.	1034	priorities of the other people who are waiting on the book.
Lines 870-878 priorities of the other people who are waiting on the book. Link Here
870	=cut	1036	=cut
871		1037
872	sub CancelReserve {	1038	sub CancelReserve {
873	my ( $biblio, $item, $borr ) = @_;	1039	my ( $reservenumber, $biblio ) = @_;
874	my $dbh = C4::Context->dbh;	1040	my $dbh = C4::Context->dbh;
875	if ( $item and $borr ) {	1041
		1042	my $sth = $dbh->prepare('SELECT * FROM reserves WHERE reservenumber = ?');
		1043	$sth->execute( $reservenumber );
		1044	my $reserve = $sth->fetchrow_hashref();
		1045
		1046	if ( $reserve->{'found'} eq 'W' ) {
876	# removing a waiting reserve record....	1047	# removing a waiting reserve record....
877	# update the database...	1048	# update the database...
878	my $query = "	1049	my $query = "
Lines 880-906 sub CancelReserve { Link Here
880	SET cancellationdate = now(),	1051	SET cancellationdate = now(),
881	found = Null,	1052	found = Null,
882	priority = 0	1053	priority = 0
883	WHERE itemnumber = ?	1054	WHERE reservenumber = ?
884	AND borrowernumber = ?
885	";	1055	";
886	my $sth = $dbh->prepare($query);	1056	my $sth = $dbh->prepare($query);
887	$sth->execute( $item, $borr );	1057	$sth->execute( $reservenumber );
888	$sth->finish;	1058
		1059	# get reserve information to place into old_reserves
889	$query = "	1060	$query = "
890	INSERT INTO old_reserves	1061	INSERT INTO old_reserves
891	SELECT * FROM reserves	1062	SELECT * FROM reserves
892	WHERE itemnumber = ?	1063	WHERE reservenumber = ?
893	AND borrowernumber = ?
894	";	1064	";
895	$sth = $dbh->prepare($query);	1065	$sth = $dbh->prepare($query);
896	$sth->execute( $item, $borr );	1066	$sth->execute( $reservenumber );
		1067	my $holditem = $sth->fetchrow_hashref;
		1068	my $insert_fields = '';
		1069	my $value_fields = '';
		1070	foreach my $column ('borrowernumber','reservedate','biblionumber','constrainttype','branchcode','notificationdate','reminderdate','cancellationdate','reservenotes','priority','found','itemnumber','waitingdate','expirationdate') {
		1071	if (defined($holditem->{$column})) {
		1072	if (length($insert_fields)) {
		1073	$insert_fields .= ",$column";
		1074	$value_fields .= ",\'$holditem->{$column}\'";
		1075	}
		1076	else {
		1077	$insert_fields .= "$column";
		1078	$value_fields .= "\'$holditem->{$column}\'";
		1079	}
		1080	}
		1081	}
		1082	$query = qq/
		1083	INSERT INTO old_reserves ($insert_fields)
		1084	VALUES ($value_fields)
		1085	/;
		1086	$sth = $dbh->prepare($query);
		1087	$sth->execute();
897	$query = "	1088	$query = "
898	DELETE FROM reserves	1089	DELETE FROM reserves
899	WHERE itemnumber = ?	1090	WHERE reservenumber = ?
900	AND borrowernumber = ?
901	";	1091	";
902	$sth = $dbh->prepare($query);	1092	$sth = $dbh->prepare($query);
903	$sth->execute( $item, $borr );	1093	$sth->execute( $reservenumber );
904	}	1094	}
905	else {	1095	else {
906	# removing a reserve record....	1096	# removing a reserve record....
Lines 908-959 sub CancelReserve { Link Here
908	my $priority;	1098	my $priority;
909	my $query = qq/	1099	my $query = qq/
910	SELECT priority FROM reserves	1100	SELECT priority FROM reserves
911	WHERE biblionumber = ?	1101	WHERE reservenumber = ?
912	AND borrowernumber = ?
913	AND cancellationdate IS NULL	1102	AND cancellationdate IS NULL
914	AND itemnumber IS NULL	1103	AND itemnumber IS NULL
915	/;	1104	/;
916	my $sth = $dbh->prepare($query);	1105	my $sth = $dbh->prepare($query);
917	$sth->execute( $biblio, $borr );	1106	$sth->execute( $reservenumber );
918	($priority) = $sth->fetchrow_array;	1107	($priority) = $sth->fetchrow_array;
919	$sth->finish;	1108	$sth->finish;
920	$query = qq/	1109	$query = qq/
921	UPDATE reserves	1110	UPDATE reserves
922	SET cancellationdate = now(),	1111	SET cancellationdate = now(),
923	found = Null,	1112	found = Null,
924	priority = 0	1113	priority = 0,
925	WHERE biblionumber = ?	1114	expirationdate = NULL
926	AND borrowernumber = ?	1115	WHERE reservenumber = ?
927	/;	1116	/;
928		1117
929	# update the database, removing the record...	1118	# update the database, removing the record...
930	$sth = $dbh->prepare($query);	1119	$sth = $dbh->prepare($query);
931	$sth->execute( $biblio, $borr );	1120	$sth->execute( $reservenumber );
932	$sth->finish;
933		1121
934	$query = qq/	1122	$query = qq/
935	INSERT INTO old_reserves	1123	INSERT INTO old_reserves
936	SELECT * FROM reserves	1124	SELECT * FROM reserves
937	WHERE biblionumber = ?	1125	WHERE reservenumber = ?
938	AND borrowernumber = ?	1126	/;
		1127	$sth = $dbh->prepare($query);
		1128	$sth->execute( $reservenumber );
		1129	my $holditem = $sth->fetchrow_hashref;
		1130
		1131	my $insert_fields = '';
		1132	my $value_fields = '';
		1133	foreach my $column ('borrowernumber','reservedate','biblionumber','constrainttype','branchcode','notificationdate','reminderdate','cancellationdate','reservenotes','priority','found','itemnumber','waitingdate','expirationdate') {
		1134	if (defined($holditem->{$column})) {
		1135	if (length($insert_fields)) {
		1136	$insert_fields .= ",$column";
		1137	$value_fields .= ",\'$holditem->{$column}\'";
		1138	}
		1139	else {
		1140	$insert_fields .= "$column";
		1141	$value_fields .= "\'$holditem->{$column}\'";
		1142	}
		1143	}
		1144	}
		1145	$query = qq/
		1146	INSERT INTO old_reserves ($insert_fields)
		1147	VALUES ($value_fields)
939	/;	1148	/;
940	$sth = $dbh->prepare($query);	1149	$sth = $dbh->prepare($query);
941	$sth->execute( $biblio, $borr );	1150	$sth->execute();
942		1151
943	$query = qq/	1152	$query = qq/
944	DELETE FROM reserves	1153	DELETE FROM reserves
945	WHERE biblionumber = ?	1154	WHERE reservenumber = ?
946	AND borrowernumber = ?
947	/;	1155	/;
948	$sth = $dbh->prepare($query);	1156	$sth = $dbh->prepare($query);
949	$sth->execute( $biblio, $borr );	1157	$sth->execute( $reservenumber );
950		1158
951	# now fix the priority on the others....	1159	# now fix the priority on the others....
952	_FixPriority( $biblio, $borr );	1160	_FixPriority( '', '', $priority,'', $reservenumber );
953	}	1161	}
954	}	1162	}
955		1163
956	=head2 ModReserve	1164	=item ModReserve
		1165
		1166	=over 4
957		1167
958	ModReserve($rank, $biblio, $borrower, $branch[, $itemnumber])	1168	ModReserve($rank, $biblio, $borrower, $branch[, $itemnumber])
959		1169
Lines 986-1037 itemnumber and supplying itemnumber. Link Here
986		1196
987	sub ModReserve {	1197	sub ModReserve {
988	#subroutine to update a reserve	1198	#subroutine to update a reserve
989	my ( $rank, $biblio, $borrower, $branch , $itemnumber) = @_;	1199	my ( $rank, $biblio, $borrower, $branch , $itemnumber, $reservenumber) = @_;
990	return if $rank eq "W";	1200	return if $rank eq "W";
991	return if $rank eq "n";	1201	return if $rank eq "n";
992	my $dbh = C4::Context->dbh;	1202	my $dbh = C4::Context->dbh;
993	if ( $rank eq "del" ) {	1203	if ( $rank eq "del" ) {
994	my $query = qq/	1204	my $query = qq/
995	UPDATE reserves	1205	UPDATE reserves
996	SET cancellationdate=now()	1206	SET cancellationdate=now(),
997	WHERE biblionumber = ?	1207	expirationdate = NULL
998	AND borrowernumber = ?	1208	WHERE reservenumber = ?
999	/;	1209	/;
1000	my $sth = $dbh->prepare($query);	1210	my $sth = $dbh->prepare($query);
1001	$sth->execute( $biblio, $borrower );	1211	$sth->execute( $reservenumber );
1002	$sth->finish;	1212	$sth->finish;
1003	$query = qq/	1213	$query = qq/
1004	INSERT INTO old_reserves	1214	INSERT INTO old_reserves
1005	SELECT *	1215	SELECT * FROM reserves
1006	FROM reserves	1216	WHERE reservenumber = ?
1007	WHERE biblionumber = ?
1008	AND borrowernumber = ?
1009	/;	1217	/;
1010	$sth = $dbh->prepare($query);	1218	$sth = $dbh->prepare($query);
1011	$sth->execute( $biblio, $borrower );	1219	$sth->execute( $reservenumber );
1012	$query = qq/	1220	$query = qq/
1013	DELETE FROM reserves	1221	DELETE FROM reserves
1014	WHERE biblionumber = ?	1222	WHERE reservenumber = ?
1015	AND borrowernumber = ?
1016	/;	1223	/;
1017	$sth = $dbh->prepare($query);	1224	$sth = $dbh->prepare($query);
1018	$sth->execute( $biblio, $borrower );	1225	$sth->execute( $reservenumber );
1019		1226
1020	}	1227	}
1021	elsif ($rank =~ /^\d+/ and $rank > 0) {	1228	elsif ($rank =~ /^\d+/ and $rank > 0) {
1022	my $query = qq/	1229	my $query = qq/
1023	UPDATE reserves SET priority = ? ,branchcode = ?, itemnumber = ?, found = NULL, waitingdate = NULL	1230	UPDATE reserves SET priority = ? ,branchcode = ?, itemnumber = ?, found = NULL, waitingdate = NULL
1024	WHERE biblionumber = ?	1231	WHERE reservenumber = ?
1025	AND borrowernumber = ?
1026	/;	1232	/;
1027	my $sth = $dbh->prepare($query);	1233	my $sth = $dbh->prepare($query);
1028	$sth->execute( $rank, $branch,$itemnumber, $biblio, $borrower);	1234	$sth->execute( $rank, $branch, $itemnumber, $reservenumber );
1029	$sth->finish;	1235	$sth->finish;
1030	_FixPriority( $biblio, $borrower, $rank);	1236	_FixPriority( $biblio, $borrower, $rank, '', $reservenumber);
1031	}	1237	}
1032	}	1238	}
1033		1239
1034	=head2 ModReserveFill	1240	=item ModReserveFill
1035		1241
1036	&ModReserveFill($reserve);	1242	&ModReserveFill($reserve);
1037		1243
Lines 1050-1065 sub ModReserveFill { Link Here
1050	my $biblionumber = $res->{'biblionumber'};	1256	my $biblionumber = $res->{'biblionumber'};
1051	my $borrowernumber = $res->{'borrowernumber'};	1257	my $borrowernumber = $res->{'borrowernumber'};
1052	my $resdate = $res->{'reservedate'};	1258	my $resdate = $res->{'reservedate'};
		1259	my $resnumber = $res->{'reservenumber'};
1053		1260
1054	# get the priority on this record....	1261	# get the priority on this record....
1055	my $priority;	1262	my $priority;
1056	my $query = "SELECT priority	1263	my $query = "SELECT priority
1057	FROM reserves	1264	FROM reserves
1058	WHERE biblionumber = ?	1265	WHERE borrowernumber = ?
1059	AND borrowernumber = ?	1266	AND reservenumber = ?
1060	AND reservedate = ?";	1267	AND reservedate = ?";
1061	my $sth = $dbh->prepare($query);	1268	my $sth = $dbh->prepare($query);
1062	$sth->execute( $biblionumber, $borrowernumber, $resdate );	1269	$sth->execute( $resnumber, $borrowernumber, $resdate );
1063	($priority) = $sth->fetchrow_array;	1270	($priority) = $sth->fetchrow_array;
1064	$sth->finish;	1271	$sth->finish;
1065		1272
Lines 1067-1101 sub ModReserveFill { Link Here
1067	$query = "UPDATE reserves	1274	$query = "UPDATE reserves
1068	SET found = 'F',	1275	SET found = 'F',
1069	priority = 0	1276	priority = 0
1070	WHERE biblionumber = ?	1277	WHERE reservenumber = ?
1071	AND reservedate = ?	1278	AND reservedate = ?
1072	AND borrowernumber = ?	1279	AND borrowernumber = ?
1073	";	1280	";
1074	$sth = $dbh->prepare($query);	1281	$sth = $dbh->prepare($query);
1075	$sth->execute( $biblionumber, $resdate, $borrowernumber );	1282	$sth->execute( $resnumber, $resdate, $borrowernumber );
1076	$sth->finish;	1283	$sth->finish;
1077		1284
1078	# move to old_reserves	1285	# move to old_reserves
1079	$query = "INSERT INTO old_reserves	1286	$query = "INSERT INTO old_reserves
1080	SELECT * FROM reserves	1287	SELECT * FROM reserves
1081	WHERE biblionumber = ?	1288	WHERE reservenumber = ?
1082	AND reservedate = ?	1289	AND reservedate = ?
1083	AND borrowernumber = ?	1290	AND borrowernumber = ?
1084	";	1291	";
1085	$sth = $dbh->prepare($query);	1292	$sth = $dbh->prepare($query);
1086	$sth->execute( $biblionumber, $resdate, $borrowernumber );	1293	$sth->execute( $resnumber, $resdate, $borrowernumber );
1087	$query = "DELETE FROM reserves	1294	$query = "DELETE FROM reserves
1088	WHERE biblionumber = ?	1295	WHERE reservenumber = ?
1089	AND reservedate = ?	1296	AND reservedate = ?
1090	AND borrowernumber = ?	1297	AND borrowernumber = ?
1091	";	1298	";
1092	$sth = $dbh->prepare($query);	1299	$sth = $dbh->prepare($query);
1093	$sth->execute( $biblionumber, $resdate, $borrowernumber );	1300	$sth->execute( $resnumber, $resdate, $borrowernumber );
1094		1301
1095	# now fix the priority on the others (if the priority wasn't	1302	# now fix the priority on the others (if the priority wasn't
1096	# already sorted!)....	1303	# already sorted!)....
1097	unless ( $priority == 0 ) {	1304	unless ( $priority == 0 ) {
1098	_FixPriority( $biblionumber, $borrowernumber );	1305	_FixPriority( $priority, $biblionumber,undef,undef, $res->{reservenumber} );
1099	}	1306	}
1100	}	1307	}
1101		1308
Lines 1112-1118 $newstatus is the new status. Link Here
1112	=cut	1319	=cut
1113		1320
1114	sub ModReserveStatus {	1321	sub ModReserveStatus {
1115
1116	#first : check if we have a reservation for this item .	1322	#first : check if we have a reservation for this item .
1117	my ($itemnumber, $newstatus) = @_;	1323	my ($itemnumber, $newstatus) = @_;
1118	my $dbh = C4::Context->dbh;	1324	my $dbh = C4::Context->dbh;
Lines 1146-1154 take care of the waiting status Link Here
1146	=cut	1352	=cut
1147		1353
1148	sub ModReserveAffect {	1354	sub ModReserveAffect {
1149	my ( $itemnumber, $borrowernumber,$transferToDo ) = @_;	1355	my ( $itemnumber, $borrowernumber,$transferToDo, $reservenumber ) = @_;
1150	my $dbh = C4::Context->dbh;	1356	my $dbh = C4::Context->dbh;
1151
1152	# we want to attach $itemnumber to $borrowernumber, find the biblionumber	1357	# we want to attach $itemnumber to $borrowernumber, find the biblionumber
1153	# attached to $itemnumber	1358	# attached to $itemnumber
1154	my $sth = $dbh->prepare("SELECT biblionumber FROM items WHERE itemnumber=?");	1359	my $sth = $dbh->prepare("SELECT biblionumber FROM items WHERE itemnumber=?");
Lines 1166-1192 sub ModReserveAffect { Link Here
1166	$query = "	1371	$query = "
1167	UPDATE reserves	1372	UPDATE reserves
1168	SET priority = 0,	1373	SET priority = 0,
1169	itemnumber = ?,	1374	itemnumber = ?
1170	found = 'T'	1375	WHERE reservenumber = ?
1171	WHERE borrowernumber = ?
1172	AND biblionumber = ?
1173	";	1376	";
1174	}	1377	}
1175	else {	1378	else {
1176	# affect the reserve to Waiting as well.	1379	# affect the reserve to Waiting as well.
1177	$query = "	1380	my $holdperiod = C4::Context->preference('ReservesMaxPickUpDelay');
1178	UPDATE reserves	1381	if ((!defined($holdperiod)) \|\| ($holdperiod eq '') \|\| ($holdperiod == 0)) {
1179	SET priority = 0,	1382	$query = "
1180	found = 'W',	1383	UPDATE reserves
1181	waitingdate=now(),	1384	SET priority = 0,
1182	itemnumber = ?	1385	found = 'W',
1183	WHERE borrowernumber = ?	1386	waitingdate=now(),
1184	AND biblionumber = ?	1387	itemnumber = ?
1185	";	1388	WHERE reservenumber = ?
		1389	";
		1390	}
		1391	else {
		1392	my ($holdexpyear,$holdexpmonth,$holdexpday) = Today();
		1393	my $holdstartdate = C4::Dates->new(sprintf "%02d/%02d/%04d",$holdexpmonth,$holdexpday,$holdexpyear, 'us');
		1394
		1395	# Grab branch for calendar purposes
		1396	$sth = $dbh->prepare("SELECT branchcode FROM reserves WHERE borrowernumber=? AND biblionumber=?");
		1397	$sth->execute($borrowernumber,$biblionumber);
		1398	my ($branch) = $sth->fetchrow;
		1399
		1400	# Check to see if hold expiration date falls on a closed library day.
		1401	# Note the useDaysMode syspref will need to be set to Calendar for
		1402	# the code to advance to the next non-closed day.
		1403	my $calendar = C4::Calendar->new( branchcode => $branch);
		1404	my $holdexpdate = $calendar->addDate($holdstartdate, $holdperiod);
		1405	my $sqlexpdate = $holdexpdate->output('iso');
		1406	$query = "
		1407	UPDATE reserves
		1408	SET priority = 0,
		1409	found = 'W',
		1410	waitingdate=now(),
		1411	itemnumber = ?,
		1412	expirationdate='$sqlexpdate'
		1413	WHERE reservenumber = ?
		1414	";
		1415	}
1186	}	1416	}
1187	$sth = $dbh->prepare($query);	1417	$sth = $dbh->prepare($query);
1188	$sth->execute( $itemnumber, $borrowernumber,$biblionumber);	1418	$sth->execute( $itemnumber, $reservenumber );
1189	_koha_notify_reserve( $itemnumber, $borrowernumber, $biblionumber ) if ( !$transferToDo && !$already_on_shelf );	1419	_koha_notify_reserve( $itemnumber, $borrowernumber, $biblionumber, $reservenumber ) if ( !$transferToDo && !$already_on_shelf );
1190		1420
1191	if ( C4::Context->preference("ReturnToShelvingCart") ) {	1421	if ( C4::Context->preference("ReturnToShelvingCart") ) {
1192	CartToShelf( $itemnumber );	1422	CartToShelf( $itemnumber );
Lines 1226-1248 Reduce the values of queuded list Link Here
1226	=cut	1456	=cut
1227		1457
1228	sub ModReserveMinusPriority {	1458	sub ModReserveMinusPriority {
1229	my ( $itemnumber, $borrowernumber, $biblionumber ) = @_;	1459	my ( $itemnumber, $borrowernumber, $biblionumber, $reservenumber ) = @_;
1230
1231	#first step update the value of the first person on reserv	1460	#first step update the value of the first person on reserv
1232	my $dbh = C4::Context->dbh;	1461	my $dbh = C4::Context->dbh;
1233	my $query = "	1462	my $query = "
1234	UPDATE reserves	1463	UPDATE reserves
1235	SET priority = 0 , itemnumber = ?	1464	SET priority = 0 , itemnumber = ?
1236	WHERE borrowernumber=?	1465	WHERE reservenumber=?
1237	AND biblionumber=?
1238	";	1466	";
1239	my $sth_upd = $dbh->prepare($query);	1467	my $sth_upd = $dbh->prepare($query);
1240	$sth_upd->execute( $itemnumber, $borrowernumber, $biblionumber );	1468	$sth_upd->execute( $itemnumber, $reservenumber );
1241	# second step update all others reservs	1469	# second step update all others reservs
1242	_FixPriority($biblionumber, $borrowernumber, '0');	1470	_FixPriority($biblionumber, $borrowernumber, '0', '', $reservenumber);
1243	}	1471	}
1244		1472
1245	=head2 GetReserveInfo	1473	=item GetReserveInfo
1246		1474
1247	&GetReserveInfo($borrowernumber,$biblionumber);	1475	&GetReserveInfo($borrowernumber,$biblionumber);
1248		1476
Lines 1327-1333 and canreservefromotherbranches. Link Here
1327	sub IsAvailableForItemLevelRequest {	1555	sub IsAvailableForItemLevelRequest {
1328	my $itemnumber = shift;	1556	my $itemnumber = shift;
1329		1557
1330	my $item = GetItem($itemnumber);	1558	my $item = C4::Items::GetItem($itemnumber);
1331		1559
1332	# must check the notforloan setting of the itemtype	1560	# must check the notforloan setting of the itemtype
1333	# FIXME - a lot of places in the code do this	1561	# FIXME - a lot of places in the code do this
Lines 1362-1371 sub IsAvailableForItemLevelRequest { Link Here
1362	$notforloan_per_itemtype;	1590	$notforloan_per_itemtype;
1363		1591
1364		1592
1365	if (C4::Context->preference('AllowOnShelfHolds')) {	1593	if (CanHoldOnShelf($itemnumber)) {
1366	return $available_per_item;	1594	return $available_per_item;
1367	} else {	1595	} else {
1368	return ($available_per_item and ($item->{onloan} or GetReserveStatus($itemnumber) eq "W"));	1596	return ($available_per_item and ($item->{onloan} or GetReserveStatus($itemnumber) eq "W"));
1369	}	1597	}
1370	}	1598	}
1371		1599
Lines 1393-1407 sub AlterPriority { Link Here
1393		1621
1394	my $priority = $reserve->{'priority'};	1622	my $priority = $reserve->{'priority'};
1395	$priority = $where eq 'up' ? $priority - 1 : $priority + 1;	1623	$priority = $where eq 'up' ? $priority - 1 : $priority + 1;
1396	_FixPriority( $biblionumber, $borrowernumber, $priority )	1624	_FixPriority( $biblionumber, $borrowernumber, $priority ,undef,$reserve->{reservenumber})
1397		1625
1398	} elsif ( $where eq 'top' ) {	1626	} elsif ( $where eq 'top' ) {
1399		1627
1400	_FixPriority( $biblionumber, $borrowernumber, '1' )	1628	_FixPriority( $biblionumber, $borrowernumber, '1',undef,$reserve->{reservenumber} )
1401		1629
1402	} elsif ( $where eq 'bottom' ) {	1630	} elsif ( $where eq 'bottom' ) {
1403		1631
1404	_FixPriority( $biblionumber, $borrowernumber, '999999' )	1632	_FixPriority( $biblionumber, $borrowernumber, '999999',undef,$reserve->{reservenumber} )
1405		1633
1406	}	1634	}
1407	}	1635	}
Lines 1424-1441 sub ToggleLowestPriority { Link Here
1424	WHERE biblionumber = ?	1652	WHERE biblionumber = ?
1425	AND borrowernumber = ?"	1653	AND borrowernumber = ?"
1426	);	1654	);
1427	$sth->execute(	1655	$sth->execute( $biblionumber, $borrowernumber, );
1428	$biblionumber,
1429	$borrowernumber,
1430	);
1431	$sth->finish;	1656	$sth->finish;
1432		1657
1433	_FixPriority( $biblionumber, $borrowernumber, '999999' );	1658	_FixPriority( $biblionumber, $borrowernumber, '999999' );
1434	}	1659	}
1435		1660
		1661	=head2 CanHoldOnShelf
		1662
		1663	my $canhold = &CanHoldOnShelf($itemnumber);
		1664
		1665	Check if a book can be hold on shelf.
		1666
		1667	=cut
		1668
		1669	sub CanHoldOnShelf {
		1670	my ($itemnumber) = @_;
		1671
		1672	my $item = C4::Items::GetItem($itemnumber);
		1673	my $itemtype = C4::Context->preference('item-level_itypes');
		1674	$itemtype = $itemtype ? $item->{itype} : $item->{itemtype} ;
		1675	my $branch = $item->{C4::Context->preference('HomeOrHoldingBranch')};
		1676
		1677	my $issuingrule = GetIssuingRule('*', $itemtype, $branch);
		1678	return $issuingrule->{allowonshelfholds};
		1679
		1680	}
		1681
		1682	sub CanHoldMultipleItems {
		1683	my ( $itemtype ) = @_;
		1684
		1685	my @multi_itemtypes = split( / /, C4::Context->preference('AllowMultipleHoldsPerBib') );
		1686	for my $mtype ( @multi_itemtypes ) {
		1687	if ( $itemtype eq $mtype ) {
		1688	return 1;
		1689	}
		1690	}
		1691
		1692	return 0;
		1693	}
		1694
1436	=head2 _FixPriority	1695	=head2 _FixPriority
1437		1696
1438	&_FixPriority($biblio,$borrowernumber,$rank,$ignoreSetLowestRank);	1697	&_FixPriority($biblio,$borrowernumber,$rank,$ignoreSetLowestRank,$reservenumber);
1439		1698
1440	Only used internally (so don't export it)	1699	Only used internally (so don't export it)
1441	Changed how this functions works #	1700	Changed how this functions works #
Lines 1447-1453 in new priority rank Link Here
1447	=cut	1706	=cut
1448		1707
1449	sub _FixPriority {	1708	sub _FixPriority {
1450	my ( $biblio, $borrowernumber, $rank, $ignoreSetLowestRank ) = @_;	1709	my ( $biblio, $borrowernumber, $rank, $ignoreSetLowestRank, $reservenumber ) = @_;
1451	my $dbh = C4::Context->dbh;	1710	my $dbh = C4::Context->dbh;
1452	if ( $rank eq "del" ) {	1711	if ( $rank eq "del" ) {
1453	CancelReserve( $biblio, undef, $borrowernumber );	1712	CancelReserve( $biblio, undef, $borrowernumber );
Lines 1458-1469 sub _FixPriority { Link Here
1458	my $query = qq/	1717	my $query = qq/
1459	UPDATE reserves	1718	UPDATE reserves
1460	SET priority = 0	1719	SET priority = 0
1461	WHERE biblionumber = ?	1720	WHERE reservenumber = ?
1462	AND borrowernumber = ?	1721	AND found IN ('W',"T")
1463	AND found IN ('W', 'T')
1464	/;	1722	/;
1465	my $sth = $dbh->prepare($query);	1723	my $sth = $dbh->prepare($query);
1466	$sth->execute( $biblio, $borrowernumber );	1724	$sth->execute( $reservenumber );
1467	}	1725	}
1468	my @priority;	1726	my @priority;
1469	my @reservedates;	1727	my @reservedates;
Lines 1474-1480 sub _FixPriority { Link Here
1474	# This is wrong a waiting reserve has W set	1732	# This is wrong a waiting reserve has W set
1475	# The assumption that having an itemnumber set means waiting is wrong and should be corrected any place it occurs	1733	# The assumption that having an itemnumber set means waiting is wrong and should be corrected any place it occurs
1476	my $query = qq/	1734	my $query = qq/
1477	SELECT borrowernumber, reservedate, constrainttype	1735	SELECT borrowernumber, reservedate, constrainttype, reservenumber
1478	FROM reserves	1736	FROM reserves
1479	WHERE biblionumber = ?	1737	WHERE biblionumber = ?
1480	AND ((found <> 'W' AND found <> 'T') or found is NULL)	1738	AND ((found <> 'W' AND found <> 'T') or found is NULL)
Lines 1509-1524 sub _FixPriority { Link Here
1509	$query = "	1767	$query = "
1510	UPDATE reserves	1768	UPDATE reserves
1511	SET priority = ?	1769	SET priority = ?
1512	WHERE biblionumber = ?	1770	WHERE reservenumber = ?
1513	AND borrowernumber = ?
1514	AND reservedate = ?	1771	AND reservedate = ?
1515	AND found IS NULL	1772	AND found IS NULL
1516	";	1773	";
1517	$sth = $dbh->prepare($query);	1774	$sth = $dbh->prepare($query);
1518	for ( my $j = 0 ; $j < @priority ; $j++ ) {	1775	for ( my $j = 0 ; $j < @priority ; $j++ ) {
1519	$sth->execute(	1776	$sth->execute(
1520	$j + 1, $biblio,	1777	$j + 1,
1521	$priority[$j]->{'borrowernumber'},	1778	$priority[$j]->{'reservenumber'},
1522	$priority[$j]->{'reservedate'}	1779	$priority[$j]->{'reservedate'}
1523	);	1780	);
1524	$sth->finish;	1781	$sth->finish;
Lines 1558-1572 sub _Findgroupreserve { Link Here
1558	# TODO: consolidate at least the SELECT portion of the first 2 queries to a common $select var.	1815	# TODO: consolidate at least the SELECT portion of the first 2 queries to a common $select var.
1559	# check for exact targetted match	1816	# check for exact targetted match
1560	my $item_level_target_query = qq/	1817	my $item_level_target_query = qq/
1561	SELECT reserves.biblionumber AS biblionumber,	1818	SELECT reserves.reservenumber AS reservenumber,
1562	reserves.borrowernumber AS borrowernumber,	1819	reserves.biblionumber AS biblionumber,
1563	reserves.reservedate AS reservedate,	1820	reserves.borrowernumber AS borrowernumber,
1564	reserves.branchcode AS branchcode,	1821	reserves.reservedate AS reservedate,
1565	reserves.cancellationdate AS cancellationdate,	1822	reserves.branchcode AS branchcode,
1566	reserves.found AS found,	1823	reserves.cancellationdate AS cancellationdate,
1567	reserves.reservenotes AS reservenotes,	1824	reserves.found AS found,
1568	reserves.priority AS priority,	1825	reserves.reservenotes AS reservenotes,
1569	reserves.timestamp AS timestamp,	1826	reserves.priority AS priority,
		1827	reserves.timestamp AS timestamp,
1570	biblioitems.biblioitemnumber AS biblioitemnumber,	1828	biblioitems.biblioitemnumber AS biblioitemnumber,
1571	reserves.itemnumber AS itemnumber	1829	reserves.itemnumber AS itemnumber
1572	FROM reserves	1830	FROM reserves
Lines 1588-1602 sub _Findgroupreserve { Link Here
1588		1846
1589	# check for title-level targetted match	1847	# check for title-level targetted match
1590	my $title_level_target_query = qq/	1848	my $title_level_target_query = qq/
1591	SELECT reserves.biblionumber AS biblionumber,	1849	SELECT reserves.reservenumber AS reservenumber,
1592	reserves.borrowernumber AS borrowernumber,	1850	reserves.biblionumber AS biblionumber,
1593	reserves.reservedate AS reservedate,	1851	reserves.borrowernumber AS borrowernumber,
1594	reserves.branchcode AS branchcode,	1852	reserves.reservedate AS reservedate,
1595	reserves.cancellationdate AS cancellationdate,	1853	reserves.branchcode AS branchcode,
1596	reserves.found AS found,	1854	reserves.cancellationdate AS cancellationdate,
1597	reserves.reservenotes AS reservenotes,	1855	reserves.found AS found,
1598	reserves.priority AS priority,	1856	reserves.reservenotes AS reservenotes,
1599	reserves.timestamp AS timestamp,	1857	reserves.priority AS priority,
		1858	reserves.timestamp AS timestamp,
1600	biblioitems.biblioitemnumber AS biblioitemnumber,	1859	biblioitems.biblioitemnumber AS biblioitemnumber,
1601	reserves.itemnumber AS itemnumber	1860	reserves.itemnumber AS itemnumber
1602	FROM reserves	1861	FROM reserves
Lines 1617-1632 sub _Findgroupreserve { Link Here
1617	return @results if @results;	1876	return @results if @results;
1618		1877
1619	my $query = qq/	1878	my $query = qq/
1620	SELECT reserves.biblionumber AS biblionumber,	1879	SELECT reserves.reservenumber AS reservenumber,
1621	reserves.borrowernumber AS borrowernumber,	1880	reserves.biblionumber AS biblionumber,
1622	reserves.reservedate AS reservedate,	1881	reserves.borrowernumber AS borrowernumber,
1623	reserves.waitingdate AS waitingdate,	1882	reserves.reservedate AS reservedate,
1624	reserves.branchcode AS branchcode,	1883	reserves.branchcode AS branchcode,
1625	reserves.cancellationdate AS cancellationdate,	1884	reserves.cancellationdate AS cancellationdate,
1626	reserves.found AS found,	1885	reserves.found AS found,
1627	reserves.reservenotes AS reservenotes,	1886	reserves.reservenotes AS reservenotes,
1628	reserves.priority AS priority,	1887	reserves.priority AS priority,
1629	reserves.timestamp AS timestamp,	1888	reserves.timestamp AS timestamp,
1630	reserveconstraints.biblioitemnumber AS biblioitemnumber,	1889	reserveconstraints.biblioitemnumber AS biblioitemnumber,
1631	reserves.itemnumber AS itemnumber	1890	reserves.itemnumber AS itemnumber
1632	FROM reserves	1891	FROM reserves
Lines 1658-1664 ModReserveAffect, _not_ ModReserveFill) Link Here
1658	=cut	1917	=cut
1659		1918
1660	sub _koha_notify_reserve {	1919	sub _koha_notify_reserve {
1661	my ($itemnumber, $borrowernumber, $biblionumber) = @_;	1920	my ($itemnumber, $borrowernumber, $biblionumber, $reservenumber) = @_;
1662		1921
1663	my $dbh = C4::Context->dbh;	1922	my $dbh = C4::Context->dbh;
1664	my $borrower = C4::Members::GetMember(borrowernumber => $borrowernumber);	1923	my $borrower = C4::Members::GetMember(borrowernumber => $borrowernumber);
Lines 1678-1698 sub _koha_notify_reserve { Link Here
1678	my $messagingprefs;	1937	my $messagingprefs;
1679	if ( $to_address \|\| $borrower->{'smsalertnumber'} ) {	1938	if ( $to_address \|\| $borrower->{'smsalertnumber'} ) {
1680	$messagingprefs = C4::Members::Messaging::GetMessagingPreferences( { borrowernumber => $borrowernumber, message_name => 'Hold_Filled' } );	1939	$messagingprefs = C4::Members::Messaging::GetMessagingPreferences( { borrowernumber => $borrowernumber, message_name => 'Hold_Filled' } );
1681
1682	return if ( !defined( $messagingprefs->{'letter_code'} ) );	1940	return if ( !defined( $messagingprefs->{'letter_code'} ) );
1683	$letter_code = $messagingprefs->{'letter_code'};	1941	$letter_code = $messagingprefs->{'letter_code'};
1684	} else {	1942	} else {
1685	$letter_code = 'HOLD_PRINT';	1943	$letter_code = 'HOLD';
1686	$print_mode = 1;	1944	$print_mode = 1;
1687	}	1945	}
1688		1946
1689	my $sth = $dbh->prepare("	1947	my $sth = $dbh->prepare("
1690	SELECT *	1948	SELECT *
1691	FROM reserves	1949	FROM reserves
1692	WHERE borrowernumber = ?	1950	WHERE reservenumber = ?
1693	AND biblionumber = ?
1694	");	1951	");
1695	$sth->execute( $borrowernumber, $biblionumber );	1952	$sth->execute( $reservenumber );
1696	my $reserve = $sth->fetchrow_hashref;	1953	my $reserve = $sth->fetchrow_hashref;
1697	my $branch_details = GetBranchDetail( $reserve->{'branchcode'} );	1954	my $branch_details = GetBranchDetail( $reserve->{'branchcode'} );
1698		1955
Lines 1705-1710 sub _koha_notify_reserve { Link Here
1705	C4::Letters::parseletter( $letter, 'borrowers', $borrowernumber );	1962	C4::Letters::parseletter( $letter, 'borrowers', $borrowernumber );
1706	C4::Letters::parseletter( $letter, 'biblio', $biblionumber );	1963	C4::Letters::parseletter( $letter, 'biblio', $biblionumber );
1707	C4::Letters::parseletter( $letter, 'reserves', $borrowernumber, $biblionumber );	1964	C4::Letters::parseletter( $letter, 'reserves', $borrowernumber, $biblionumber );
		1965	C4::Letters::parseletter( $letter, 'items', $itemnumber );
1708		1966
1709	if ( $reserve->{'itemnumber'} ) {	1967	if ( $reserve->{'itemnumber'} ) {
1710	C4::Letters::parseletter( $letter, 'items', $reserve->{'itemnumber'} );	1968	C4::Letters::parseletter( $letter, 'items', $reserve->{'itemnumber'} );




#!/usr/bin/perl

# 2009 BibLibre <jeanandre.santoni@biblibre.com>

# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA
#

use CGI;
use C4::Auth;
use C4::IssuingRules qw(ModIssuingRule GetIssuingRule);

my $cgi = CGI->new;

# get the status of the user, this will check his credentials and rights
my ($status, $cookie, $sessionId) = C4::Auth::check_api_auth($cgi, undef);

my $result;

if ($status eq 'ok') { # if authentication is ok

    # Get the POST data
    my $branchcode   = $cgi->param('branchcode');
    my $categorycode = $cgi->param('categorycode');
    my $itemtype     = $cgi->param('itemtype');
    my $varname      = $cgi->param('varname');
    my $inputvalue   = $cgi->param('inputvalue') eq '' ? undef : $cgi->param('inputvalue');
    
    # Modify the existing rule
    ModIssuingRule({
        branchcode   => $branchcode,
        categorycode => $categorycode,
        itemtype     => $itemtype,
        $varname     => $inputvalue,
    });
    
    # Compute inheritance, and return the new value;
    my $rule = GetIssuingRule($categorycode, $itemtype, $branchcode);
    
    $result = $rule->{$varname};
    $result = C4::Dates->new($rule->{$varname},'iso')->output() if ($varname eq 'hardduedate');
    if ($varname eq 'fine') {
        my $num_formatter;
        my $cur_format = C4::Context->preference("CurrencyFormat");
        use Number::Format;
        if ( $cur_format eq 'FR' ) {
            $num_formatter = Number::Format->new(
                'decimal_fill'      => '2',
                'decimal_point'     => ',',
                'int_curr_symbol'   => '',
                'mon_thousands_sep' => ' ',
                'thousands_sep'     => ' ',
                'mon_decimal_point' => ','
            );
        } else {    # US by default..
            $num_formatter = Number::Format->new(
                'int_curr_symbol'   => '',
                'mon_thousands_sep' => ',',
                'mon_decimal_point' => '.'
            );
        }
        $result = $num_formatter->format_price($result);
    }
} else {
    $result = 'Fail';
}

print CGI::header('-type'=>'text/plain', '-charset'=>'utf-8');
print $result;





use C4::Debug;
use C4::Branch; # GetBranches
use C4::Dates qw/format_date format_date_in_iso/;
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, hardduedate, hardduedatecompare, fine, finedays, firstremind, chargeperiod,rentaldiscount) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
    my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, reservesallowed=?, issuelength=?, hardduedate=?, hardduedatecompare=?, 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 $hardduedate = $input->param('hardduedate');
    $hardduedate = format_date_in_iso($hardduedate);
    my $hardduedatecompare = $input->param('hardduedatecompare');
    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,$hardduedate,$hardduedatecompare,$rentaldiscount, $br,$bor,$cat);
    } else {
        $sth_insert->execute($br,$bor,$cat,$maxissueqty,$renewalsallowed,$reservesallowed,$issuelength,$hardduedate,$hardduedatecompare,$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) {
    push @branchloop, {
        value      => $thisbranch,
        selected   => $thisbranch eq $branchcode,
        branchname => $branches->{$thisbranch}->{'branchname'},
    };
}

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

# Get the item types list
my @itemtypes = C4::ItemType->all;

if ( $op eq 'delete' ) {
    DelIssuingRule({
        branchcode   => $branchcode,
        categorycode => $input->param('categorycode'),
        itemtype     => $input->param('itemtype'),
    });
}
# save the values entered
elsif ( $op eq 'add' ) {

    # 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;
    }
        ON (categories.categorycode = issuingrules.categorycode)
    WHERE issuingrules.branchcode = ?
");
$sth2->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 );
    }
    push @row_loop, $row;
}
$sth->finish;

my @sorted_row_loop = sort by_category_and_itemtype @row_loop;

my $sth_branch_cat;
if ($branch eq "*") {
    $sth_branch_cat = $dbh->prepare("
        SELECT default_borrower_circ_rules.*, categories.description AS humancategorycode
        FROM default_borrower_circ_rules
        JOIN categories USING (categorycode)
        
    ");
    $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);
}

my @branch_cat_rules = ();
while (my $row = $sth_branch_cat->fetchrow_hashref) {
    push @branch_cat_rules, $row;
}
my @sorted_branch_cat_rules = sort { $a->{'humancategorycode'} cmp $b->{'humancategorycode'} } @branch_cat_rules;

# note undef maxissueqty so that template can deal with them
foreach my $entry (@sorted_branch_cat_rules, @sorted_row_loop) {
    $entry->{unlimited_maxissueqty} = 1 unless defined($entry->{maxissueqty});
}

@sorted_row_loop = sort by_category_and_itemtype @row_loop;

my $sth_branch_item;
if ($branch eq "*") {
    $sth_branch_item = $dbh->prepare("
        SELECT default_branch_item_rules.*, itemtypes.description AS humanitemtype
        FROM default_branch_item_rules
        JOIN itemtypes USING (itemtype)
    ");
    $sth_branch_item->execute();
} else {
    $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);
}

my @branch_item_rules = ();
while (my $row = $sth_branch_item->fetchrow_hashref) {
    push @branch_item_rules, $row;
}
my @sorted_branch_item_rules = sort { $a->{'humanitemtype'} cmp $b->{'humanitemtype'} } @branch_item_rules;

# note undef holdallowed so that template can deal with them
foreach my $entry (@sorted_branch_item_rules) {
    $entry->{holdallowed_any} = 1 if($entry->{holdallowed} == 2);
    $entry->{holdallowed_same} = 1 if($entry->{holdallowed} == 1);
}

# Get the issuing rules list...
my @issuingrules = GetIssuingRulesByBranchCode($branchcode);

# ...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 '*';
    if ($rule->{'hardduedate'} ne '0000-00-00') {
       $rule->{'hardduedate'} = format_date( $rule->{'hardduedate'});
       $rule->{'hardduedatebefore'} = 1 if ($rule->{'hardduedatecompare'} == -1);
       $rule->{'hardduedateexact'} = 1 if ($rule->{'hardduedatecompare'} ==  0);
       $rule->{'hardduedateafter'} = 1 if ($rule->{'hardduedatecompare'} ==  1);
    } else {
       $rule->{'hardduedate'} = 0;
    }
    $rule->{'fine'}                        = sprintf('%.2f', $rule->{'fine'});

    # 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;
        }
    }
}

my $defaults = $sth_defaults->fetchrow_hashref;

$template->param(default_rules => ($branchcode eq '*' ? 1 : 0));
    $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(
    categoryloop  => \@category_loop,
    itemtypeloop  => \@itemtypes,
    rules         => \@issuingrules,
    branchloop    => \@branchloop,
    humanbranch   => ($branchcode ne '*' ? $branches->{$branchcode}->{branchname} : ''),
    branchcode    => $branchcode,
    definedbranch => scalar(@issuingrules) > 0,
);

$template->param(categoryloop => \@category_loop,
                        itemtypeloop => \@itemtypes,
                        rules => \@sorted_row_loop,
                        branchloop => \@branchloop,
                        humanbranch => ($branch ne '*' ? $branches->{$branch}->{branchname} : ''),
                        current_branch => $branch,
                        definedbranch => scalar(@sorted_row_loop)>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 86-92 if ( $request eq "KillWaiting" ) { Link Here

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

# 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');
    }
}


    }
}

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

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

        $template->param(
            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 @relprevissues;
my $displayrelissues;

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'} );

        # Getting borrower details
        my $memberdetails = GetMemberDetails($it->{'borrowernumber'});
        $it->{'borrowername'} = $memberdetails->{'firstname'} . " " . $memberdetails->{'surname'};
        $it->{'cardnumber'} = $memberdetails->{'cardnumber'};
        # 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->{'od'} = ( $it->{'date_due'} lt $todaysdate ) ? 1 : 0 ;
        $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 ( 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;
	}

    }
}


        @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'};


# 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},

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

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

# 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 $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 $canceltransfer = $query->param('canceltransfer');
my $dest = $query->param('dest');
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';

    # 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;
my $shelflocations = GetKohaAuthorisedValues('items.location','');

        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{itemcallnumber}   = $biblio->{'itemcallnumber'};
        $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'}};
        $ri{'location'} = $shelflocations->{$shelfcode} if ( defined( $shelfcode ) && defined($shelflocations) && exists( $shelflocations->{$shelfcode} ) );

    }
    else {
        last;

Lines 317-320 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here

(-)a/installer/data/mysql/de-DE/mandatory/sysprefs.sql (-1 / +1 lines)
317	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.\|do not ask for confirmation.', 'Choice');	317	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.\|do not ask for confirmation.', 'Choice');
318	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '\|\| aca\|\|aabn \| a\|a d', NULL, NULL, 'Textarea');	318	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '\|\| aca\|\|aabn \| a\|a d', NULL, NULL, 'Textarea');
319	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0, 'If ON Openlibrary book covers will be show',NULL,'YesNo');	319	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0, 'If ON Openlibrary book covers will be show',NULL,'YesNo');
320		320	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ReservesControlBranch','PatronLibrary','Which branch to use do check holds limits','ItemHomeLibrary\|PatronLibrary','Choice');

Lines 317-319 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here

(-)a/installer/data/mysql/en/mandatory/sysprefs.sql (+1 lines)
317	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.\|do not ask for confirmation.', 'Choice');	317	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.\|do not ask for confirmation.', 'Choice');
318	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '\|\| aca\|\|aabn \| a\|a d', NULL, NULL, 'Textarea');	318	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '\|\| aca\|\|aabn \| a\|a d', NULL, NULL, 'Textarea');
319	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');	319	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');
		320	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ReservesControlBranch','PatronLibrary','Which branch to use do check holds limits','ItemHomeLibrary\|PatronLibrary','Choice');

Lines 318-321 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here

(-)a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql (-1 / +1 lines)
318	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.\|do not ask for confirmation.', 'Choice');	318	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.\|do not ask for confirmation.', 'Choice');
319	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '\|\| aca\|\|aabn \| a\|a d', NULL, NULL, 'Textarea');	319	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '\|\| aca\|\|aabn \| a\|a d', NULL, NULL, 'Textarea');
320	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');	320	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');
321		321	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ReservesControlBranch','PatronLibrary','Which branch to use do check holds limits','ItemHomeLibrary\|PatronLibrary','Choice');

Lines 305-307 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here

(-)a/installer/data/mysql/it-IT/necessari/sysprefs.sql (+1 lines)
305	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '\|\| aca\|\|aabn \| a\|a d', NULL, NULL, 'Textarea');	305	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '\|\| aca\|\|aabn \| a\|a d', NULL, NULL, 'Textarea');
306	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');	306	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');
307		307
		308	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ReservesControlBranch','PatronLibrary','Which branch to use do check holds limits','ItemHomeLibrary\|PatronLibrary','Choice');

Lines 976-984 CREATE TABLE `issuingrules` ( Link Here

(-)a/installer/data/mysql/kohastructure.sql (-3 / +11 lines)
976	`maxissueqty` int(4) default NULL,	976	`maxissueqty` int(4) default NULL,
977	`issuelength` int(4) default NULL,	977	`issuelength` int(4) default NULL,
978	`hardduedate` date default NULL,	978	`hardduedate` date default NULL,
979	`hardduedatecompare` tinyint NOT NULL default "0",	979	`holdspickupdelay` int(11) default NULL,
980	`renewalsallowed` smallint(6) NOT NULL default "0",	980	`renewalperiod` int(11) default NULL,
981	`reservesallowed` smallint(6) NOT NULL default "0",	981	`allowonshelfholds` tinyint(1) default NULL,
		982	`holdrestricted` tinyint(1) default NULL,
		983	`hardduedatecompare` tinyint NULL default "0",
		984	`renewalsallowed` smallint(6) NULL default "0",
		985	`reservesallowed` smallint(6) NULL default "0",
982	`branchcode` varchar(10) NOT NULL default '',	986	`branchcode` varchar(10) NOT NULL default '',
983	PRIMARY KEY (`branchcode`,`categorycode`,`itemtype`),	987	PRIMARY KEY (`branchcode`,`categorycode`,`itemtype`),
984	KEY `categorycode` (`categorycode`),	988	KEY `categorycode` (`categorycode`),
Lines 1364-1369 CREATE TABLE `old_issues` ( Link Here
1364	--	1368	--
1365	DROP TABLE IF EXISTS `old_reserves`;	1369	DROP TABLE IF EXISTS `old_reserves`;
1366	CREATE TABLE `old_reserves` (	1370	CREATE TABLE `old_reserves` (
		1371	`reservenumber` int(11) NOT NULL AUTO_INCREMENT,
1367	`borrowernumber` int(11) default NULL,	1372	`borrowernumber` int(11) default NULL,
1368	`reservedate` date default NULL,	1373	`reservedate` date default NULL,
1369	`biblionumber` int(11) default NULL,	1374	`biblionumber` int(11) default NULL,
Lines 1380-1385 CREATE TABLE `old_reserves` ( Link Here
1380	`waitingdate` date default NULL,	1385	`waitingdate` date default NULL,
1381	`expirationdate` DATE DEFAULT NULL,	1386	`expirationdate` DATE DEFAULT NULL,
1382	`lowestPriority` tinyint(1) NOT NULL,	1387	`lowestPriority` tinyint(1) NOT NULL,
		1388	PRIMARY KEY (`reservenumber`),
1383	KEY `old_reserves_borrowernumber` (`borrowernumber`),	1389	KEY `old_reserves_borrowernumber` (`borrowernumber`),
1384	KEY `old_reserves_biblionumber` (`biblionumber`),	1390	KEY `old_reserves_biblionumber` (`biblionumber`),
1385	KEY `old_reserves_itemnumber` (`itemnumber`),	1391	KEY `old_reserves_itemnumber` (`itemnumber`),
Lines 1539-1544 CREATE TABLE `reserveconstraints` ( Link Here
1539		1545
1540	DROP TABLE IF EXISTS `reserves`;	1546	DROP TABLE IF EXISTS `reserves`;
1541	CREATE TABLE `reserves` (	1547	CREATE TABLE `reserves` (
		1548	`reservenumber` int(11) NOT NULL AUTO_INCREMENT,
1542	`borrowernumber` int(11) NOT NULL default 0,	1549	`borrowernumber` int(11) NOT NULL default 0,
1543	`reservedate` date default NULL,	1550	`reservedate` date default NULL,
1544	`biblionumber` int(11) NOT NULL default 0,	1551	`biblionumber` int(11) NOT NULL default 0,
Lines 1555-1560 CREATE TABLE `reserves` ( Link Here
1555	`waitingdate` date default NULL,	1562	`waitingdate` date default NULL,
1556	`expirationdate` DATE DEFAULT NULL,	1563	`expirationdate` DATE DEFAULT NULL,
1557	`lowestPriority` tinyint(1) NOT NULL,	1564	`lowestPriority` tinyint(1) NOT NULL,
		1565	PRIMARY KEY (`reservenumber`),
1558	KEY `borrowernumber` (`borrowernumber`),	1566	KEY `borrowernumber` (`borrowernumber`),
1559	KEY `biblionumber` (`biblionumber`),	1567	KEY `biblionumber` (`biblionumber`),
1560	KEY `itemnumber` (`itemnumber`),	1568	KEY `itemnumber` (`itemnumber`),

Lines 324-326 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here

(-)a/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql (+1 lines)
324	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.\|do not ask for confirmation.', 'Choice');	324	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.\|do not ask for confirmation.', 'Choice');
325	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '\|\| aca\|\|aabn \| a\|a d', NULL, NULL, 'Textarea');	325	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '\|\| aca\|\|aabn \| a\|a d', NULL, NULL, 'Textarea');
326	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');	326	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');
		327	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ReservesControlBranch','PatronLibrary','Which branch to use do check holds limits','ItemHomeLibrary\|PatronLibrary','Choice');

Lines 316-318 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here

(-)a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql (+1 lines)
316	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.\|do not ask for confirmation.', 'Choice');	316	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.\|do not ask for confirmation.', 'Choice');
317	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '\|\| aca\|\|aabn \| a\|a d', NULL, NULL, 'Textarea');	317	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '\|\| aca\|\|aabn \| a\|a d', NULL, NULL, 'Textarea');
318	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0, 'If ON Openlibrary book covers will be show',NULL,'YesNo');	318	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0, 'If ON Openlibrary book covers will be show',NULL,'YesNo');
		319	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ReservesControlBranch','PatronLibrary','Which branch to use do check holds limits','ItemHomeLibrary\|PatronLibrary','Choice');

Lines 371-373 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here

(-)a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql (+1 lines)
371	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.\|do not ask for confirmation.', 'Choice');	371	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.\|do not ask for confirmation.', 'Choice');
372	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '\|\| aca\|\|aabn \| a\|a d', NULL, NULL, 'Textarea');	372	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '\|\| aca\|\|aabn \| a\|a d', NULL, NULL, 'Textarea');
373	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');	373	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');
		374	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ReservesControlBranch','PatronLibrary','Which branch to use do check holds limits','ItemHomeLibrary\|PatronLibrary','Choice');

Lines 396-399 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here

(-)a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql (-1 / +1 lines)
396	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.\|do not ask for confirmation.', 'Choice');	396	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.\|do not ask for confirmation.', 'Choice');
397	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '\|\| aca\|\|aabn \| a\|a d', NULL, NULL, 'Textarea');	397	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '\|\| aca\|\|aabn \| a\|a d', NULL, NULL, 'Textarea');
398	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0, 'If ON Openlibrary book covers will be show',NULL,'YesNo');	398	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0, 'If ON Openlibrary book covers will be show',NULL,'YesNo');
399		399	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ReservesControlBranch','PatronLibrary','Which branch to use do check holds limits','ItemHomeLibrary\|PatronLibrary','Choice');




    print "Add state and country to cities table corresponding to new columns in borrowers\n";
    SetVersion($DBversion);
}
$DBversion = '3.05.00.005';
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
    $dbh->do("ALTER TABLE issuingrules ADD holdspickupdelay int(11) default NULL");
    $dbh->do("ALTER TABLE issuingrules ADD renewalperiod int(11) default NULL");
    $dbh->do("ALTER TABLE issuingrules ADD allowonshelfholds tinyint(1) default NULL");
    $dbh->do("ALTER TABLE issuingrules ADD holdrestricted tinyint(1) default NULL");

    my $sth = $dbh->prepare("SELECT value from systempreferences where variable = 'AllowOnShelfHolds';");
    $sth->execute();
    my $data = $sth->fetchrow_hashref();
            
    if ($data->{value}){
        my $updsth = $dbh->prepare("UPDATE issuingrules SET allowonshelfholds = ?");
        $updsth->execute( $data->{value} );
    }
    $dbh->do(
        'INSERT IGNORE INTO issuingrules (branchcode, categorycode, itemtype,holdrestricted,maxissueqty)
                SELECT "*","*","*",holdallowed,maxissueqty
                FROM default_circ_rules defaults
              ON DUPLICATE KEY update maxissueqty=defaults.maxissueqty, holdrestricted=defaults.holdallowed'
    );
    $dbh->do(
        'INSERT IGNORE INTO issuingrules (branchcode, itemtype, categorycode,maxissueqty)
                    SELECT "*","*",categorycode,maxissueqty from default_borrower_circ_rules defaults
              ON DUPLICATE KEY update maxissueqty=defaults.maxissueqty'
    );
    $dbh->do(
        'INSERT IGNORE INTO issuingrules (branchcode, categorycode, itemtype,holdrestricted,maxissueqty)
                    SELECT branchcode,"*","*",holdallowed,maxissueqty from default_branch_circ_rules defaults
              ON DUPLICATE KEY update maxissueqty=defaults.maxissueqty, holdrestricted=defaults.holdallowed'
    );
    $dbh->do(
        'INSERT IGNORE INTO issuingrules (branchcode, categorycode, itemtype,holdrestricted)
                    SELECT "*","*",itemtype,holdallowed from default_branch_item_rules defaults 
              ON DUPLICATE KEY update holdrestricted=defaults.holdallowed'
    );
    $dbh->do('ALTER TABLE issuingrules CHANGE reservesallowed reservesallowed smallint(6) NULL');
    $dbh->do('ALTER TABLE issuingrules CHANGE renewalsallowed renewalsallowed smallint(6) NULL');
#    for my $tablename qw(default_circ_rules default_branch_circ_rules default_branch_item_rules default_borrower_circ_rules) {
#        $dbh->do("DROP TABLE $tablename");
#    }

    $dbh->do("INSERT INTO systempreferences (variable,value, options, explanation, type) VALUES('ReservesControlBranch','PatronLibrary','ItemHomeLibrary|PatronLibrary','Which branch to use do check holds limits','Choice')");
    $dbh->do(q{
      ALTER TABLE reserves ADD `reservenumber` int(11) NOT NULL AUTO_INCREMENT FIRST, ADD PRIMARY KEY (`reservenumber`);
});
    $dbh->do(q{
      ALTER TABLE old_reserves ADD `reservenumber` int(11) NOT NULL AUTO_INCREMENT FIRST, ADD PRIMARY KEY (`reservenumber`);
});

    print "Upgrade to $DBversion done (Improved circulation rules : holds and renewals at granular level)\n";
    SetVersion ($DBversion);
}

=head1 FUNCTIONS


Lines 2081-2083 fieldset.rows+h3 {clear:both;padding-top:.5em;} Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css (+3 lines)
2081	color : #cc0000;	2081	color : #cc0000;
2082	}	2082	}
2083		2083
		2084	.herited {
		2085	color: #ccc;
		2086	}

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jeditable (+1 lines)
	1	Subproject commit 29b70035bbd60fc9412df3a5186367034114c9b2




<title>Koha &rsaquo; Administration &rsaquo; Circulation and Fine Rules</title>
[% INCLUDE 'doc-head-close.inc' %]

<link href="/content/ui-lightness/jquery-ui-1.8.1.custom.css" rel="stylesheet" />
<script src="/scripts/jquery-ui-1.8.1.custom.min.js" type="text/javascript"></script>
<script type="text/javascript" src="/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.uitablefilter.js"></script>
<script type="text/javascript" src="/intranet-tmpl/prog/en/lib/jquery/plugins/ui.tabs.js"></script>
<script src="/intranet-tmpl/prog/en/lib/jquery/plugins/jeditable/jquery.jeditable.js" type="text/javascript" charset="utf-8"></script>
<script src="/intranet-tmpl/prog/en/lib/jquery/plugins/jeditable/jquery.jeditable.datepicker.js" type="text/javascript" charset="utf-8"></script>
<script src="/intranet-tmpl/prog/en/lib/jquery/plugins/jeditable/js/jquery.datePicker.js" type="text/javascript" charset="utf-8"></script>
<script src="/intranet-tmpl/prog/en/lib/jquery/plugins/jeditable/js/date.js" type="text/javascript" charset="utf-8"></script>

<link rel="stylesheet" type="text/css" href="/intranet-tmpl/prog/en/lib/jquery/plugins/jeditable/css/datePicker.css" />
<link rel="stylesheet" type="text/css" href="/intranet-tmpl/prog/en/lib/jquery/plugins/ui.tabs.css" />

<script type="text/javascript">
//<![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);
        });
        $('.editabledatepicker').editable('/cgi-bin/koha/admin/smart-rules-service.pl', {
             submitdata   : function(){
                    return {
                        branchcode   : $('#branchcode').val(),
                        categorycode : $(this).parent().find('td.categorycode > span:first').text(),
                        itemtype     : $(this).parent().find('td.itemtype > span:first').text(),
                        varname      : $(this).attr('varname')
                        };
                    },
            name         : 'inputvalue',
            type: 'datepicker',
            onblur: 'submit',
            tooltip: _("Click to edit....")
        });
        $('.datecompare').editable('/cgi-bin/koha/admin/smart-rules-service.pl', {
             submitdata   : function(){
                    return {
                        branchcode   : $('#branchcode').val(),
                        categorycode : $(this).parent().find('td.categorycode > span:first').text(),
                        itemtype     : $(this).parent().find('td.itemtype > span:first').text(),
                        varname      : $(this).attr('varname')
                        };
                    },
             name         : 'inputvalue',
             data   : "{'':'','1':"+_("'After'")+",'-1':"+_("'Before'")+",0:"+_("'Exactly On'")+"}",
             type   : 'select',
             submit : 'OK'
         });
        $('.editable').editable('/cgi-bin/koha/admin/smart-rules-service.pl', {
             submitdata   : function(){
                    return {
                        branchcode   : $('#branchcode').val(),
                        categorycode : $(this).parent().find('td.categorycode > span:first').text(),
                        itemtype     : $(this).parent().find('td.itemtype > span:first').text(),
                        varname      : $(this).attr('varname')
                        };
                    },
             name         : 'inputvalue',
             data: function(value, settings) {
                    var retval = value.replace(/^\s+/gi, '').replace(/\s+$/gi, '');
                    return retval;
            },
             submit : 'OK'
         });
        $('.triple').editable('/cgi-bin/koha/admin/smart-rules-service.pl', {
             submitdata   : function(){
                    return {
                        branchcode   : $('#branchcode').val(),
                        categorycode : $(this).parent().find('td.categorycode > span:first').text(),
                        itemtype     : $(this).parent().find('td.itemtype > span:first').text(),
                        varname      : $(this).attr('varname')
                        };
                    },
             name         : 'inputvalue',
             data   : "{'':'','1':"+_("'Yes'")+",'0':"+_("'No'")+"}",
             type   : 'select',
            tooltip: _("Click to edit...."),
             submit : 'OK'
         });
});
//]]>
</script>

            Defining circulation and fine rules for all libraries
        [% END %]
    </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="*">All libraries</option>
            [% FOREACH branchloo IN branchloop %]
				[% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]

[% IF ( definedbranch ) %]<form action="/cgi-bin/koha/admin/clone-rules.pl" method="post"><label 
for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidden" name="frombranch" value="[% current_branch %]" />
            <select name="tobranch" id="tobranch">[% FOREACH branchloo IN branchloop %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]</select> <input type="submit" value="Clone" /></form>[% END %]</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">Holds</a></li>
                <div style="text-align:right;">
                    <label for="filter" style="float:none;">Filter: </label>
                    <input type="text" name="filter" id="filter" title="Dynamic filter on itemtype/patron category"/>
                </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="issues">Hard due date compare</th>
                                <th class="issues">Hard due date</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>
                        [% FOREACH rule IN rules %]
                            <tr>
                                    <td class="categorycode">
                                        <span style="display:none;">[% rule.categorycode %]</span>
                                        [% IF ( rule.default_humancategorycode ) %]
                                            <em>Default</em>
                                        [% ELSE %]
                                            [% rule.humancategorycode %]
                                        [% END %]
                                    </td>
                                    <td class="itemtype">
                                        <span style="display:none;">[% rule.itemtype %]</span>
                                        [% IF ( rule.default_humanitemtype ) %]
                                            <em>Default</em>
                                        [% ELSE %]
                                            [% rule.humanitemtype %]
                                        [% END %]
                                    </td>
                                    [% IF ( rule.herited_maxissueqty ) %]
                                    <td class="maxissueqty editable issues herited" varname="maxissueqty">
                                    [% ELSE %]
                                    <td class="issues editable" varname="maxissueqty">
                                    [% END %]
                                        [% IF ( rule.unlimited_maxissueqty ) %]
                                            Unlimited
                                        [% ELSE %]
                                            [% rule.maxissueqty %]
                                        [% END %]
                                    </td>
                                    [% IF ( rule.herited_issuelength ) %]
                                    <td class="issuelength editable issues herited" varname="issuelength">
                                    [% ELSE %]
                                    <td class="issuelength editable issues" varname="issuelength">
                                    [% END %][% rule.issuelength %]
                                    </td>
                                    [% IF ( rule.herited_hardduedatecompare ) %]
                                    <td class="hardduedatecompare issues datecompare herited" varname="hardduedatecompare">
                                    [% ELSE %]
                                    <td class="hardduedatecompare issues datecompare" varname="hardduedatecompare">
                                    [% END %]
                                    [% rule.hardduedatecompare %]
                                    </td>
                                    [% IF (rule.herited_hardduedate ) %]
                                    <td class="hardduedate editabledatepicker issues herited" varname="hardduedate">
                                    [% ELSE %]
                                    <td class="hardduedate editabledatepicker issues" varname="hardduedate">
                                    [% END %]
                                    [% rule.hardduedate %]
                                    </td>
                                    [% IF (rule.herited_fine ) %]
                                    <td class="fine editable fines herited" varname="fine">
                                    [% ELSE %]
                                    <td class="fine editable fines" varname="fine">
                                    [% END %]
                                    [% fine %]
                                    </td>
                                    [% IF ( rule.herited_chargeperiod ) %]
                                    <td class="chargeperiod editable fines herited" varname="chargeperiod">
                                    [% ELSE %]
                                    <td class="chargeperiod editable fines" varname="chargeperiod">
                                    [% END %]
                                    [% rule.chargeperiod %]
                                    </td>
                                    [% IF ( rule.herited_firstremind ) %]
                                    <td class="firstremind editable fines herited" varname="firstremind">
                                    [% ELSE %]
                                    <td class="firstremind editable fines" varname="firstremind">
                                    [% END %]
                                    [% rule.firstremind %]
                                    </td>
                                    [% IF ( rule.herited_finedays ) %]
                                    <td class="finedays editable fines herited" varname="finedays">
                                    [% ELSE %]
                                    <td class="finedays editable fines" varname="finedays">
                                    [% END %]
                                    [% rule.finedays %]
                                    </td>
                                    [% IF ( rule.herited_renewalsallowed ) %]
                                    <td class="renewalsallowed editable issues herited" varname="renewalsallowed">
                                    [% ELSE %]
                                    <td class="renewalsallowed editable issues" varname="renewalsallowed">
                                    [% END %]
                                    [% rule.renewalsallowed %]
                                    </td>
                                    [% IF ( rule.herited_renewalperiod ) %]
                                    <td class="renewalperiod editable issues herited" varname="renewalperiod">
                                    [% ELSE %]
                                    <td class="renewalperiod editable issues" varname="renewalperiod">
                                    [% END %]
                                    [% rule.renewalperiod %]
                                    </td>
                                    [% IF ( rule.herited_reservesallowed ) %]
                                    <td class="reservesallowed editable reserves herited" varname="reservesallowed">
                                    [% ELSE %]
                                    <td class="reservesallowed editable reserves" varname="reservesallowed">
                                    [% END %]
                                    [% rule.reservesallowed %]
                                    </td>
                                     [% IF ( rule.herited_holdspickupdelay ) %]
                                    <td class="holdspickupdelay editable reserves herited" varname="holdspickupdelay">
                                    [% ELSE %]
                                    <td class="holdspickupdelay editable reserves" varname="holdspickupdelay">
                                    [% END %]
                                    [% rule.holdspickupdelay %]
                                    </td>
                                    [% IF ( rule.herited_allowonshelfholds ) %]
                                    <td class="allowonshelfholds reserves triple herited" varname="allowonshelfholds">
                                    [% ELSE %]
                                    <td class="allowonshelfholds reserves triple" varname="allowonshelfholds">
				                    [% END %]
                                    [% IF ( rule.allowonshelfholds ) %]
                                    Yes
                                    [% ELSE %]
                                    No
                                    [% END %]
                                    </td>
                                    [% IF ( rule.herited_holdrestricted ) %]
                                    <td class="holdrestricted reserves triple herited" varname="holdrestricted">
                                    [% ELSE %]
                                     <td class="holdrestricted reserves triple" varname="holdrestricted">
                                    [% END %]
                                    [% IF ( rule.holdrestricted ) %]
                                    Yes
                                    [% ELSE %]
                                    No
                                    [% END %]
                                    </td>
                                    [% IF ( rule.herited_rentaldiscount ) %]
                                    <td class="rentaldiscount editable issues herited" varname="rentaldiscount">
                                    [% ELSE %]
                                    <td class="rentaldiscount editable issues" varname="rentaldiscount">
                                    [% END %]
                                    [% rule.rentaldiscount %]
                                    </td>
                                    <td>
                                        <a class="button" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=[% rule.itemtype %]&amp;categorycode=[% rule.categorycode %]&amp;branchcode=[% rule.branchcode %]">Delete</a>
                                    </td>
                                </tr>
                            [% END %]
                        </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>
                                    [% FOREACH category IN categoryloop %]
                                        [% IF ( category.selected ) %]
                                        <option value="[% category.categorycode %]" selected="selected">[% category.description %]</option>
                                        [% ELSE %] <option value="[% category.categorycode %]" >[% category.description %]</option>
                                        [% END %]
                                    [% END %]
                                    </select>
                                </td>
                                <td>
                                    <select name="itemtype" style="width:12em;">
                                        <option value="*">Default</option>
                                    [% FOREACH itemtypeL IN itemtypeloop %]
                                        [% IF itemtypeL.selected %]
                                        <option value="[% itemtypeL.itemtype %]" selected="selected">[% itemtypeL.description %]</option>
                                        [% ELSE %] <option value="[% itemtypeL.itemtype %]">[% itemtypeL.description %]</option>
                                        [% END %]
                                    [% END %]
                                    </select>
                                </td>
                                <td class="issues"><input name="maxissueqty" size="3" value="[% maxissueqty %]"/></td>
                                <td class="issues"><input name="issuelength" size="3" value="[% issuelength %]"/> </td>
                                <td class="issues"><select name="hardduedatecompare" >
                                                        <option value="-1">Before</option>
                                                        <option value="0">Exactly on</option>
                                                        <option value="1">After</option>
                                                   </select>
                                    </td>
                                <td class="issues">
                                    <input type="text" size="10" name="hardduedate" value="[% hardduedate %]" />
                                 </td>
                                <td class="fines"><input name="fine" size="4" value="[% fine %]"/></td>
                                <td class="fines"><input name="chargeperiod" size="2" value="[% chargeperiod %]"/></td>
                                <td class="fines"><input name="firstremind" size="2" value="[% firstremind %]"/> </td>
                                <td class="fines"><input name="finedays" size="3" value="[% finedays %]"/> </td>
                                <td class="issues"><input name="renewalsallowed" size="2" value="[% renewalsallowed %]"/></td>
                                <td class="issues"><input name="renewalperiod" size="2" value="[% renewalperiod %]"/></td>
                                <td class="reserves"><input name="reservesallowed" size="2" value="[% reservesallowed %]"/></td>
                                <td class="reserves"><input name="holdspickupdelay" size="2" value="[% 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">[% IF ( holdrestricted ) %]<input type="checkbox" name="holdrestricted" checked="checked" value="1"/> [% ELSE %]<input type="checkbox" name="holdrestricted" value="1"/> [% END %]</td>
		                        <td class="issues"><input name="rentaldiscount" size="2" /></td>
                                <td><input type="hidden" name="branchcode" value="[% branchcode %]"/><input type="submit" value="Add" class="submit" /></td>
                            </tr>
                        </tfoot>
                </form>
                    </table>
            </div><!-- tabs-container -->
        </div><!-- toptabs -->
                        <td>
                            <a class="button" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-cat&amp;categorycode=[% branch_cat_rule_loo.categorycode %]&amp;branch=[% branch_cat_rule_loo.current_branch %]">Delete</a>
                        </td>
                    </tr>
                [% END %]
                <tr>
                    <td>
                        <select name="categorycode">
                        [% FOREACH categoryloo IN categoryloop %]
                            <option value="[% categoryloo.categorycode %]">[% categoryloo.description %]</option>
                        [% END %]
                        </select>
                    </td>
                    <td><input name="maxissueqty" size="3" /></td>
                    <td><input type="submit" value="Add" class="submit" /></td>
                </tr>
            </table>
        </form>
    </div>
    [% END %]
    <div id="holds-policy-by-item-type" class="container">
    <h3>Holds policy by item type for [% IF ( humanbranch ) %][% humanbranch %][% ELSE %]all libraries[% END %]</h3>
        <p>
            For this library, you can edit rules for given itemtypes, regardless
            of the patron's category.
        </p>
        <p>
            Currently, this means hold policies.
            The various policies have the following effects:
        </p>
        <ul>
            <li><strong>From Any Library:</strong> Patrons from any library may put this item on hold. <cite>(default if none is defined)</cite></li>
            <li><strong>From Home Library:</strong> Only patrons from the item's home library may put this book on hold.</li>
            <li><strong>No Holds Allowed:</strong> No patron may put this book on hold.</li>
        </ul>
        <p>
            Note that if the system preference
            <code>AllowHoldPolicyOverride</code> is enabled, these policies can
            be overridden by your circulation staff. Also, these policies are
            based on the patron's home library, <em>not</em> the library where the hold is being placed..
        </p>

        <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
            <input type="hidden" name="op" value="add-branch-item" />
            <input type="hidden" name="branch" value="[% current_branch %]"/>
            <table>
                <tr>
                    <th>Item Type</th>
                    <th>Hold Policy</th>
                    <th>&nbsp;</th>
                </tr>
                [% FOREACH branch_item_rule_loo IN branch_item_rule_loop %]
                    [% UNLESS ( loop.odd ) %]
                    <tr class="highlight">
                    [% ELSE %]
                    <tr>
                    [% END %]
                        <td>[% IF ( branch_item_rule_loo.default_humanitemtype ) %]
                                <em>Default</em>
                            [% ELSE %]
                                [% branch_item_rule_loo.humanitemtype %]
                            [% END %]
                        </td>
                        <td>[% IF ( branch_item_rule_loo.holdallowed_any ) %]
                                From Any Library
                            [% ELSIF ( branch_item_rule_loo.holdallowed_same ) %]
                                From Home Library
                            [% ELSE %]
                                No Holds Allowed
                            [% END %]
                        </td>
                        <td>
                            <a class="button" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-item&amp;itemtype=[% branch_item_rule_loo.itemtype %]&amp;branch=[% branch_item_rule_loo.current_branch %]">Delete</a>
                        </td>
                    </tr>
                [% END %]
                <tr>
                    <td>
                        <select name="itemtype">
                        [% FOREACH itemtypeloo IN itemtypeloop %]
                            <option value="[% itemtypeloo.itemtype %]">[% itemtypeloo.description %]</option>
                        [% END %]
                        </select>
                    </td>
                    <td>
                        <select name="holdallowed">
                            <option value="2">From Any Library</option>
                            <option value="1">From Home Library</option>
                            <option value="0">No Holds Allowed</option>
                        </select>
                    </td>
                    <td><input type="submit" value="Add" class="submit" /></td>
                </tr>
            </table>
        </form>
    </div>
</div>





                <input type="hidden" name="diffBranch" value="[% destbranch %]" />
                <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
                <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
                <input type="hidden" name="reservenumber" value="[% reservenumber %]" />
                </form>
	</div>
    [% END %]

            <input type="hidden" name="diffBranch" value="[% destbranch %]" />
            <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
            <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
            <input type="hidden" name="reservenumber" value="[% reservenumber %]" />
            <input type="hidden" name="barcode" value="0" />
        </form>
		</div>

            <input type="hidden" name="diffBranch" value="[% destbranch %]" />
            <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
            <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
            <input type="hidden" name="reservenumber" value="[% reservenumber %]" />
        </form>
	</div>
    [% END %]




	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");
    }


        [% UNLESS ( itemloo.hide ) %]
        <tr class="[% itemloo.backgroundcolor %]">
            <td>
            [% IF ( itemloo.canholdmultiple ) %]
                <input type="hidden" name="hold_type" value="multiple" />
            [% ELSIF ( itemloo.available ) %]
                <input type="hidden" name="hold_type" value="single" />
            [% ELSIF ( itemloo.override ) %]
                <input type="hidden" name="hold_type" value="single" />
            [% END %]
            [% IF ( itemloo.cannothold ) %]
                <input disabled="disabled" type="radio" name="checkitem" value="[% itemloo.itemnumber %]" />                            
                <img src="/intranet-tmpl/[% theme %]/img/famfamfam/silk/cross.png" alt="Cannot be put on hold" />               
            [% ELSE %]
                [% IF ( itemloo.canholdmultiple ) %]
                    <input type="checkbox" name="checkitem" value="[% itemnumber %]" />
                [% ELSIF ( itemloo.available ) %]
                    [% IF ( itemloo.available ) %]
                        <input type="radio" name="checkitem" value="[% itemloo.itemnumber %]" />
                    [% ELSIF ( itemloo.override ) %]
                        <input type="radio" name="checkitem" class="needsoverride" value="[% itemloo.itemnumber %]" />
                        <img src="/intranet-tmpl/[% theme %]/img/famfamfam/silk/error.png" alt="Requires override of hold policy" />
                    [% ELSE %]
                        <input disabled="disabled" type="radio" name="checkitem" value="[% itemloo.itemnumber %]" />
                        <img src="/intranet-tmpl/[% theme %]/img/famfamfam/silk/cross.png" alt="Cannot be put on hold" />
                    [% END %]
                [% ELSE %]
                    <input disabled="disabled" type="radio" name="checkitem" value="[% itemnumber %]" />
                    <img src="/intranet-tmpl/[% theme %]/img/famfamfam/silk/cross.png" alt="Cannot be put on hold" />
                [% END %]
            [% END %]
            </td>
            [% IF ( item_level_itypes ) %]

    [% END %]

	<td>
		<a title="Cancel Hold" href="request.pl?action=cancel&amp;reservenumber=[% reserveloo.reservenumber %]&amp;biblionumber=[% reserveloo.biblionumber %]">
                    <img src="/intranet-tmpl/[% theme %]/img/x.png" border="0" alt="Cancel" />
                </a>
	</td>

Lines 16-22 the kohaversion is divided in 4 parts : Link Here

(-)a/kohaversion.pl (-1 / +1 lines)
16	use strict;	16	use strict;
17		17
18	sub kohaversion {	18	sub kohaversion {
19	our $VERSION = '3.05.00.008';	19	our $VERSION = '3.05.00.XXX';
20	# version needs to be set this way	20	# version needs to be set this way
21	# so that it can be picked up by Makefile.PL	21	# so that it can be picked up by Makefile.PL
22	# during install	22	# during install

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 (-26 / +41 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-473 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	}
468	if(not CanBookBeReserved($borrowernumber,$biblioNum)){	481	if(not CanBookBeReserved($borrowernumber,$biblioNum)){
		482	$template->param( message => 1 );
		483	$noreserves = 1;
		484	$template->param( too_many_reserves => scalar(@reserves) );
469	$biblioLoopIter{holdable} = undef;	485	$biblioLoopIter{holdable} = undef;
470	$anyholdable = undef;
471	}	486	}
472		487
473	push @$biblioLoop, \%biblioLoopIter;	488	push @$biblioLoop, \%biblioLoopIter;




    }
);

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 $borrowernumber = $input->param('borrowernumber');
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 $borrower = GetMember( 'borrowernumber' => $borrowernumber );
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 $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,$borrower->{'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,$borrower->{'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,$borrower->{'borrowernumber'},$biblionumber,'o',\@reqbib,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem, $found);
            } else {
                for my $item (@checkitems){
                AddReserve( $branch, $borrower->{'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;
# instead.
#	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 $messages;

my $date = C4::Dates->today('iso');
my $action = $input->param('action') || '';

if ( $action eq 'move' ) {
  my $where = $input->param('where');

  AlterPriority( $where, $borrowernumber, $biblionumber );

} elsif ( $action eq 'cancel' ) {
  my $reservenumber = $input->param('reservenumber');
  my $biblionumber = $input->param('biblionumber');
  CancelReserve( $reservenumber, $biblionumber );
} elsif ( $action eq 'setLowestPriority' ) {
  my $borrowernumber = $input->param('borrowernumber');
  my $biblionumber   = $input->param('biblionumber');

#   we check the reserves of the borrower, and if he can reserv a document
# FIXME At this time we have a simple count of reservs, but, later, we could improve the infos "title" ...

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

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

    # we check the date expiry of the borrower (only if there is an expiry date, otherwise, set to 1 (warn)
    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');
}

	my $maxreserves;

    my $dat          = GetBiblioData($biblionumber);

    unless ( CanBookBeReserved($borrowerinfo->{borrowernumber}, $biblionumber) ) {
 		$warnings = 1;
        $maxreserves = 1;

        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 $branchitemrule = GetIssuingRule( $borrowerinfo->{categorycode}, $item->{'itype'}, GetReservesControlBranch( $borrowerinfo, $item ) );
            my $policy_holdrestricted = $branchitemrule->{'reservesallowed'};
            # prevent item to be reserved if holdrestricted & branch not the librarian branch & syspref to override not set
            $item->{'holdrestricted'} = $branchitemrule->{'holdrestricted'};
            
            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->{'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 ( $policy_holdallowed ) {
                    $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};
            
            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 4398-4403 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+53 lines)
4398	print "Add state and country to cities table corresponding to new columns in borrowers\n";	4398	print "Add state and country to cities table corresponding to new columns in borrowers\n";
4399	SetVersion($DBversion);	4399	SetVersion($DBversion);
4400	}	4400	}
		4401	$DBversion = '3.05.00.005';
		4402	if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
		4403	$dbh->do("ALTER TABLE issuingrules ADD holdspickupdelay int(11) default NULL");
		4404	$dbh->do("ALTER TABLE issuingrules ADD renewalperiod int(11) default NULL");
		4405	$dbh->do("ALTER TABLE issuingrules ADD allowonshelfholds tinyint(1) default NULL");
		4406	$dbh->do("ALTER TABLE issuingrules ADD holdrestricted tinyint(1) default NULL");
		4407
		4408	my $sth = $dbh->prepare("SELECT value from systempreferences where variable = 'AllowOnShelfHolds';");
		4409	$sth->execute();
		4410	my $data = $sth->fetchrow_hashref();
		4411
		4412	if ($data->{value}){
		4413	my $updsth = $dbh->prepare("UPDATE issuingrules SET allowonshelfholds = ?");
		4414	$updsth->execute( $data->{value} );
		4415	}
		4416	$dbh->do(
		4417	'INSERT IGNORE INTO issuingrules (branchcode, categorycode, itemtype,holdrestricted,maxissueqty)
		4418	SELECT "","","*",holdallowed,maxissueqty
		4419	FROM default_circ_rules defaults
		4420	ON DUPLICATE KEY update maxissueqty=defaults.maxissueqty, holdrestricted=defaults.holdallowed'
		4421	);
		4422	$dbh->do(
		4423	'INSERT IGNORE INTO issuingrules (branchcode, itemtype, categorycode,maxissueqty)
		4424	SELECT "","",categorycode,maxissueqty from default_borrower_circ_rules defaults
		4425	ON DUPLICATE KEY update maxissueqty=defaults.maxissueqty'
		4426	);
		4427	$dbh->do(
		4428	'INSERT IGNORE INTO issuingrules (branchcode, categorycode, itemtype,holdrestricted,maxissueqty)
		4429	SELECT branchcode,"","",holdallowed,maxissueqty from default_branch_circ_rules defaults
		4430	ON DUPLICATE KEY update maxissueqty=defaults.maxissueqty, holdrestricted=defaults.holdallowed'
		4431	);
		4432	$dbh->do(
		4433	'INSERT IGNORE INTO issuingrules (branchcode, categorycode, itemtype,holdrestricted)
		4434	SELECT "","",itemtype,holdallowed from default_branch_item_rules defaults
		4435	ON DUPLICATE KEY update holdrestricted=defaults.holdallowed'
		4436	);
		4437	$dbh->do('ALTER TABLE issuingrules CHANGE reservesallowed reservesallowed smallint(6) NULL');
		4438	$dbh->do('ALTER TABLE issuingrules CHANGE renewalsallowed renewalsallowed smallint(6) NULL');
		4439	# for my $tablename qw(default_circ_rules default_branch_circ_rules default_branch_item_rules default_borrower_circ_rules) {
		4440	# $dbh->do("DROP TABLE $tablename");
		4441	# }
		4442
		4443	$dbh->do("INSERT INTO systempreferences (variable,value, options, explanation, type) VALUES('ReservesControlBranch','PatronLibrary','ItemHomeLibrary\|PatronLibrary','Which branch to use do check holds limits','Choice')");
		4444	$dbh->do(q{
		4445	ALTER TABLE reserves ADD `reservenumber` int(11) NOT NULL AUTO_INCREMENT FIRST, ADD PRIMARY KEY (`reservenumber`);
		4446	});
		4447	$dbh->do(q{
		4448	ALTER TABLE old_reserves ADD `reservenumber` int(11) NOT NULL AUTO_INCREMENT FIRST, ADD PRIMARY KEY (`reservenumber`);
		4449	});
		4450
		4451	print "Upgrade to $DBversion done (Improved circulation rules : holds and renewals at granular level)\n";
		4452	SetVersion ($DBversion);
		4453	}
4401		4454
4402	=head1 FUNCTIONS	4455	=head1 FUNCTIONS
4403		4456

Line 0 Link Here

(-)a/C4/IssuingRules.pm (+278 lines)
		1	package C4::IssuingRules;
		2
		3	# Copyright 2009 BibLibre SARL
		4	#
		5	# This file is part of Koha.
		6	#
		7	# Koha is free software; you can redistribute it and/or modify it under the
		8	# terms of the GNU General Public License as published by the Free Software
		9	# Foundation; either version 2 of the License, or (at your option) any later
		10	# version.
		11	#
		12	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
		13	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
		14	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
		15	#
		16	# You should have received a copy of the GNU General Public License along with
		17	# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
		18	# Suite 330, Boston, MA 02111-1307 USA
		19
		20	use strict;
		21	use warnings;
		22	use C4::Context;
		23	use C4::Koha;
		24	use C4::SQLHelper qw( SearchInTable InsertInTable UpdateInTable DeleteInTable );
		25	eval {
		26	my $servers = C4::Context->config('memcached_servers');
		27	if ($servers) {
		28	require Memoize::Memcached;
		29	import Memoize::Memcached qw(memoize_memcached flush_cache);
		30	my $memcached = {
		31	servers => [$servers],
		32	key_prefix => C4::Context->config('memcached_namespace') \|\| 'koha',
		33	};
		34	memoize_memcached( 'GetIssuingRule', memcached => $memcached, expire_time => 600000 ); #cache for 10 minutes
		35	memoize_memcached( 'GetIssuingRules', memcached => $memcached, expire_time => 600000 ); #cache for 10 minutes
		36	}
		37
		38	};
		39	use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
		40
		41	BEGIN {
		42	# set the version for version checking
		43	$VERSION = 3.0.5;
		44	@ISA = qw(Exporter);
		45	@EXPORT = qw(
		46	&GetIssuingRule
		47	&GetIssuingRulesByBranchCode
		48	&GetIssuingRules
		49	&AddIssuingRule
		50	&ModIssuingRule
		51	&DelIssuingRule
		52	);
		53	}
		54
		55	=head1 NAME
		56
		57	C4::IssuingRules - Koha issuing rules module
		58
		59	=head1 SYNOPSIS
		60
		61	use C4::IssuingRules;
		62
		63	=head1 DESCRIPTION
		64
65	The functions in this module deal with issuing rules.
66
67	=head1 FUNCTIONS
68
69	=head2 GetIssuingRule
70
71	Compute the issuing rule for an itemtype, a borrower category and a branch.
72	Returns a hashref from the issuingrules table.
73
74	my $rule = &GetIssuingRule($categorycode, $itemtype, $branchcode);
75
76	The rules are applied from most specific to less specific, using the first found in this order:
77	* same library, same patron type, same item type
78	* same library, same patron type, default item type
79	* same library, default patron type, same item type
80	* same library, default patron type, default item type
81	* default library, same patron type, same item type
82	* default library, same patron type, default item type
83	* default library, default patron type, same item type
84	* default library, default patron type, default item type
85
86	The values in the returned hashref are inherited from a more generic rules if undef.
87
88	=cut
89	#Caching GetIssuingRule
90
91	sub GetIssuingRule {
92	my ( $categorycode, $itemtype, $branchcode ) = @_;
93	$categorycode\|\|="*";
94	$itemtype\|\|="*";
95	$branchcode\|\|="*";
96
97	# This configuration table defines the order of inheritance. We'll loop over it.
98	my @attempts = (
99	[ "" , "" , "*" ],
100	[ "" , $itemtype, "" ],
101	[ $categorycode, "" , "" ],
102	[ $categorycode, $itemtype, "*" ],
103	[ "" , "" , $branchcode ],
104	[ "*" , $itemtype, $branchcode ],
105	[ $categorycode, "*" , $branchcode ],
106	[ $categorycode, $itemtype, $branchcode ],
107	);
108
109	# This complex query returns a nested hashref, so we can access a rule using :
110	# my $rule = $$rules{$categorycode}{$itemtype}{$branchcode};
111	# this will be usefull in the inheritance computation code
112	my $dbh = C4::Context->dbh;
113	my $rules = $dbh->selectall_hashref(
114	"SELECT * FROM issuingrules where branchcode IN ('',?) and itemtype IN ('', ?) and categorycode IN ('*',?)",
115	["branchcode", "itemtype", "categorycode"],
116	undef,
117	( $branchcode, $itemtype, $categorycode )
118	);
119
120	# This block is for inheritance. It loops over rules returned by the
121	# previous query. If a value is found in a more specific rule, it replaces
122	# the old value from the more generic rule.
123	my $oldrule;
124	for my $attempt ( @attempts ) {
125	if ( my $rule = $$rules{@$attempt[2]}{@$attempt[1]}{@$attempt[0]} ) {
126	if ( $oldrule ) {
127	for ( keys %$oldrule ) {
128	if ( defined $rule->{$_} ) {
129	$oldrule->{$_} = $rule->{$_};
130	}
131	}
132	} else {
133	$oldrule = $rule;
134	}
135	}
136	}
137	if($oldrule){
138	return $oldrule;
139	}else{
140	return {
141	'itemtype' => $itemtype,
142	'categorycode' => $categorycode,
143	'branchcode' => $branchcode,
144	'holdspickupdelay' => 0,
145	# 'maxissueqty' => 0,
146	'renewalsallowed' => 0,
147	'firstremind' => 0,
148	'accountsent' => 0,
149	'reservecharge' => 0,
150	'fine' => 0,
151	'restrictedtype' => 0,
152	'rentaldiscount' => 0,
153	'chargename' => 0,
154	'finedays' => 0,
155	'holdrestricted' => 0,
156	'allowonshelfholds' => 0,
157	'reservesallowed' => 0,
158	'chargeperiod' => 0,
159	# 'issuelength' => 0,
160	'renewalperiod' => 0,
161	};
162	}
163	}
164
165	=head2 GetIssuingRulesByBranchCode
166
167	my @issuingrules = &GetIssuingRulesByBranchCode($branchcode);
168
169	Retruns a list of hashref from the issuingrules Koha table for a given
170	branchcode.
171	Each hashref will contain data from issuingrules plus human readable names of
172	patron and item categories.
173
174	=cut
175
176	sub GetIssuingRulesByBranchCode {
177	my $dbh = C4::Context->dbh;
178	my $sth = $dbh->prepare("
179	SELECT issuingrules.*, itemtypes.description AS humanitemtype, categories.description AS humancategorycode
180	FROM issuingrules
181	LEFT JOIN itemtypes
182	ON (itemtypes.itemtype = issuingrules.itemtype)
183	LEFT JOIN categories
184	ON (categories.categorycode = issuingrules.categorycode)
185	WHERE issuingrules.branchcode = ?
186	ORDER BY humancategorycode, humanitemtype
187	");
188	$sth->execute(shift);
189
190	my $res = $sth->fetchall_arrayref({});
191
192	return @$res;
193	}
194
195	=head2 GetIssuingRules
196
197	my @issuingrules = &GetIssuingRules({
198	branchcode => $branch,
199	categorycode => $input->param('categorycode'),
200	itemtype => $input->param('itemtype'),
201	});
202
203	Get an issuing rule from Koha database.
204	An alias for SearchInTable, see C4::SQLHelper for more help.
205
206	=cut
207
208	sub GetIssuingRules {
209	my $res = SearchInTable('issuingrules', shift);
210	return @$res;
211	}
212
213	=head2 AddIssuingRule
214
215	my $issuingrule = {
216	branchcode => $branch,
217	categorycode => $input->param('categorycode'),
218	itemtype => $input->param('itemtype'),
219	maxissueqty => $maxissueqty,
220	renewalsallowed => $input->param('renewalsallowed'),
221	reservesallowed => $input->param('reservesallowed'),
222	issuelength => $input->param('issuelength'),
223	fine => $input->param('fine'),
224	finedays => $input->param('finedays'),
225	firstremind => $input->param('firstremind'),
226	chargeperiod => $input->param('chargeperiod'),
227	};
228
229	&AddIssuingRule( $issuingrule );
230
231	Adds an issuing rule to Koha database.
232	An alias for InsertInTable, see C4::SQLHelper for more help.
233
234	=cut
235
236	sub AddIssuingRule { InsertInTable('issuingrules',shift); }
237
238	=head2 ModIssuingRule
239
240	&ModIssuingRule( $issuingrule );
241
242	Update an issuing rule of the Koha database.
243	An alias for UpdateInTable, see C4::SQLHelper for more help.
244
245	=cut
246
247	sub ModIssuingRule {
248	if (C4::Context->config('memcached_servers')){
249	flush_cache('GetIssuingRule');
250	flush_cache('GetIssuingRules');
251	}
252	UpdateInTable('issuingrules',shift);
253	}
254
255	=head2 DelIssuingRule
256
257	DelIssuingRule({
258	branchcode => $branch,
259	categorycode => $input->param('categorycode'),
260	itemtype => $input->param('itemtype'),
261	});
262
263	Delete an issuing rule from Koha database.
264	An alias for DeleteInTable, see C4::SQLHelper for more help.
265
266	=cut
267
268	sub DelIssuingRule { DeleteInTable('issuingrules',shift); }
269
270	1;
271
272	=head1 AUTHOR
273
274	Koha Developement team <info@koha.org>
275
276	Jean-André Santoni <jeanandre.santoni@biblibre.com>
277
278	=cut

Lines 24-29 use strict; Link Here

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

Line 0 Link Here

(-)a/admin/smart-rules-service.pl (+82 lines)
		1	#!/usr/bin/perl
		2
		3	# 2009 BibLibre <jeanandre.santoni@biblibre.com>
		4
		5	# This file is part of Koha.
		6	#
		7	# Koha is free software; you can redistribute it and/or modify it under the
		8	# terms of the GNU General Public License as published by the Free Software
		9	# Foundation; either version 2 of the License, or (at your option) any later
		10	# version.
		11	#
		12	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
		13	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
		14	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
		15	#
		16	# You should have received a copy of the GNU General Public License along with
		17	# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
		18	# Suite 330, Boston, MA 02111-1307 USA
		19	#
		20
		21	use CGI;
		22	use C4::Auth;
		23	use C4::IssuingRules qw(ModIssuingRule GetIssuingRule);
		24
		25	my $cgi = CGI->new;
		26
		27	# get the status of the user, this will check his credentials and rights
		28	my ($status, $cookie, $sessionId) = C4::Auth::check_api_auth($cgi, undef);
		29
		30	my $result;
		31
		32	if ($status eq 'ok') { # if authentication is ok
		33
		34	# Get the POST data
		35	my $branchcode = $cgi->param('branchcode');
		36	my $categorycode = $cgi->param('categorycode');
		37	my $itemtype = $cgi->param('itemtype');
		38	my $varname = $cgi->param('varname');
		39	my $inputvalue = $cgi->param('inputvalue') eq '' ? undef : $cgi->param('inputvalue');
		40
		41	# Modify the existing rule
		42	ModIssuingRule({
		43	branchcode => $branchcode,
		44	categorycode => $categorycode,
		45	itemtype => $itemtype,
		46	$varname => $inputvalue,
		47	});
		48
		49	# Compute inheritance, and return the new value;
		50	my $rule = GetIssuingRule($categorycode, $itemtype, $branchcode);
		51
		52	$result = $rule->{$varname};
		53	$result = C4::Dates->new($rule->{$varname},'iso')->output() if ($varname eq 'hardduedate');
		54	if ($varname eq 'fine') {
		55	my $num_formatter;
		56	my $cur_format = C4::Context->preference("CurrencyFormat");
		57	use Number::Format;
		58	if ( $cur_format eq 'FR' ) {
		59	$num_formatter = Number::Format->new(
		60	'decimal_fill' => '2',
		61	'decimal_point' => ',',
		62	'int_curr_symbol' => '',
		63	'mon_thousands_sep' => ' ',
		64	'thousands_sep' => ' ',
65	'mon_decimal_point' => ','
66	);
67	} else { # US by default..
68	$num_formatter = Number::Format->new(
69	'int_curr_symbol' => '',
70	'mon_thousands_sep' => ',',
71	'mon_decimal_point' => '.'
72	);
73	}
74	$result = $num_formatter->format_price($result);
75	}
76	} else {
77	$result = 'Fail';
78	}
79
80	print CGI::header('-type'=>'text/plain', '-charset'=>'utf-8');
81	print $result;
82

Lines 37-50 use C4::Circulation; Link Here

(-)a/circ/returns.pl (-33 / +97 lines)
37	use C4::Dates qw/format_date/;	37	use C4::Dates qw/format_date/;
38	use Date::Calc qw/Add_Delta_Days/;	38	use Date::Calc qw/Add_Delta_Days/;
39	use C4::Calendar;	39	use C4::Calendar;
		40	use C4::Budgets qw/GetCurrency/;
40	use C4::Print;	41	use C4::Print;
41	use C4::Reserves;	42	use C4::Reserves;
42	use C4::Biblio;	43	use C4::Biblio;
43	use C4::Items;	44	use C4::Items;
44	use C4::Members;	45	use C4::Members;
		46	use C4::Overdues qw/CheckBorrowerDebarred/;
45	use C4::Branch; # GetBranches GetBranchName	47	use C4::Branch; # GetBranches GetBranchName
46	use C4::Koha; # FIXME : is it still useful ?	48	use C4::Koha; # FIXME : is it still useful ?
47	use C4::RotatingCollections;	49	use C4::RotatingCollections;
		50	use C4::Debug;
48		51
49	my $query = new CGI;	52	my $query = new CGI;
50		53
Lines 134-139 if ( $query->param('resbarcode') ) { Link Here
134	my $item = $query->param('itemnumber');	137	my $item = $query->param('itemnumber');
135	my $borrowernumber = $query->param('borrowernumber');	138	my $borrowernumber = $query->param('borrowernumber');
136	my $resbarcode = $query->param('resbarcode');	139	my $resbarcode = $query->param('resbarcode');
		140	my $reservenumber = $query->param('reservenumber');
137	my $diffBranchReturned = $query->param('diffBranch');	141	my $diffBranchReturned = $query->param('diffBranch');
138	my $iteminfo = GetBiblioFromItemNumber($item);	142	my $iteminfo = GetBiblioFromItemNumber($item);
139	# fix up item type for display	143	# fix up item type for display
Lines 141-158 if ( $query->param('resbarcode') ) { Link Here
141	my $diffBranchSend = ($userenv_branch ne $diffBranchReturned) ? $diffBranchReturned : undef;	145	my $diffBranchSend = ($userenv_branch ne $diffBranchReturned) ? $diffBranchReturned : undef;
142	# 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,
143	# i.e., whether to apply waiting status	147	# i.e., whether to apply waiting status
144	ModReserveAffect( $item, $borrowernumber, $diffBranchSend);	148	ModReserveAffect( $item, $borrowernumber, $diffBranchSend, $reservenumber );
		149
145	# 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
146	my ( $messages, $nextreservinfo ) = GetOtherReserves($item);	151	my ( $reservemessages, $nextreservinfo ) = GetOtherReserves($item);
147		152
148	my ($borr) = GetMemberDetails( $nextreservinfo, 0 );	153	my ($borr) = GetMemberDetails( $nextreservinfo, 0 );
149	my $name = $borr->{'surname'} . ", " . $borr->{'title'} . " " . $borr->{'firstname'};	154	my $name = $borr->{'surname'} . ", " . $borr->{'title'} . " " . $borr->{'firstname'};
150	if ( $messages->{'transfert'} ) {	155	if ( $reservemessages->{'transfert'} ) {
151	$template->param(	156	$template->param(
152	itemtitle => $iteminfo->{'title'},	157	itemtitle => $iteminfo->{'title'},
153	itembiblionumber => $iteminfo->{'biblionumber'},	158	itembiblionumber => $iteminfo->{'biblionumber'},
154	iteminfo => $iteminfo->{'author'},	159	iteminfo => $iteminfo->{'author'},
155	tobranchname => GetBranchName($messages->{'transfert'}),	160	tobranchname => GetBranchName($reservemessages->{'transfert'}),
156	name => $name,	161	name => $name,
157	borrowernumber => $borrowernumber,	162	borrowernumber => $borrowernumber,
158	borcnum => $borr->{'cardnumber'},	163	borcnum => $borr->{'cardnumber'},
Lines 168-179 my $returned = 0; Link Here
168	my $messages;	173	my $messages;
169	my $issueinformation;	174	my $issueinformation;
170	my $itemnumber;	175	my $itemnumber;
		176	my $biblio;
171	my $barcode = $query->param('barcode');	177	my $barcode = $query->param('barcode');
172	my $exemptfine = $query->param('exemptfine');	178	my $exemptfine = $query->param('exemptfine');
173	my $dropboxmode = $query->param('dropboxmode');	179	my $dropboxmode = $query->param('dropboxmode');
174	my $dotransfer = $query->param('dotransfer');	180	my $dotransfer = $query->param('dotransfer');
175	my $canceltransfer = $query->param('canceltransfer');	181	my $canceltransfer = $query->param('canceltransfer');
176	my $dest = $query->param('dest');	182	my $dest = $query->param('dest');
		183	my $override = $query->param('override');
177	my $calendar = C4::Calendar->new( branchcode => $userenv_branch );	184	my $calendar = C4::Calendar->new( branchcode => $userenv_branch );
178	#dropbox: get last open day (today - 1)	185	#dropbox: get last open day (today - 1)
179	my $today = C4::Dates->new();	186	my $today = C4::Dates->new();
Lines 198-204 if ($canceltransfer){ Link Here
198	}	205	}
199		206
200	# actually return book and prepare item table.....	207	# actually return book and prepare item table.....
201	if ($barcode) {	208	if ($barcode and not $query->param('cancel')) {
202	$barcode =~ s/^\s\|\s$//g; # remove leading/trailing whitespace	209	$barcode =~ s/^\s\|\s$//g; # remove leading/trailing whitespace
203	$barcode = barcodedecode($barcode) if C4::Context->preference('itemBarcodeInputFilter');	210	$barcode = barcodedecode($barcode) if C4::Context->preference('itemBarcodeInputFilter');
204	$itemnumber = GetItemnumberFromBarcode($barcode);	211	$itemnumber = GetItemnumberFromBarcode($barcode);
Lines 221-231 if ($barcode) { Link Here
221	# save the return	228	# save the return
222	#	229	#
223	( $returned, $messages, $issueinformation, $borrower ) =	230	( $returned, $messages, $issueinformation, $borrower ) =
224	AddReturn( $barcode, $userenv_branch, $exemptfine, $dropboxmode); # do the return	231	AddReturn( $barcode, $userenv_branch, $exemptfine, $dropboxmode,$override); # do the return
225	my $homeorholdingbranchreturn = C4::Context->preference('HomeOrHoldingBranchReturn') or 'homebranch';	232	my $homeorholdingbranchreturn = C4::Context->preference('HomeOrHoldingBranchReturn') or 'homebranch';
226		233
227	# get biblio description	234	# get biblio description
228	my $biblio = GetBiblioFromItemNumber($itemnumber);	235	$biblio = GetBiblioFromItemNumber($itemnumber);
229	# fix up item type for display	236	# fix up item type for display
230	$biblio->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $biblio->{'itype'} : $biblio->{'itemtype'};	237	$biblio->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $biblio->{'itype'} : $biblio->{'itemtype'};
231		238
Lines 283-289 if ($barcode) { Link Here
283	}	290	}
284	}	291	}
285	}	292	}
286	elsif ( !$messages->{'BadBarcode'} ) {	293	elsif ( !$messages->{'BadBarcode'} and ! $messages->{'Wrongbranch'} ) {
287	$input{duedate} = 0;	294	$input{duedate} = 0;
288	$returneditems{0} = $barcode;	295	$returneditems{0} = $barcode;
289	$riduedate{0} = 0;	296	$riduedate{0} = 0;
Lines 301-306 if ($barcode) { Link Here
301	}	308	}
302	$template->param( inputloop => \@inputloop );	309	$template->param( inputloop => \@inputloop );
303		310
		311
		312	# Is there a circulation note?
		313	my $itemnumber = GetItemnumberFromBarcode($barcode);
		314	my $biblionumber = GetBiblionumberFromItemnumber($itemnumber);
		315	my $record = GetMarcBiblio($biblionumber);
		316	my $frameworkcode = GetFrameworkCode($biblionumber);
		317	my $circnotefield = GetRecordValue('circnote', $record, $frameworkcode);
		318	if (defined @$circnotefield[0]) {
		319	$template->param(circnote => @$circnotefield[0]->{'subfield'});
		320	}
		321
		322
304	my $found = 0;	323	my $found = 0;
305	my $waiting = 0;	324	my $waiting = 0;
306	my $reserved = 0;	325	my $reserved = 0;
Lines 324-332 if ( $messages->{'NeedsTransfer'} ){ Link Here
324	}	343	}
325		344
326	if ( $messages->{'Wrongbranch'} ){	345	if ( $messages->{'Wrongbranch'} ){
327	$template->param(	346	$template->param(
328	wrongbranch => 1,	347	wrongbranch => $branches->{$messages->{'Wrongbranch'}->{'Wrongbranch'}}->{'branchname'},
329	);	348	rightbranch => $branches->{$messages->{'Wrongbranch'}->{'Rightbranch'}}->{'branchname'},
		349	barcode => $barcode,
		350	exemptfine => $exemptfine,
		351	dropboxmode => $dropboxmode,
		352	);
330	}	353	}
331		354
332	# case of wrong transfert, if the document wasn't transfered to the right library (according to branchtransfer (tobranch) BDD)	355	# case of wrong transfert, if the document wasn't transfered to the right library (according to branchtransfer (tobranch) BDD)
Lines 382-388 if ( $messages->{'ResFound'}) { Link Here
382	reserved => 1,	405	reserved => 1,
383	);	406	);
384	}	407	}
385		408	my $debarred = CheckBorrowerDebarred($reserve->{borrowernumber});
386	# same params for Waiting or Reserved	409	# same params for Waiting or Reserved
387	$template->param(	410	$template->param(
388	found => 1,	411	found => 1,
Lines 399-415 if ( $messages->{'ResFound'}) { Link Here
399	borcity => $borr->{'city'},	422	borcity => $borr->{'city'},
400	borzip => $borr->{'zipcode'},	423	borzip => $borr->{'zipcode'},
401	borcnum => $borr->{'cardnumber'},	424	borcnum => $borr->{'cardnumber'},
402	debarred => $borr->{'debarred'},	425	debarred => $debarred,
403	gonenoaddress => $borr->{'gonenoaddress'},	426	gonenoaddress => $borr->{'gonenoaddress'},
404	barcode => $barcode,	427	barcode => $barcode,
405	destbranch => $reserve->{'branchcode'},	428	reservenumber => $reserve->{'reservenumber'},
		429	destbranch => $reserve->{'branchcode'},
406	borrowernumber => $reserve->{'borrowernumber'},	430	borrowernumber => $reserve->{'borrowernumber'},
407	itemnumber => $reserve->{'itemnumber'},	431	itemnumber => $reserve->{'itemnumber'},
408	reservenotes => $reserve->{'reservenotes'},	432	reservenotes => $reserve->{'reservenotes'},
409	);	433	);
410	} # else { ; } # error?	434	} # else { ; } # error?
411	}	435	}
412		436	$borrower->{'flags'}= C4::Members::patronflags($borrower);
413	# Error Messages	437	# Error Messages
414	my @errmsgloop;	438	my @errmsgloop;
415	foreach my $code ( keys %$messages ) {	439	foreach my $code ( keys %$messages ) {
Lines 435-440 foreach my $code ( keys %$messages ) { Link Here
435	elsif ( $code eq 'WasTransfered' ) {	459	elsif ( $code eq 'WasTransfered' ) {
436	; # FIXME... anything to do here?	460	; # FIXME... anything to do here?
437	}	461	}
		462	elsif ( $code eq 'NotForLoan' ) {
		463	my $fw = GetFrameworkCode($biblio->{'biblionumber'});
		464	my $category = GetAuthValCode('items.notforloan',$fw);
		465	my $authorizedvalues = GetAuthorisedValues($category, $messages->{$code});
		466
		467	foreach my $authvalue (@$authorizedvalues){
		468	$err{notforloan} = $authvalue->{lib} if $authvalue->{'authorised_value'} eq $messages->{$code};
		469	}
		470	}
		471	elsif ( $code eq 'Damaged' ) {
		472	my $fw = GetFrameworkCode($biblio->{'biblionumber'});
		473	my $category = GetAuthValCode('items.damaged',$fw);
		474	my $authorizedvalues = GetAuthorisedValues($category, $messages->{$code});
		475
		476	foreach my $authvalue (@$authorizedvalues){
		477	$err{damaged} = $authvalue->{lib} if $authvalue->{'authorised_value'} eq $messages->{$code};
		478	}
		479	}
		480	elsif( $code eq 'Debarred' ){
		481	$err{debarred} = format_date($messages->{'Debarred'});
		482	$err{debarcardnumber} = $borrower->{cardnumber};
		483	$err{debarborrowernumber} = $borrower->{borrowernumber};
		484	$err{debarname} = "$borrower->{firstname} $borrower->{surname}";
		485	}
		486	elsif( $code eq 'HaveFines' ){
		487	$err{havefines} = $borrower->{'flags'}->{'CHARGES'}->{'amount'} . %{GetCurrency()}->{symbol};
		488	$err{finecardnumber} = $borrower->{cardnumber};
		489	$err{finename} = "$borrower->{firstname} $borrower->{surname}";
		490	}
438	elsif ( $code eq 'wthdrawn' ) {	491	elsif ( $code eq 'wthdrawn' ) {
439	$err{withdrawn} = 1;	492	$err{withdrawn} = 1;
440	$exit_required_p = 1;	493	$exit_required_p = 1;
Lines 456-462 foreach my $code ( keys %$messages ) { Link Here
456	}	509	}
457	elsif ( $code eq 'Wrongbranch' ) {	510	elsif ( $code eq 'Wrongbranch' ) {
458	}	511	}
459
460	else {	512	else {
461	die "Unknown error code $code"; # note we need all the (empty) elsif's above, or we die.	513	die "Unknown error code $code"; # note we need all the (empty) elsif's above, or we die.
462	# This forces the issue of staying in sync w/ Circulation.pm	514	# This forces the issue of staying in sync w/ Circulation.pm
Lines 470-483 $template->param( errmsgloop => \@errmsgloop ); Link Here
470		522
471	# patrontable ....	523	# patrontable ....
472	if ($borrower) {	524	if ($borrower) {
473	my $flags = $borrower->{'flags'};
474	my @flagloop;	525	my @flagloop;
475	my $flagset;	526	my $flags=$borrower->{flags};
476	foreach my $flag ( sort keys %$flags ) {	527	foreach my $flag ( sort keys %$flags ) {
477	my %flaginfo;	528	my %flaginfo;
478	unless ($flagset) { $flagset = 1; }
479	$flaginfo{redfont} = ( $flags->{$flag}->{'noissues'} );
480	$flaginfo{flag} = $flag;
481	if ( $flag eq 'CHARGES' ) {	529	if ( $flag eq 'CHARGES' ) {
482	$flaginfo{msg} = $flag;	530	$flaginfo{msg} = $flag;
483	$flaginfo{charges} = 1;	531	$flaginfo{charges} = 1;
Lines 492-505 if ($borrower) { Link Here
492	foreach my $item (@$items) {	540	foreach my $item (@$items) {
493	my $biblio = GetBiblioFromItemNumber( $item->{'itemnumber'});	541	my $biblio = GetBiblioFromItemNumber( $item->{'itemnumber'});
494	push @waitingitemloop, {	542	push @waitingitemloop, {
495	biblionum => $biblio->{'biblionumber'},	543	biblionumber=> $biblio->{'biblionumber'},
496	barcode => $biblio->{'barcode'},	544	author => $biblio->{'author'},
497	title => $biblio->{'title'},	545	itemtype => $item->{'ccode'},
498	brname => $branches->{ $biblio->{'holdingbranch'} }->{'branchname'},	546	reservedate => format_date($item->{'reservedate'}),
		547	waitingdate => format_date($item->{'waitingdate'}),
		548	barcode => $item->{'barcode'},
		549	maxpickupdate=> format_date( sprintf("%d-%02d-%02d",GetMaxPickupDate($item->{'waitingdate'}, $borrower->{borrowernumber},$item ))),
		550	title => $biblio->{'title'},
		551	brname => $branches->{ $item->{'branchcode'} }->{'branchname'},
		552	waitinghere => ($item->{'branchcode'} eq $userenv_branch)
499	};	553	};
500	}	554	}
501	$flaginfo{itemloop} = \@waitingitemloop;	555	$flaginfo{itemloop} = \@waitingitemloop;
502	}	556	}
		557	elsif ( $flag =~ /DEBARRED\|LOST\|GNA/ ) {
		558	if ($flag ne "GNA"){
		559	$flag=lc($flag);
		560	}
		561	else{
		562	$flag="gonenoaddress";
		563	}
		564	%flaginfo=( $flag =>1, $flag."comment"=>$borrower->{$flag."comment"},dateend=>$flags->{uc($flag)}->{dateend});
		565	}
503	elsif ( $flag eq 'ODUES' ) {	566	elsif ( $flag eq 'ODUES' ) {
504	my $items = $flags->{$flag}->{'itemlist'};	567	my $items = $flags->{$flag}->{'itemlist'};
505	my @itemloop;	568	my @itemloop;
Lines 525-531 if ($borrower) { Link Here
525	push( @flagloop, \%flaginfo );	588	push( @flagloop, \%flaginfo );
526	}	589	}
527	$template->param(	590	$template->param(
528	flagset => $flagset,
529	flagloop => \@flagloop,	591	flagloop => \@flagloop,
530	riborrowernumber => $borrower->{'borrowernumber'},	592	riborrowernumber => $borrower->{'borrowernumber'},
531	riborcnum => $borrower->{'cardnumber'},	593	riborcnum => $borrower->{'cardnumber'},
Lines 536-542 if ($borrower) { Link Here
536	}	598	}
537		599
538	#set up so only the last 8 returned items display (make for faster loading pages)	600	#set up so only the last 8 returned items display (make for faster loading pages)
539	my $returned_counter = ( C4::Context->preference('numReturnedItemsToShow') ) ? C4::Context->preference('numReturnedItemsToShow') : 8;	601	my $returned_counter = ( C4::Context->preference('numReturnedItemsToShow') ) ? C4::Context->preference('numReturnedItemsToShow') : 10;
540	my $count = 0;	602	my $count = 0;
541	my @riloop;	603	my @riloop;
542	my $shelflocations = GetKohaAuthorisedValues('items.location','');	604	my $shelflocations = GetKohaAuthorisedValues('items.location','');
Lines 564-572 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here
564	else {	626	else {
565	$ri{borrowernumber} = $riborrowernumber{$_};	627	$ri{borrowernumber} = $riborrowernumber{$_};
566	}	628	}
567
568	# my %ri;	629	# my %ri;
569	my $biblio = GetBiblioFromItemNumber(GetItemnumberFromBarcode($bar_code));	630	my $biblio = GetBiblioFromItemNumber(GetItemnumberFromBarcode($bar_code));
		631	my $item = GetItem(GetItemnumberFromBarcode($bar_code));
570	# fix up item type for display	632	# fix up item type for display
571	$biblio->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $biblio->{'itype'} : $biblio->{'itemtype'};	633	$biblio->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $biblio->{'itype'} : $biblio->{'itemtype'};
572	$ri{itembiblionumber} = $biblio->{'biblionumber'};	634	$ri{itembiblionumber} = $biblio->{'biblionumber'};
Lines 575-588 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here
575	$ri{itemcallnumber} = $biblio->{'itemcallnumber'};	637	$ri{itemcallnumber} = $biblio->{'itemcallnumber'};
576	$ri{itemtype} = $biblio->{'itemtype'};	638	$ri{itemtype} = $biblio->{'itemtype'};
577	$ri{itemnote} = $biblio->{'itemnotes'};	639	$ri{itemnote} = $biblio->{'itemnotes'};
578	$ri{ccode} = $biblio->{'ccode'};
579	$ri{itemnumber} = $biblio->{'itemnumber'};	640	$ri{itemnumber} = $biblio->{'itemnumber'};
		641	$ri{itemtype} = $item->{'itype'};
		642	$ri{ccode} = $item->{'ccode'};
		643	$ri{itemcallnumber} = $item->{'itemcallnumber'};
		644	$ri{homebranch} = $item->{'homebranch'};
		645	$ri{holdingbranch} = $item->{'holdingbranch'};
580	$ri{barcode} = $bar_code;	646	$ri{barcode} = $bar_code;
581		647
582	$ri{location} = $biblio->{'location'};	648	my $shelflocations = GetKohaAuthorisedValues('items.location','');
583	my $shelfcode = $ri{'location'};	649	$ri{itemlocation} = $shelflocations->{$biblio->{'location'}};
584	$ri{'location'} = $shelflocations->{$shelfcode} if ( defined( $shelfcode ) && defined($shelflocations) && exists( $shelflocations->{$shelfcode} ) );
585
586	}	650	}
587	else {	651	else {
588	last;	652	last;

Lines 144-149 function Dopop(link) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (+3 lines)
144	<input type="hidden" name="diffBranch" value="[% destbranch %]" />	144	<input type="hidden" name="diffBranch" value="[% destbranch %]" />
145	<input type="hidden" name="exemptfine" value="[% exemptfine %]" />	145	<input type="hidden" name="exemptfine" value="[% exemptfine %]" />
146	<input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />	146	<input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
		147	<input type="hidden" name="reservenumber" value="[% reservenumber %]" />
147	</form>	148	</form>
148	</div>	149	</div>
149	[% END %]	150	[% END %]
Lines 180-185 function Dopop(link) { Link Here
180	<input type="hidden" name="diffBranch" value="[% destbranch %]" />	181	<input type="hidden" name="diffBranch" value="[% destbranch %]" />
181	<input type="hidden" name="exemptfine" value="[% exemptfine %]" />	182	<input type="hidden" name="exemptfine" value="[% exemptfine %]" />
182	<input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />	183	<input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
		184	<input type="hidden" name="reservenumber" value="[% reservenumber %]" />
183	<input type="hidden" name="barcode" value="0" />	185	<input type="hidden" name="barcode" value="0" />
184	</form>	186	</form>
185	</div>	187	</div>
Lines 281-286 function Dopop(link) { Link Here
281	<input type="hidden" name="diffBranch" value="[% destbranch %]" />	283	<input type="hidden" name="diffBranch" value="[% destbranch %]" />
282	<input type="hidden" name="exemptfine" value="[% exemptfine %]" />	284	<input type="hidden" name="exemptfine" value="[% exemptfine %]" />
283	<input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />	285	<input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
		286	<input type="hidden" name="reservenumber" value="[% reservenumber %]" />
284	</form>	287	</form>
285	</div>	288	</div>
286	[% END %]	289	[% END %]

Lines 23-32 function check() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-9 / +32 lines)
23	var count_reserv = 0;	23	var count_reserv = 0;
24	var alreadyreserved = 0;	24	var alreadyreserved = 0;
25		25
		26	var hold_type="";
26	// check if we have checkitem form	27	// check if we have checkitem form
27	if (document.form.checkitem){	28	if (document.form.checkitem){
28	for (i=0;i<document.form.checkitem.length;i++){	29	for (i=0;i<document.form.checkitem.length;i++){
29	if (document.form.checkitem[i].checked == true) {	30	if (document.form.checkitem[i].checked == true) {
		31	if (hold_type=="" \|\| hold_type=="single"){
		32	hold_type=document.form.hold_type[i].value;
		33	}
30	count_reserv++ ;	34	count_reserv++ ;
31	}	35	}
32	}	36	}
Lines 49-59 function check() { Link Here
49	if (count_reserv == "0"){	53	if (count_reserv == "0"){
50	msg += (_("- Please select an item to place a hold") + "\n");	54	msg += (_("- Please select an item to place a hold") + "\n");
51	}	55	}
52	if (count_reserv >= "2"){	56	if (count_reserv >= "2" && hold_type != "multiple"){
53	msg += (_("- You may only place a hold on one item at a time") + "\n");	57	msg += (_("- You may only place a hold on one item at a time") + "\n");
54	}	58	}
55		59
56	if (alreadyreserved > "0"){	60	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");	61	msg += (_("- This patron had already placed a hold on this item") + "\n" + _("Please cancel the previous hold first") + "\n");
58	}	62	}
59		63
Lines 395-408 function checkMultiHold() { Link Here
395	[% UNLESS ( itemloo.hide ) %]	399	[% UNLESS ( itemloo.hide ) %]
396	<tr class="[% itemloo.backgroundcolor %]">	400	<tr class="[% itemloo.backgroundcolor %]">
397	<td>	401	<td>
398	[% IF ( itemloo.available ) %]	402	[% IF ( itemloo.canholdmultiple ) %]
399	<input type="radio" name="checkitem" value="[% itemloo.itemnumber %]" />	403	<input type="hidden" name="hold_type" value="multiple" />
		404	[% ELSIF ( itemloo.available ) %]
		405	<input type="hidden" name="hold_type" value="single" />
400	[% ELSIF ( itemloo.override ) %]	406	[% ELSIF ( itemloo.override ) %]
401	<input type="radio" name="checkitem" class="needsoverride" value="[% itemloo.itemnumber %]" />	407	<input type="hidden" name="hold_type" value="single" />
402	<img src="/intranet-tmpl/[% theme %]/img/famfamfam/silk/error.png" alt="Requires override of hold policy" />	408	[% END %]
		409	[% IF ( itemloo.cannothold ) %]
		410	<input disabled="disabled" type="radio" name="checkitem" value="[% itemloo.itemnumber %]" />
		411	<img src="/intranet-tmpl/[% theme %]/img/famfamfam/silk/cross.png" alt="Cannot be put on hold" />
403	[% ELSE %]	412	[% ELSE %]
404	<input disabled="disabled" type="radio" name="checkitem" value="[% itemloo.itemnumber %]" />	413	[% IF ( itemloo.canholdmultiple ) %]
405	<img src="/intranet-tmpl/[% theme %]/img/famfamfam/silk/cross.png" alt="Cannot be put on hold" />	414	<input type="checkbox" name="checkitem" value="[% itemnumber %]" />
		415	[% ELSIF ( itemloo.available ) %]
		416	[% IF ( itemloo.available ) %]
		417	<input type="radio" name="checkitem" value="[% itemloo.itemnumber %]" />
		418	[% ELSIF ( itemloo.override ) %]
		419	<input type="radio" name="checkitem" class="needsoverride" value="[% itemloo.itemnumber %]" />
		420	<img src="/intranet-tmpl/[% theme %]/img/famfamfam/silk/error.png" alt="Requires override of hold policy" />
		421	[% ELSE %]
		422	<input disabled="disabled" type="radio" name="checkitem" value="[% itemloo.itemnumber %]" />
		423	<img src="/intranet-tmpl/[% theme %]/img/famfamfam/silk/cross.png" alt="Cannot be put on hold" />
		424	[% END %]
		425	[% ELSE %]
		426	<input disabled="disabled" type="radio" name="checkitem" value="[% itemnumber %]" />
		427	<img src="/intranet-tmpl/[% theme %]/img/famfamfam/silk/cross.png" alt="Cannot be put on hold" />
		428	[% END %]
406	[% END %]	429	[% END %]
407	</td>	430	</td>
408	[% IF ( item_level_itypes ) %]	431	[% IF ( item_level_itypes ) %]
Lines 713-719 function checkMultiHold() { Link Here
713	[% END %]	736	[% END %]
714		737
715	<td>	738	<td>
716	<a title="Cancel Hold" href="request.pl?action=cancel&borrowernumber=[% reserveloo.borrowernumber %]&biblionumber=[% reserveloo.biblionumber %]&date=[% reserveloo.date %]">	739	<a title="Cancel Hold" href="request.pl?action=cancel&reservenumber=[% reserveloo.reservenumber %]&biblionumber=[% reserveloo.biblionumber %]">
717	<img src="/intranet-tmpl/[% theme %]/img/x.png" border="0" alt="Cancel" />	740	<img src="/intranet-tmpl/[% theme %]/img/x.png" border="0" alt="Cancel" />
718	</a>	741	</a>
719	</td>	742	</td>

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 (-49 / +47 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 $borrowernumber=$input->param('borrowernumber');	46	my $borrowernumber = $input->param('borrowernumber');
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 $borrower=GetMember('borrowernumber'=>$borrowernumber);	53	my $borrower = GetMember( 'borrowernumber' => $borrowernumber );
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' && $borrower){	84	if ( $type eq 'str8' && $borrowernumber ne '' ) {
85		85	foreach my $biblionumber ( keys %bibinfos ) {
86	foreach my $biblionumber (keys %bibinfos) {	86	my $count = @bibitems;
87	my $count=@bibitems;	87	@bibitems = sort @bibitems;
88	@bibitems=sort @bibitems;	88	my $i2 = 1;
89	my $i2=1;
90	my @realbi;	89	my @realbi;
91	$realbi[0]=$bibitems[0];	90	$realbi[0] = $bibitems[0];
92	for (my $i=1;$i<$count;$i++) {	91	for ( my $i = 1 ; $i < $count ; $i++ ) {
93	my $i3=$i2-1;	92	my $i3 = $i2 - 1;
94	if ($realbi[$i3] ne $bibitems[$i]) {	93	if ( $realbi[$i3] ne $bibitems[$i] ) {
95	$realbi[$i2]=$bibitems[$i];	94	$realbi[$i2] = $bibitems[$i];
96	$i2++;	95	$i2++;
97	}	96	}
98	}	97	}
Lines 100-117 if ($type eq 'str8' && $borrower){ Link Here
100		99
101	if ($multi_hold) {	100	if ($multi_hold) {
102	my $bibinfo = $bibinfos{$biblionumber};	101	my $bibinfo = $bibinfos{$biblionumber};
		102
103	AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,'a',[$biblionumber],	103	AddReserve($branch,$borrower->{'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,$borrower->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem,$found);	108	AddReserve($branch,$borrower->{'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,$borrower->{'borrowernumber'},$biblionumber,'o',\@reqbib,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem, $found);
113	} else {	109	} else {
114	AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem, $found);	110	for my $item (@checkitems){
		111	AddReserve( $branch, $borrower->{'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-133 if ($type eq 'str8' && $borrower){ 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 ($borrower eq ''){	127	} elsif ( $borrowernumber eq '' ) {
128	print $input->header();	128	print $input->header();
129	print "Invalid borrower number please try again";	129	print "Invalid card number please try again";
130	# Not sure that Dump() does HTML escaping. Use firebug or something to trace	130	print $input->Dump;
131	# instead.
132	# print $input->Dump;
133	}	131	}

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

(-)a/reserve/request.pl (-31 / +37 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 92-98 my $warnings; Link Here
92	my $messages;	93	my $messages;
93		94
94	my $date = C4::Dates->today('iso');	95	my $date = C4::Dates->today('iso');
95	my $action = $input->param('action');	96	my $action = $input->param('action') \|\| '';
96		97
97	if ( $action eq 'move' ) {	98	if ( $action eq 'move' ) {
98	my $where = $input->param('where');	99	my $where = $input->param('where');
Lines 102-110 if ( $action eq 'move' ) { Link Here
102	AlterPriority( $where, $borrowernumber, $biblionumber );	103	AlterPriority( $where, $borrowernumber, $biblionumber );
103		104
104	} elsif ( $action eq 'cancel' ) {	105	} elsif ( $action eq 'cancel' ) {
105	my $borrowernumber = $input->param('borrowernumber');	106	my $reservenumber = $input->param('reservenumber');
106	my $biblionumber = $input->param('biblionumber');	107	my $biblionumber = $input->param('biblionumber');
107	CancelReserve( $biblionumber, '', $borrowernumber );	108	CancelReserve( $reservenumber, $biblionumber );
108	} elsif ( $action eq 'setLowestPriority' ) {	109	} elsif ( $action eq 'setLowestPriority' ) {
109	my $borrowernumber = $input->param('borrowernumber');	110	my $borrowernumber = $input->param('borrowernumber');
110	my $biblionumber = $input->param('biblionumber');	111	my $biblionumber = $input->param('biblionumber');
Lines 138-156 if ($borrowernumber_hold) { Link Here
138	# we check the reserves of the borrower, and if he can reserv a document	139	# we check the reserves of the borrower, and if he can reserv a document
139	# FIXME At this time we have a simple count of reservs, but, later, we could improve the infos "title" ...	140	# FIXME At this time we have a simple count of reservs, but, later, we could improve the infos "title" ...
140		141
141	my $number_reserves =	142	my $number_reserves = GetReserveCount( $borrowerinfo->{'borrowernumber'} );
142	GetReserveCount( $borrowerinfo->{'borrowernumber'} );
143		143
144	if ( C4::Context->preference('maxreserves') && ($number_reserves >= C4::Context->preference('maxreserves')) ) {	144	if ( not CanBookBeReserved( $borrowerinfo->{borrowernumber}, $input->param('biblionumber') ) ) {
145	$warnings = 1;	145	$warnings = 1;
146	$maxreserves = 1;	146	$maxreserves = 1;
147	}	147	}
		148	if ( not CanBookBeReserved( $borrowerinfo->{borrowernumber}, $input->param('biblionumber') ) ) {
		149	$warnings = 1;
		150	}
148		151
149	# we check the date expiry of the borrower (only if there is an expiry date, otherwise, set to 1 (warn)	152	# we check the date expiry of the borrower (only if there is an expiry date, otherwise, set to 1 (warn)
150	my $expiry_date = $borrowerinfo->{dateexpiry};	153	my $expiry_date = $borrowerinfo->{dateexpiry};
151	my $expiry = 0; # flag set if patron account has expired	154	my $expiry = 0; # flag set if patron account has expired
152	if ($expiry_date and $expiry_date ne '0000-00-00' and	155	if ($expiry_date and $expiry_date ne '0000-00-00' and
153	Date_to_Days(split /-/,$date) > Date_to_Days(split /-/,$expiry_date)) {	156	Date_to_Days(split (/-/,$date)) > Date_to_Days(split (/-/,$expiry_date))) {
154	$messages = $expiry = 1;	157	$messages = $expiry = 1;
155	}	158	}
156		159
Lines 224-230 my $borrowerinfo = GetMemberDetails( $borrowernumber_hold ); Link Here
224	my @biblionumbers = ();	227	my @biblionumbers = ();
225	my $biblionumbers = $input->param('biblionumbers');	228	my $biblionumbers = $input->param('biblionumbers');
226	if ($multihold) {	229	if ($multihold) {
227	@biblionumbers = split '/', $biblionumbers;	230	@biblionumbers = split ('/', $biblionumbers);
228	} else {	231	} else {
229	push @biblionumbers, $input->param('biblionumber');	232	push @biblionumbers, $input->param('biblionumber');
230	}	233	}
Lines 236-242 foreach my $biblionumber (@biblionumbers) { Link Here
236	my $maxreserves;	239	my $maxreserves;
237		240
238	my $dat = GetBiblioData($biblionumber);	241	my $dat = GetBiblioData($biblionumber);
239
240	unless ( CanBookBeReserved($borrowerinfo->{borrowernumber}, $biblionumber) ) {	242	unless ( CanBookBeReserved($borrowerinfo->{borrowernumber}, $biblionumber) ) {
241	$warnings = 1;	243	$warnings = 1;
242	$maxreserves = 1;	244	$maxreserves = 1;
Lines 250-257 foreach my $biblionumber (@biblionumbers) { Link Here
250	if ( defined $res->{found} && $res->{found} eq 'W' ) {	252	if ( defined $res->{found} && $res->{found} eq 'W' ) {
251	$count--;	253	$count--;
252	}	254	}
253		255	if ($res->{itemnumber} && not $res->{itemtype}){
254	if ( defined $borrowerinfo && ($borrowerinfo->{borrowernumber} eq $res->{borrowernumber}) ) {	256	$res->{itemtype}=GetItem($res->{itemnumber},$res->{biblionumber})->{itype};
		257	}
		258	next if CanHoldMultipleItems($res->{itemtype});
		259	if ( defined $borrowerinfo && ($borrowerinfo->{borrowernumber} eq $res->{borrowernumber}) && !CanHoldMultipleItems($res->{itemtype}) ) {
255	$warnings = 1;	260	$warnings = 1;
256	$alreadyreserved = 1;	261	$alreadyreserved = 1;
257	$biblioloopiter{warn} = 1;	262	$biblioloopiter{warn} = 1;
Lines 419-442 foreach my $biblionumber (@biblionumbers) { Link Here
419	}	424	}
420	}	425	}
421	}	426	}
		427	my $branchitemrule = GetIssuingRule( $borrowerinfo->{categorycode}, $item->{'itype'}, GetReservesControlBranch( $borrowerinfo, $item ) );
		428	my $policy_holdrestricted = $branchitemrule->{'reservesallowed'};
		429	# prevent item to be reserved if holdrestricted & branch not the librarian branch & syspref to override not set
		430	$item->{'holdrestricted'} = $branchitemrule->{'holdrestricted'};
422		431
423	my $branch = C4::Circulation::_GetCircControlBranch($item, $borrowerinfo);	432	if (IsAvailableForItemLevelRequest($itemnumber) and not $item->{cantreserve} and CanItemBeReserved($borrowerinfo->{borrowernumber}, $itemnumber) ) {
424		433	if ( not $policy_holdrestricted and C4::Context->preference( 'AllowHoldPolicyOverride' ) ) {
425	my $branchitemrule = GetBranchItemRule( $branch, $item->{'itype'} );	434	$item->{override} = 1;
426	my $policy_holdallowed = 1;	435	$num_override++;
427		436	} elsif ( $policy_holdrestricted ) {
428	$item->{'holdallowed'} = $branchitemrule->{'holdallowed'};
429
430	if ( $branchitemrule->{'holdallowed'} == 0 \|\|
431	( $branchitemrule->{'holdallowed'} == 1 &&
432	$borrowerinfo->{'branchcode'} ne $item->{'homebranch'} ) ) {
433	$policy_holdallowed = 0;
434	}
435
436	if (IsAvailableForItemLevelRequest($itemnumber) and
437	not $item->{cantreserve} and
438	CanItemBeReserved($borrowerinfo->{borrowernumber}, $itemnumber) ) {
439	if ( $policy_holdallowed ) {
440	$item->{available} = 1;	437	$item->{available} = 1;
441	$num_available++;	438	$num_available++;
442	}	439	}
Lines 458-467 foreach my $biblionumber (@biblionumbers) { Link Here
458	while (my $wait_hashref = $sth2->fetchrow_hashref) {	455	while (my $wait_hashref = $sth2->fetchrow_hashref) {
459	$item->{waitingdate} = format_date($wait_hashref->{waitingdate});	456	$item->{waitingdate} = format_date($wait_hashref->{waitingdate});
460	}	457	}
		458
		459	if ( BorrowerHasReserve( $borrowerinfo->{'borrowernumber'}, '', $itemnumber ) ) {
		460	$item->{available} = 0;
		461	$item->{override} = 0;
		462	}
		463	$item->{canholdmultiple}=CanHoldMultipleItems($item->{itype}) && $item->{available};
		464
461	push @{ $biblioitem->{itemloop} }, $item;	465	push @{ $biblioitem->{itemloop} }, $item;
462	}	466	}
463		467	if ( $num_override > 0) {
464	if ( $num_override == scalar( @{ $biblioitem->{itemloop} } ) ) { # That is, if all items require an override
465	$template->param( override_required => 1 );	468	$template->param( override_required => 1 );
466	} elsif ( $num_available == 0 ) {	469	} elsif ( $num_available == 0 ) {
467	$template->param( none_available => 1 );	470	$template->param( none_available => 1 );
Lines 483-488 foreach my $biblionumber (@biblionumbers) { Link Here
483	$a_found cmp $b_found;	486	$a_found cmp $b_found;
484	} @$reserves ) {	487	} @$reserves ) {
485	my %reserve;	488	my %reserve;
		489
		490	$reserve{'reservenumber'} = $res->{'reservenumber'};
		491
486	my @optionloop;	492	my @optionloop;
487	for ( my $i = 1 ; $i <= $totalcount ; $i++ ) {	493	for ( my $i = 1 ; $i <= $totalcount ; $i++ ) {
488	push(	494	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;