[Koha-cvs] koha/C4 Bull.pm [rel_2_2]

[paul poulain]

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch: 	rel_2_2
Changes by:	paul poulain <tipaul at savannah.gnu.org>	06/05/12 09:35:09

Modified files:
	C4             : Bull.pm 

Log message:
	adding the starting period even when adding a subscription : it fixes bug 1059 :
	Subscriptions must be entered in as Vol X No. 1 or issue calculation is incorrect
	
	- doc updated on the wiki
	- JOSHUA / KADOS / OWEN / KYLE: be carefull your templates have to be modified

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/C4/Bull.pm.diff?only_with_tag=rel_2_2&tr1=1.6.2.23&tr2=1.6.2.24&r1=text&r2=text

Patches:
Index: koha/C4/Bull.pm
diff -u koha/C4/Bull.pm:1.6.2.23 koha/C4/Bull.pm:1.6.2.24
--- koha/C4/Bull.pm:1.6.2.23	Tue May  9 15:09:16 2006
+++ koha/C4/Bull.pm	Fri May 12 09:35:09 2006
@@ -110,26 +110,26 @@
 sub newsubscription {
 	my ($auser,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
 		$startdate,$periodicity,$dow,$numberlength,$weeklength,$monthlength,
-		$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,
-		$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
-		$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
+		$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
+		$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
+		$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
 		$numberingmethod, $status, $notes) = @_;
 	my $dbh = C4::Context->dbh;
 	#save subscription
 	my $sth=$dbh->prepare("insert into subscription (librarian,aqbooksellerid,cost,aqbudgetid,biblionumber,
 							startdate,periodicity,dow,numberlength,weeklength,monthlength,
-							add1,every1,whenmorethan1,setto1,lastvalue1,
-							add2,every2,whenmorethan2,setto2,lastvalue2,
-							add3,every3,whenmorethan3,setto3,lastvalue3,
+							add1,every1,whenmorethan1,setto1,lastvalue1,innerloop1,
+							add2,every2,whenmorethan2,setto2,lastvalue2,innerloop2,
+							add3,every3,whenmorethan3,setto3,lastvalue3,innerloop3,
 							numberingmethod, status, notes) values 
 							(?,?,?,?,?,?,?,?,?,
 							 ?,?,?,?,?,?,?,?,?,?,
-							 ?,?,?,?,?,?,?,?,?,?)");
+							 ?,?,?,?,?,?,?,?,?,?,?,?,?)");
 	$sth->execute($auser,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
 					format_date_in_iso($startdate),$periodicity,$dow,$numberlength,$weeklength,$monthlength,
-					$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,
-					$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
-					$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
+					$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
+					$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
+					$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
 	 				$numberingmethod, $status, $notes);
 	#then create the 1st waited number
 	my $subscriptionid = $dbh->{'mysql_insertid'};