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

(-)a/C4/SIP/ILS/Patron.pm (-1 / +1 lines)
Lines 329-335 sub excessive_fines { Link Here
329
329
330
sub holds_blocked_by_excessive_fees {
330
sub holds_blocked_by_excessive_fees {
331
    return ( $self->fee_amount
331
    return ( $self->fee_amount
332
          && $self->fee_amount > C4::Context->preference("maxoutstanding") );
332
          && $self->fee_amount > C4::Context->preference("FeesBlockHoldsAmount") );
333
}
333
}
334
    
334
    
335
sub library_name {
335
sub library_name {
(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 56-62 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here
56
-- INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('marcflavour','MARC21','Define global MARC flavor (MARC21 or UNIMARC) used for character encoding','MARC21|UNIMARC','Choice');
56
-- INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('marcflavour','MARC21','Define global MARC flavor (MARC21 or UNIMARC) used for character encoding','MARC21|UNIMARC','Choice');
57
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MARCOrgCode','OSt','Define MARC Organization Code - http://www.loc.gov/marc/organizations/orgshome.html','','free');
57
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MARCOrgCode','OSt','Define MARC Organization Code - http://www.loc.gov/marc/organizations/orgshome.html','','free');
58
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MaxFine',NULL,'Maximum fine a patron can have for all late returns at one moment. Single item caps are specified in the circulation rules matrix.','','Integer');
58
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MaxFine',NULL,'Maximum fine a patron can have for all late returns at one moment. Single item caps are specified in the circulation rules matrix.','','Integer');
59
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxoutstanding',5,'maximum amount withstanding to be able make holds','','Integer');
59
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FeesBlockHoldsAmount',5,'maximum amount withstanding to be able make holds','','Integer');
60
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxreserves',50,'Define maximum number of holds a patron can place','','Integer');
60
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxreserves',50,'Define maximum number of holds a patron can place','','Integer');
61
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxItemsInSearchResults',20,'Specify the maximum number of items to display for each result on a page of results',NULL,'free');
61
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxItemsInSearchResults',20,'Specify the maximum number of items to display for each result on a page of results',NULL,'free');
62
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('memberofinstitution',0,'If ON, patrons can be linked to institutions',NULL,'YesNo');
62
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('memberofinstitution',0,'If ON, patrons can be linked to institutions',NULL,'YesNo');
(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
Lines 7058-7063 if ( CheckVersion($DBversion) ) { Link Here
7058
    SetVersion($DBversion);
7058
    SetVersion($DBversion);
7059
}
7059
}
7060
7060
7061
$DBversion = "3.13.00.XXX";
7062
if ( CheckVersion($DBversion) ) {
7063
    $dbh->do("UPDATE systempreferences SET variable = 'FeesBlockHoldsAmount' WHERE variable = 'maxoutstanding'");
7064
    print "Upgrade to $DBversion done (Bug 10446 - System preference maxoutstanding is poorly named)\n";
7065
    SetVersion($DBversion);
7066
}
7067
7061
=head1 FUNCTIONS
7068
=head1 FUNCTIONS
7062
7069
7063
=head2 TableExists($table)
7070
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-1 / +1 lines)
Lines 241-247 Circulation: Link Here
241
            - a renewal notice according to patron checkout alert preferences.
241
            - a renewal notice according to patron checkout alert preferences.
242
        -
242
        -
243
            - Prevent patrons from making holds on the OPAC if they owe more than
243
            - Prevent patrons from making holds on the OPAC if they owe more than
244
            - pref: maxoutstanding
244
            - pref: FeesBlockHoldsAmount
245
              class: currency
245
              class: currency
246
            - '[% local_currency %] in fines.'
246
            - '[% local_currency %] in fines.'
247
        -
247
        -
(-)a/opac/opac-reserve.pl (-4 / +3 lines)
Lines 285-293 if ( $query->param('place_reserve') ) { Link Here
285
#
285
#
286
#
286
#
287
my $noreserves     = 0;
287
my $noreserves     = 0;
288
my $maxoutstanding = C4::Context->preference("maxoutstanding");
288
my $FeesBlockHoldsAmount = C4::Context->preference("FeesBlockHoldsAmount");
289
$template->param( noreserve => 1 ) unless $maxoutstanding;
289
$template->param( noreserve => 1 ) unless $FeesBlockHoldsAmount;
290
if ( $borr->{'amountoutstanding'} && ($borr->{'amountoutstanding'} > $maxoutstanding) ) {
290
if ( $borr->{'amountoutstanding'} && ($borr->{'amountoutstanding'} > $FeesBlockHoldsAmount) ) {
291
    my $amount = sprintf "\$%.02f", $borr->{'amountoutstanding'};
291
    my $amount = sprintf "\$%.02f", $borr->{'amountoutstanding'};
292
    $template->param( message => 1 );
292
    $template->param( message => 1 );
293
    $noreserves = 1;
293
    $noreserves = 1;
294
- 

Return to bug 10446