[Koha-cvs] CVS: koha/bull statecollection.pl,1.8,1.9 subscription-add.pl,1.7,1.8 subscription-detail.pl,1.8,1.9

[Paul POULAIN]

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

Modified Files:
	statecollection.pl subscription-add.pl subscription-detail.pl 
Log Message:
new features for serial module :
- the last 5 issues are now shown, and their status can be changed (but not reverted to "waited", as there can be only one "waited")
- the library can create a "distribution list". this paper contains a list of borrowers (selected from the borrower list, or manually entered), and print it for a given issue. once printed, the sheet can be put on the issue and distributed to every reader on the list (one by one).

Index: statecollection.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/statecollection.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** statecollection.pl	26 Oct 2005 09:11:50 -0000	1.8
--- statecollection.pl	27 Oct 2005 12:09:23 -0000	1.9
***************
*** 60,64 ****
  }
  my $subs = &getsubscription($subscriptionid);
! my ($totalissues, at serialslist) = getserials($subscriptionid);
  
  my $sth=$dbh->prepare("select * from subscriptionhistory where subscriptionid = ?");
--- 60,64 ----
  }
  my $subs = &getsubscription($subscriptionid);
! my ($totalissues, at serialslist) = getserials($subscriptionid,10);
  
  my $sth=$dbh->prepare("select * from subscriptionhistory where subscriptionid = ?");

Index: subscription-add.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/subscription-add.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** subscription-add.pl	4 Aug 2005 08:54:54 -0000	1.7
--- subscription-add.pl	27 Oct 2005 12:09:23 -0000	1.8
***************
*** 39,43 ****
  
  #FIXME : If Budgets are never used, then these lines are useless.
! my $dbh = C4::Context->dbh;
  my $sthtemp = $dbh->prepare("Select flags, branchcode from borrowers where borrowernumber = ?");
  $sthtemp->execute($loggedinuser);
--- 39,43 ----
  
  #FIXME : If Budgets are never used, then these lines are useless.
! $dbh = C4::Context->dbh;
  my $sthtemp = $dbh->prepare("Select flags, branchcode from borrowers where borrowernumber = ?");
  $sthtemp->execute($loggedinuser);
***************
*** 49,53 ****
  	my $subs = &getsubscription($subscriptionid);
  	$auser = $subs->{'user'};
! 	$librarian => $subs->{'librarian'},
  	$cost = $subs->{'cost'};
  	$aqbooksellerid = $subs->{'aqbooksellerid'};
--- 49,53 ----
  	my $subs = &getsubscription($subscriptionid);
  	$auser = $subs->{'user'};
! 	$librarian = $subs->{'librarian'};
  	$cost = $subs->{'cost'};
  	$aqbooksellerid = $subs->{'aqbooksellerid'};
***************
*** 55,58 ****
--- 55,59 ----
  	$bookfundid = $subs->{'bookfundid'};
  	$aqbudgetid = $subs->{'aqbudgetid'};
+ 	defined $aqbudgetid or $aqbudgetid='';
  	$startdate = $subs->{'startdate'};
  	$periodicity = $subs->{'periodicity'};
***************
*** 85,88 ****
--- 86,90 ----
  	$notes = $subs->{'notes'};
  	$letter = $subs->{'letter'};
+ 	defined $letter or $letter='';
  	$template->param(
  		$op => 1,
***************
*** 134,138 ****
  (my $temp, at budgets) = bookfunds($homebranch);
  # find default value & set it for the template
! for (my $i=0;$i<=$#budgets;$i++) {
  	if ($budgets[$i]->{'aqbudgetid'} eq $aqbudgetid) {
  		$budgets[$i]->{'selected'}=1;
--- 136,140 ----
  (my $temp, at budgets) = bookfunds($homebranch);
  # find default value & set it for the template
! for (my $i=0;$i<$#budgets;$i++) {
  	if ($budgets[$i]->{'aqbudgetid'} eq $aqbudgetid) {
  		$budgets[$i]->{'selected'}=1;
***************
*** 144,148 ****
  my @letterlist = GetLetterList('serial');
  for (my $i=0;$i<=$#letterlist;$i++) {
- 	warn "$letterlist[$i]->{'code'} eq ".$letter;
  	$letterlist[$i]->{'selected'} =1 if $letterlist[$i]->{'code'} eq $letter;
  }
--- 146,149 ----

Index: subscription-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/subscription-detail.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** subscription-detail.pl	22 Sep 2005 10:01:45 -0000	1.8
--- subscription-detail.pl	27 Oct 2005 12:09:24 -0000	1.9
***************
*** 13,21 ****
  
  my $query = new CGI;
! my $op = $query->param('op');
  my $dbh = C4::Context->dbh;
  my $sth;
  # my $id;
! my ($template, $loggedinuser, $cookie, $subs);
  my ($subscriptionid,$auser,$librarian,$cost,$aqbooksellerid, $aqbooksellername,$aqbudgetid, $bookfundid, $startdate, $periodicity,
  	$dow, $numberlength, $weeklength, $monthlength,
--- 13,21 ----
  
  my $query = new CGI;
! my $op = $query->param('op') || '';
  my $dbh = C4::Context->dbh;
  my $sth;
  # my $id;
! my ($template, $loggedinuser, $cookie, $subs, $user, $sessionID, $flags);
  my ($subscriptionid,$auser,$librarian,$cost,$aqbooksellerid, $aqbooksellername,$aqbudgetid, $bookfundid, $startdate, $periodicity,
  	$dow, $numberlength, $weeklength, $monthlength,
***************
*** 29,33 ****
  if ($op eq 'modsubscription') {
  	$auser = $query->param('user');
! 	$librarian => $query->param('librarian'),
  	$cost = $query->param('cost');
  	$aqbooksellerid = $query->param('aqbooksellerid');
--- 29,33 ----
  if ($op eq 'modsubscription') {
  	$auser = $query->param('user');
! 	$librarian = $query->param('librarian');
  	$cost = $query->param('cost');
  	$aqbooksellerid = $query->param('aqbooksellerid');
***************
*** 77,81 ****
  
  }
! 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)
--- 77,83 ----
  
  }
! $subs = &getsubscription($subscriptionid);
! # html'ize distributedto
! $subs->{distributedto}=~ s/\n/<br \/>/g;
  my ($totalissues, at serialslist) = getserials($subscriptionid);
  $totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
***************
*** 90,94 ****
  				});
  
! my ($user, $cookie, $sessionID, $flags) = checkauth($query, 0, {catalogue => 1}, "intranet");
  
  $template->param(
--- 92,96 ----
  				});
  
! ($user, $cookie, $sessionID, $flags) = checkauth($query, 0, {catalogue => 1}, "intranet");
  
  $template->param(