[Koha-cvs] CVS: koha/circ circulation.pl,1.52,1.53

[Mike Hansen]

Update of /cvsroot/koha/koha/circ
In directory sc8-pr-cvs1:/tmp/cvs-serv21565/koha/circ

Modified Files:
        circulation.pl 
Log Message:
Fixed bug #169


Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** circulation.pl      5 May 2003 21:22:24 -0000       1.52
--- circulation.pl      8 May 2003 13:04:15 -0000       1.53
***************
*** 34,37 ****
--- 34,38 ----
  use C4::Koha;
  use HTML::Template;
+ use C4::Date;
  
  my $query=new CGI;
***************
*** 219,227 ****
        my $dd = $book->{'date_due'};
        my $datedue = $book->{'date_due'};
!       #convert to nz style dates
!       #this should be set with some kinda config variable
!       my @tempdate=split(/-/,$dd);
!       $dd="$tempdate[2]/$tempdate[1]/$tempdate[0]";
!       $datedue=~s/-//g;
        if ($datedue < $todaysdate) {
            $dd="<font color=red>$dd</font>\n";
--- 220,225 ----
        my $dd = $book->{'date_due'};
        my $datedue = $book->{'date_due'};
!       $dd=format_date($dd);
!       $datedue=~s/-//g;
        if ($datedue < $todaysdate) {
            $dd="<font color=red>$dd</font>\n";
***************
*** 244,252 ****
        my $dd = $book->{'date_due'};
        my $datedue = $book->{'date_due'};
!       #convert to nz style dates
!       #this should be set with some kinda config variable
!       my @tempdate=split(/-/,$dd);
!       $dd="$tempdate[2]/$tempdate[1]/$tempdate[0]";
!       $datedue=~s/-//g;
        if ($datedue < $todaysdate) {
            $dd="<font color=red>$dd</font>\n";
--- 242,247 ----
        my $dd = $book->{'date_due'};
        my $datedue = $book->{'date_due'};
!       $dd=format_date($dd);
!       $datedue=~s/-//g;
        if ($datedue < $todaysdate) {
            $dd="<font color=red>$dd</font>\n";
***************
*** 371,375 ****
                $invalidduedate="Invalid Due Date Specified. Book was not 
issued.  $year is not a leap year.<p>\n";
            } else {
!               $date="$year-$month-$day";
            }
        }
--- 366,370 ----
                $invalidduedate="Invalid Due Date Specified. Book was not 
issued.  $year is not a leap year.<p>\n";
            } else {
!               $date=format_date("$year-$month-$day");
            }
        }