[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui newbiblio.
From: |
Paul POULAIN |
Subject: |
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui newbiblio.tmpl,1.5,1.6 |
Date: |
Mon, 07 Jul 2003 07:11:18 -0700 |
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui
In directory
sc8-pr-cvs1:/tmp/cvs-serv30909/koha-tmpl/intranet-tmpl/default/en/acqui
Modified Files:
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: newbiblio.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** newbiblio.tmpl 24 Jun 2003 09:02:15 -0000 1.5
--- newbiblio.tmpl 7 Jul 2003 14:11:16 -0000 1.6
***************
*** 23,37 ****
GST=0;
if (gst_on){
! rrp=rrp*1.125;
! GST=ecost*0.125
}
total=(ecost+GST)*quantity
!
! f.rrp.value=display(rrp)
! f.ecost.value=display(ecost)
! f.GST.value=display(GST)
! f.total.value=display(total)
}
--- 23,36 ----
GST=0;
if (gst_on){
! rrp=rrp*(1+<TMPL_VAR name="gstrate">);
! GST=ecost*(<TMPL_VAR name="gstrate">);
}
total=(ecost+GST)*quantity
! 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">">
--- 61,66 ----
<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">">
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui newbiblio.tmpl,1.5,1.6,
Paul POULAIN <=
- Prev by Date:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui basket.tmpl,1.3,1.4 newbiblio.tmpl,1.2,1.3
- Next by Date:
[Koha-cvs] CVS: koha/acqui basket.pl,1.13,1.14 newbiblio.pl,1.12,1.13
- Previous by thread:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui basket.tmpl,1.3,1.4 newbiblio.tmpl,1.2,1.3
- Next by thread:
[Koha-cvs] CVS: koha/acqui basket.pl,1.13,1.14 newbiblio.pl,1.12,1.13
- Index(es):