From b1f388bbee132b12fd4141b61b2cb77423350c55 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Fri, 11 Aug 2006 16:33:53 +0000
Subject: [PATCH] fixing some bugs in subscription add. However,
 alt_subscription-add.pl seems so nice that I think it could be the official
 subscription-add... will drop a mail on koha-devel about this

---
 .../en/serials/subscription-bib-search.tmpl   |  6 +++++-
 serials/alt_subscription-add.pl               | 14 --------------
 serials/subscription-add.pl                   | 19 -------------------
 3 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl
index ee2f08e670..e5cdc456ce 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl
@@ -17,7 +17,11 @@
 	</p>
 	<p>
 		<label>Itemtype</label>
-		<!-- TMPL_VAR name="CGIitemtype" -->
+            <select name="value">
+            <!-- TMPL_LOOP name="itemtypeloop" -->
+                <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="description" --></option>
+            <!-- /TMPL_LOOP -->
+            </select>
 		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="category" -->">
 		<input type="hidden" name="marclist" value="">
 		<input type="hidden" name="and_or" value="and">
diff --git a/serials/alt_subscription-add.pl b/serials/alt_subscription-add.pl
index 1cfb9f0f44..a553ee78eb 100755
--- a/serials/alt_subscription-add.pl
+++ b/serials/alt_subscription-add.pl
@@ -67,8 +67,6 @@ if ($op eq 'mod') {
 	$cost = $subs->{'cost'};
 	$aqbooksellerid = $subs->{'aqbooksellerid'};
 	$aqbooksellername = $subs->{'aqbooksellername'};
-	$bookfundid = $subs->{'bookfundid'};
-	$aqbudgetid = $subs->{'aqbudgetid'};
 	$startdate = $subs->{'startdate'};
 	$firstacquidate = $subs->{'firstacquidate'};    
 	$periodicity = $subs->{'periodicity'};
@@ -180,18 +178,6 @@ if ($op eq 'mod') {
 	                        "numberpattern$numberpattern" => 1,
 				);
 }
-(my $temp,@budgets) = bookfunds();
-# 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;
-	}
-}
-$template->param(budgets => \@budgets,
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
 
 if ($op eq 'addsubscription') {
         my @irregular = $query->param('irregular');
diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl
index ccc94b93c8..8cdc97375d 100755
--- a/serials/subscription-add.pl
+++ b/serials/subscription-add.pl
@@ -79,14 +79,6 @@ my ($template, $loggedinuser, $cookie)
                 debug => 1,
                 });
 
-
-#FIXME : If Budgets are never used, then these lines are useless.
-$dbh = C4::Context->dbh;
-my $sthtemp = GetBranchCodeFromBorrowers();
-$sthtemp->execute($loggedinuser);
-my ($flags, $homebranch)=$sthtemp->fetchrow;
-#FIXME : END added by hdl on July,14 2005
-
 if ($op eq 'mod') {
     my $subscriptionid = $query->param('subscriptionid');
     my $subs = &GetSubscription($subscriptionid);
@@ -173,17 +165,6 @@ if ($op eq 'mod') {
         "dow$dow" => 1,
         );
 }
-@budgets = GetBookFunds($homebranch);
-my $temp = scalar(@budgets);
-
-# 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;
-    }
-}
-$template->param(budgets => \@budgets);
-#FIXME : END Added by hdl on July, 14 2005
 
 my @letterlist = GetLetterList('serial');
 for (my $i=0;$i<=$#letterlist;$i++) {
-- 
2.39.5