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

(-)a/C4/Reserves.pm (+1 lines)
Lines 368-373 sub GetReservesFromItemnumber { Link Here
368
        $r->get_column('branchcode'),
368
        $r->get_column('branchcode'),
369
        $r->reserve_id(),
369
        $r->reserve_id(),
370
        $r->waitingdate(),
370
        $r->waitingdate(),
371
        $r->get_column('expirationdate'),
371
    );
372
    );
372
}
373
}
373
374
(-)a/circ/returns.pl (+1 lines)
Lines 594-599 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here
594
        $ri{itemtitle}           = $biblio->{'title'};
594
        $ri{itemtitle}           = $biblio->{'title'};
595
        $ri{itemauthor}          = $biblio->{'author'};
595
        $ri{itemauthor}          = $biblio->{'author'};
596
        $ri{itemcallnumber}      = $biblio->{'itemcallnumber'};
596
        $ri{itemcallnumber}      = $biblio->{'itemcallnumber'};
597
        $ri{enumchron}           = $item->{'enumchron'};
597
        $ri{dateaccessioned}     = $item->{dateaccessioned};
598
        $ri{dateaccessioned}     = $item->{dateaccessioned};
598
        $ri{itemtype}            = $biblio->{'itemtype'};
599
        $ri{itemtype}            = $biblio->{'itemtype'};
599
        $ri{itemnote}            = $biblio->{'itemnotes'};
600
        $ri{itemnote}            = $biblio->{'itemnotes'};
(-)a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js (-2 / +10 lines)
Lines 227-233 $(document).ready(function() { Link Here
227
                                  title += " " + value.subfield;
227
                                  title += " " + value.subfield;
228
                        });
228
                        });
229
229
230
                        title += "</a></span>";
230
                        if ( oObj.enumchron ) {
231
                            title += "</a>" + " " + oObj.enumchron + "</span>";
232
                        } else {
233
                            title += "</a></span>";
234
                        }
231
235
232
                        if ( oObj.author ) {
236
                        if ( oObj.author ) {
233
                            title += " " + BY.replace( "_AUTHOR_",  " " + oObj.author );
237
                            title += " " + BY.replace( "_AUTHOR_",  " " + oObj.author );
Lines 499-505 $(document).ready(function() { Link Here
499
                                      title += " " + value.subfield;
503
                                      title += " " + value.subfield;
500
                            });
504
                            });
501
505
502
                            title += "</a></span>";
506
                            if ( oObj.enumchron ) {
507
                                title += "</a>" + " " + oObj.enumchron + "</span>";
508
                            } else {
509
                                title += "</a></span>";
510
                            }
503
511
504
                            if ( oObj.author ) {
512
                            if ( oObj.author ) {
505
                                title += " " + BY.replace( "_AUTHOR_", " " + oObj.author );
513
                                title += " " + BY.replace( "_AUTHOR_", " " + oObj.author );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-22 / +24 lines)
Lines 800-827 No patron matched <span class="ex">[% message %]</span> Link Here
800
			</ul>
800
			</ul>
801
        </div>
801
        </div>
802
802
803
            [% IF WaitingHolds.count %]
803
            [% IF ( WaitingReserveLoop ) %]
804
                <div id="holdswaiting" class="circmessage">
804
                 <div id="holdswaiting" class="circmessage">
805
                    <h4>Holds waiting:</h4>
805
                     <h4>Holds waiting:</h4>
806
                    [% FOREACH w IN WaitingHolds %]
806
                    [% FOREACH WaitingReserveLoo IN WaitingReserveLoop %]
807
                        <ul>
807
                         <ul>
808
                            <li>
808
                             <li>
809
                                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% w.biblio.biblionumber %]">[% w.biblio.title | html %]</a>
809
                                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% WaitingReserveLoo.biblionumber %]">[% WaitingReserveLoo.title | html %]</a>
810
                                ([% ItemTypes.GetDescription( w.item.effective_itemtype ) %]),
810
                                ([% WaitingReserveLoo.itemtype %])
811
                                [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
811
                                [% IF ( WaitingReserveLoo.enumchron ) %] [% WaitingReserveLoo.enumchron %][% END %],
812
                                [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber %]] [% END %]
812
                                [% IF ( WaitingReserveLoo.author ) %]<br/>by [% WaitingReserveLoo.author | html %][% END %]
813
                                Hold placed on [% w.reservedate | $KohaDates %].
813
                                [% IF ( WaitingReserveLoo.itemcallnumber ) %][[% WaitingReserveLoo.itemcallnumber %]] [% END %]
814
814
                                Hold placed on [% WaitingReserveLoo.reservedate %].
815
                                <br/>
815
816
                                [% IF ( w.branch.branchcode == Branches.GetLoggedInBranchcode()  ) %]<strong class="waitinghere">[% ELSE %]<strong>[% END %]
816
                                <br />
817
                                    [% SET waiting_expires_on = w.waiting_expires_on %]
817
                                [% IF ( WaitingReserveLoo.waitingat ) %]
818
                                    Waiting at [% w.branch.branchname | html %] [% IF waiting_expires_on %] until [% waiting_expires_on | $KohaDates %] [% END %]
818
                                    [% IF ( WaitingReserveLoo.waitinghere ) %]<strong class="waitinghere">[% ELSE %]<strong>[% END %]
819
                                </strong>
819
                                        Waiting at [% WaitingReserveLoo.waitingat | html %] [% IF WaitingReserveLoo.expiratedate %] until [% WaitingReserveLoo.expirationdate | $KohaDates %] [% END %]
820
                            </li>
820
                                    </strong>
821
                        </ul>
821
                                [% END %]
822
                    [% END %]
822
                             </li>
823
                </div>
823
                         </ul>
824
            [% END %]
824
                     [% END %]
825
                 </div>
826
            [% END %]<!-- /If WaitingReserveLoop -->
825
827
826
	[% IF ( notes ) %]
828
	[% IF ( notes ) %]
827
			<div id="circnotes" class="circmessage">
829
			<div id="circnotes" class="circmessage">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +1 lines)
Lines 614-620 $(document).ready(function () { Link Here
614
                [% END %]
614
                [% END %]
615
            </td>
615
            </td>
616
            <td class="ci-title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% riloo.itembiblionumber %]">
616
            <td class="ci-title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% riloo.itembiblionumber %]">
617
                    [% riloo.itemtitle |html %]</a></td>
617
                    [% riloo.itemtitle |html %]</a>[% IF ( riloo.enumchron ) %]<br/>[% riloo.enumchron %][% END %]</td>
618
            <td class="ci-author">[% riloo.itemauthor %]</td>
618
            <td class="ci-author">[% riloo.itemauthor %]</td>
619
            <td class="ci-barcode"><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% riloo.itembiblionumber %]&amp;itemnumber=[% riloo.itemnumber %]#item[% riloo.itemnumber %]">[% riloo.barcode %]</a></td>
619
            <td class="ci-barcode"><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% riloo.itembiblionumber %]&amp;itemnumber=[% riloo.itemnumber %]#item[% riloo.itemnumber %]">[% riloo.barcode %]</a></td>
620
            <td class="ci-homelibrary">[% Branches.GetName( riloo.homebranch ) %]</td>
620
            <td class="ci-homelibrary">[% Branches.GetName( riloo.homebranch ) %]</td>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-1 / +2 lines)
Lines 193-198 Link Here
193
193
194
                                                <td class="title">
194
                                                <td class="title">
195
                                                    <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber %]">[% ISSUE.title |html %] [% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl.subfield %][% END %]</a>
195
                                                    <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber %]">[% ISSUE.title |html %] [% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl.subfield %][% END %]</a>
196
                                                    [% IF ( ISSUE.enumchron ) %] [% ISSUE.enumchron %][% END %]
196
                                                    <span class="item-details">[% ISSUE.author %]</span>
197
                                                    <span class="item-details">[% ISSUE.author %]</span>
197
                                                </td>
198
                                                </td>
198
                                                [% IF ( ISSUE.overdue ) %]
199
                                                [% IF ( ISSUE.overdue ) %]
Lines 353-359 Link Here
353
                                                <tr>
354
                                                <tr>
354
                                                    <td>
355
                                                    <td>
355
                                                        <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.item.biblio.biblionumber %]">
356
                                                        <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.item.biblio.biblionumber %]">
356
                                                            [% i.item.biblio.title %]
357
                                                            [% i.item.biblio.title %][% IF ( i.item.enumchron ) %] [% i.item.enumchron %][% END %]
357
                                                        </a>
358
                                                        </a>
358
                                                    </td>
359
                                                    </td>
359
360
(-)a/svc/checkouts (-2 / +2 lines)
Lines 97-103 my $sql = ' Link Here
97
        itemlost,
97
        itemlost,
98
        damaged,
98
        damaged,
99
        location,
99
        location,
100
100
        items.enumchron,
101
        DATEDIFF( issuedate, CURRENT_DATE() ) AS not_issued_today
101
        DATEDIFF( issuedate, CURRENT_DATE() ) AS not_issued_today
102
    FROM issues
102
    FROM issues
103
        LEFT JOIN items USING ( itemnumber )
103
        LEFT JOIN items USING ( itemnumber )
Lines 173-178 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
173
        date_due_overdue    => $c->{date_due_overdue} ? JSON::true : JSON::false,
173
        date_due_overdue    => $c->{date_due_overdue} ? JSON::true : JSON::false,
174
        timestamp           => $c->{timestamp},
174
        timestamp           => $c->{timestamp},
175
        onsite_checkout     => $c->{onsite_checkout},
175
        onsite_checkout     => $c->{onsite_checkout},
176
        enumchron           => $c->{'enumchron'},
176
        renewals_count      => $renewals_count,
177
        renewals_count      => $renewals_count,
177
        renewals_allowed    => $renewals_allowed,
178
        renewals_allowed    => $renewals_allowed,
178
        renewals_remaining  => $renewals_remaining,
179
        renewals_remaining  => $renewals_remaining,
179
- 

Return to bug 14668