[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui basket.tmpl,1.3,1.4 newbiblio.tmpl,1.2,1.3

[Paul POULAIN]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui
In directory sc8-pr-cvs1:/tmp/cvs-serv30909/koha-tmpl/intranet-tmpl/default/fr/acqui

Modified Files:
	basket.tmpl newbiblio.tmpl 
Log Message:
fixing bug #526 : gst rate is now calculated through systempref gist entry.
Before this fix :
* was harcoded to 12,5%
* some bugs in template parameters prevented the javascript to work.
* some bugs prevented some calculations to be done properly.

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** basket.tmpl	24 Jun 2003 09:02:15 -0000	1.3
--- basket.tmpl	7 Jul 2003 14:11:16 -0000	1.4
***************
*** 11,16 ****
  		<td width="30%"><b>Titre</b></td>
  		<td width="20%"><b>Auteur</b></td>
! 		<td width="6%"><b>? frais</b></td>
! 		<td width="8%"><b>? est</b></td>
  		<td width="8%"><b>Qté</b></td>
  		<td width="8%"><b>Total</b></td>
--- 11,16 ----
  		<td width="30%"><b>Titre</b></td>
  		<td width="20%"><b>Auteur</b></td>
! 		<td width="6%"><b>Px rempl</b></td>
! 		<td width="8%"><b>Px est</b></td>
  		<td width="8%"><b>Qté</b></td>
  		<td width="8%"><b>Total</b></td>
***************
*** 22,27 ****
  			<td><a href="newbiblio.pl?ordnum=<TMPL_VAR name="ordernumber">&id=<TMPL_VAR name="booksellerid">&basket=<TMPL_VAR name="basket">"><TMPL_VAR name="title"></a></td>
  			<td><TMPL_VAR name="author"></td>
! 			<td><TMPL_VAR name="rrp">"></td>
! 			<td><TMPL_VAR name="ecost">"></td>
  			<td><TMPL_VAR name="quantity"></td>
  			<td><TMPL_VAR name="line_total"></td>
--- 22,27 ----
  			<td><a href="newbiblio.pl?ordnum=<TMPL_VAR name="ordernumber">&id=<TMPL_VAR name="booksellerid">&basket=<TMPL_VAR name="basket">"><TMPL_VAR name="title"></a></td>
  			<td><TMPL_VAR name="author"></td>
! 			<td><TMPL_VAR name="rrp"></td>
! 			<td><TMPL_VAR name="ecost"></td>
  			<td><TMPL_VAR name="quantity"></td>
  			<td><TMPL_VAR name="line_total"></td>

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** newbiblio.tmpl	5 May 2003 08:53:39 -0000	1.2
--- newbiblio.tmpl	7 Jul 2003 14:11:16 -0000	1.3
***************
*** 23,28 ****
    GST=0;
    if (gst_on){
!     rrp=rrp*1.125;
!     GST=ecost*0.125
    }
  
--- 23,28 ----
    GST=0;
    if (gst_on){
!     rrp=rrp*(1+<TMPL_VAR name="gstrate">);
!     GST=ecost*<TMPL_VAR name="gstrate">;
    }
  
***************
*** 30,37 ****
  
  
!   f.rrp.value=display(rrp)
!   f.ecost.value=display(ecost)
!   f.GST.value=display(GST)
!   f.total.value=display(total)
  
  }
--- 30,37 ----
  
  
!   f.rrp.value=rrp;
!   f.ecost.value=ecost;
!   f.GST.value=GST;
!   f.total.value=total;
  
  }
***************
*** 62,67 ****
  <input type=hidden name=discount value="<TMPL_VAR name="discount">">
  <input type=hidden name=listinc value="<TMPL_VAR name="listincgst">">
! <input type=hidden name=currency value="<TMPL_VAR name="listprice">">
! <input type=hidden name=applygst value="<TMPL_VAR name"gstreg">">
  <TMPL_LOOP name="loop_currencies">
  	<input type=hidden name="<TMPL_VAR name="currency">" value="<TMPL_VAR name="rate">">
--- 62,67 ----
  <input type=hidden name=discount value="<TMPL_VAR name="discount">">
  <input type=hidden name=listinc value="<TMPL_VAR name="listincgst">">
! <input type=hidden name=currency value="<TMPL_VAR name="currency">">
! <input type=hidden name=applygst value="<TMPL_VAR name="gstreg">">
  <TMPL_LOOP name="loop_currencies">
  	<input type=hidden name="<TMPL_VAR name="currency">" value="<TMPL_VAR name="rate">">
***************
*** 137,141 ****
  	</tr>
  	<TR VALIGN=TOP>
! 		<TD>Port budgété</td>
  		<td><input type=text size=20 name=GST value="" onchange='update(this.form)'></td>
  	</tr>
--- 137,141 ----
  	</tr>
  	<TR VALIGN=TOP>
! 		<TD>Taxes</td>
  		<td><input type=text size=20 name=GST value="" onchange='update(this.form)'></td>
  	</tr>