[Koha-cvs] CVS: koha/acqui acquire.pl,1.13,1.14 basket.pl,1.7,1.8 order.pl,1.7,1.8

[Mike Hansen]

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1:/tmp/cvs-serv14986/koha/acqui

Modified Files:
        acquire.pl basket.pl order.pl 
Log Message:
Added format_date() to the scripts.


Index: acquire.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acquire.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** acquire.pl  19 Mar 2003 21:02:24 -0000      1.13
--- acquire.pl  22 Apr 2003 10:22:19 -0000      1.14
***************
*** 34,37 ****
--- 34,38 ----
  use C4::Database;
  use HTML::Template;
+ use C4::Date;
  
  my $input=new CGI;
***************
*** 47,52 ****
  my ($count,@results)=ordersearch($search,$id,$biblio,$catview);
  my ($count2,@booksellers)=bookseller($results[0]->{'booksellerid'});
! my @date=split('-',$results[0]->{'entrydate'});
! my $date="$date[2]/$date[1]/$date[0]";
  
  my ($template, $loggedinuser, $cookie)
--- 48,52 ----
  my ($count,@results)=ordersearch($search,$id,$biblio,$catview);
  my ($count2,@booksellers)=bookseller($results[0]->{'booksellerid'});
! my $date = $results[0]->{'entrydate'};
  
  my ($template, $loggedinuser, $cookie)
***************
*** 141,148 ****
                catview => ($catview ne 'yes'?1:0),
                name => $booksellers[0]->{'name'},
!               date => $date,
                title => $results[0]->{'title'},
                author => $results[0]->{'author'},
!               copyrightdate => $results[0]->{'copyrightdate'},
                CGIitemtype => $CGIitemtype,
                CGIbranch => $CGIbranch,
--- 141,148 ----
                catview => ($catview ne 'yes'?1:0),
                name => $booksellers[0]->{'name'},
!               date => format_date($date),
                title => $results[0]->{'title'},
                author => $results[0]->{'author'},
!               copyrightdate => format_date($results[0]->{'copyrightdate'}),
                CGIitemtype => $CGIitemtype,
                CGIbranch => $CGIbranch,
***************
*** 178,182 ****
        }
        $template->param( loop => address@hidden,
!                                               date => $date,
                                                name => 
$booksellers[0]->{'name'},
                                                id => $id,
--- 178,182 ----
        }
        $template->param( loop => address@hidden,
!                                               date => format_date($date),
                                                name => 
$booksellers[0]->{'name'},
                                                id => $id,

Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** basket.pl   13 Feb 2003 17:27:49 -0000      1.7
--- basket.pl   22 Apr 2003 10:22:20 -0000      1.8
***************
*** 33,36 ****
--- 33,37 ----
  use HTML::Template;
  use C4::Catalogue;
+ use C4::Date;
  use strict;
  
***************
*** 96,100 ****
  $template->param(basket => $basket,
                                                authorisedby => 
$results[0]->{'authorisedby'},
!                                               entrydate 
=>$results[0]->{'entrydate'},
                                                id=> 
$results[0]->{'booksellerid'},
                                                name => 
$booksellers[0]->{'name'},
--- 97,101 ----
  $template->param(basket => $basket,
                                                authorisedby => 
$results[0]->{'authorisedby'},
!                                               entrydate => 
format_date($results[0]->{'entrydate'}),
                                                id=> 
$results[0]->{'booksellerid'},
                                                name => 
$booksellers[0]->{'name'},

Index: order.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/order.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** order.pl    13 Feb 2003 17:27:51 -0000      1.7
--- order.pl    22 Apr 2003 10:22:20 -0000      1.8
***************
*** 34,37 ****
--- 34,38 ----
  use HTML::Template;
  use C4::Catalogue;
+ use C4::Date;
  
  my $query=new CGI;
***************
*** 72,76 ****
                $inner_line{total} =$orders->[$i2]->{'count(*)'};
                $inner_line{authorisedby} = $orders->[$i2]->{'authorisedby'};
!               $inner_line{entrydate} = $orders->[$i2]->{'entrydate'};
                push @loop_basket, \%inner_line;
        }
--- 73,77 ----
                $inner_line{total} =$orders->[$i2]->{'count(*)'};
                $inner_line{authorisedby} = $orders->[$i2]->{'authorisedby'};
!               $inner_line{entrydate} = 
format_date($orders->[$i2]->{'entrydate'});
                push @loop_basket, \%inner_line;
        }