[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui basket.tmpl,1.15.2.5,1.15.2.6

[Paul POULAIN]

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

Modified Files:
      Tag: rel_2_2
	basket.tmpl 
Log Message:
adding total to calculate rrp & est prices separately

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.15.2.5
retrieving revision 1.15.2.6
diff -C2 -r1.15.2.5 -r1.15.2.6
*** basket.tmpl	19 May 2005 22:41:07 -0000	1.15.2.5
--- basket.tmpl	7 Jun 2005 11:03:52 -0000	1.15.2.6
***************
*** 32,38 ****
  				<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>
--- 32,36 ----
***************
*** 50,60 ****
  					<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>
--- 48,69 ----
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
  					<!-- TMPL_IF name="closedate" -->
! 						<td><p>
! 							<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" --><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</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" --><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
  					<!-- /TMPL_IF -->
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ecost" --></td>
***************
*** 76,92 ****
  			<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>
--- 85,121 ----
  			<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>&nbsp;</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>