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

(-)a/C4/Members.pm (-1 / +2 lines)
Lines 1256-1262 sub GetMemberAccountBalance { Link Here
1256
1256
1257
    my $ACCOUNT_TYPE_LENGTH = 5; # this is plain ridiculous...
1257
    my $ACCOUNT_TYPE_LENGTH = 5; # this is plain ridiculous...
1258
1258
1259
    my @not_fines = ('Res');
1259
    my @not_fines;
1260
    push @not_fines, 'Res' unless C4::Context->preference('HoldsInNoissuesCharge');
1260
    push @not_fines, 'Rent' unless C4::Context->preference('RentalsInNoissuesCharge');
1261
    push @not_fines, 'Rent' unless C4::Context->preference('RentalsInNoissuesCharge');
1261
    unless ( C4::Context->preference('ManInvInNoissuesCharge') ) {
1262
    unless ( C4::Context->preference('ManInvInNoissuesCharge') ) {
1262
        my $dbh = C4::Context->dbh;
1263
        my $dbh = C4::Context->dbh;
(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
Lines 8465-8470 if ( CheckVersion($DBversion) ) { Link Here
8465
    SetVersion($DBversion);
8465
    SetVersion($DBversion);
8466
}
8466
}
8467
8467
8468
$DBversion = "3.15.00.XXX";
8469
if ( CheckVersion($DBversion) ) {
8470
    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('HoldsInNoissuesCharge', '0', 'Hold charges block checkouts (added to noissuescharge).',NULL,'YesNo');");
8471
    print "Upgrade to $DBversion done (Add HoldsInNoissuesCharge systempreference)\n";
8472
    SetVersion($DBversion);
8473
}
8474
8475
8468
=head1 FUNCTIONS
8476
=head1 FUNCTIONS
8469
8477
8470
=head2 TableExists($table)
8478
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-1 / +6 lines)
Lines 308-313 Circulation: Link Here
308
                  no: "Don't include"
308
                  no: "Don't include"
309
            - MANUAL_INV charges when summing up charges for noissuescharge.
309
            - MANUAL_INV charges when summing up charges for noissuescharge.
310
        -
310
        -
311
            - pref: HoldsInNoissuesCharge
312
              choices:
313
                  yes: Include
314
                  no: "Don't include"
315
            - hold charges when summing up charges for noissuescharge.
316
        -
311
            - pref: ReturnBeforeExpiry
317
            - pref: ReturnBeforeExpiry
312
              choices:
318
              choices:
313
                  yes: Require
319
                  yes: Require
314
- 

Return to bug 12205