bugfix for bugzilla #160

diff --git a/admin/aqbookfund.pl b/admin/aqbookfund.pl
index 882e1ca..d64b4eb 100755 (executable)
--- a/admin/aqbookfund.pl
+++ b/admin/aqbookfund.pl
@@ -51,14 +51,14 @@ sub StringSearch  {
        $searchstring=~ s/\'/\\\'/g;
        my @data=split(' ',$searchstring);
        my $count=@data;
-       my $query="select bookfundid,bookfundname,bookfundgroup from aqbookfund where bookfundid and (bookfundid like \"$data[0]%\") order by bookfundid";
+       my $query="select bookfundid,bookfundname,bookfundgroup from aqbookfund where (bookfundid like \"$data[0]%\") order by bookfundid";
        my $sth=$dbh->prepare($query);
        $sth->execute;
        my @results;
        my $cnt=0;
        while (my $data=$sth->fetchrow_hashref){
-       push(@results,$data);
-       $cnt ++;
+               push(@results,$data);
+               $cnt ++;
        }
        #  $sth->execute;
        $sth->finish;
@@ -193,7 +193,7 @@ if ($op eq 'add_form') {
                } else {
                        $toggle="white";
                }
-       while (@toggle and @bookfundid and @bookfundname and @bookfundgroup) { 
+       while (@toggle and @bookfundid and @bookfundname and @bookfundgroup) {
           my %row_data;
           $row_data{toggle} = shift @toggle;
           $row_data{bookfundid} = shift @bookfundid;

diff --git a/admin/aqbudget.pl b/admin/aqbudget.pl
index 5759516..57ff1a0 100755 (executable)
--- a/admin/aqbudget.pl
+++ b/admin/aqbudget.pl
@@ -53,7 +53,7 @@ sub StringSearch  {
        $searchstring=~ s/\'/\\\'/g;
        my @data=split(' ',$searchstring);
        my $count=@data;
-       my $query="Select bookfundid,startdate,enddate,budgetamount from aqbudget where bookfundid and (bookfundid like \"$data[0]%\") order by bookfundid";
+       my $query="Select bookfundid,startdate,enddate,budgetamount from aqbudget where (bookfundid like \"$data[0]%\") order by bookfundid";
        my $sth=$dbh->prepare($query);
        $sth->execute;
        my @results;

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl
index 66e62be..a191062 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl
@@ -9,12 +9,20 @@
 <FONT SIZE=6><em>bookfund admin</em></FONT><form action=<TMPL_VAR name=scriptname> method=post>
 <input type=text name=searchfield value=""><input type=reset name=reset value="clr"></form>
 <TMPL_IF name=search>
-<br>You Searched for <b><TMPL_VAR name=searchfield><b><p><br>
+       <br>You Searched for <b><TMPL_VAR name=searchfield><b><p><br>
 </TMPL_IF>
 <table border=0 cellspacing=0 cellpadding=2>
 <tr valign=top bgcolor=#99cc33><td background="/images/background-mem.gif"><b>Book fund</b></td><td background="/images/background-mem.gif"><b>Name</b></td><td background="/images/background-mem.gif"><b>Group</b></td><td background="/images/background-mem.gif"><b>Budget</b></td><td background="/images/background-mem.gif">&nbsp;</td><td background="/images/background-mem.gif"> &nbsp; </td><td background="/images/background-mem.gif"> &nbsp; </td></tr>
 <TMPL_LOOP name="bookfund">
-<tr valign=top bgcolor="<TMPL_VAR name="toggle">"<td><TMPL_VAR name="bookfundid"></td><td><TMPL_VAR name="bookfundname"></td><td><TMPL_VAR name="bookfundgroup"> &nbsp;</td><td><a href="aqbudget.pl?op=add_form&bookfundid=<TMPL_VAR name="bookfundid"> ">Budget</a></td><td><a href="<TMPL_VAR name="action">?op=add_form&bookfundid=<TMPL_VAR name="bookfundid"> ">Edit</a></td><td><a href="<TMPL_VAR name="action">?op=delete_confirm&bookfundid=<TMPL_VAR name="bookfundid">">Delete</a></td><td> &nbsp; </td></tr>
+       <tr valign=top bgcolor="<TMPL_VAR name="toggle">"
+               <td><TMPL_VAR name="bookfundid"></td>
+               <td><TMPL_VAR name="bookfundname"></td>
+               <td><TMPL_VAR name="bookfundgroup"> &nbsp;</td>
+               <td><a href="aqbudget.pl?bookfundid=<TMPL_VAR name="bookfundid"> ">Budget</a></td>
+               <td><a href="<TMPL_VAR name="action">?op=add_form&bookfundid=<TMPL_VAR name="bookfundid"> ">Edit</a></td>
+               <td><a href="<TMPL_VAR name="action">?op=delete_confirm&bookfundid=<TMPL_VAR name="bookfundid">">Delete</a></td>
+               <td> &nbsp; </td>
+       </tr>
 </TMPL_LOOP>
 </table>
 <form action='<TMPL_VAR name=scriptname>' method=post><input type=hidden name=op value=add_form>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br><input type=image src="/images/button-add-new.gif"  WIDTH=188  HEIGHT=44  ALT="Add budget" BORDER=0 ></a><br></form><br clear=all>

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl
index bb569d0..00117aa 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl
@@ -14,7 +14,14 @@
 <table border=0 cellspacing=0 cellpadding=5>
 <tr valign=top bgcolor=#99cc33><td background="/images/background-mem.gif"><b>Book fund</b></td><td background="/images/background-mem.gif"><b>Start date</b></td><td background="/images/background-mem.gif"><b>End date</b></td><td background="/images/background-mem.gif"><b>Budget amount</b></td><td background="/images/background-mem.gif">&nbsp;</td><td background="/images/background-mem.gif">&nbsp;</td></tr>
 <TMPL_LOOP name="budget">
-<tr valign=top bgcolor=<TMPL_VAR name="toggle"> ><td><TMPL_VAR name="bookfundid"> (<TMPL_VAR name="bookfundname">)</td><td><TMPL_VAR name="startdate"></td><td><TMPL_VAR name="enddate"></td><td><TMPL_VAR name="budgetamount"></td><td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&bookfundid=<TMPL_VAR name="bookfundid">">Edit</a></td><td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&bookfundid=<TMPL_VAR name="bookfundid">">Delete</a></td></tr>
+       <tr valign=top bgcolor=<TMPL_VAR name="toggle"> >
+               <td><TMPL_VAR name="bookfundid"> (<TMPL_VAR name="bookfundname">)</td>
+               <td><TMPL_VAR name="startdate"></td>
+               <td><TMPL_VAR name="enddate"></td>
+               <td><TMPL_VAR name="budgetamount"></td>
+               <td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&bookfundid=<TMPL_VAR name="bookfundid">">Edit</a></td>
+               <td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&bookfundid=<TMPL_VAR name="bookfundid">">Delete</a></td>
+       </tr>
 </TMPL_LOOP>
 </table>
 <form action='/cgi-bin/koha/admin/aqbudget.pl' method=post><input type=hidden name=op value=add_form>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br><input type=image src="/images/button-add-new.gif"  WIDTH=188  HEIGHT=44  ALT="Add budget" BORDER=0 ></a><br></form><br clear=all>