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

(-)a/C4/Circulation.pm (-7 / +5 lines)
Lines 906-922 sub CanBookBeIssued { Link Here
906
              if ( $borrower->{'branchcode'} ne $userenv->{branch} );
906
              if ( $borrower->{'branchcode'} ne $userenv->{branch} );
907
        }
907
        }
908
    }
908
    }
909
909
    #
910
    # CHECK IF THERE IS RENTAL CHARGES. RENTAL MUST BE CONFIRMED BY THE BORROWER
910
    # CHECK IF THERE IS RENTAL CHARGES. RENTAL MUST BE CONFIRMED BY THE BORROWER
911
    my $sth = $dbh->prepare("SELECT rentalcharge FROM itemtypes WHERE itemtype = ?");
911
    #
912
    $sth->execute( $item->{'itemtype'} );
912
    my ($rentalCharge) = GetIssuingCharges( $item->{'itemnumber'}, $borrower->{'borrowernumber'} );
913
    my $rentalCharge = $sth->fetchrow();
914
    my $rentalConfirmation = C4::Context->preference("RentalFeesCheckoutConfirmation");
913
    my $rentalConfirmation = C4::Context->preference("RentalFeesCheckoutConfirmation");
915
914
916
    if ( $rentalCharge && $rentalConfirmation )
915
    if ( $rentalConfirmation && $rentalCharge != 0 )
917
    {
916
    {
918
        $rentalCharge = sprintf("%.02f \$", $rentalCharge);
917
        $rentalCharge = sprintf("%.02f", $rentalCharge);
919
        $rentalCharge =~ s/\./,/;
920
        $needsconfirmation{RENTALCHARGE} = $rentalCharge;
918
        $needsconfirmation{RENTALCHARGE} = $rentalCharge;
921
    }
919
    }
922
920
(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 332-338 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
332
('RenewalPeriodBase','date_due','date_due|now','Set whether the renewal date should be counted from the date_due or from the moment the Patron asks for renewal ','Choice'),
332
('RenewalPeriodBase','date_due','date_due|now','Set whether the renewal date should be counted from the date_due or from the moment the Patron asks for renewal ','Choice'),
333
('RenewalSendNotice','0','',NULL,'YesNo'),
333
('RenewalSendNotice','0','',NULL,'YesNo'),
334
('RenewSerialAddsSuggestion','0',NULL,'If ON, adds a new suggestion at serial subscription renewal','YesNo'),
334
('RenewSerialAddsSuggestion','0',NULL,'If ON, adds a new suggestion at serial subscription renewal','YesNo'),
335
('RentalFeesCheckoutConfirmation', '1', NULL , 'Allow user to confirme when checking out an item with rental fees.', 'YesNo'),
335
('RentalFeesCheckoutConfirmation', '0', NULL , 'Allow user to confirme when checking out an item with rental fees.', 'YesNo'),
336
('RentalsInNoissuesCharge','1',NULL,'Rental charges block checkouts (added to noissuescharge).','YesNo'),
336
('RentalsInNoissuesCharge','1',NULL,'Rental charges block checkouts (added to noissuescharge).','YesNo'),
337
('RequestOnOpac','1',NULL,'If ON, globally enables patron holds on OPAC','YesNo'),
337
('RequestOnOpac','1',NULL,'If ON, globally enables patron holds on OPAC','YesNo'),
338
('ReservesControlBranch','PatronLibrary','ItemHomeLibrary|PatronLibrary','Branch checked for members reservations rights','Choice'),
338
('ReservesControlBranch','PatronLibrary','ItemHomeLibrary|PatronLibrary','Branch checked for members reservations rights','Choice'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-3 / +2 lines)
Lines 203-213 var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); Link Here
203
[% END %]
203
[% END %]
204
204
205
[% IF ( DEBT ) %]
205
[% IF ( DEBT ) %]
206
    <li>The patron has a debt of [% DEBT %]</li>
206
    <li>The patron has a debt of [% DEBT %].</li>
207
[% END %]
207
[% END %]
208
208
209
[% IF ( RENTALCHARGE ) %]
209
[% IF ( RENTALCHARGE ) %]
210
    <li>Rental charge for this item : [% RENTALCHARGE %]</li>
210
    <li>Rental charge for this item: [% RENTALCHARGE %]</li>
211
[% END %]
211
[% END %]
212
212
213
[% IF ( RENEW_ISSUE ) %]
213
[% IF ( RENEW_ISSUE ) %]
214
- 

Return to bug 12448