[Koha-cvs] CVS: koha/C4 Bull.pm,1.14,1.15

[Henri-Damien LAURENT]

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

Modified Files:
	Bull.pm 
Log Message:
Adding a note field in serial table.
This will allow librarian to mention a note on a peculiar waiting serial number.


Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** Bull.pm	5 Aug 2005 14:47:23 -0000	1.14
--- Bull.pm	24 Aug 2005 08:49:03 -0000	1.15
***************
*** 361,365 ****
  	my $dbh = C4::Context->dbh;
  	# status = 2 is "arrived"
! 	my $sth=$dbh->prepare("select serialid,serialseq, status, planneddate from serial where subscriptionid = ? and status <>2 and status <>4 and status <>5");
  	$sth->execute($subscriptionid);
  	my @serials;
--- 361,366 ----
  	my $dbh = C4::Context->dbh;
  	# status = 2 is "arrived"
! 	my $sth=$dbh->prepare("select serialid,serialseq, status, planneddate, notes from serial where subscriptionid = ? and status <>2 and status <>4 and status <>5");
! 
  	$sth->execute($subscriptionid);
  	my @serials;
***************
*** 396,400 ****
  
  sub serialchangestatus {
! 	my ($serialid,$serialseq,$planneddate,$status)=@_;
  	# 1st, get previous status : if we change from "waited" to something else, then we will have to create a new "waited" entry
  	my $dbh = C4::Context->dbh;
--- 397,401 ----
  
  sub serialchangestatus {
! 	my ($serialid,$serialseq,$planneddate,$status,$note)=@_;
  	# 1st, get previous status : if we change from "waited" to something else, then we will have to create a new "waited" entry
  	my $dbh = C4::Context->dbh;
***************
*** 406,411 ****
  		delissue($serialseq, $subscriptionid) 
  	}else{
! 		$sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=? where serialid = ?");
! 		$sth->execute($serialseq,$planneddate,$status,$serialid);
  		$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
  		$sth->execute($subscriptionid);
--- 407,412 ----
  		delissue($serialseq, $subscriptionid) 
  	}else{
! 		$sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=?, notes=? where serialid = ?");
! 		$sth->execute($serialseq,$planneddate,$status,$note,$serialid);
  		$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
  		$sth->execute($subscriptionid);