[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/serials/su...

[paul poulain]

CVSROOT:        /sources/koha
Module name:    koha
Changes by:     paul poulain <tipaul>   06/08/11 16:33:53

Modified files:
        koha-tmpl/intranet-tmpl/prog/en/serials: 
                                                 subscription-bib-search.tmpl 
        serials        : alt_subscription-add.pl subscription-add.pl 

Log message:
        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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/serials/alt_subscription-add.pl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/serials/subscription-add.pl?cvsroot=koha&r1=1.5&r2=1.6

Patches:
Index: koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl        
19 Jan 2006 12:46:58 -0000      1.1
+++ koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl        
11 Aug 2006 16:33:53 -0000      1.2
@@ -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">

Index: serials/alt_subscription-add.pl
===================================================================
RCS file: /sources/koha/koha/serials/alt_subscription-add.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- serials/alt_subscription-add.pl     20 Jul 2006 03:17:15 -0000      1.1
+++ serials/alt_subscription-add.pl     11 Aug 2006 16:33:53 -0000      1.2
@@ -67,8 +67,6 @@
        $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 @@
                                "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 => address@hidden,
-               intranetcolorstylesheet => 
C4::Context->preference("intranetcolorstylesheet"),
-               intranetstylesheet => 
C4::Context->preference("intranetstylesheet"),
-               IntranetNav => C4::Context->preference("IntranetNav"),
-               );
 
 if ($op eq 'addsubscription') {
         my @irregular = $query->param('irregular');

Index: serials/subscription-add.pl
===================================================================
RCS file: /sources/koha/koha/serials/subscription-add.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- serials/subscription-add.pl 27 Jul 2006 14:00:19 -0000      1.5
+++ serials/subscription-add.pl 11 Aug 2006 16:33:53 -0000      1.6
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: subscription-add.pl,v 1.5 2006/07/27 14:00:19 toins Exp $
+# $Id: subscription-add.pl,v 1.6 2006/08/11 16:33:53 tipaul Exp $
 
 =head1 NAME
 
@@ -79,14 +79,6 @@
                 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 @@
         "dow$dow" => 1,
         );
 }
address@hidden = 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 => address@hidden);
-#FIXME : END Added by hdl on July, 14 2005
 
 my @letterlist = GetLetterList('serial');
 for (my $i=0;$i<=$#letterlist;$i++) {