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

(-)a/C4/Circulation.pm (-1 / +3 lines)
Lines 1069-1075 sub AddIssue { Link Here
1069
1069
1070
        ## If item was lost, it has now been found, reverse any list item charges if neccessary.
1070
        ## If item was lost, it has now been found, reverse any list item charges if neccessary.
1071
        if ( $item->{'itemlost'} ) {
1071
        if ( $item->{'itemlost'} ) {
1072
            _FixAccountForLostAndReturned( $item->{'itemnumber'}, undef, $item->{'barcode'} );
1072
            if ( C4::Context->preference('RefundLostItemFeeOnReturn' ) ) {
1073
                _FixAccountForLostAndReturned( $item->{'itemnumber'}, undef, $item->{'barcode'} );
1074
            }
1073
        }
1075
        }
1074
1076
1075
        ModItem({ issues           => $item->{'issues'},
1077
        ModItem({ issues           => $item->{'issues'},
(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 374-377 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' Link Here
374
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('OPACShowUnusedAuthorities','1','','Show authorities that are not being used in the OPAC.','YesNo');
374
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('OPACShowUnusedAuthorities','1','','Show authorities that are not being used in the OPAC.','YesNo');
375
INSERT INTO systempreferences (variable,value,explanation,type) VALUES('EnableBorrowerFiles','0','If enabled, allows librarians to upload and attach arbitrary files to a borrower record.','YesNo');
375
INSERT INTO systempreferences (variable,value,explanation,type) VALUES('EnableBorrowerFiles','0','If enabled, allows librarians to upload and attach arbitrary files to a borrower record.','YesNo');
376
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UpdateTotalIssuesOnCirc','0','Whether to update the totalissues field in the biblio on each circ.',NULL,'YesNo');
376
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UpdateTotalIssuesOnCirc','0','Whether to update the totalissues field in the biblio on each circ.',NULL,'YesNo');
377
377
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('RefundLostItemFeeOnReturn', '1', 'If enabled, the lost item fee charged to a borrower will be refunded when the lst item is returned.', NULL, 'YesNo');
(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
Lines 5213-5218 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
5213
    SetVersion($DBversion);
5213
    SetVersion($DBversion);
5214
}
5214
}
5215
5215
5216
<<<<<<< HEAD
5216
$DBversion = "3.09.00.001";
5217
$DBversion = "3.09.00.001";
5217
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
5218
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
5218
    $dbh->do("ALTER TABLE borrower_attribute_types MODIFY category_code VARCHAR( 1 ) NULL DEFAULT NULL");
5219
    $dbh->do("ALTER TABLE borrower_attribute_types MODIFY category_code VARCHAR( 1 ) NULL DEFAULT NULL");
Lines 5452-5457 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
5452
    SetVersion($DBversion);
5453
    SetVersion($DBversion);
5453
}
5454
}
5454
5455
5456
$DBversion = "3.09.00.XXX";
5457
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
5458
    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('RefundLostItemFeeOnReturn', '1', 'If enabled, the lost item fee charged to a borrower will be refunded when the lst item is returned.', NULL, 'YesNo')");
5459
    print "Upgrade to $DBversion done ( Add system preference RefundLostItemFeeOnReturn )\n";
5460
    SetVersion($DBversion);
5461
}
5462
5455
=head1 FUNCTIONS
5463
=head1 FUNCTIONS
5456
5464
5457
=head2 TableExists($table)
5465
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-1 / +6 lines)
Lines 393-398 Circulation: Link Here
393
                  test: Calculate (but only for mailing to the admin)
393
                  test: Calculate (but only for mailing to the admin)
394
                  production: Calculate and charge
394
                  production: Calculate and charge
395
            - fines (when <code>misc/cronjobs/fines.pl</code> is being run).
395
            - fines (when <code>misc/cronjobs/fines.pl</code> is being run).
396
        -
397
            - pref: RefundLostItemFeeOnReturn
398
              choices:
399
                  yes: Refund
400
                  no: "Don't refund"
401
            - lost item fees charged to a borrower when the lost item is returned.
396
    Self Checkout:
402
    Self Checkout:
397
        -
403
        -
398
            - pref: ShowPatronImageInWebBasedSelfCheck
404
            - pref: ShowPatronImageInWebBasedSelfCheck
399
- 

Return to bug 7189