[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui... [dev_week]

[Joshua Ferraro]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Joshua Ferraro <kados>	06/08/03 06:55:09

Modified files:
	koha-tmpl/intranet-tmpl/npl/en/acqui: acqui-home.tmpl 

Log message:
	sync with rel_2_2

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.3.2.3&r2=1.3.2.3.2.1

Patches:
Index: acqui-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.3.2.1
diff -u -b -r1.3.2.3 -r1.3.2.3.2.1
--- acqui-home.tmpl	5 Jan 2006 22:39:42 -0000	1.3.2.3
+++ acqui-home.tmpl	3 Aug 2006 06:55:09 -0000	1.3.2.3.2.1
@@ -7,7 +7,7 @@
 
 <h1>Acquisitions</h1>
 	<!-- TMPL_IF name="nobudget" -->
-		<div class="error">You must define a budget in parameters</div>
+		<div class="error">You must <a href="/cgi-bin/koha/admin/aqbookfund.pl">define a budget</a></div>
 	<!-- TMPL_ELSE -->
 <div class="details">
 <form action="/cgi-bin/koha/acqui/order.pl" method="post"><table>
@@ -17,7 +17,7 @@
 	<td><input type="text" size="25" name="supplier" id="supplier" /></td>
 </tr>
 </table>
-<input type="submit" class="submit" value="Search" /></form>
+<input type="submit" class="submit" value="Search" /> (hint: you must search for a supplier to add a new one)</form>
 <p>	<form action="histsearch.pl" method="get"><input type="submit" class="submit" value="Search Order History" /></form></p>
 </div>
 <!-- /TMPL_IF -->
@@ -59,12 +59,14 @@
 
 <!-- showbudget-->
 	<!-- TMPL_IF name="nobudget" -->
-		<div class="error">You must define a budget in parameters</div>
+		<div class="error">You must <a href="/cgi-bin/koha/admin/aqbookfund.pl">define a budget</a></div>
 	<!-- TMPL_ELSE -->
 	<table>
 		<caption>Budgets and Bookfunds</caption>
 			<tr>
 				<th>Budgets</th>
+				<th>From</th>
+				<th>To</th>
 				<th>Total</th>
 				<th>Spent</th>
 				<th>Comtd</th>
@@ -73,6 +75,8 @@
 			<!-- TMPL_LOOP name="loop_budget" -->
 				<tr>
 					<td><!-- TMPL_VAR name="bookfundname" --></td>
+					<td><!-- TMPL_VAR name="startdate" --></td>
+					<td><!-- TMPL_VAR name="enddate" --></td>
 					<td><!-- TMPL_VAR name="budgetamount" --></td>
 					<td><!-- TMPL_VAR name="spent" --></td>
 					<td><!-- TMPL_VAR name="comtd" --></td>
@@ -81,7 +85,7 @@
 			<!-- /TMPL_LOOP -->
 			<tr>
 				<tfoot>
-				<td>Total</td>
+				<th colspan="3">Total</th>
 				<td><!-- TMPL_VAR name="total" --></td>
 				<td><!-- TMPL_VAR name="totspent" --></td>
 				<td><!-- TMPL_VAR name="totcomtd" --></td>