[Koha-cvs] CVS: koha/bull statecollection.pl,1.3,1.4 subscription-detail.pl,1.5,1.6

[Paul POULAIN]

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

Modified Files:
	statecollection.pl subscription-detail.pl 
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits done here

Index: statecollection.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/statecollection.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** statecollection.pl	12 Aug 2004 14:36:07 -0000	1.3
--- statecollection.pl	1 Mar 2005 13:40:50 -0000	1.4
***************
*** 40,44 ****
  }
  my $subs = &getsubscription($subscriptionid);
! my @serialslist = getserials($subscriptionid);
  
  my $sth=$dbh->prepare("select * from subscriptionhistory where subscriptionid = ?");
--- 40,44 ----
  }
  my $subs = &getsubscription($subscriptionid);
! my ($totalissues, at serialslist) = getserials($subscriptionid);
  
  my $sth=$dbh->prepare("select * from subscriptionhistory where subscriptionid = ?");

Index: subscription-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/subscription-detail.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** subscription-detail.pl	20 Sep 2004 10:16:05 -0000	1.5
--- subscription-detail.pl	1 Mar 2005 13:40:50 -0000	1.6
***************
*** 70,75 ****
  }
  
  my $subs = &getsubscription($subscriptionid);
! my @serialslist = getserials($subscriptionid);
  
  ($template, $loggedinuser, $cookie)
--- 70,83 ----
  }
  
+ if ($op eq 'del') {
+ 	&delsubscription($subscriptionid);
+ 	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=../bull-home.pl\"></html>";
+ 	exit;
+ 
+ }
  my $subs = &getsubscription($subscriptionid);
! my ($totalissues, at serialslist) = getserials($subscriptionid);
! $totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
! # the subscription must be deletable if there is NO issues for a reason or another (should not happend, but...)
  
  ($template, $loggedinuser, $cookie)
***************
*** 124,127 ****
--- 132,136 ----
  	subscriptionid => $subs->{subscriptionid},
  	serialslist => \@serialslist,
+ 	totalissues => $totalissues,
  	);
  $template->param(