[Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.8,1.6.2.9

[Paul POULAIN]

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14962/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
formating dates to user format

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.8
retrieving revision 1.6.2.9
diff -C2 -r1.6.2.8 -r1.6.2.9
*** Bull.pm	6 Jun 2005 16:00:56 -0000	1.6.2.8
--- Bull.pm	16 Jun 2005 15:35:27 -0000	1.6.2.9
***************
*** 102,105 ****
--- 102,106 ----
  	return @issuelist;
  }
+ 
  sub newsubscription {
  	my ($auser,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
***************
*** 141,144 ****
--- 142,146 ----
  	return $subscriptionid;
  }
+ 
  sub getsubscription {
  	my ($subscriptionid) = @_;
***************
*** 179,185 ****
--- 181,194 ----
  	while (my $subs = $sth->fetchrow_hashref) {
  		$subs->{startdate} = format_date($subs->{startdate});
+ 		$subs->{histstartdate} = format_date($subs->{histstartdate});
  		$subs->{opacnote} =~ s/\n/\<br\/\>/g;
  		$subs->{missinglist} =~ s/\n/\<br\/\>/g;
  		$subs->{recievedlist} =~ s/\n/\<br\/\>/g;
+ 		$subs->{"periodicity".$subs->{periodicity}} = 1;
+ 		if ($subs->{enddate} eq '0000-00-00') {
+ 			$subs->{enddate}='';
+ 		} else {
+ 			$subs->{enddate} = format_date($subs->{enddate});
+ 		}
  		push @res,$subs;
  	}
***************
*** 215,219 ****
  			my $temp=$res[scalar(@res)-1]->{'serials'};
  			push @$temp,
! 				{'planneddate' => $subs->{'planneddate'}, 
  				'serialseq' => $subs->{'serialseq'},
  				'status1' => $subs->{'status'}==1,
--- 224,228 ----
  			my $temp=$res[scalar(@res)-1]->{'serials'};
  			push @$temp,
! 				{'planneddate' => format_date($subs->{'planneddate'}), 
  				'serialseq' => $subs->{'serialseq'},
  				'status1' => $subs->{'status'}==1,
***************
*** 225,234 ****
  			$first=1 if (not $year);
  			$year= $subs->{'year'};
! 			$startdate= $subs->{'startdate'};
  			$aqbooksellername= $subs->{'aqbooksellername'};
  			$bibliotitle= $subs->{'bibliotitle'};
  			my @temp;
  			push @temp,
! 				{'planneddate' => $subs->{'planneddate'}, 
  				'serialseq' => $subs->{'serialseq'},
  				'status1' => $subs->{'status'}==1,
--- 234,243 ----
  			$first=1 if (not $year);
  			$year= $subs->{'year'};
! 			$startdate= format_date($subs->{'startdate'});
  			$aqbooksellername= $subs->{'aqbooksellername'};
  			$bibliotitle= $subs->{'bibliotitle'};
  			my @temp;
  			push @temp,
! 				{'planneddate' => format_date($subs->{'planneddate'}), 
  				'serialseq' => $subs->{'serialseq'},
  				'status1' => $subs->{'status'}==1,