[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui acqui-home.tmpl,1.14,1.15 basket.tmpl,1.21,1.22 histsearch.tmpl,1.3,1.4

Paul POULAIN tipaul at users.sourceforge.net
Mon Jun 20 16:13:24 CEST 2005 

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3420/koha-tmpl/intranet-tmpl/default/en/acqui

Modified Files:
	acqui-home.tmpl basket.tmpl histsearch.tmpl 
Log Message:
synch'ing 2.2 and head

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** acqui-home.tmpl	19 Oct 2004 12:24:57 -0000	1.14
--- acqui-home.tmpl	20 Jun 2005 14:13:12 -0000	1.15
***************
*** 5,8 ****
--- 5,11 ----
  <div id="bloc25">
  	<h2 class="acquisition">Start, receive, modify order</h2>
+ 	<!-- TMPL_IF name="nobudget" -->
+ 		<p class="problem">You must define a budget in parameters</p>
+ 	<!-- TMPL_ELSE -->
  		<form action="/cgi-bin/koha/acqui/order.pl" method="post">
  			Supplier name : <input type="text"  size="25"   name="supplier">
***************
*** 10,13 ****
--- 13,17 ----
  		</form>
  	<p>or <a href="histsearch.pl" class="button acquisition">Search order history</a></p>
+ 	<!-- /TMPL_IF -->
  </div>
  
***************
*** 38,43 ****
  <!-- showbudget-->
  <div id="bloc25">
! 	<form action="/cgi-bin/koha/search.pl">
! 		<h2 class="acquisition">budgets and bookfunds</h2>
  		<table class="noborder">
  			<tr>
--- 42,49 ----
  <!-- showbudget-->
  <div id="bloc25">
! 	<h2 class="acquisition">budgets and bookfunds</h2>
! 	<!-- TMPL_IF name="nobudget" -->
! 		<p class="problem">You must define a budget in parameters</p>
! 	<!-- TMPL_ELSE -->
  		<table class="noborder">
  			<tr>
***************
*** 68,72 ****
  		Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.
  		</p>
! 	</form>
  </div>
  
--- 74,78 ----
  		Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.
  		</p>
! 	<!-- /TMPL_IF -->
  </div>
  

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** basket.tmpl	4 May 2005 08:52:49 -0000	1.21
--- basket.tmpl	20 Jun 2005 14:13:22 -0000	1.22
***************
*** 18,21 ****
--- 18,28 ----
  		</div>
  	<!-- /TMPL_UNLESS -->
+ 	<div id="bloc25" style="align:right">
+ 		<p><!-- TMPL_VAR name="name" --></p>
+ 		<p><!-- TMPL_VAR name="address1" --></p>
+ 		<p><!-- TMPL_VAR name="address2" --></p>
+ 		<p><!-- TMPL_VAR name="address3" --></p>
+ 		<p><!-- TMPL_VAR name="address4" --></p>
+ 	</div>
  	<div id="bloc100">
  	<h2 class="acquisition">Order</h2>
***************
*** 24,31 ****
  			<tr valign="top" bgcolor="#ffdf61">
  				<th class="acquisition doNotPrint">Order</th>
! 				<th class="acquisition">Publisher<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition doNotPrint">[order]</a></th>
! 				<th class="acquisition">Isbn</th>
  				<th class="acquisition">Title</th>
- 				<th class="acquisition">Author</th>
  				<th class="acquisition">rrp</th>
  				<th class="acquisition doNotPrint">est</th>
--- 31,36 ----
  			<tr valign="top" bgcolor="#ffdf61">
  				<th class="acquisition doNotPrint">Order</th>
! 				<th class="acquisition">Publisher<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition">[order]</a></th>
  				<th class="acquisition">Title</th>
  				<th class="acquisition">rrp</th>
  				<th class="acquisition doNotPrint">est</th>
***************
*** 40,57 ****
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
! 				<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="color" -->">
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
- 					<td><!-- TMPL_VAR NAME="isbn" --></td>
  					<!-- TMPL_IF name="closedate" -->
! 						<td><!-- TMPL_VAR NAME="title" --></td>
  					<!-- TMPL_ELSE -->
! 						<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  					<!-- /TMPL_IF -->
! 					<td><!-- TMPL_VAR NAME="author" --></td>
! 					<td><!-- TMPL_VAR NAME="rrp" --></td>
! 					<td class="doNotPrint"><!-- TMPL_VAR NAME="ecost" --></td>
! 					<td><!-- TMPL_VAR NAME="quantity" --></td>
! 					<td><!-- TMPL_VAR NAME="line_total" --></td>
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="bookfundid" --></td>
  					<!-- TMPL_IF name="active" -->
--- 45,76 ----
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
! 				<!-- TMPL_IF name="odd" -->
! 				<tr class="hilighted">
! 				<!-- TMPL_ELSE -->
! 				<tr>
! 				<!-- /TMPL_IF -->
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
  					<!-- TMPL_IF name="closedate" -->
! 						<td>
! 							<b><!-- TMPL_VAR NAME="title" --></b><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --><p class="doNotPrint"><i><!--TMPL_VAR name="notes" --></i></p><!-- /TMPL_IF -->
! 						</td>
  					<!-- TMPL_ELSE -->
! 						<td>
! 							<p>
! 							<a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
  					<!-- /TMPL_IF -->
! 					<td class="number"><!-- TMPL_VAR NAME="rrp" --></td>
! 					<td class="doNotPrint number"><!-- TMPL_VAR NAME="ecost" --></td>
! 					<td class="number"><!-- TMPL_VAR NAME="quantity" --></td>
! 					<td class="number"><!-- TMPL_VAR NAME="line_total" --></td>
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="bookfundid" --></td>
  					<!-- TMPL_IF name="active" -->
***************
*** 69,85 ****
  			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
  			<tr>
! 				<td colspan="4" rowspan=3>
  					&nbsp;
  				</td>
! 				<th colspan="2" class="acquisition">SubTotal</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="sub_total" --></th>
! 			</tr>
! 			<tr>
! 				<th colspan="2" class="acquisition">GST</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="gist" --></th>
! 			</tr>
! 			<tr>
! 				<th colspan="2" class="acquisition">TOTAL</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="grand_total" --></th>
  			</tr>
  		</table>
--- 88,124 ----
  			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
  			<tr>
! 				<td colspan="2" class="acquisition">
  					&nbsp;
  				</td>
! 				<td class="acquisition number">
! 					<p>Sub total</p>
! 					<p>GST</p>
! 					<p>TOTAL (<!-- TMPL_VAR NAME="currency" -->)</p>
! 				</td>
! 				<td class="acquisition number">
! 					<p><!-- TMPL_VAR NAME="sub_total_est" --></p>
! 					<p><!-- TMPL_VAR NAME="gist_est" --></p>
! 					<p><!-- TMPL_VAR NAME="grand_total_est" --></p>
! 				</td>
! 				<td class="acquisition number">
! 					<p><!-- TMPL_VAR NAME="sub_total" --></p>
! 					<p><!-- TMPL_VAR NAME="gist" --></p>
! 					<p><!-- TMPL_VAR NAME="grand_total" --></p>
! 				</td>
! 				<td class="acquisition">
! 					<p><!-- TMPL_VAR name="qty_total" --></p>
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 				</td>
! 				<td class="acquisition">
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 				</td>
! 				<td class="acquisition">
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 				</td>
  			</tr>
  		</table>

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** histsearch.tmpl	20 Jun 2005 10:14:12 -0000	1.3
--- histsearch.tmpl	20 Jun 2005 14:13:22 -0000	1.4
***************
*** 31,34 ****
--- 31,93 ----
  				</th>
  				<th class="acquisition">
+ 					From <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
+ 					<input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->">
+ 					<script language="JavaScript" type="text/javascript">
+ 						function validate1(date) {
+ 							var day = date.getDate();
+ 							var month = date.getMonth() + 1;
+ 							var year = date.getFullYear();
+ 							var weekDay = date.getDay();
+ 							var dayMonth = month + '-' + day;
+ 							var dateString = year + '-' + month + '-' + day;
+ 							var dateTo = document.getElementById('to').value.split("-");
+ 							var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
+ 							if (date > limitDate) {
+ 								return true;
+ 							} else {
+ 								return false;
+ 							}
+ 						}
+ 						Calendar.setup(
+ 							{
+ 								inputField : "from",
+ 								ifFormat : "%Y-%m-%d",
+ 								button : "openCalendarFrom",
+ 								disableFunc : validate1,
+ 								dateStatusFunc : validate1
+ 							}
+ 						);
+ 					</script>
+ 					To <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
+ 					<input readonly="readonly" size="10" id="to" name="toplacedon" value="<!-- TMPL_VAR name="to_placed_on" -->" type="text">
+ 					<script type="text/javascript">
+ 						function validate2(date) {
+ 							var day = date.getDate();
+ 							var month = date.getMonth() + 1;
+ 							var year = date.getFullYear();
+ 							var weekDay = date.getDay();
+ 							var dayMonth = month + '-' + day;
+ 							var dateString = year + '-' + month + '-' + day;
+ 							var dateFrom = document.getElementById('from').value.split("-");
+ 							var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
+ 							if (limitDate > date) {
+ 								return true;
+ 							} else {
+ 								return false;
+ 							}
+ 						}
+ 
+ 						Calendar.setup(
+ 							{
+ 								inputField : "to",
+ 								ifFormat : "%Y-%m-%d",
+ 								button : "openCalendarTo",
+ 								disableFunc : validate2,
+ 								dateStatusFunc : validate2
+ 							}
+ 						);
+ 					</script>
+ 				</th>
+ 				<th class="acquisition">
  					&nbsp;
  				</th>
***************
*** 77,79 ****
--- 136,139 ----
  	</table>
  </div>
+ 
  <!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->

More information about the Koha-cvs mailing list