[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui acquire.tmpl,1.1.2.4,1.1.2.5 basket.tmpl,1.5.2.3,1.5.2.4 newbasket2.tmpl,1.4.2.4,1.4.2.5 newbasket.tmpl,1.1.2.3,1.1.2.4 newbiblio.tmpl,1.5.2.5,1.5.2.6 recieveorder.tmpl,1.1.2.1,1.1.2.2 recieve.tmpl,1.1.2.2,1.1.2.3 supplier.tmpl,1.4.2.4,1.4.2.5
Paul POULAIN
tipaul at users.sourceforge.net
Fri Mar 19 09:17:09 CET 2004
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28206/koha-tmpl/intranet-tmpl/default/fr/acqui
Modified Files:
Tag: rel_2_0
acquire.tmpl basket.tmpl newbasket2.tmpl newbasket.tmpl
newbiblio.tmpl recieveorder.tmpl recieve.tmpl supplier.tmpl
Log Message:
Index: acquire.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acquire.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** acquire.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.4
--- acquire.tmpl 19 Mar 2004 08:17:07 -0000 1.1.2.5
***************
*** 60,65 ****
</tr>
<TR VALIGN=TOP>
! <TD>Séries</td>
! <td><input type=text size=20 name=Séries value="<!-- TMPL_VAR name="seriestitle" -->"></td>
</tr>
<TR VALIGN=TOP>
--- 60,65 ----
</tr>
<TR VALIGN=TOP>
! <TD>Titre périodique ou collection</td>
! <td><input type=text size=20 name=Titre périodique ou collection value="<!-- TMPL_VAR name="seriestitle" -->"></td>
</tr>
<TR VALIGN=TOP>
***************
*** 114,118 ****
</tr>
<TR VALIGN=TOP>
! <TD>Coûts budgetés </td>
<td><input type=text size=20 name=ecost value="<!-- TMPL_VAR name="ecost" -->"></td>
</tr>
--- 114,118 ----
</tr>
<TR VALIGN=TOP>
! <TD>Coûts budgétés </td>
<td><input type=text size=20 name=ecost value="<!-- TMPL_VAR name="ecost" -->"></td>
</tr>
***************
*** 147,151 ****
<td><b>AUTEUR</b></td>
<td><b>Quantité</b></td>
! <td><b>Reçu</b></td>
</tr>
<!-- TMPL_LOOP name="loop" -->
--- 147,151 ----
<td><b>AUTEUR</b></td>
<td><b>Quantité</b></td>
! <td><b>Recu</b></td>
</tr>
<!-- TMPL_LOOP name="loop" -->
Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -C2 -r1.5.2.3 -r1.5.2.4
*** basket.tmpl 10 Feb 2004 14:05:39 -0000 1.5.2.3
--- basket.tmpl 19 Mar 2004 08:17:07 -0000 1.5.2.4
***************
*** 41,45 ****
</tr>
<tr valign=top bgcolor=white>
! <td><b>GST</b></td>
<td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="gist" --></td>
</tr>
--- 41,45 ----
</tr>
<tr valign=top bgcolor=white>
! <td><b>TVA</b></td>
<td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="gist" --></td>
</tr>
Index: newbasket2.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket2.tmpl,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -C2 -r1.4.2.4 -r1.4.2.5
*** newbasket2.tmpl 10 Feb 2004 14:05:39 -0000 1.4.2.4
--- newbasket2.tmpl 19 Mar 2004 08:17:07 -0000 1.4.2.5
***************
*** 66,70 ****
--- 66,78 ----
</TD>
<TD>
+ <!-- TMPL_IF name="use-location-flags-p" -->
+ <!-- TMPL_IF name="location-only" --><!-- TMPL_VAR name="location-only" --><br><!-- /TMPL_IF -->
+ <!-- TMPL_IF name="on-loan-p" -->Emprunté<br><!-- /TMPL_IF -->
+ <!-- TMPL_IF name="lost-p" -->Perdu<br><!-- /TMPL_IF -->
+ <!-- TMPL_IF name="mending-p" -->En attente<br><!-- /TMPL_IF -->
+ <!-- TMPL_IF name="in-transit-p" -->En transit<br><!-- /TMPL_IF -->
+ <!-- TMPL_ELSE -->
<!-- TMPL_VAR name="location" -->
+ <!-- /TMPL_IF -->
</TD>
</TR>
Index: newbasket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** newbasket.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.3
--- newbasket.tmpl 19 Mar 2004 08:17:07 -0000 1.1.2.4
***************
*** 2,7 ****
<h1>Panier <!-- TMPL_VAR name="basket" --> for <!-- TMPL_VAR name="name" --></h1><br />
! (Notre ref: <!-- TMPL_VAR name="entrydate" -->, #<!-- TMPL_VAR name="basket" -->, validée par: <!-- TMPL_VAR name="user" -->)<br />
! Tél.: <!-- TMPL_VAR name="phone" -->, Fax: <!-- TMPL_VAR name="fax" --><br />
<!-- TMPL_VAR name="address1" -->, <!-- TMPL_VAR name="address2" --><br />
<!-- TMPL_VAR name="address3" -->, <!-- TMPL_VAR name="address4" --><br />
--- 2,7 ----
<h1>Panier <!-- TMPL_VAR name="basket" --> for <!-- TMPL_VAR name="name" --></h1><br />
! (Notre ref: <b><!-- TMPL_VAR name="entrydate" --></b>, #<b><!-- TMPL_VAR name="basket" --></b>, validée par: <b><!-- TMPL_VAR name="user" --></b>)<br />
! Ph: <!-- TMPL_VAR name="phone" -->, Fax: <!-- TMPL_VAR name="fax" --><br />
<!-- TMPL_VAR name="address1" -->, <!-- TMPL_VAR name="address2" --><br />
<!-- TMPL_VAR name="address3" -->, <!-- TMPL_VAR name="address4" --><br />
Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -C2 -r1.5.2.5 -r1.5.2.6
*** newbiblio.tmpl 19 Feb 2004 10:26:07 -0000 1.5.2.5
--- newbiblio.tmpl 19 Mar 2004 08:17:07 -0000 1.5.2.6
***************
*** 13,17 ****
// rrp=f.rrp.value
// ecost=f.ecost.value //budgetted cost
! // GST=f.GST.value
// total=f.total.value
//make useful constants out sur the above
--- 13,17 ----
// rrp=f.rrp.value
// ecost=f.ecost.value //budgetted cost
! // TVA=f.TVA.value
// total=f.total.value
//make useful constants out sur the above
***************
*** 21,35 ****
rrp=listprice*exchangerate;
ecost=rrp*(100-discount)/100
! 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;
--- 21,35 ----
rrp=listprice*exchangerate;
ecost=rrp*(100-discount)/100
! TVA=0;
if (gst_on){
rrp=rrp*(1+<!-- TMPL_VAR name="gstrate" -->);
! TVA=ecost*(<!-- TMPL_VAR name="gstrate" -->);
}
! total=(ecost+TVA)*quantity
f.rrp.value=rrp;
f.ecost.value=ecost;
! f.TVA.value=TVA;
f.total.value=total;
***************
*** 102,107 ****
</tr>
<TR VALIGN=TOP>
! <TD>Séries</td>
! <td><input type=text size=20 name=Séries value="<!-- TMPL_VAR name="seriestitle" -->"></td>
</tr>
<TR VALIGN=TOP>
--- 102,107 ----
</tr>
<TR VALIGN=TOP>
! <TD>Titre périodique ou collection</td>
! <td><input type=text size=20 name=Titre périodique ou collection value="<!-- TMPL_VAR name="seriestitle" -->"></td>
</tr>
<TR VALIGN=TOP>
***************
*** 130,139 ****
</tr>
<TR VALIGN=TOP>
! <TD>Coûts budgetés<BR><FONT SIZE=2>(ex TVA, remise)</FONT> </td>
<td><input type=text size=20 name=ecost value="<!-- TMPL_VAR name="ecost" -->" onchange='update(this.form)'></td>
</tr>
<TR VALIGN=TOP>
! <TD>GST budgeté</td>
! <td><input type=text size=20 name=GST value="" onchange='update(this.form)'></td>
</tr>
<TR VALIGN=TOP>
--- 130,139 ----
</tr>
<TR VALIGN=TOP>
! <TD>Coûts budgétés<BR><FONT SIZE=2>(ex TVA, remise)</FONT> </td>
<td><input type=text size=20 name=ecost value="<!-- TMPL_VAR name="ecost" -->" onchange='update(this.form)'></td>
</tr>
<TR VALIGN=TOP>
! <TD>TVA budgétée</td>
! <td><input type=text size=20 name=TVA value="" onchange='update(this.form)'></td>
</tr>
<TR VALIGN=TOP>
Index: recieveorder.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/recieveorder.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** recieveorder.tmpl 20 Jan 2004 09:09:16 -0000 1.1.2.1
--- recieveorder.tmpl 19 Mar 2004 08:17:07 -0000 1.1.2.2
***************
*** 15,19 ****
</tr>
<TR VALIGN=TOP bgcolor="#ffffcc">
! <TD>GST</td>
<td><input type=text size=20 name=gst>
</td>
--- 15,19 ----
</tr>
<TR VALIGN=TOP bgcolor="#ffffcc">
! <TD>TVA</td>
<td><input type=text size=20 name=gst>
</td>
Index: recieve.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/recieve.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** recieve.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.2
--- recieve.tmpl 19 Mar 2004 08:17:07 -0000 1.1.2.3
***************
*** 65,69 ****
Quand vous avez fini cette facture, sauvegardez les changements.
</td>
! <td colspan=2 align=right><b>GST</b></td>
<td>$<!-- TMPL_VAR name="gst" --></td>
</tr>
--- 65,69 ----
Quand vous avez fini cette facture, sauvegardez les changements.
</td>
! <td colspan=2 align=right><b>TVA</b></td>
<td>$<!-- TMPL_VAR name="gst" --></td>
</tr>
Index: supplier.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/supplier.tmpl,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -C2 -r1.4.2.4 -r1.4.2.5
*** supplier.tmpl 10 Feb 2004 14:05:39 -0000 1.4.2.4
--- supplier.tmpl 19 Mar 2004 08:17:07 -0000 1.4.2.5
***************
*** 99,103 ****
<!-- TMPL_ELSE -->
<input type="radio" name="status" value="1">Actif
! <input type="radio" name="status" value="0"checked>Inactif</td>
<!-- /TMPL_IF -->
</tr>
--- 99,103 ----
<!-- TMPL_ELSE -->
<input type="radio" name="status" value="1">Actif
! <input type="radio" name="status" value="0" checked>Inactif</td>
<!-- /TMPL_IF -->
</tr>
***************
*** 131,135 ****
</tr>
<TR VALIGN=TOP>
! <TD>GST enregistré</td>
<td>
<input type=radio name=gst value=1 <!-- TMPL_IF name="gstreg" -->checked<!-- /TMPL_IF -->>Oui
--- 131,135 ----
</tr>
<TR VALIGN=TOP>
! <TD>TVA à payer</td>
<td>
<input type=radio name=gst value=1 <!-- TMPL_IF name="gstreg" -->checked<!-- /TMPL_IF -->>Oui
***************
*** 138,142 ****
</tr>
<TR VALIGN=TOP>
! <TD>Prix catalogue de l'ouvrage inclus le GST</td>
<td>
<input type=radio name=list_gst value=1 <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Oui
--- 138,142 ----
</tr>
<TR VALIGN=TOP>
! <TD>Prix catalogue de l'ouvrage inclus la TVA</td>
<td>
<input type=radio name=list_gst value=1 <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Oui
***************
*** 145,149 ****
</tr>
<TR VALIGN=TOP>
! <TD>Prix de la facture de l'ouvrage inclus le GST</td>
<td>
<input type=radio name=invoice_gst value=1 <!-- TMPL_IF name= "invoiceincgst" -->checked<!-- /TMPL_IF -->>Oui
--- 145,149 ----
</tr>
<TR VALIGN=TOP>
! <TD>Prix de la facture de l'ouvrage inclus la TVA</td>
<td>
<input type=radio name=invoice_gst value=1 <!-- TMPL_IF name= "invoiceincgst" -->checked<!-- /TMPL_IF -->>Oui
More information about the Koha-cvs
mailing list