Attachment #71614 for bug #20194

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

Lines 601-607 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here

(-)a/circ/returns.pl (-1 / +2 lines)
601	$ri{itemauthor} = $biblio->author;	601	$ri{itemauthor} = $biblio->author;
602	$ri{itemcallnumber} = $item->itemcallnumber;	602	$ri{itemcallnumber} = $item->itemcallnumber;
603	$ri{dateaccessioned} = $item->dateaccessioned;	603	$ri{dateaccessioned} = $item->dateaccessioned;
604	$ri{itemtype} = $item->effective_itemtype;	604	$ri{itemtype} = Koha::ItemTypes->find($item->biblioitem->itemtype);
		605	$ri{itype} = Koha::ItemTypes->find($item->itype);
605	$ri{itemnote} = $item->itemnotes;	606	$ri{itemnote} = $item->itemnotes;
606	$ri{itemnotes_nonpublic} = $item->itemnotes_nonpublic;	607	$ri{itemnotes_nonpublic} = $item->itemnotes_nonpublic;
607	$ri{ccode} = $item->ccode;	608	$ri{ccode} = $item->ccode;




[% IF ( riloop ) %]
    <h2>Checked-in items</h2>
    <table id="checkedintable">
        <thead>
            <tr>
                <th class="ci-duedate">Due date</th>
                <th class="ci-title">Title</th>
                <th class="ci-author">Author</th>
                <th class="ci-barcode">Barcode</th>
                <th class="ci-homelibrary">Home library</th>
                <th class="ci-holdinglibrary">Holding library</th>
                <th class="ci-shelvinglocation">Shelving location</th>
                <th class="ci-callnumber">Call number</th>
                <th class="ci-dateaccessioned">Date acquired</th>
                <th class="ci-type">Item type</th>
                <th class="ci-ccode">Collection</th>
                <th class="ci-patron">Patron</th>
                <th class="ci-note">Note</th>
            </tr>
        </thead>

        <tbody>
        [% FOREACH riloo IN riloop %]
            <tr>
            <td class="ci-duedate">[% IF ( riloo.duedate ) %]

            <td class="ci-shelvinglocation">[% riloo.location %]</td>
            <td class="ci-callnumber">[% riloo.itemcallnumber %]</td>
            <td class="ci-dateaccessioned">[% riloo.dateaccessioned | $KohaDates %]</td>
            <td class="ci-type">
                [% IF riloo.itemtype %]
                    [% riloo.itemtype.translated_description %]
                    <br>
                [% END %]
                [% IF riloo.itype %]
                    [% riloo.itype.translated_description %]
                [% END %]
            </td>
            <td class="ci-ccode">[% AuthorisedValues.GetByCode('CCODE', riloo.ccode) %]</td>
            <td class="ci-patron">[% IF ( riloo.duedate ) %]
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% riloo.borrowernumber %]">
                    [% riloo.borsurname %], [% riloo.borfirstname %] ([% riloo.borcategorycode %])

            </td>
           </tr>
        [% END %]
        </tbody>
    </table>
[% END %]
</div>
- 

Return to bug 20194

Lines 628-635 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-4 / +30 lines)
628	[% IF ( riloop ) %]	628	[% IF ( riloop ) %]
629	<h2>Checked-in items</h2>	629	<h2>Checked-in items</h2>
630	<table id="checkedintable">	630	<table id="checkedintable">
631	<thead><tr><th class="ci-duedate">Due date</th><th class="ci-title">Title</th><th class="ci-author">Author</th><th class="ci-barcode">Barcode</th><th class="ci-homelibrary">Home library</th><th class="ci-holdinglibrary">Holding library</th><th class="ci-shelvinglocation">Shelving location</th><th class="ci-callnumber">Call number</th><th class="ci-dateaccessioned">Date acquired</th><th class="ci-type">Type</th><th class="ci-patron">Patron</th><th class="ci-note">Note</th></tr></thead>	631	<thead>
632		632	<tr>
		633	<th class="ci-duedate">Due date</th>
		634	<th class="ci-title">Title</th>
		635	<th class="ci-author">Author</th>
		636	<th class="ci-barcode">Barcode</th>
		637	<th class="ci-homelibrary">Home library</th>
		638	<th class="ci-holdinglibrary">Holding library</th>
		639	<th class="ci-shelvinglocation">Shelving location</th>
		640	<th class="ci-callnumber">Call number</th>
		641	<th class="ci-dateaccessioned">Date acquired</th>
		642	<th class="ci-type">Item type</th>
		643	<th class="ci-ccode">Collection</th>
		644	<th class="ci-patron">Patron</th>
		645	<th class="ci-note">Note</th>
		646	</tr>
		647	</thead>
		648
		649	<tbody>
633	[% FOREACH riloo IN riloop %]	650	[% FOREACH riloo IN riloop %]
634	<tr>	651	<tr>
635	<td class="ci-duedate">[% IF ( riloo.duedate ) %]	652	<td class="ci-duedate">[% IF ( riloo.duedate ) %]
Lines 655-661 Link Here
655	<td class="ci-shelvinglocation">[% riloo.location %]</td>	672	<td class="ci-shelvinglocation">[% riloo.location %]</td>
656	<td class="ci-callnumber">[% riloo.itemcallnumber %]</td>	673	<td class="ci-callnumber">[% riloo.itemcallnumber %]</td>
657	<td class="ci-dateaccessioned">[% riloo.dateaccessioned \| $KohaDates %]</td>	674	<td class="ci-dateaccessioned">[% riloo.dateaccessioned \| $KohaDates %]</td>
658	<td class="ci-type">[% ItemTypes.GetDescription( riloo.itemtype ) %] [% AuthorisedValues.GetByCode('CCODE', riloo.ccode) %]</td>	675	<td class="ci-type">
		676	[% IF riloo.itemtype %]
		677	[% riloo.itemtype.translated_description %]
		678	<br>
		679	[% END %]
		680	[% IF riloo.itype %]
		681	[% riloo.itype.translated_description %]
		682	[% END %]
		683	</td>
		684	<td class="ci-ccode">[% AuthorisedValues.GetByCode('CCODE', riloo.ccode) %]</td>
659	<td class="ci-patron">[% IF ( riloo.duedate ) %]	685	<td class="ci-patron">[% IF ( riloo.duedate ) %]
660	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% riloo.borrowernumber %]">	686	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% riloo.borrowernumber %]">
661	[% riloo.borsurname %], [% riloo.borfirstname %] ([% riloo.borcategorycode %])	687	[% riloo.borsurname %], [% riloo.borfirstname %] ([% riloo.borcategorycode %])
Lines 676-681 Link Here
676	</td>	702	</td>
677	</tr>	703	</tr>
678	[% END %]	704	[% END %]
		705	</tbody>
679	</table>	706	</table>
680	[% END %]	707	[% END %]
681	</div>	708	</div>
682	-