Bug 5549: Formatting duedates in catalogue scripts
authorColin Campbell <colin.campbell@ptfs-europe.com>
Fri, 17 Jun 2011 14:02:46 +0000 (15:02 +0100)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 19 Mar 2012 23:35:57 +0000 (12:35 +1300)
catalogue/detail.pl
catalogue/issuehistory.pl
catalogue/moredetail.pl

index db38551..da62e07 100755 (executable)
@@ -39,6 +39,7 @@ use C4::Tags qw(get_tags);
 use C4::VirtualShelves;
 use C4::XSLT;
 use C4::Images;
+use Koha::DateUtils;
 
 # use Smart::Comments;
 
@@ -192,9 +193,10 @@ foreach my $item (@items) {
     $item->{imageurl} = defined $item->{itype} ? getitemtypeimagelocation('intranet', $itemtypes->{ $item->{itype} }{imageurl})
                                                : '';
 
-       foreach (qw(datedue datelastseen onloan)) {
+       foreach (qw(datelastseen onloan)) {
                $item->{$_} = format_date($item->{$_});
-       }
+    }
+    $item->{datedue} = format_sqldatetime($item->{datedue});
     # item damaged, lost, withdrawn loops
     $item->{itemlostloop} = GetAuthorisedValues($authvalcode_items_itemlost, $item->{itemlost}) if $authvalcode_items_itemlost;
     if ($item->{damaged}) {
index 3fb936e..2d415e1 100755 (executable)
@@ -67,11 +67,11 @@ if ($itemnumber){
                %{$biblio[0]},
        );
 } 
-foreach (@$issues){
-       $_->{date_due}   = format_date($_->{date_due});
-       $_->{issuedate}  = format_date($_->{issuedate});
-       $_->{returndate} = format_date($_->{returndate});
-       $_->{lastreneweddate} = format_date($_->{lastreneweddate});
+foreach (@{$issues}){
+       $_->{date_due}   = format_sqldatetime($_->{date_due});
+       $_->{issuedate}  = format_sqldatetime($_->{issuedate});
+       $_->{returndate} = format_sqldatetime($_->{returndate});
+       $_->{lastreneweddate} = format_sqldatetime($_->{lastreneweddate});
 }
 $template->param(
     total        => scalar @$issues,
index f5bb904..1a3a2d0 100755 (executable)
@@ -35,6 +35,7 @@ use C4::Circulation;  # to use itemissues
 use C4::Members; # to use GetMember
 use C4::Search;                # enabled_staff_search_views
 use C4::Members qw/GetHideLostItemsPreference/;
+use Koha::DateUtils;
 
 my $query=new CGI;
 
@@ -162,8 +163,8 @@ foreach my $item (@items){
     }
     $item->{'homebranchname'} = GetBranchName($item->{'homebranch'});
     $item->{'holdingbranchname'} = GetBranchName($item->{'holdingbranch'});
-    if ($item->{'datedue'}) {
-        $item->{'datedue'} = format_date($item->{'datedue'});
+    if ($item->{datedue}) {
+        $item->{datedue} = format_sqldatetime($item->{datedue});
         $item->{'issue'}= 1;
     } else {
         $item->{'issue'}= 0;