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

[Paul POULAIN]

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

Modified Files:
	subscription-add.pl subscription-detail.pl 
Log Message:
some changes in serial management :
* in subscription Add, the issue number & date is used to calculate the 1st issue (previously, a "next issue number & date" was applied, meaning you had to enter the number & date of a previous issue)
* the "inner loop" used for serials number ({XYZ}) is now shown & can be modified. The innerloop is used for numbering formulas saying "change the number once every 4 times".

Index: subscription-add.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/subscription-add.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** subscription-add.pl	12 Aug 2004 14:36:07 -0000	1.4
--- subscription-add.pl	20 Sep 2004 10:16:05 -0000	1.5
***************
*** 20,26 ****
  my ($subscriptionid,$auser,$librarian,$cost,$aqbooksellerid, $aqbooksellername,$aqbudgetid, $bookfundid, $startdate, $periodicity,
  	$dow, $numberlength, $weeklength, $monthlength,
! 	$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,
! 	$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
! 	$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
  	$numberingmethod, $status, $biblionumber, 
  	$bibliotitle, $notes);
--- 20,26 ----
  my ($subscriptionid,$auser,$librarian,$cost,$aqbooksellerid, $aqbooksellername,$aqbudgetid, $bookfundid, $startdate, $periodicity,
  	$dow, $numberlength, $weeklength, $monthlength,
! 	$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
! 	$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
! 	$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
  	$numberingmethod, $status, $biblionumber, 
  	$bibliotitle, $notes);
***************
*** 58,61 ****
--- 58,62 ----
  	$setto1 = $subs->{'setto1'};
  	$lastvalue1 = $subs->{'lastvalue1'};
+ 	$innerloop1 = $subs->{'innerloop1'};
  	$add2 = $subs->{'add2'};
  	$every2 = $subs->{'every2'};
***************
*** 63,66 ****
--- 64,68 ----
  	$setto2 = $subs->{'setto2'};
  	$lastvalue2 = $subs->{'lastvalue2'};
+ 	$innerloop2 = $subs->{'innerloop2'};
  	$add3 = $subs->{'add3'};
  	$every3 = $subs->{'every3'};
***************
*** 68,71 ****
--- 70,74 ----
  	$setto3 = $subs->{'setto3'};
  	$lastvalue3 = $subs->{'lastvalue3'};
+ 	$innerloop3 = $subs->{'innerloop3'};
  	$numberingmethod = $subs->{'numberingmethod'};
  	$status = $subs->{status};
***************
*** 93,96 ****
--- 96,100 ----
  		setto1 => $setto1,
  		lastvalue1 => $lastvalue1,
+ 		innerloop1 => $innerloop1,
  		add2 => $add2,
  		every2 => $every2,
***************
*** 98,101 ****
--- 102,106 ----
  		setto2 => $setto2,
  		lastvalue2 => $lastvalue2,
+ 		innerloop2 => $innerloop2,
  		add3 => $add3,
  		every3 => $every3,
***************
*** 103,106 ****
--- 108,112 ----
  		setto3 => $setto3,
  		lastvalue3 => $lastvalue3,
+ 		innerloop3 => $innerloop3,
  		numberingmethod => $numberingmethod,
  		status => $status,

Index: subscription-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/subscription-detail.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** subscription-detail.pl	12 Aug 2004 14:36:07 -0000	1.4
--- subscription-detail.pl	20 Sep 2004 10:16:05 -0000	1.5
***************
*** 20,26 ****
  my ($subscriptionid,$auser,$librarian,$cost,$aqbooksellerid, $aqbooksellername,$aqbudgetid, $bookfundid, $startdate, $periodicity,
  	$dow, $numberlength, $weeklength, $monthlength,
! 	$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,
! 	$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
! 	$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
  	$numberingmethod, $status, $biblionumber, $bibliotitle, $notes);
  
--- 20,26 ----
  my ($subscriptionid,$auser,$librarian,$cost,$aqbooksellerid, $aqbooksellername,$aqbudgetid, $bookfundid, $startdate, $periodicity,
  	$dow, $numberlength, $weeklength, $monthlength,
! 	$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
! 	$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
! 	$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
  	$numberingmethod, $status, $biblionumber, $bibliotitle, $notes);
  
***************
*** 45,48 ****
--- 45,49 ----
  	$setto1 = $query->param('setto1');
  	$lastvalue1 = $query->param('lastvalue1');
+ 	$innerloop1 = $query->param('innerloop1');
  	$add2 = $query->param('add2');
  	$every2 = $query->param('every2');
***************
*** 50,53 ****
--- 51,55 ----
  	$setto2 = $query->param('setto2');
  	$lastvalue2 = $query->param('lastvalue2');
+ 	$innerloop2 = $query->param('innerloop2');
  	$add3 = $query->param('add3');
  	$every3 = $query->param('every3');
***************
*** 55,58 ****
--- 57,61 ----
  	$setto3 = $query->param('setto3');
  	$lastvalue3 = $query->param('lastvalue3');
+ 	$innerloop3 = $query->param('innerloop3');
  	$numberingmethod = $query->param('numberingmethod');
  	$status = 1;
***************
*** 61,67 ****
  	&modsubscription($auser,$aqbooksellerid,$cost,$aqbudgetid,$startdate,
  					$periodicity,$dow,$numberlength,$weeklength,$monthlength,
! 					$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,
! 					$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
! 					$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
  					$numberingmethod, $status, $biblionumber, $notes, $subscriptionid);
  }
--- 64,70 ----
  	&modsubscription($auser,$aqbooksellerid,$cost,$aqbudgetid,$startdate,
  					$periodicity,$dow,$numberlength,$weeklength,$monthlength,
! 					$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
! 					$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
! 					$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
  					$numberingmethod, $status, $biblionumber, $notes, $subscriptionid);
  }
***************
*** 99,102 ****
--- 102,106 ----
  	every1 => $subs->{every1},
  	whenmorethan1 => $subs->{whenmorethan1},
+ 	innerloop1 => $subs->{innerloop1},
  	setto1 => $subs->{setto1},
  	lastvalue1 => $subs->{lastvalue1},
***************
*** 106,109 ****
--- 110,114 ----
  	setto2 => $subs->{setto2},
  	lastvalue2 => $subs->{lastvalue2},
+ 	innerloop2 => $subs->{innerloop2},
  	add3 => $subs->{add3},
  	every3 => $subs->{every3},
***************
*** 111,114 ****
--- 116,120 ----
  	setto3 => $subs->{setto3},
  	lastvalue3 => $subs->{lastvalue3},
+ 	innerloop3 => $subs->{innerloop3},
  	numberingmethod => $subs->{numberingmethod},
  	status => $subs->{status},