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

[Paul POULAIN]

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

Modified Files:
      Tag: rel_2_2
	statecollection.pl subscription-detail.pl 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)



Index: statecollection.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/statecollection.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** statecollection.pl	12 Aug 2004 14:36:07 -0000	1.3
--- statecollection.pl	11 Jan 2005 15:07:57 -0000	1.3.2.1
***************
*** 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.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** subscription-detail.pl	20 Sep 2004 10:16:05 -0000	1.5
--- subscription-detail.pl	11 Jan 2005 15:07:58 -0000	1.5.2.1
***************
*** 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(