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

(-)a/C4/Circulation.pm (+1 lines)
Lines 2639-2644 sub CanBookBeRenewed { Link Here
2639
                my ( $reserve_found, $reserve, undef ) =
2639
                my ( $reserve_found, $reserve, undef ) =
2640
                  C4::Reserves::CheckReserves( $itemnumber, undef, undef, \@borrowernumbers );
2640
                  C4::Reserves::CheckReserves( $itemnumber, undef, undef, \@borrowernumbers );
2641
2641
2642
                warn $reserve_found;
2642
                if ($reserve_found) {
2643
                if ($reserve_found) {
2643
                    push( @borrowernumbers, $reserve->{borrowernumber} );
2644
                    push( @borrowernumbers, $reserve->{borrowernumber} );
2644
                }
2645
                }
(-)a/circ/renew.pl (+2 lines)
Lines 76-81 if ($barcode) { Link Here
76
                    else {
76
                    else {
77
                        $can_renew = 0;
77
                        $can_renew = 0;
78
                    }
78
                    }
79
80
                    $template->param(can_renew => $can_renew );
79
                }
81
                }
80
82
81
                if ( $error && ($error eq 'too_soon' or $error eq 'auto_too_soon') ) {
83
                if ( $error && ($error eq 'too_soon' or $error eq 'auto_too_soon') ) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt (-15 / +7 lines)
Lines 106-125 Link Here
106
106
107
                                    <p>This item is on hold for another patron.</p>
107
                                    <p>This item is on hold for another patron.</p>
108
108
109
                                [% IF (Koha.Preference('AllowRenewalLimitOverride')) && (Koha.Preference('AllowRenewalIfOtherItemsAvailable')) %]
109
                                    [% IF (can_renew == 1 && (!Koha.Preference('AllowRenewalLimitOverride')) && ((Koha.Preference('AllowRenewalIfOtherItemsAvailable')))) || (can_renew==1 && (Koha.Preference('AllowRenewalLimitOverride')) && (!(Koha.Preference('AllowRenewalIfOtherItemsAvaliable')))) || (can_renew == 1 && (Koha.Preference('AllowRenewalLimitOverride')) && ((Koha.Preference('AllowRenewalIfOtherItemsAvailable')))) %]
110
                                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
110
                                        <form method="post" action="/cgi-bin/koha/circ/renew.pl">
111
                                        <input type="hidden" name="barcode" value="[% item.barcode %]"/>
111
                                            <input type="hidden" name="barcode" value="[% item.barcode %]"/>
112
                                        <input type="hidden" name="override_limit" value="1" />
112
                                            <input type="hidden" name="override_limit" value="1" />
113
                                        <input type="hidden" name="override_holds" value="1" />
113
                                            <input type="hidden" name="override_holds" value="1" />
114
                                        <button type="submit" class="approve"><i class="fa fa-check"></i> Override and renew</button>
114
                                            <button type="submit" class="approve"><i class="fa fa-check"></i> Override and renew</button>
115
                                    </form>
115
                                        </form>
116
                                [% ELSIF (!(Koha.Preference('AllowRenewalLimitOverride')) && (Koha.Preference('AllowRenewalIfOtherItemsAvailable')))  || (Koha.Preference('AllowRenewalLimitOverride') && (!(Koha.Preference('AllowRenewalIfOtherItemsAvaliable')))) %]
117
                                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
118
                                       <input type="hidden" name="barcode" value="[% item.barcode %]"/>
119
                                       <input type="hidden" name="override_limit" value="1" />
120
                                       <input type="hidden" name="override_holds" value="1" />
121
                                       <button type="submit" class="approve"><i class="fa fa-check"></i> Override and renew</button>
122
                                     </form>
123
                                [% END %]
116
                                [% END %]
124
                            [% ELSIF error == "patron_restricted" %]
117
                            [% ELSIF error == "patron_restricted" %]
125
118
126
- 

Return to bug 18450