Attachment #111037 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 272-288 if ($barcode) { Link Here

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

Lines 127-133 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-9 / +8 lines)
127	[% IF ( collectionItemNeedsTransferred ) %]	127	[% IF ( collectionItemNeedsTransferred ) %]
128	<div id="rotating-collection" class="dialog message">	128	<div id="rotating-collection" class="dialog message">
129	<h3>Please transfer item to: [% Branches.GetName( collectionBranch ) \| html %]</h3>	129	<h3>Please transfer item to: [% Branches.GetName( collectionBranch ) \| html %]</h3>
130	<p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% itembarcode \| html %]: [% title \| html %]</a></p>	130	<p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% item.barcode \| html %]: [% title \| html %]</a></p>
131	<p>This item is part of a rotating collection.</p>	131	<p>This item is part of a rotating collection.</p>
132	<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>	132	<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>
133	</div>	133	</div>
Lines 188-194 Link Here
188	<div class="dialog alert audio-alert-warning">	188	<div class="dialog alert audio-alert-warning">
189	<h3>Check in message</h3>	189	<h3>Check in message</h3>
190	[% IF itembiblionumber %]	190	[% IF itembiblionumber %]
191	<p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% itembarcode \| html %]: [% title \| html %]</a></p>	191	<p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% item.barcode \| html %]: [% title \| html %]</a></p>
192	[% END %]	192	[% END %]
193	[% FOREACH errmsgloo IN errmsgloop %]	193	[% FOREACH errmsgloo IN errmsgloop %]
194	[% IF ( errmsgloo.NotForLoanStatusUpdated ) %]	194	[% IF ( errmsgloo.NotForLoanStatusUpdated ) %]
Lines 316-322 Link Here
316	</div>	316	</div>
317	<div class="modal-footer">	317	<div class="modal-footer">
318	<form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">	318	<form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
319	<input type="hidden" name="barcode" value="[% itembarcode \| html %]" />	319	<input type="hidden" name="barcode" value="[% item.barcode \| html %]" />
320	<input type="hidden" name="multiple_confirm" value="1" />	320	<input type="hidden" name="multiple_confirm" value="1" />
321	[% FOREACH inputloo IN inputloop %]	321	[% FOREACH inputloo IN inputloop %]
322	<input type="hidden" name="ri-[% inputloo.counter \| html %]" value="[% inputloo.barcode \| html %]" />	322	<input type="hidden" name="ri-[% inputloo.counter \| html %]" value="[% inputloo.barcode \| html %]" />
Lines 345-351 Link Here
345	<div class="modal-body">	345	<div class="modal-body">
346	<p>	346	<p>
347	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">	347	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">
348	[% itembarcode \| html %]: [% title \| html %]	348	[% item.barcode \| html %]: [% title \| html %]
349	</a>	349	</a>
350	</p>	350	</p>
351	<p>	351	<p>
Lines 388-394 Link Here
388	<div class="modal-body">	388	<div class="modal-body">
389	<p>	389	<p>
390	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">	390	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">
391	[% itembarcode \| html %]: [% title \| html %]	391	[% item.barcode \| html %]: [% title \| html %]
392	</a>	392	</a>
393	</p>	393	</p>
394	[% INCLUDE all_checkin_messages %]	394	[% INCLUDE all_checkin_messages %]
Lines 430-436 Link Here
430	<br/>	430	<br/>
431	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% title \| html %]</a>	431	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% title \| html %]</a>
432	<div class="hold-found-barcode">	432	<div class="hold-found-barcode">
433	<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber \| uri %]&itemnumber=[% itemnumber \| uri %]">[% itembarcode \| html %]</a>	433	<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber \| uri %]&itemnumber=[% itemnumber \| uri %]">[% item.barcode \| html %]</a>
434	</div>	434	</div>
435	</h3>	435	</h3>
436	</div>	436	</div>
Lines 533-539 Link Here
533	<div class="modal-body">	533	<div class="modal-body">
534	<p>	534	<p>
535	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">	535	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">
536	[% itembarcode \| html %]: [% title \| html %]	536	[% item.barcode \| html %]: [% title \| html %]
537	</a>	537	</a>
538	</p>	538	</p>
539	[% IF !transfer %]	539	[% IF !transfer %]
Lines 589-595 Link Here
589	<br/>	589	<br/>
590	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% title \| html %]</a>	590	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber \| uri %]">[% title \| html %]</a>
591	<div class="hold-found-barcode">	591	<div class="hold-found-barcode">
592	(<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber \| uri %]&itemnumber=[% itemnumber \| uri %]">[% itembarcode \| html %]</a>)	592	(<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber \| uri %]&itemnumber=[% itemnumber \| uri %]">[% item.barcode \| html %]</a>)
593	</div>	593	</div>
594	</h3>	594	</h3>
595	</div>	595	</div>
596	-