Bug 5549 : Overdues : Handle some date comparison and display issues

This commit is contained in:
Colin Campbell 2011-06-21 14:07:41 +01:00 committed by Chris Cormack
parent 31a3a7ed93
commit 39d1b7e61b
2 changed files with 6 additions and 6 deletions

View File

@ -124,7 +124,7 @@ sub Getoverdues {
SELECT issues.*, items.itype as itemtype, items.homebranch, items.barcode
FROM issues
LEFT JOIN items USING (itemnumber)
WHERE date_due < CURDATE()
WHERE date_due < NOW()
";
} else {
$statement = "
@ -132,7 +132,7 @@ LEFT JOIN items USING (itemnumber)
FROM issues
LEFT JOIN items USING (itemnumber)
LEFT JOIN biblioitems USING (biblioitemnumber)
WHERE date_due < CURDATE()
WHERE date_due < NOW()
";
}
@ -199,7 +199,7 @@ sub checkoverdues {
LEFT JOIN biblio ON items.biblionumber = biblio.biblionumber
LEFT JOIN biblioitems ON items.biblioitemnumber = biblioitems.biblioitemnumber
WHERE issues.borrowernumber = ?
AND issues.date_due < CURDATE()"
AND issues.date_due < NOW()"
);
# FIXME: SELECT * across 4 tables? do we really need the marc AND marcxml blobs??
$sth->execute($borrowernumber);

View File

@ -323,7 +323,7 @@ if (@branchcodes) {
# these are the fields that will be substituted into <<item.content>>
my @item_content_fields = split( /,/, $itemscontent );
binmode STDOUT, ':encoding(UTF-8)';
binmode( STDOUT, ':encoding(UTF-8)' );
our $csv; # the Text::CSV_XS object
@ -350,8 +350,8 @@ if ( defined $htmlfilename ) {
if ( $htmlfilename eq '' ) {
$html_fh = *STDOUT;
} else {
my $today = C4::Dates->new();
open $html_fh, ">",File::Spec->catdir ($htmlfilename,"notices-".$today->output('iso').".html");
my $today = DateTime->now(time_zone => C4::Context->tz );
open $html_fh, ">",File::Spec->catdir ($htmlfilename,"notices-".$today->ymd().".html");
}
print $html_fh "<html>\n";