Attachment #119794 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 160-166 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-9 / +8 lines)
160	[% IF ( collectionItemNeedsTransferred ) %]	160	[% IF ( collectionItemNeedsTransferred ) %]
161	<div id="rotating-collection" class="dialog message">	161	<div id="rotating-collection" class="dialog message">
162	<h3>Please transfer item to: [% Branches.GetName( collectionBranch ) \| html %]</h3>	162	<h3>Please transfer item to: [% Branches.GetName( collectionBranch ) \| html %]</h3>
163	<p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% itembarcode \| html %]: [% title \| html %]</a></p>	163	<p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% item.barcode \| html %]: [% title \| html %]</a></p>
164	<p>This item is part of a rotating collection.</p>	164	<p>This item is part of a rotating collection.</p>
165	<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>	165	<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>
166	</div>	166	</div>
Lines 221-227 Link Here
221	<div class="dialog alert audio-alert-warning">	221	<div class="dialog alert audio-alert-warning">
222	<h3>Check in message</h3>	222	<h3>Check in message</h3>
223	[% IF itembiblionumber %]	223	[% IF itembiblionumber %]
224	<p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% itembarcode \| html %]: [% title \| html %]</a></p>	224	<p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% item.barcode \| html %]: [% title \| html %]</a></p>
225	[% END %]	225	[% END %]
226	[% FOREACH errmsgloo IN errmsgloop %]	226	[% FOREACH errmsgloo IN errmsgloop %]
227	[% IF ( errmsgloo.NotForLoanStatusUpdated ) %]	227	[% IF ( errmsgloo.NotForLoanStatusUpdated ) %]
Lines 360-366 Link Here
360	</div>	360	</div>
361	<div class="modal-footer">	361	<div class="modal-footer">
362	<form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">	362	<form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
363	<input type="hidden" name="barcode" value="[% itembarcode \| html %]" />	363	<input type="hidden" name="barcode" value="[% item.barcode \| html %]" />
364	<input type="hidden" name="multiple_confirm" value="1" />	364	<input type="hidden" name="multiple_confirm" value="1" />
365	[% FOREACH inputloo IN inputloop %]	365	[% FOREACH inputloo IN inputloop %]
366	<input type="hidden" name="ri-[% inputloo.counter \| html %]" value="[% inputloo.barcode \| html %]" />	366	<input type="hidden" name="ri-[% inputloo.counter \| html %]" value="[% inputloo.barcode \| html %]" />
Lines 389-395 Link Here
389	<div class="modal-body">	389	<div class="modal-body">
390	<p>	390	<p>
391	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">	391	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">
392	[% itembarcode \| html %]: [% title \| html %]	392	[% item.barcode \| html %]: [% title \| html %]
393	</a>	393	</a>
394	</p>	394	</p>
395	<p>	395	<p>
Lines 432-438 Link Here
432	<div class="modal-body">	432	<div class="modal-body">
433	<p>	433	<p>
434	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">	434	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">
435	[% itembarcode \| html %]: [% title \| html %]	435	[% item.barcode \| html %]: [% title \| html %]
436	</a>	436	</a>
437	</p>	437	</p>
438	[% INCLUDE all_checkin_messages %]	438	[% INCLUDE all_checkin_messages %]
Lines 474-480 Link Here
474	<br/>	474	<br/>
475	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% title \| html %]</a>	475	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% title \| html %]</a>
476	<div class="hold-found-barcode">	476	<div class="hold-found-barcode">
477	<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber \| uri %]&itemnumber=[% itemnumber \| uri %]">[% itembarcode \| html %]</a>	477	<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber \| uri %]&itemnumber=[% itemnumber \| uri %]">[% item.barcode \| html %]</a>
478	</div>	478	</div>
479	</h3>	479	</h3>
480	</div>	480	</div>
Lines 577-583 Link Here
577	<div class="modal-body">	577	<div class="modal-body">
578	<p>	578	<p>
579	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">	579	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">
580	[% itembarcode \| html %]: [% title \| html %]	580	[% item.barcode \| html %]: [% title \| html %]
581	</a>	581	</a>
582	</p>	582	</p>
583	[% IF !transfer %]	583	[% IF !transfer %]
Lines 633-639 Link Here
633	<br/>	633	<br/>
634	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% title \| html %]</a>	634	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% title \| html %]</a>
635	<div class="hold-found-barcode">	635	<div class="hold-found-barcode">
636	(<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber \| uri %]&itemnumber=[% itemnumber \| uri %]">[% itembarcode \| html %]</a>)	636	(<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber \| uri %]&itemnumber=[% itemnumber \| uri %]">[% item.barcode \| html %]</a>)
637	</div>	637	</div>
638	</h3>	638	</h3>
639	</div>	639	</div>
640	-