Attachment #117719 for bug #21883

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




        my $biblio   = $item->biblio;
        $template->param(
            title                => $biblio->title,
            homebranch           => $item->homebranch,
            holdingbranch        => $item->holdingbranch,
            returnbranch         => $returnbranch,
            author               => $biblio->author,
            itembarcode          => $item->barcode,
            itemtype             => $item->effective_itemtype,
            ccode                => $item->ccode,
            itembiblionumber     => $biblio->biblionumber,
            biblionumber         => $biblio->biblionumber,
            additional_materials => $materials,
            issue                => $checkout,
            item                 => $item,
        );
    } # FIXME else we should not call AddReturn but set BadBarcode directly instead





                            [% IF ( collectionItemNeedsTransferred ) %]
                                 <div id="rotating-collection" class="dialog message">
                                    <h3>Please transfer item to: [% Branches.GetName( collectionBranch ) | html %]</h3>
                                    <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% item.barcode | html %]: [% title | html %]</a></p>
                                    <p>This item is part of a rotating collection.</p>
                                    <p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | uri %]&amp;branchcode=[% collectionBranch | uri %]&amp;op=slip"><i class="fa fa-print"></i> Print slip</button></p>
                                </div>

                                <div class="dialog alert audio-alert-warning">
                                    <h3>Check in message</h3>
                                    [% IF itembiblionumber %]
                                        <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% item.barcode | html %]: [% title | html %]</a></p>
                                    [% END %]
                                    [% FOREACH errmsgloo IN errmsgloop %]
                                        [% IF ( errmsgloo.NotForLoanStatusUpdated ) %]

                                        </div>
                                        <div class="modal-footer">
                                            <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
                                                <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
                                                <input type="hidden" name="multiple_confirm" value="1" />
                                                [% FOREACH inputloo IN inputloop %]
                                                    <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />

                                            <div class="modal-body">
                                                <p>
                                                    <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">
                                                        [% item.barcode | html %]: [% title | html %]
                                                    </a>
                                                </p>
                                                <p>

                                            <div class="modal-body">
                                                <p>
                                                    <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">
                                                        [% item.barcode | html %]: [% title | html %]
                                                    </a>
                                                </p>
                                                [% INCLUDE all_checkin_messages %]

                                                        <br/>
                                                        <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% title | html %]</a>
                                                        <div class="hold-found-barcode">
                                                            <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber | uri %]&amp;itemnumber=[% itemnumber | uri %]">[% item.barcode | html %]</a>
                                                        </div>
                                                    </h3>
                                                </div>

                                                <div class="modal-body">
                                                    <p>
                                                        <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">
                                                            [% item.barcode | html %]: [% title | html %]
                                                        </a>
                                                    </p>
                                                    [% IF !transfer %]

                                                        <br/>
                                                        <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% title | html %]</a>
                                                        <div class="hold-found-barcode">
                                                            (<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber | uri %]&amp;itemnumber=[% itemnumber | uri %]">[% item.barcode | html %]</a>)
                                                        </div>
                                                    </h3>
                                                </div>
- 

Return to bug 21883

Lines 268-284 if ($barcode) { Link Here

(-)a/circ/returns.pl (-5 / +1 lines)
268	my $biblio = $item->biblio;	268	my $biblio = $item->biblio;
269	$template->param(	269	$template->param(
270	title => $biblio->title,	270	title => $biblio->title,
271	homebranch => $item->homebranch,
272	holdingbranch => $item->holdingbranch,
273	returnbranch => $returnbranch,	271	returnbranch => $returnbranch,
274	author => $biblio->author,	272	author => $biblio->author,
275	itembarcode => $item->barcode,
276	itemtype => $item->effective_itemtype,
277	ccode => $item->ccode,
278	itembiblionumber => $biblio->biblionumber,	273	itembiblionumber => $biblio->biblionumber,
279	biblionumber => $biblio->biblionumber,	274	biblionumber => $biblio->biblionumber,
280	additional_materials => $materials,	275	additional_materials => $materials,
281	issue => $checkout,	276	issue => $checkout,
		277	item => $item,
282	);	278	);
283	} # FIXME else we should not call AddReturn but set BadBarcode directly instead	279	} # FIXME else we should not call AddReturn but set BadBarcode directly instead
284		280

Lines 146-152 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-9 / +8 lines)
146	[% IF ( collectionItemNeedsTransferred ) %]	146	[% IF ( collectionItemNeedsTransferred ) %]
147	<div id="rotating-collection" class="dialog message">	147	<div id="rotating-collection" class="dialog message">
148	<h3>Please transfer item to: [% Branches.GetName( collectionBranch ) \| html %]</h3>	148	<h3>Please transfer item to: [% Branches.GetName( collectionBranch ) \| html %]</h3>
149	<p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% itembarcode \| html %]: [% title \| html %]</a></p>	149	<p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% item.barcode \| html %]: [% title \| html %]</a></p>
150	<p>This item is part of a rotating collection.</p>	150	<p>This item is part of a rotating collection.</p>
151	<p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber \| uri %]&branchcode=[% collectionBranch \| uri %]&op=slip"><i class="fa fa-print"></i> Print slip</button></p>	151	<p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber \| uri %]&branchcode=[% collectionBranch \| uri %]&op=slip"><i class="fa fa-print"></i> Print slip</button></p>
152	</div>	152	</div>
Lines 207-213 Link Here
207	<div class="dialog alert audio-alert-warning">	207	<div class="dialog alert audio-alert-warning">
208	<h3>Check in message</h3>	208	<h3>Check in message</h3>
209	[% IF itembiblionumber %]	209	[% IF itembiblionumber %]
210	<p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% itembarcode \| html %]: [% title \| html %]</a></p>	210	<p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% item.barcode \| html %]: [% title \| html %]</a></p>
211	[% END %]	211	[% END %]
212	[% FOREACH errmsgloo IN errmsgloop %]	212	[% FOREACH errmsgloo IN errmsgloop %]
213	[% IF ( errmsgloo.NotForLoanStatusUpdated ) %]	213	[% IF ( errmsgloo.NotForLoanStatusUpdated ) %]
Lines 346-352 Link Here
346	</div>	346	</div>
347	<div class="modal-footer">	347	<div class="modal-footer">
348	<form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">	348	<form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
349	<input type="hidden" name="barcode" value="[% itembarcode \| html %]" />	349	<input type="hidden" name="barcode" value="[% item.barcode \| html %]" />
350	<input type="hidden" name="multiple_confirm" value="1" />	350	<input type="hidden" name="multiple_confirm" value="1" />
351	[% FOREACH inputloo IN inputloop %]	351	[% FOREACH inputloo IN inputloop %]
352	<input type="hidden" name="ri-[% inputloo.counter \| html %]" value="[% inputloo.barcode \| html %]" />	352	<input type="hidden" name="ri-[% inputloo.counter \| html %]" value="[% inputloo.barcode \| html %]" />
Lines 375-381 Link Here
375	<div class="modal-body">	375	<div class="modal-body">
376	<p>	376	<p>
377	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">	377	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">
378	[% itembarcode \| html %]: [% title \| html %]	378	[% item.barcode \| html %]: [% title \| html %]
379	</a>	379	</a>
380	</p>	380	</p>
381	<p>	381	<p>
Lines 418-424 Link Here
418	<div class="modal-body">	418	<div class="modal-body">
419	<p>	419	<p>
420	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">	420	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">
421	[% itembarcode \| html %]: [% title \| html %]	421	[% item.barcode \| html %]: [% title \| html %]
422	</a>	422	</a>
423	</p>	423	</p>
424	[% INCLUDE all_checkin_messages %]	424	[% INCLUDE all_checkin_messages %]
Lines 460-466 Link Here
460	<br/>	460	<br/>
461	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% title \| html %]</a>	461	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% title \| html %]</a>
462	<div class="hold-found-barcode">	462	<div class="hold-found-barcode">
463	<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber \| uri %]&itemnumber=[% itemnumber \| uri %]">[% itembarcode \| html %]</a>	463	<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber \| uri %]&itemnumber=[% itemnumber \| uri %]">[% item.barcode \| html %]</a>
464	</div>	464	</div>
465	</h3>	465	</h3>
466	</div>	466	</div>
Lines 563-569 Link Here
563	<div class="modal-body">	563	<div class="modal-body">
564	<p>	564	<p>
565	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">	565	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">
566	[% itembarcode \| html %]: [% title \| html %]	566	[% item.barcode \| html %]: [% title \| html %]
567	</a>	567	</a>
568	</p>	568	</p>
569	[% IF !transfer %]	569	[% IF !transfer %]
Lines 619-625 Link Here
619	<br/>	619	<br/>
620	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% title \| html %]</a>	620	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% title \| html %]</a>
621	<div class="hold-found-barcode">	621	<div class="hold-found-barcode">
622	(<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber \| uri %]&itemnumber=[% itemnumber \| uri %]">[% itembarcode \| html %]</a>)	622	(<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber \| uri %]&itemnumber=[% itemnumber \| uri %]">[% item.barcode \| html %]</a>)
623	</div>	623	</div>
624	</h3>	624	</h3>
625	</div>	625	</div>
626	-