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

(-)a/circ/returns.pl (+10 lines)
Lines 278-283 if ($barcode) { Link Here
278
        	);
278
        	);
279
    	}
279
    	}
280
    }
280
    }
281
    elsif($itemtype->checkinmsgtype eq 'question' && $accept == '1'){
282
	$template->param(
283
	checkinmsgtype	=> "accepted",
284
	);
285
    }
286
    elsif($itemtype->checkinmsgtype eq 'question' && $accept == '2'){
287
	$template->param(
288
	checkinmsgtype	=> "rejected",
289
	);
290
    }
281
291
282
    # make sure return branch respects home branch circulation rules, default to homebranch
292
    # make sure return branch respects home branch circulation rules, default to homebranch
283
    my $hbr = GetBranchItemRule($biblio->{'homebranch'}, $itemtype ? $itemtype->itemtype : undef )->{'returnbranch'} || "homebranch";
293
    my $hbr = GetBranchItemRule($biblio->{'homebranch'}, $itemtype ? $itemtype->itemtype : undef )->{'returnbranch'} || "homebranch";
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-2 / +10 lines)
Lines 548-554 $(document).ready(function () { Link Here
548
           </form>
548
           </form>
549
        </div>
549
        </div>
550
[% END%]
550
[% END%]
551
551
[% IF checkinmsgtype == 'accepted' %]
552
	<div class="dialog alert">
553
		<p class="problem">Your item was checked in!</p>
554
	</div>
555
[% END %]
556
[% IF checkinmsgtype == 'rejected' %]
557
	<div class="dialog alert">
558
		<p class="problem">Your item was not checked in!</p>
559
	</div>
560
[% END %]
552
    <div id="exemptfines" class="dialog message" style="display:none;">
561
    <div id="exemptfines" class="dialog message" style="display:none;">
553
        <p>Fines for returned items are forgiven.</p>
562
        <p>Fines for returned items are forgiven.</p>
554
    </div>
563
    </div>
555
- 

Return to bug 17101