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

(-)a/C4/Circulation.pm (-2 / +2 lines)
Lines 861-867 sub CanBookBeIssued { Link Here
861
                $patron->borrowernumber,
861
                $patron->borrowernumber,
862
                $item_object->itemnumber,
862
                $item_object->itemnumber,
863
            );
863
            );
864
            if ( $CanBookBeRenewed == 0 ) {    # no more renewals allowed
864
              if ( $CanBookBeRenewed == 0 ) {    # no more renewals allowed
865
                if ( $renewerror eq 'onsite_checkout' ) {
865
                if ( $renewerror eq 'onsite_checkout' ) {
866
                    $issuingimpossible{NO_RENEWAL_FOR_ONSITE_CHECKOUTS} = 1;
866
                    $issuingimpossible{NO_RENEWAL_FOR_ONSITE_CHECKOUTS} = 1;
867
                }
867
                }
Lines 2690-2696 sub CanBookBeRenewed { Link Here
2690
                my ( $reserve_found, $reserve, undef ) =
2690
                my ( $reserve_found, $reserve, undef ) =
2691
                  C4::Reserves::CheckReserves( $itemnumber, undef, undef, \@borrowernumbers );
2691
                  C4::Reserves::CheckReserves( $itemnumber, undef, undef, \@borrowernumbers );
2692
2692
2693
                warn $reserve_found;
2693
2694
                if ($reserve_found) {
2694
                if ($reserve_found) {
2695
                    push( @borrowernumbers, $reserve->{borrowernumber} );
2695
                    push( @borrowernumbers, $reserve->{borrowernumber} );
2696
                }
2696
                }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt (-4 / +12 lines)
Lines 112-121 Link Here
112
112
113
                            [% ELSIF error == "on_reserve" %]
113
                            [% ELSIF error == "on_reserve" %]
114
114
115
116
                                    <p>This item is on hold for another patron.</p>
115
                                    <p>This item is on hold for another patron.</p>
117
116
118
                                    [% IF ((!Koha.Preference('AllowRenewalLimitOverride')) && ((Koha.Preference('AllowRenewalIfOtherItemsAvailable'))) && can_renew == 1) || ((Koha.Preference('AllowRenewalLimitOverride')) && ((Koha.Preference('AllowRenewalIfOtherItemsAvailable'))) && can_renew == 1 )%]
117
                                    <!--[% IF ((!Koha.Preference('AllowRenewalLimitOverride')) && ((Koha.Preference('AllowRenewalIfOtherItemsAvailable'))) && can_renew == 1) || ((Koha.Preference('AllowRenewalLimitOverride')) && ((Koha.Preference('AllowRenewalIfOtherItemsAvailable'))) && can_renew == 1 )%]
119
                                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
118
                                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
120
                                            <input type="hidden" name="barcode" value="[% item.barcode | html %]"/>
119
                                            <input type="hidden" name="barcode" value="[% item.barcode | html %]"/>
121
                                            <input type="hidden" name="override_limit" value="1" />
120
                                            <input type="hidden" name="override_limit" value="1" />
Lines 129-135 Link Here
129
                                            <input type="hidden" name="override_holds" value="1" />
128
                                            <input type="hidden" name="override_holds" value="1" />
130
                                            <button type="submit" class="approve"><i class="fa fa-check"></i> Override and renew</button>
129
                                            <button type="submit" class="approve"><i class="fa fa-check"></i> Override and renew</button>
131
                                        </form>
130
                                        </form>
132
                                [% END %]
131
                                        [% END %]-->
132
                                    
133
                                    [% IF ((!Koha.Preference('AllowRenewalLimitOverride')) && ((Koha.Preference('AllowRenewalIfOtherItemsAvailable'))) && can_renew == 1) || ((Koha.Preference('AllowRenewalLimitOverride')) && ((Koha.Preference('AllowRenewalIfOtherItemsAvailable'))) && can_renew == 1 ) %]
134
                                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
135
                                            <input type="hidden" name="barcode" value="[% item.barcode | html %]"/>
136
                                            <input type="hidden" name="override_limit" value="1" />
137
                                            <input type="hidden" name="override_holds" value="1" />
138
                                            <button type="submit" class="approve"><i class="fa fa-check"></i> Override and renew</button>
139
                                        </form>
140
                                    [% END %]
141
133
                            [% ELSIF error == "patron_restricted" %]
142
                            [% ELSIF error == "patron_restricted" %]
134
143
135
                                <p>[% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | uri %]"> [% borrower.cardnumber | html %] </a> ) is currently restricted.</p>
144
                                <p>[% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | uri %]"> [% borrower.cardnumber | html %] </a> ) is currently restricted.</p>
136
- 

Return to bug 18450