@@ -, +, @@
---
C4/Reserves.pm | 2 +-
catalogue/detail.pl | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 3 ++-
koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 2 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt | 3 ++-
opac/opac-reserve.pl | 2 +-
reserve/request.pl | 2 +-
7 files changed, 9 insertions(+), 7 deletions(-)
--- a/C4/Reserves.pm
+++ a/C4/Reserves.pm
@@ -371,7 +371,7 @@ sub GetReservesFromItemnumber {
my $query = "
SELECT reservedate,borrowernumber,branchcode,reserve_id,waitingdate
FROM reserves
- WHERE itemnumber=? AND ( reservedate <= CURRENT_DATE() OR
+ WHERE itemnumber=? AND ( reservedate <= CAST(now() AS date) OR
waitingdate IS NOT NULL )
ORDER BY priority
";
--- a/catalogue/detail.pl
+++ a/catalogue/detail.pl
@@ -237,7 +237,7 @@ foreach my $item (@items) {
$item->{ExpectedAtLibrary} = $branches->{$expectedAt}{branchname};
$item->{Reservedcardnumber} = $ItemBorrowerReserveInfo->{'cardnumber'};
# Check waiting status
- $item->{waitingdate} = format_date($wait) if $wait;
+ $item->{waitingdate} = $wait;
}
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -1,4 +1,5 @@
[% USE AuthorisedValues %]
+[% USE KohaDates %]
[% ShowCourseReserves = 0 %]
[% IF UseCourseReserves %]
@@ -620,7 +621,7 @@ function verify_images() {
[% END %]
[% item.ExpectedAtLibrary %]
[% IF ( item.waitingdate ) %]
- since [% item.waitingdate %]
+ since [% item.waitingdate | $KohaDates %]
[% ELSE %]
[% IF ( item.reservedate ) %]
(placed [% item.reservedate %])
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -456,7 +456,7 @@ function checkMultiHold() {
[% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %]
[% IF ( itemloo.canreservefromotherbranches ) %]for [% itemloo.ReservedForFirstname %] [% itemloo.ReservedForSurname %][% END %] [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% itemloo.ExpectedAtLibrary %]
since
- [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate %][% END %][% END %]. Cancel hold
+ [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate | $KohaDates %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate %][% END %][% END %]. Cancel hold
[% END %]
[% ELSE %]
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
+++ a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
@@ -1,4 +1,5 @@
[% USE Koha %]
+[% USE KohaDates %]
[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog › Placing a hold
[% INCLUDE 'doc-head-close.inc' %]
[% INCLUDE 'calendar.inc' %]
@@ -529,7 +530,7 @@
[% IF ( itemLoo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %] for patron
[% IF ( itemLoo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% itemLoo.ExpectedAtLibrary %]
since
- [% IF ( itemLoo.waitingdate ) %][% itemLoo.waitingdate %][% ELSE %][% IF ( itemLoo.reservedate ) %][% itemLoo.reservedate %][% END %][% END %].
+ [% IF ( itemLoo.waitingdate ) %][% itemLoo.waitingdate | $KohaDates %][% ELSE %][% IF ( itemLoo.reservedate ) %][% itemLoo.reservedate %][% END %][% END %].
[% ELSE %]
Not on hold
--- a/opac/opac-reserve.pl
+++ a/opac/opac-reserve.pl
@@ -447,7 +447,7 @@ foreach my $biblioNum (@biblionumbers) {
$itemLoopIter->{ReservedForFirstname} = $ItemBorrowerReserveInfo->{'firstname'};
$itemLoopIter->{ExpectedAtLibrary} = $expectedAt;
#waiting status
- $itemLoopIter->{waitingdate} = format_date($wait) if $wait;
+ $itemLoopIter->{waitingdate} = $wait;
}
$itemLoopIter->{notforloan} = $itemInfo->{notforloan};
--- a/reserve/request.pl
+++ a/reserve/request.pl
@@ -338,7 +338,7 @@ foreach my $biblionumber (@biblionumbers) {
$item->{ReservedForSurname} = $ItemBorrowerReserveInfo->{'surname'};
$item->{ReservedForFirstname} = $ItemBorrowerReserveInfo->{'firstname'};
$item->{ExpectedAtLibrary} = $branches->{$expectedAt}{branchname};
- $item->{waitingdate} = format_date($wait) if $wait;
+ $item->{waitingdate} = $wait;
}
# Management of the notforloan document
--