[Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.13,1.6.2.14

[Paul POULAIN]

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

Modified Files:
      Tag: rel_2_2
        Bull.pm 
Log Message:
* removing the limit to delete a subscription
* adding serial note column to the subscription-detail

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.13
retrieving revision 1.6.2.14
diff -C2 -r1.6.2.13 -r1.6.2.14
*** Bull.pm     24 Aug 2005 09:02:25 -0000      1.6.2.13
--- Bull.pm     9 Sep 2005 10:11:38 -0000       1.6.2.14
***************
*** 290,302 ****
  sub delsubscription {
        my ($subscriptionid) = @_;
!       # check again there is only one issue (the subscription is new)
!       my ($totalissues) = getserials($subscriptionid);
!       if ($totalissues eq 1) {
!               my $dbh = C4::Context->dbh;
!               $subscriptionid=$dbh->quote($subscriptionid);
!               $dbh->do("delete from subscription where 
subscriptionid=$subscriptionid");
!               $dbh->do("delete from subscriptionhistory where 
subscriptionid=$subscriptionid");
!               $dbh->do("delete from serial where 
subscriptionid=$subscriptionid");
!       }
  }
  sub getsubscriptions {
--- 290,298 ----
  sub delsubscription {
        my ($subscriptionid) = @_;
!       my $dbh = C4::Context->dbh;
!       $subscriptionid=$dbh->quote($subscriptionid);
!       $dbh->do("delete from subscription where 
subscriptionid=$subscriptionid");
!       $dbh->do("delete from subscriptionhistory where 
subscriptionid=$subscriptionid");
!       $dbh->do("delete from serial where subscriptionid=$subscriptionid");
  }
  sub getsubscriptions {