whole raft of cosmetic changes

C4/Acquisitions.pm

@@ -16,7 +16,7 @@ $VERSION = 0.01;
  &bookfundbreakdown &curconvert &updatesup &insertsup &makeitems &modbibitem
 &getcurrencies &modsubtitle &modsubject &modaddauthor &moditem &countitems 
 &findall &needsmod &delitem &delbibitem &delbiblio &delorder &branches
-&getallorders);
+&getallorders &updatecurrencies);
 %EXPORT_TAGS = ( );     # eg: TAG => [ qw!name1 name2! ],
 
 # your exported package globals go here,
@@ -600,7 +600,17 @@ sub getcurrencies {
   }
   $sth->finish;
   $dbh->disconnect;
-  return($i,@results);
+  return($i,\@results);
+} 
+
+sub updatecurrencies {
+  my ($currency,$rate)=@_;
+  my $dbh=C4Connect;
+  my $query="update currency set rate=$rate where currency='$currency'";
+  my $sth=$dbh->prepare($query);
+  $sth->execute;
+  $sth->finish;
+  $dbh->disconnect;
 } 
 
 sub updatesup {

C4/Reserves2.pm

@@ -60,17 +60,19 @@ sub FindReserves {
     if ($bor ne ''){
        $query=$query." where reserves.biblionumber=$bib and
        reserves.borrowernumber=borrowers.borrowernumber and
-       biblio.biblionumber=$bib and cancellationdate is NULL and found
-       <> 'F'";
+       biblio.biblionumber=$bib and cancellationdate is NULL and 
+       (found <> 'F' or found is NULL)";
     } else {
        $query=$query." where reserves.borrowernumber=borrowers.borrowernumber
        and biblio.biblionumber=$bib and reserves.biblionumber=$bib
-       and cancellationdate is NULL and found <> 'F'";
+       and cancellationdate is NULL and 
+       (found <> 'F' or found is NULL)";
     }
   } else {
     $query=$query." where borrowers.borrowernumber=$bor and
     reserves.borrowernumber=borrowers.borrowernumber and reserves.biblionumber
-    =biblio.biblionumber and cancellationdate is NULL and found <> 'F'";
+    =biblio.biblionumber and cancellationdate is NULL and 
+    (found <> 'F' or found is NULL)";
   }
   $query.=" order by priority";
   my $sth=$dbh->prepare($query);

acqui/basket.pl

@@ -116,12 +116,7 @@ To add new orders to this supplier, start with a search. </td>
 </table>
 </CENTER>
 
-<b><font color=red>NOTES TO LIBRARY AND PROGRAMMERS</FONT></B>
-<BR>
-Again a bunch of questions here that you may have already answered elsewhere - but I couldn't spot it. 
-Is GST charged on overseas orders?  
-<br>
-Is GST usually include in the RRP, and thus the Estimated price? Or do your suppliers quote ex GST
+
 
 EOP
 ;

acqui/newbasket.pl

@@ -30,7 +30,7 @@ Our Reference: HLT-$basket<br>
 Authorsed By: $user<br>
 $date
 </div>
-<FONT SIZE=6><em>Shopping Basket For: <a href=whitcoulls.html>
+<FONT SIZE=6><em>Shopping Basket For: <a href=/cgi-bin/koha/acqui/supplier.pl?id=$booksellers[0]->{'id'}>
 $booksellers[0]->{'name'}</a></em></FONT><br>
 Ph: $booksellers[0]->{'phone'}, Fax: $booksellers[0]->{'fax'},
 $booksellers[0]->{'address1'}, $booksellers[0]->{'address2'}, 
@@ -56,7 +56,7 @@ Levin<br>
 New Zealand<p>
 
 Ph: +64-6-368 1953<br>
-Email: <a href="mailto:ruth\@levin.library.org.nz">ruth\@levin.library.org.nz</a>
+Email: <a href="mailto:orders\@library.org.nz">orders\@library.org.nz</a>
 
 </dl>
 

acqui/newbiblio.pl

@@ -114,9 +114,9 @@ print <<printend
 <input type=hidden name=applygst value=$booksellers[0]->{'gstreg'}>
 printend
 ;
-my ($count2,@currencies)=getcurrencies;
+my ($count2,$currencies)=getcurrencies;
 for (my $i=0;$i<$count2;$i++){
-  print "<input type=hidden name=\"$currencies[$i]->{'currency'}\" value=$currencies[0]->{'rate'}>";
+  print "<input type=hidden name=\"$currencies->[$i]->{'currency'}\" value=$currencies->[0]->{'rate'}>";
 }
 
 print <<printend;
@@ -263,11 +263,7 @@ BUDGETED TOTAL</B></td>
 <LI><B>Bold</B> fields must be filled in to create a new bibilo and item.<p>
 <LI>Shaded fields can be used to do a "quick" recieve, when items have been purchased locally or gifted. In this case the quantity "ordered" will also  be entered into the database as the quantity recieved.
 </UL>
-<b><font color=red>NOTES TO LIBRARY AND PROGRAMMERS</FONT></B>
-<BR>
-Is it desirable  to make the shaded fields ONLY available if the supplier is set to "Gift" or "Local Supplier".<br>
-Library can you confirm that you do not actually record the name of the local supplier?
-<br clear=all>
+
 <p> &nbsp; </p>
 printend
 ;

acqui/order.pl

@@ -55,11 +55,11 @@ printend
 ;
  for (my $i2=1;$i2<$ordcount;$i2++){
    print <<printend
-   <tr valign=top bgcolor=white>
-   <td></td>
-   <td></td>
+   <tr valign=top bgcolor=$colour>
+   <td> &nbsp; </td>
+   <td> &nbsp; </td>
    <td><a href="/cgi-bin/koha/acqui/basket.pl?basket=$orders->[$i2]->{'basketno'}">HLT-$orders->[$i2]->{'basketno'}</a></td>
-   <td>$orders->[$i2]->{'count(*)'}</td><td>$orders->[$i2]->{'authorisedby'}</td>
+   <td>$orders->[$i2]->{'count(*)'}</td><td>$orders->[$i2]->{'authorisedby'} &nbsp; </td>
    <td>$orders->[$i2]->{'entrydate'}</td></tr>
    
 printend

detail.pl

@@ -217,7 +217,7 @@ if ($type ne 'opac'){
 print <<printend
 <TR VALIGN=TOP>
 <TD  bgcolor="99cc33" background="/images/background-mem.gif" colspan=2><p><b>HELP</b><br>
-<b>Update Biblio for all Items:</b> Click on the <b>Modify</b> button [left] to ammend the biblio.  Any changes you make will update the record for <b>all</b> the items listed above. <p>
+<b>Update Biblio for all Items:</b> Click on the <b>Modify</b> button [left] to amend the biblio.  Any changes you make will update the record for <b>all</b> the items listed above. <p>
 <b>Updating the Biblio for only ONE or SOME Items:</b> If some of the items listed above need a different biblio, or are on the wrong biblio, you must use the <a href="acquisitions/">acquisitions</a> process to fix this. You will need to "re-order" the items, and delete them from this biblio.<p>
 
    </TR>

imemberentry.pl

@@ -129,7 +129,7 @@ print <<printend
 	
 	
 	<td  COLSPAN=5 align=right >
-	<input type=image src="/images/modify-mem.gif"  WIDTH=188  HEIGHT=44  ALT="Add New Member" border=0 ></td>
+	<input type=image src="/images/save-changes.gif"  WIDTH=188  HEIGHT=44  ALT="Add New Member" border=0 ></td>
 	</tr>
 	</TABLE>
 	</table>

jmemberentry.pl

@@ -154,7 +154,7 @@ printend
 }
 print <<printend
    <tr valign=top bgcolor=white><td  COLSPAN=5 align=right >
-   <input type=image src="/images/modify-mem.gif"  WIDTH=188  HEIGHT=44  ALT="Add New Member" border=0 ></td>
+   <input type=image src="/images/save-changes.gif"  WIDTH=188  HEIGHT=44  ALT="Add New Member" border=0 ></td>
    </tr>
    </TABLE>
    </table>

memberentry.pl

@@ -376,12 +376,12 @@ printend
 ;
 if ($type ne 'modify'){
   print <<printend
-<input type=image src="/images/modify-mem.gif"  WIDTH=188  HEIGHT=44  ALT="Add New Member" border=0 ></td>
+<input type=image src="/images/save-changes.gif"  WIDTH=188  HEIGHT=44  ALT="Add New Member" border=0 ></td>
 printend
 ;
 } else {
 print <<printend
-<input type=image src="/images/button-add-member.gif"  WIDTH=188  HEIGHT=44  ALT="Add New Member" border=0 ></td>
+<input type=image src="/images/save-changes.gif"  WIDTH=188  HEIGHT=44  ALT="Add New Member" border=0 ></td>
 printend
 ;
 }

opac-search.pl

@@ -146,6 +146,6 @@ sub validateinp {
   $input=~ s/\<\/[a-z]+\>//gi;
   $input=~ s/\<//g;
   $input=~ s/\>//g;
-  $input=~ s/^%//g;
+  $input=~ s/%//g;
   return($input);
 }

request.pl

@@ -66,7 +66,7 @@ my $date="$mday/$mon/$year";
 print <<printend
 </select>
 </td>
-<TD><input type=text size=20 name=member></td>
+<TD><input type=text size=10 name=member></td>
 <TD><input type=text size=20 name=notes></td>
 <TD>$date</td>
 <TD><select name=pickup>
@@ -217,7 +217,7 @@ print <<printend
 <tr VALIGN=TOP  >
 
 <TD colspan=6 align=right>
-Delete a request by selcting "del" from the rank list.
+Delete a request by selecting "del" from the rank list.
 
 <INPUT TYPE="image" name="submit"  VALUE="request" height=42  WIDTH=64 BORDER=0 src="/images/ok.gif"></td>
 

showbudget.pl

@@ -10,7 +10,7 @@ use C4::Acquisitions;
 #print $inp->header;
 my ($count,@results)=bookfunds;
 
-open (FILE,'>/usr/local/www/koha/htdocs/includes/budgets.inc') || die "Cant open file";
+open (FILE,'>/usr/local/www/hdl/htdocs/includes/budgets.inc') || die "Cant open file";
 print FILE <<printend
 
 <TABLE  width="40%"  cellspacing=0 cellpadding=5 border=1 >
@@ -34,7 +34,7 @@ for (my $i=0;$i<$count;$i++){
   my $avail=$results[$i]->{'budgetamount'}-($spent+$comtd);
   print FILE <<EOP
 <tr><td>
-<A HREF="total-budget-1.html">$results[$i]->{'bookfundname'}</a> </TD> 
+$results[$i]->{'bookfundname'} </TD> 
 <TD>$results[$i]->{'budgetamount'}</TD> <TD>
 EOP
 ;
@@ -55,7 +55,7 @@ print FILE <<printend
 <hr size=1 noshade></TD></TR>
 
 <tr><td>
-<A HREF="total.html">Total</a> </TD> <TD>$total</TD> <TD>
+Total </TD> <TD>$total</TD> <TD>
 printend
 ;
 printf FILE ("%.2f",$totspent);

subjectsearch.pl

@@ -36,9 +36,9 @@ my $i=0;
 print center();
 print mktablehdr;
 if ($type ne 'opac'){
-  print mktablerow(4,$main,bold('TITLE'),bold('AUTHOR'),bold('COUNT'),bold('LOCATION'),"/images/background-mem.gif"); 
+  print mktablerow(5,$main,bold('TITLE'),bold('AUTHOR'),bold('COUNT'),bold('LOCATION'),' ',"/images/background-mem.gif"); 
 } else {
-  print mktablerow(4,$main,bold('TITLE'),bold('AUTHOR'),bold('COUNT'),bold('BRANCH')); 
+  print mktablerow(5,$main,bold('TITLE'),bold('AUTHOR'),bold('COUNT'),bold('BRANCH'),'   '); 
 }
 my $colour=1;
 while ($i < $count){