koha-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui acqui-home


From: Paul POULAIN
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui acqui-home.tmpl,1.3,1.4 acquire.tmpl,1.1,1.2 basket.tmpl,1.5,1.6 newbasket2.tmpl,1.4,1.5 newbasket.tmpl,1.1,1.2 newbiblio.tmpl,1.5,1.6 order.tmpl,1.3,1.4 recieveorder.tmpl,1.1,1.2 recieve.tmpl,1.1,1.2 supplier.tmpl,1.4,1.5
Date: Wed, 11 Feb 2004 01:00:49 -0800

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

Modified Files:
        acqui-home.tmpl acquire.tmpl basket.tmpl newbasket2.tmpl 
        newbasket.tmpl newbiblio.tmpl order.tmpl recieveorder.tmpl 
        recieve.tmpl supplier.tmpl 
Log Message:
synch'ing 2.0.0 branch (RC4 tag) and head

Index: acqui-home.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acqui-home.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** acqui-home.tmpl     22 Sep 2003 13:04:48 -0000      1.3
--- acqui-home.tmpl     11 Feb 2004 09:00:47 -0000      1.4
***************
*** 1,14 ****
! <TMPL_INCLUDE name="acquisitions-top.inc">
  
! <FONT SIZE=6><em>Acquisitions</em></FONT><br>
  
! <TABLE width="50%" cellspacing=0 cellpadding=5 border=1 >
  <TR VALIGN=TOP>
        <TD  bgcolor="ffdf61" colspan=2>
!               <b>Débuter, réceptionner, modifier une commande</b>
        </TD>
  </TR>
  <TR VALIGN=TOP>
!       <TD>N° ou nom du vendeur</TD>
        <TD>
                <form action="/cgi-bin/koha/acqui/order.pl" method=post>
--- 1,14 ----
! <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  
! <h1>Acquisitions</h1><br>
  
! <TABLE align="left" width="40%" cellspacing=0 cellpadding=5 border=1 >
  <TR VALIGN=TOP>
        <TD  bgcolor="ffdf61" colspan=2>
!               <b>COMMENCER, RECEVOIR, MODIFIER UNE COMMANDE</b>
        </TD>
  </TR>
  <TR VALIGN=TOP>
!       <TD>Nom du fournisseur</TD>
        <TD>
                <form action="/cgi-bin/koha/acqui/order.pl" method=post>
***************
*** 18,96 ****
  </TR>
  </table>
! <br />
! <!-- showbudget-->
! <TABLE  align="left" width="40%"  cellspacing=0 cellpadding=5 border=1 >
! <FORM ACTION="/cgi-bin/koha/search.pl">
  <TR VALIGN=TOP>
!       <TD  bgcolor="ffdf61" colspan=2><b>Budgets</b></TD>
  </TR>
  <TR VALIGN=TOP>
!       <TD colspan=2>
!               <table cellspacing=0 cellpadding=2 border=1>
!                       <tr>
!                               <td><b>Budgets</B></TD>
!                               <TD><b>Total</B></TD>
!                               <TD><b>Dépensé</B></TD>
!                               <TD><b>Engagé</B></TD>
!                               <TD><b>Dispo</B></TD>
!                       </TR>
!                       <TMPL_LOOP name="loop_budget">
!                               <tr>
!                                       <td><TMPL_VAR name="bookfundname"></TD>
!                                       <TD><TMPL_VAR name="budgetamount"></TD>
!                                       <TD><TMPL_VAR name="spent"></TD>
!                                       <TD><TMPL_VAR name="comtd"></TD>
!                                       <TD><TMPL_VAR name="avail"></TD>
!                               </TR>
!                       </TMPL_LOOP>
!                       <tr>
!                               <td><b>Total</b></TD>
!                               <TD><b><TMPL_VAR name="total"></b></TD>
!                               <TD><b><TMPL_VAR name="totspent"></b></TD>
!                               <TD><b><TMPL_VAR name="totcomtd"></b></TD>
!                               <TD><b><TMPL_VAR name="totavail"></b></TD>
!                       </TR>
!               </table><br>
!               Utiliser la fonction "mise à jour" (ctrl-r) pour mettre à jour 
les valeurs.
!               Les montants engagés sont approximatifs, ils varient en 
fonction des taux de change.
        </TD>
  </TR>
- </form>
  </table>
  <!-- currencies-->
! <TABLE cellspacing=0 cellpadding=5 border=1 >
        <FORM ACTION="/cgi-bin/koha/currency.pl">
        <input type=hidden name=type value=change>
        <TR VALIGN=TOP>
!               <TD  bgcolor="ffdf61" colspan=2><b>Taux de change</b></TD>
        </TR>
!       <TMPL_LOOP name="loop_currency">
                <TR VALIGN=TOP>
                        <TD>
!                               <TMPL_VAR name="currency">
                        </td>
                        <td>
!                               <INPUT TYPE="text"  SIZE="10"   NAME="<TMPL_VAR 
name="currency">" value=<TMPL_VAR name="rate">>
                        </td>
                </TR>
!       </TMPL_LOOP>
        <tr>
!               <td colspan=2 align="center"><input type=submit 
value="Save"></TD>
        </tr>
        </form>
  </table>
  
  <br />
  <TABLE cellspacing=0 cellpadding=5 border=1 >
  <TR VALIGN=TOP>
        <TD  bgcolor="ffdf61" colspan=2>
!               <b>Aide</b><br>
!               <b>Commande:</b> <p>Pour débuter une acquisition, chercher tout 
d'abord le vendeur. Vous pourrez ensuite créer un nouveau "panier".</p>
!               <p>Pour commander un exemplaire, vous devez vérifier qu'une 
notice existe déjà, et soit ajouter un exemplaire, soit créer une nouvelle 
notice et y ajouter un exemplaire</p>
!               <p>Pour commencer un nouveau panier avec un nouveau 
fournisseur, revenez à cette page, et passez par la recherche d'un 
fournisseur</p>
!               <p>Pour cloturer un panier, cliquer sur "voir panier", et 
choisir "confirmer panier"</p>
        </td>
  </TR>
  </table>
  
! <TMPL_INCLUDE name="acquisitions-bottom.inc">
--- 18,115 ----
  </TR>
  </table>
! <TABLE width="40%" cellspacing=0 cellpadding=5 border=1 >
  <TR VALIGN=TOP>
!       <TD  bgcolor="ffdf61" colspan=2>
!               <b>RECEPTIONNE OU MODIFIE UNE COMMANDE PERIODIQUE</b>
!       </TD>
  </TR>
  <TR VALIGN=TOP>
!       <TD>Recherche Titre</TD>
!       <TD>
!               <FORM ACTION="/cgi-bin/koha/acqui/acquire.pl" method=post>
!               <INPUT TYPE="text"  SIZE="25"   NAME="recieve">
!               </form>
        </TD>
  </TR>
  </table>
+ 
+ <br />
+ 
  <!-- currencies-->
! <TABLE align="left" cellspacing=0 cellpadding=5 border=1 >
        <FORM ACTION="/cgi-bin/koha/currency.pl">
        <input type=hidden name=type value=change>
        <TR VALIGN=TOP>
!               <TD  bgcolor="ffdf61" colspan=2><b>TAUX DE CHANGE </b></TD>
        </TR>
!       <!-- TMPL_LOOP name="loop_currency" -->
                <TR VALIGN=TOP>
                        <TD>
!                               <!-- TMPL_VAR name="currency" -->
                        </td>
                        <td>
!                               <INPUT TYPE="text"  SIZE="10"   NAME="<!-- 
TMPL_VAR name="currency" -->" value=<!-- TMPL_VAR name="rate" -->>
                        </td>
                </TR>
!       <!-- /TMPL_LOOP -->
        <tr>
!               <td colspan=2 align="center"><input type=submit 
value="Enregistrer"></TD>
        </tr>
        </form>
  </table>
  
+ <!-- showbudget-->
+ <TABLE  width="40%"  cellspacing=0 cellpadding=5 border=1 >
+ <FORM ACTION="/cgi-bin/koha/search.pl">
+ <TR VALIGN=TOP>
+       <TD  bgcolor="ffdf61" colspan=2><b>BUDGETS ET COMPTES</b></TD>
+ </TR>
+ <TR VALIGN=TOP>
+       <TD colspan=2>
+               <table cellspacing=0 cellpadding=2 border=1>
+                       <tr>
+                               <td><b>Budgets</B></TD>
+                               <TD><b> Total</B></TD>
+                               <TD><b>Dépensé</B></TD>
+                               <TD><b>Engagé</B></TD>
+                               <TD><b>Disp.</B></TD>
+                       </TR>
+                       <!-- TMPL_LOOP name="loop_budget" -->
+                               <tr>
+                                       <td><!-- TMPL_VAR name="bookfundname" 
--></TD>
+                                       <TD align=right><!-- TMPL_VAR 
name="budgetamount" --></TD>
+                                       <TD align=right><!-- TMPL_VAR 
name="spent" --></TD>
+                                       <TD align=right><!-- TMPL_VAR 
name="comtd" --></TD>
+                                       <TD align=right><!-- TMPL_VAR 
name="avail" --></TD>
+                               </TR>
+                       <!-- /TMPL_LOOP -->
+                       <tr>
+                               <td><b> Total</b></TD>
+                               <TD align=right><b><!-- TMPL_VAR name="total" 
--></b></TD>
+                               <TD align=right><b><!-- TMPL_VAR 
name="totspent" --></b></TD>
+                               <TD align=right><b><!-- TMPL_VAR 
name="totcomtd" --></b></TD>
+                               <TD align=right><b><!-- TMPL_VAR 
name="totavail" --></b></TD>
+                       </TR>
+               </table>
+               <p>
+               Rafraichissez la page pour avoir les derniers chiffres. Les 
montants engagés sont approximatifs, car les taux de change peuvent modifier le 
montant effectivement payé.
+               </p>
+       </TD>
+ </TR>
+ </form>
+ </table>
+ 
  <br />
  <TABLE cellspacing=0 cellpadding=5 border=1 >
  <TR VALIGN=TOP>
        <TD  bgcolor="ffdf61" colspan=2>
!               <p><b>AIDE commande:</b></p>
!               <ul>Pour faire une acquisition, soit par commande, par achat 
direct ou par un don, commencer par rechercher le fournisseur. Ajoutez-en un si 
nécessaire.</ul>
!               <ul>Sélectionnez ensuite un panier ou créez-en un nouveau. 
Note: le panier sera rattaché à cet utilisateur </ul>
!               <ul>Pour commander un ouvrage, une notice biblio doit exister 
pour l'ajouter ou alors il faut d'abord créer une nouvelle notice biblio avant 
de l'ajouter.  </ul>
!               <p>Pour quittez un panier, cliquez sur "Voir les paniers" ou 
Recherche ci-dessus, puis cliquez sur "Confirmer le panier".</p>
        </td>
  </TR>
  </table>
  
! <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: acquire.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acquire.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** acquire.tmpl        4 Apr 2003 08:29:43 -0000       1.1
--- acquire.tmpl        11 Feb 2004 09:00:47 -0000      1.2
***************
*** 1,14 ****
! <TMPL_INCLUDE name="acquisitions-top.inc">
  
  <div align=right>
! Facture : <TMPL_VAR name="invoice"><br>
! Réceptionnée par : <TMPL_VAR name="user"><br>
! <TMPL_VAR name="date">
  </div>
! <FONT SIZE=6><em>Réception pour : <TMPL_VAR name="name"> facture, <TMPL_VAR 
name="invoice"></em></FONT>
  <CENTER>
  
  
! <TMPL_IF name="count">
        <script language="javascript" type="text/javascript">
        <!--
--- 1,14 ----
! <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  
  <div align=right>
! Facture: <!-- TMPL_VAR name="invoice" --><br>
! Reçu par: <!-- TMPL_VAR name="user" --><br>
! <!-- TMPL_VAR name="date" -->
  </div>
! <h1>Sommaire pour: <i><!-- TMPL_VAR name="name" --></i> Facture <i><!-- 
TMPL_VAR name="invoice" --></i></h1>
  <CENTER>
  
  
! <!-- TMPL_IF name="count" -->
        <script language="javascript" type="text/javascript">
        <!--
***************
*** 25,73 ****
        </script>
        <form action="/cgi-bin/koha/acqui/finishreceive.pl" method=post>
!       <FONT SIZE=6><em><TMPL_VAR name="ordernumber"> - Receive 
Order</em></FONT><br>
!       Panier pour : <TMPL_VAR name="name">
!       <br> Commande passée le : <TMPL_VAR name="date">
        <P>
        <CENTER>
        <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
                <tr valign=top bgcolor=#99cc33>
!                       <td background="<TMPL_VAR 
name="themelang">/images/background-mem.gif" colspan=2>
!                               <B>Détail catalogue </B>
                        </td>
                </tr>
                <TR VALIGN=TOP>
                        <TD><b>Titre *</b></td>
!                       <td><input type=text size=20 name=title 
value="<TMPL_VAR name="title">" >
                        </td>
                </tr>
                <TR VALIGN=TOP>
                        <TD>Auteur</td>
!                       <td><input type=text size=20 name=author 
value="<TMPL_VAR name="author">" >
                        </td>
                </tr>
                <TR VALIGN=TOP>
!                       <TD>Copyright</td>
!                       <td><input type=text size=20 name=copyright 
value="<TMPL_VAR name="copyrightdate">" >
                        </td>
                </tr>
                <TR VALIGN=TOP>
                        <TD>Format</td>
!                       <td><TMPL_VAR name="CGIitemtype"></td>
                </tr>
                <TR VALIGN=TOP>
                        <TD>ISBN</td>
!                       <td><input type=text size=20 name=ISBN value="<TMPL_VAR 
name="isbn">"></td>
                </tr>
                <TR VALIGN=TOP>
!                       <TD>titre périodique</td>
!                       <td><input type=text size=20 name=Series 
value="<TMPL_VAR name="seriestitle">"></td>
                </tr>
                <TR VALIGN=TOP>
!                       <TD>Site</td>
!                       <td><TMPL_VAR name="CGIbranch"></td>
                </tr>
                <TR VALIGN=TOP bgcolor=#ffffcc >
!                       <TD><B>code barre exemplaire *</B></td>
!                       <td><input type=text size=20 name=barcode 
value="<TMPL_VAR name="barcode">"></td>
                </tr>
                <TR VALIGN=TOP bgcolor=#ffffcc >
--- 25,73 ----
        </script>
        <form action="/cgi-bin/koha/acqui/finishreceive.pl" method=post>
!       <h1><!-- TMPL_VAR name="ordernumber" --> - Recevoir Commande</h1><br>
!       Panier pour: <!-- TMPL_VAR name="name" -->
!       <br> Commande envoyée: <!-- TMPL_VAR name="date" -->
        <P>
        <CENTER>
        <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
                <tr valign=top bgcolor=#99cc33>
!                       <td background="<!-- TMPL_VAR name="themelang" 
-->/images/background-mem.gif" colspan=2>
!                               <B>DETAILS CATALOGUE</B>
                        </td>
                </tr>
                <TR VALIGN=TOP>
                        <TD><b>Titre *</b></td>
!                       <td><input type=text size=20 name=title value="<!-- 
TMPL_VAR name="title" -->" >
                        </td>
                </tr>
                <TR VALIGN=TOP>
                        <TD>Auteur</td>
!                       <td><input type=text size=20 name=author value="<!-- 
TMPL_VAR name="author" -->" >
                        </td>
                </tr>
                <TR VALIGN=TOP>
!                       <TD>Date Copyright</td>
!                       <td><input type=text size=20 name=copyright value="<!-- 
TMPL_VAR name="copyrightdate" -->" >
                        </td>
                </tr>
                <TR VALIGN=TOP>
                        <TD>Format</td>
!                       <td><!-- TMPL_VAR name="CGIitemtype" --></td>
                </tr>
                <TR VALIGN=TOP>
                        <TD>ISBN</td>
!                       <td><input type=text size=20 name=ISBN value="<!-- 
TMPL_VAR name="isbn" -->"></td>
                </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>
!                       <TD>Annexe</td>
!                       <td><!-- TMPL_VAR name="CGIbranch" --></td>
                </tr>
                <TR VALIGN=TOP bgcolor=#ffffcc >
!                       <TD><B>Code barre d'un ouvrage *</B></td>
!                       <td><input type=text size=20 name=barcode value="<!-- 
TMPL_VAR name="barcode" -->"></td>
                </tr>
                <TR VALIGN=TOP bgcolor=#ffffcc >
***************
*** 77,91 ****
                <TR VALIGN=TOP>
                        <td colspan=2 align="center">
!                               <input type=hidden name=biblio value=<TMPL_VAR 
name="biblionumber">>
!                               <input type=hidden name=ordnum value=<TMPL_VAR 
name="ordernumber">>
!                               <input type=hidden name=biblioitemnum 
value=<TMPL_VAR name="biblioitemnumber">>
!                               <input type=hidden name=id value="<TMPL_VAR 
name="booksellerid">">
!                               <input type=hidden name=freight 
value="<TMPL_VAR name="freight">">
!                               <input type=hidden name=gst value="<TMPL_VAR 
name="gst">">
!                               <TMPL_IF name="catview">
!                                       <input type=image  name=submit 
src="/<TMPL_VAR name="theme">/images/filesave.png" border=0 title="continue" 
alt="save" border=0 border=0>
!                               <TMPL_ELSE>
!                                       <a 
href=/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<TMPL_VAR 
name="ordernumber">&id=<TMPL_VAR name="booksellerid">><img src="/<TMPL_VAR 
name="theme">/images/fileopen.png" border=0 title="edit" alt="edit" border=0 
border=0></a>
!                               </TMPL_IF>
                        </td>
                </tr>
--- 77,91 ----
                <TR VALIGN=TOP>
                        <td colspan=2 align="center">
!                               <input type=hidden name=biblio value=<!-- 
TMPL_VAR name="biblionumber" -->>
!                               <input type=hidden name=ordnum value=<!-- 
TMPL_VAR name="ordernumber" -->>
!                               <input type=hidden name=biblioitemnum 
value=<!-- TMPL_VAR name="biblioitemnumber" -->>
!                               <input type=hidden name=id value="<!-- TMPL_VAR 
name="booksellerid" -->">
!                               <input type=hidden name=freight value="<!-- 
TMPL_VAR name="freight" -->">
!                               <input type=hidden name=gst value="<!-- 
TMPL_VAR name="gst" -->">
!                               <!-- TMPL_IF name="catview" -->
!                                       <input type="submit" class="button" 
value="Enregistrer">
!                               <!-- TMPL_ELSE -->
!                                       <a class="button" 
href=/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR name="ordernumber" 
-->&id=<!-- TMPL_VAR name="booksellerid" -->>Editer</a>
!                               <!-- /TMPL_IF -->
                        </td>
                </tr>
***************
*** 93,134 ****
        <table border=1 cellspacing=0 cellpadding=5 width="40%">
                <tr valign=top bgcolor=#99cc33>
!                       <td background="<TMPL_VAR 
name="themelang">/images/background-mem.gif" colspan=2><B>Détails 
financiers</B></td>
                </tr>
                <TR VALIGN=TOP>
!                       <TD><B>Fonds *</B></td>
!                       <td><TMPL_VAR name="CGIbookfund">
                </tr>
                <TR VALIGN=TOP>
                        <TD>Quantité commandée</td>
!                       <td><input type=text size=20 name=quantity 
value="<TMPL_VAR name="quantity">">
                        </td>
                </tr>
                <TR VALIGN=TOP bgcolor=#ffffcc>
!                       <TD><B>Quantité Reçue *</B></td>
!                       <td><input type=text size=20 name=quantityrec 
value="<TMPL_VAR name="quantityreceived">">
                        </td>
                </tr>
                <TR VALIGN=TOP>
!                       <TD>Cout remplacement</td>
!                       <td><input type=text size=20 name=rrp value="<TMPL_VAR 
name="rrp">">
                </tr>
                <TR VALIGN=TOP>
!                       <TD>cout budgété</td>
!                       <td><input type=text size=20 name=ecost 
value="<TMPL_VAR name="ecost">"></td>
                </tr>
                <TR VALIGN=TOP bgcolor=#ffffcc>
!                       <TD><B>Cout réel *</B></td>
!                       <td><input type=text size=20 name=cost value="<TMPL_VAR 
name="unitprice">"></td>
                </tr>
                <TR VALIGN=TOP bgcolor=#ffffcc>
!                       <TD>Facture N°</td>
                        <td>
!                               <TMPL_VAR name="invoice">
!                               <input type=hidden name=invoice 
value="<TMPL_VAR name="invoice">">
                        </td>
                </tr>
                <TR VALIGN=TOP>
                        <TD>Notes</td>
!                       <td><input type=text size=20 name=notes 
value="<TMPL_VAR name="notes">"></td>
                </tr>
        </table>
--- 93,134 ----
        <table border=1 cellspacing=0 cellpadding=5 width="40%">
                <tr valign=top bgcolor=#99cc33>
!                       <td background="<!-- TMPL_VAR name="themelang" 
-->/images/background-mem.gif" colspan=2><B>DETAILS COMPTABILITE</B></td>
                </tr>
                <TR VALIGN=TOP>
!                       <TD><B>Comptes *</B></td>
!                       <td><!-- TMPL_VAR name="CGIbookfund" -->
                </tr>
                <TR VALIGN=TOP>
                        <TD>Quantité commandée</td>
!                       <td><input type=text size=20 name=quantity value="<!-- 
TMPL_VAR name="quantity" -->">
                        </td>
                </tr>
                <TR VALIGN=TOP bgcolor=#ffffcc>
!                       <TD><B>Quantité reçue *</B></td>
!                       <td><input type=text size=20 name=quantityrec 
value="<!-- TMPL_VAR name="quantityreceived" -->">
                        </td>
                </tr>
                <TR VALIGN=TOP>
!                       <TD>Frais Remplacement</td>
!                       <td><input type=text size=20 name=rrp value="<!-- 
TMPL_VAR name="rrp" -->">
                </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>
                <TR VALIGN=TOP bgcolor=#ffffcc>
!                       <TD><B>Coût effectif *</B></td>
!                       <td><input type=text size=20 name=cost value="<!-- 
TMPL_VAR name="unitprice" -->"></td>
                </tr>
                <TR VALIGN=TOP bgcolor=#ffffcc>
!                       <TD>N° facture</td>
                        <td>
!                               <!-- TMPL_VAR name="invoice" -->
!                               <input type=hidden name=invoice value="<!-- 
TMPL_VAR name="invoice" -->">
                        </td>
                </tr>
                <TR VALIGN=TOP>
                        <TD>Notes</td>
!                       <td><input type=text size=20 name=notes value="<!-- 
TMPL_VAR name="notes" -->"></td>
                </tr>
        </table>
***************
*** 137,141 ****
        <br clear=all>
        <p> &nbsp; </p>
! <TMPL_ELSE>
        <br />
        <center>
--- 137,141 ----
        <br clear=all>
        <p> &nbsp; </p>
! <!-- TMPL_ELSE -->
        <br />
        <center>
***************
*** 144,162 ****
                <td><b>Panier</b></td>
                <td><b>ISBN</b></td>
!               <td><b>TITLE</b></td>
                <td><b>AUTEUR</b></td>
!               <td><b>Qté</b></td>
                <td><b>Reçu</b></td>
        </tr>
!       <TMPL_LOOP name="loop">
                <tr>
!                       <TD><TMPL_VAR name="basketno"></td>
!                       <TD><TMPL_VAR name="isbn"></td>
!                       <td><a href=acquire.pl?recieve=<TMPL_VAR 
name="ordernumber">&biblio=<TMPL_VAR name="biblionumber">&invoice=<TMPL_VAR 
name="invoice">&freight=<TMPL_VAR name="freight">&gst=<TMPL_VAR 
name="gst">&id=<TMPL_VAR name="id">><TMPL_VAR name="title"></a></td>
!                       <td><TMPL_VAR name="author"></td>
!                       <td><TMPL_VAR name="quantity"></td>
!                       <td><TMPL_VAR name="quantityrecieved"></td>
                </tr>
!       </TMPL_LOOP>
        </table>
! </TMPL_IF>
--- 144,162 ----
                <td><b>Panier</b></td>
                <td><b>ISBN</b></td>
!               <td><b>TITRE</b></td>
                <td><b>AUTEUR</b></td>
!               <td><b>Quantité</b></td>
                <td><b>Reçu</b></td>
        </tr>
!       <!-- TMPL_LOOP name="loop" -->
                <tr>
!                       <TD><!-- TMPL_VAR name="basketno" --></td>
!                       <TD><!-- TMPL_VAR name="isbn" --></td>
!                       <td><a href=acquire.pl?recieve=<!-- TMPL_VAR 
name="ordernumber" -->&biblio=<!-- TMPL_VAR name="biblionumber" 
-->&invoice=<!-- TMPL_VAR name="invoice" -->&freight=<!-- TMPL_VAR 
name="freight" -->&gst=<!-- TMPL_VAR name="gst" -->&id=<!-- TMPL_VAR name="id" 
-->><!-- TMPL_VAR name="title" --></a></td>
!                       <td><!-- TMPL_VAR name="author" --></td>
!                       <td><!-- TMPL_VAR name="quantity" --></td>
!                       <td><!-- TMPL_VAR name="quantityrecieved" --></td>
                </tr>
!       <!-- /TMPL_LOOP -->
        </table>
! <!-- /TMPL_IF -->

Index: basket.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** basket.tmpl 17 Sep 2003 13:34:11 -0000      1.5
--- basket.tmpl 11 Feb 2004 09:00:47 -0000      1.6
***************
*** 1,57 ****
! <TMPL_INCLUDE name="acquisitions-top.inc">
  
! <FONT SIZE=6><em>Panier <TMPL_VAR name="basket"> pour <a 
href=supplier.pl?id=<TMPL_VAR name="booksellerid">></a> <TMPL_VAR 
name="name"></em></FONT><br />
! (Référence: <TMPL_VAR name="entrydate">, #<TMPL_VAR name="basket">, passée 
par : <TMPL_VAR name="authorisedby">)<br />
  <CENTER>
  <p>
  <table border=0 cellspacing=0 cellpadding=5>
        <tr valign=top bgcolor="#ffdf61">
!               <td width="5%"><b>N° cmde</b></td>
                <td width="10%"><b>Isbn</b></td>
                <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>Recu</b></td>
!               <td width="8%"><b>Total</b></td>
        </tr>
!       <TMPL_LOOP name="books_loop">
!               <tr valign=top bgcolor="<TMPL_VAR name="color">">
!                       <td><TMPL_VAR name="ordernumber"></td>
!                       <td><TMPL_VAR name="isbn"></td>
!                       <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="quantityrecieved"></td>
!                       <td><TMPL_VAR name="line_total"></td>
                </tr>
!       </TMPL_LOOP>
!       <input type=hidden name=number value=<TMPL_VAR name="count">>
!       <input type=hidden name=basketno value="<TMPL_VAR name="basket">">
        <tr valign=top bgcolor=white>
                <td colspan=6 rowspan=3  bgcolor="#ffdf61">
                        <b>AIDE</b><br>
!                       Pour changer un élément de cataloguage ou de 
comptabilité attaché à une commande, cliquer sur le titre<br>
                </td>
!               <td><b>Sous-Total</b></td>
!               <td><TMPL_VAR name="currency"><input type=text name=subtotal 
size=10 value=<TMPL_VAR name="sub_total">></td>
        </tr>
        <tr valign=top bgcolor=white>
!               <td><b>TVA</b></td>
!               <td><TMPL_VAR name="currency"><input type=text name=gst size=10 
value=<TMPL_VAR name="gist">></td>
        </tr>
        <tr valign=top bgcolor=white>
                <td><b>TOTAL</b></td>
!               <td><TMPL_VAR name="currency"><input type=text name=grandtotal 
size=10 value=<TMPL_VAR name="grand_total">></td>
        </tr>
        <tr valign=top bgcolor=white>
                <td colspan=9>
                        <FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl" 
method=post>
!                               <input type=hidden name=id value="<TMPL_VAR 
name="id">">
!                               <input type=hidden name=basket value="<TMPL_VAR 
name="basket">">
!                               <b> Ajouter commande : entrer mot clef ou titre 
de notice </b><INPUT TYPE="text"  SIZE="25"   NAME="search">
                        </form>
                </td>
--- 1,57 ----
! <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  
! <h1>Panier <b><!-- TMPL_VAR name="basket" --> </b>pour <a 
href=supplier.pl?id=<!-- TMPL_VAR name="booksellerid" -->></a> <!-- 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="loggedinusername" 
--></b><br />
  <CENTER>
  <p>
  <table border=0 cellspacing=0 cellpadding=5>
        <tr valign=top bgcolor="#ffdf61">
!               <td width="5%"><b>Commande</b></td>
!               <td width="10%"><b> Editeur</b></td>
                <td width="10%"><b>Isbn</b></td>
                <td width="30%"><b>Titre</b></td>
                <td width="20%"><b>Auteur</b></td>
!               <td width="5%"><b>$ rrp</b></td>
!               <td width="7%"><b>$est</b></td>
!               <td width="7%"><b>Quantité</b></td>
!               <td width="7%"><b> Total</b></td>
        </tr>
!       <!-- TMPL_LOOP name="books_loop" -->
!               <tr valign=top bgcolor="<!-- TMPL_VAR name="color" -->">
!                       <td><!-- TMPL_VAR name="ordernumber" --></td>
!                       <td><!-- TMPL_VAR name="publishercode" --></td>
!                       <td><!-- TMPL_VAR name="isbn" --></td>
!                       <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>
                </tr>
!       <!-- /TMPL_LOOP -->
!       <input type=hidden name=number value=<!-- TMPL_VAR name="count" -->>
!       <input type=hidden name=basketno value="<!-- TMPL_VAR name="basket" 
-->">
        <tr valign=top bgcolor=white>
                <td colspan=6 rowspan=3  bgcolor="#ffdf61">
                        <b>AIDE</b><br>
!                       Pour changer n'importe quelle information attachée à 
cette commande, cliquez sur le titre.<br>
                </td>
!               <td><b>Sous-total</b></td>
!               <td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR 
name="sub_total" --></td>
        </tr>
        <tr valign=top bgcolor=white>
!               <td><b>GST</b></td>
!               <td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="gist" 
--></td>
        </tr>
        <tr valign=top bgcolor=white>
                <td><b>TOTAL</b></td>
!               <td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR 
name="grand_total" --></td>
        </tr>
        <tr valign=top bgcolor=white>
                <td colspan=9>
                        <FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl" 
method=post>
!                               <input type=hidden name=id value="<!-- TMPL_VAR 
name="id" -->">
!                               <input type=hidden name=basket value="<!-- 
TMPL_VAR name="basket" -->">
!                               <b> Ajouter une commande : entrez un mot-clé ou 
un titre: </b><INPUT TYPE="text"  SIZE="25"   NAME="search">
                        </form>
                </td>
***************
*** 61,63 ****
  </CENTER>
  
! <TMPL_INCLUDE name="acquisitions-bottom.inc">
--- 61,63 ----
  </CENTER>
  
! <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: newbasket2.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket2.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** newbasket2.tmpl     17 Sep 2003 13:34:11 -0000      1.4
--- newbasket2.tmpl     11 Feb 2004 09:00:47 -0000      1.5
***************
*** 1,76 ****
! <TMPL_INCLUDE NAME="acquisitions-top.inc">
  
!  <H1>Panier pour: <TMPL_VAR name="bookselname"></H1>
  
! <TMPL_IF name ="testdonation">
!       <a href="newbiblio.pl?id=<TMPL_VAR name="id">&basket=<TMPL_VAR 
name="basket">&sub=<TMPL_VAR name="parsub">">
!       <img src="<TMPL_VAR name="interface">/<TMPL_VAR 
name="theme">/images/filenew.png" align=right alt="Ajouter Notice" border=0></a>
! <TMPL_ELSE>
!       <a href="newdonation.pl?id=<TMPL_VAR name="id">&basket=<TMPL_VAR 
name="basket">&sub=<TMPL_VAR name="parsub">">
!       <img src="<TMPL_VAR name="interface">/<TMPL_VAR 
name="theme">/images/filenew.png" border=0 align=right alt="Ajouter Notice"></a>
! </TMPL_IF>
  
! <a href="basket.pl?basket=<TMPL_VAR name="basket">">
! <img src="<TMPL_VAR name="interface">/<TMPL_VAR 
name="theme">/images/1uparrow.png" border=0 align=right alt="Voir Panier"></a>
  <FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl">
! <input type=hidden name=id value=<TMPL_VAR name="id">>
! <input type=hidden name=basket value=<TMPL_VAR name="basket">>
! <b>Nouvelle Recherche: </b><INPUT TYPE="text"  SIZE="25"   
NAME="search"></form>
  <br clear=all>
  
  <CENTER>
  
! Votre recherche:
  <B>
! <TMPL_LOOP name="loopsearch">
!       <TMPL_VAR name="key"> <TMPL_VAR name="value">
! </TMPL_LOOP>
  </B>
  <BR>
! <TMPL_VAR name="count">  r&eacute;sultats.
  
! <br> Affichage des r&eacute;sultats <TMPL_VAR name="dispnum"> &agrave; 
<TMPL_VAR name="offset2">.
  
! <TABLE  CELLSPACING=0  CELLPADDING=6 border=0 Color="<TMPL_VAR name="main">">
!       <TR  VALIGN=TOP  background="<TMPL_VAR 
name="themelang">/images/background-mem.gif">
                <TD><b>TITRE</b></TD>
                <TD><b>AUTEUR</b></TD>
!               <TD><b>ANNEE</b></TD>
!               <TD><b>NOMBRE</b></TD>
                <TD><b>LOCALISATION</b></TD>
        </TR>
  
! <TMPL_LOOP name="loopresult">
!       <TR VALIGN=TOP bgcolor="<TMPL_VAR name="coltab">">
                <TD>
!                       <TMPL_IF name="testdonation">
!                               <A 
HREF="/cgi-bin/koha/acqui/newbiblio.pl?sub=<TMPL_VAR 
name="sub">&author=<TMPL_VAR name="author2">&copyright=<TMPL_VAR 
name="copyright">&id=<TMPL_VAR name="id">&basket=<TMPL_VAR 
name="basket">&biblio=<TMPL_VAR name="biblionumber">&title=<TMPL_VAR 
name="title2">">
!                               <TMPL_VAR name="title">
                                </A>
!                       <TMPL_ELSE>
!                               <A 
HREF="/cgi-bin/koha/acqui/newdonation.pl?author=<TMPL_VAR 
name="author2">&copyright=<TMPL_VAR name="copyright">&id=<TMPL_VAR 
name="id">&basket=<TMPL_VAR name="basket">&biblio=<TMPL_VAR 
name="biblionumber">&title=<TMPL_VAR name="title2">">
!                               <TMPL_VAR name="title">
                                </A>
!                       </TMPL_IF>
                </TD>
                <TD>
!                       <A HREF="/cgi-bin/koha/search.pl?author=<TMPL_VAR 
name="word">&type=<TMPL_VAR name="type">">
!                       <TMPL_VAR name="author">
                        </A>
                </TD>
                <TD>
!                       <TMPL_VAR name="copyright">
                </TD>
                <TD>
!                       <TMPL_VAR name="itemcount">
                </TD>
                <TD>
!                       <TMPL_VAR name="location">
                </TD>
        </TR>
  
! </TMPL_LOOP>
  
!       <TR VALIGN=TOP>
                <TD>
                        &nbsp;
--- 1,76 ----
! <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
  
!  <H1>Panier pour: <!-- TMPL_VAR name="bookselname" --></H1>
  
! <!-- TMPL_IF name ="testdonation" -->
!       <a href="newbiblio.pl?id=<!-- TMPL_VAR name="id" -->&basket=<!-- 
TMPL_VAR name="basket" -->&sub=<!-- TMPL_VAR name="parsub" -->">
!       <img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" 
-->/images/filenew.png" border=0 align=right alt="Ajouter New Biblio"></a>
! <!-- TMPL_ELSE -->
!       <a href="newdonation.pl?id=<!-- TMPL_VAR name="id" -->&basket=<!-- 
TMPL_VAR name="basket" -->&sub=<!-- TMPL_VAR name="parsub" -->">
!       <img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" 
-->/images/filenew.png"  border=0 align=right alt="Ajouter New Biblio"></a>
! <!-- /TMPL_IF -->
  
! <a href="basket.pl?basket=<!-- TMPL_VAR name="basket" -->">
! <img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" 
-->/images/1uparrow.png"  border=0 align=right alt="Voir Panier"></a>
  <FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl">
! <input type=hidden name=id value=<!-- TMPL_VAR name="id" -->>
! <input type=hidden name=basket value=<!-- TMPL_VAR name="basket" -->>
! <b>Nouvelle recherche: </b><INPUT TYPE="text"  SIZE="25"   
NAME="search"></form>
  <br clear=all>
  
  <CENTER>
  
! Recherche effectuée sur
  <B>
! <!-- TMPL_LOOP name="loopsearch" -->
!       <!-- TMPL_VAR name="key" --> <!-- TMPL_VAR name="value" -->
! <!-- /TMPL_LOOP -->
  </B>
  <BR>
! <!-- TMPL_VAR name="count" -->  Résultats trouvés.
  
! <br> Résultats <i><!-- TMPL_VAR name="dispnum" --></i> to <i><!-- TMPL_VAR 
name="offset2" --></i> affiché.
  
! <TABLE  CELLSPACING=0  CELLPADDING=6 border=0>
!       <TR  VALIGN=TOP bgcolor="#ffdf61">
                <TD><b>TITRE</b></TD>
                <TD><b>AUTEUR</b></TD>
!               <TD><b>&copy;</b></TD>
!               <TD><b>COMPTE</b></TD>
                <TD><b>LOCALISATION</b></TD>
        </TR>
  
! <!-- TMPL_LOOP name="loopresult" -->
!       <TR VALIGN=TOP bgcolor="<!-- TMPL_VAR name="toggle" -->">
                <TD>
!                       <!-- TMPL_IF name="testdonation" -->
!                               <A 
HREF="/cgi-bin/koha/acqui/newbiblio.pl?sub=<!-- TMPL_VAR name="sub" 
-->&author=<!-- TMPL_VAR name="author2" -->&copyright=<!-- TMPL_VAR 
name="copyright" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR 
name="basket" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&title=<!-- 
TMPL_VAR name="title2" -->">
!                               <!-- TMPL_VAR name="title" -->
                                </A>
!                       <!-- TMPL_ELSE -->
!                               <A 
HREF="/cgi-bin/koha/acqui/newdonation.pl?author=<!-- TMPL_VAR name="author2" 
-->&copyright=<!-- TMPL_VAR name="copyright" -->&id=<!-- TMPL_VAR name="id" 
-->&basket=<!-- TMPL_VAR name="basket" -->&biblio=<!-- TMPL_VAR 
name="biblionumber" -->&title=<!-- TMPL_VAR name="title2" -->">
!                               <!-- TMPL_VAR name="title" -->
                                </A>
!                       <!-- /TMPL_IF -->
                </TD>
                <TD>
!                       <A HREF="/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR 
name="word" -->&type=<!-- TMPL_VAR name="type" -->">
!                       <!-- TMPL_VAR name="author" -->
                        </A>
                </TD>
                <TD>
!                       <!-- TMPL_VAR name="copyright" -->
                </TD>
                <TD>
!                       <!-- TMPL_VAR name="itemcount" -->
                </TD>
                <TD>
!                       <!-- TMPL_VAR name="location" -->
                </TD>
        </TR>
  
! <!-- /TMPL_LOOP -->
  
!       <TR VALIGN=TOP bgcolor="#ffdf61">
                <TD>
                        &nbsp;
***************
*** 91,100 ****
  </TABLE>
  
! <TMPL_IF name="offsetover">
! <A HREF="/cgi-bin/koha/acqui/newbasket2.pl?num=<TMPL_VAR 
name="num">&offset=<TMPL_VAR name="offset">&type=<TMPL_VAR 
name="type">&id=<TMPL_VAR name="id">&basket=<TMPL_VAR 
name="basket">&search=<TMPL_VAR name="title">&author=<TMPL_VAR name="author">">
  Next
  </A>
! </TMPL_IF>
  </CENTER>
  
! <TMPL_INCLUDE NAME="acquisitions-bottom.inc">
--- 91,100 ----
  </TABLE>
  
! <!-- TMPL_IF name="offsetover" -->
! <A HREF="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR name="num" 
-->&offset=<!-- TMPL_VAR name="offset" -->&type=<!-- TMPL_VAR name="type" 
-->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" 
-->&search=<!-- TMPL_VAR name="title" -->&author=<!-- TMPL_VAR name="author" 
-->">
  Next
  </A>
! <!-- /TMPL_IF -->
  </CENTER>
  
! <!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->

Index: newbasket.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** newbasket.tmpl      4 Apr 2003 08:29:43 -0000       1.1
--- newbasket.tmpl      11 Feb 2004 09:00:47 -0000      1.2
***************
*** 1,14 ****
! <TMPL_INCLUDE name="acquisitions-top.inc">
  
! <FONT SIZE=6><em>Panier <TMPL_VAR name="basket"> for <TMPL_VAR 
name="name"></em></FONT><br />
! (Référence: <TMPL_VAR name="entrydate">, #<TMPL_VAR name="basket">, passée 
par : <TMPL_VAR name="user">)<br />
! Tel: <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 />
  <p>
  <FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl" method=post>
! <input type=hidden name=id value="<TMPL_VAR name="id">">
! <input type=hidden name=basket value="<TMPL_VAR name="basket">">
! <b> Chercher mot-clef ou titre: </b><INPUT TYPE="text"  SIZE="25"   
NAME="search">
  
  </form>
--- 1,14 ----
! <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  
! <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 />
  <p>
  <FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl" method=post>
! <input type=hidden name=id value="<!-- TMPL_VAR name="id" -->">
! <input type=hidden name=basket value="<!-- TMPL_VAR name="basket" -->">
! <b> Rechercher Mot-clé ou Titre: </b><INPUT TYPE="text"  SIZE="25"   
NAME="search">
  
  </form>
***************
*** 16,36 ****
  <table border=0 cellspacing=0 cellpadding=5>
        <tr valign=top bgcolor="#ffdf61">
!               <td width="5%"><b>N° cmde</b></td>
                <td width="10%"><b>Isbn</b></td>
                <td width="30%"><b>Titre</b></td>
                <td width="20%"><b>Auteur</b></td>
!               <td width="8%"><b>Qté</b></td>
        </tr>
!       <TMPL_LOOP name="books_loop">
!               <tr valign=top bgcolor=<TMPL_VAR name="color">>
!                       <td><TMPL_VAR name="ordernumber"></td>
!                       <td><TMPL_VAR name="isbn"></td>
!                       <td><TMPL_VAR name="title"></td>
!                       <td><TMPL_VAR name="author"></td>
!                       <td><TMPL_VAR name="quantity"></td>
                </tr>
!       </TMPL_LOOP>
  </table>
! <TMPL_INCLUDE name="acquisitions-bottom.inc">
  
  
--- 16,36 ----
  <table border=0 cellspacing=0 cellpadding=5>
        <tr valign=top bgcolor="#ffdf61">
!               <td width="5%"><b>Commande</b></td>
                <td width="10%"><b>Isbn</b></td>
                <td width="30%"><b>Titre</b></td>
                <td width="20%"><b>Auteur</b></td>
!               <td width="8%"><b>Quantité</b></td>
        </tr>
!       <!-- TMPL_LOOP name="books_loop" -->
!               <tr valign=top bgcolor=<!-- TMPL_VAR name="color" -->>
!                       <td><!-- TMPL_VAR name="ordernumber" --></td>
!                       <td><!-- TMPL_VAR name="isbn" --></td>
!                       <td><!-- TMPL_VAR name="title" --></td>
!                       <td><!-- TMPL_VAR name="author" --></td>
!                       <td><!-- TMPL_VAR name="quantity" --></td>
                </tr>
!       <!-- /TMPL_LOOP -->
  </table>
! <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
  
  

Index: newbiblio.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** newbiblio.tmpl      17 Sep 2003 13:34:11 -0000      1.5
--- newbiblio.tmpl      11 Feb 2004 09:00:47 -0000      1.6
***************
*** 1,7 ****
! <TMPL_INCLUDE name="acquisitions-top.inc">
  <script language="javascript" type="text/javascript">
  
  <!--
! function update(f){
    //collect values
    quantity=f.quantity.value
--- 1,7 ----
! <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  <script language="javascript" type="text/javascript">
  
  <!--
! function mettre à jour(f){
    //collect values
    quantity=f.quantity.value
***************
*** 15,33 ****
    //  GST=f.GST.value
    //  total=f.total.value
!   //make useful constants out of the above
    exchangerate=f.elements[currency].value      //get exchange rate
    gst_on=(!listinc && applygst);
    //do real stuff
    rrp=listprice*exchangerate;
!   ecost=Math.round(rrp*(100-discount))/100;
    GST=0;
    if (gst_on){
!     rrp= Math.round(rrp*(1+<TMPL_VAR name="gstrate">)*100)/100;
!     GST=ecost*<TMPL_VAR name="gstrate">;
    }
  
    total=(ecost+GST)*quantity
  
- 
    f.rrp.value=rrp;
    f.ecost.value=ecost;
--- 15,32 ----
    //  GST=f.GST.value
    //  total=f.total.value
!   //make useful constants out sur the above
    exchangerate=f.elements[currency].value      //get exchange rate
    gst_on=(!listinc && applygst);
    //do real stuff
    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;
***************
*** 52,146 ****
  </script>
  <form action=/cgi-bin/koha/acqui/addorder.pl method=post name=frusin>
! <TMPL_UNLESS name="existing"><input type=hidden name=existing 
value=no></TMPL_UNLESS>
! <!-- <TMPL_VAR name="title"> -->
! <input type=hidden name=ordnum value="<TMPL_VAR name="ordnum">">
! <input type=hidden name=basket value="<TMPL_VAR name="basket">">
! <input type=hidden name=supplier value="<TMPL_VAR name="id">">
! <input type=hidden name=biblio value="<TMPL_VAR name="biblio">">
! <input type=hidden name=bibitemnum value="<TMPL_VAR name="biblioitemnumber">">
! <input type=hidden name=oldtype value="<TMPL_VAR name="itemtype">">
! <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">">
! </TMPL_LOOP>
! <TMPL_IF name="orderexists"><input type=hidden name=orderexists 
value=yes></TMPL_IF>
! <table width="80%">
! <tr><td>
!       <FONT SIZE=6><em><TMPL_VAR name="ordnum"> - Détail 
commande</em></FONT><br>
!       Panier pour : <TMPL_VAR name="name">
! </td><td>
!       <a href="basket.pl?basket=<TMPL_VAR name="basket">">
!               <img src="<TMPL_VAR name="interface">/<TMPL_VAR 
name="theme">/images/1uparrow.png" border=0 alt="View Basket">
!       </a>
! </td></tr></table>
  <P>
  <CENTER>
  <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
        <tr valign=top bgcolor=#99cc33>
!               <td background="<TMPL_VAR 
name="themelang">/images/background-mem.gif" colspan=2><B>DETAIL CATALOGUE 
</B></td>
        </tr>
        <TR VALIGN=TOP>
                <TD><b>Titre *</b></td>
!               <td><input type=text size=20 name=title value="<TMPL_VAR 
name="title">"></td>
        </tr>
        <TR VALIGN=TOP>
                <TD>Auteur</td>
!               <td><input type=text size=20 name=author value="<TMPL_VAR 
name="author">" ></td>
        </tr>
        <TR VALIGN=TOP>
!       <TD>Date copyright</td>
!       <td><input type=text size=20 name=copyright value="<TMPL_VAR 
name="copyrightdate">">
        </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Catégorie</td>
!               <td><TMPL_VAR name="CGIitemtype"></td>
        </tr>
        <TR VALIGN=TOP>
                <TD>ISBN</td>
!               <td><input type=text size=20 name=ISBN value="<TMPL_VAR 
name="isbn">"></td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Périodiques</td>
!               <td><input type=text size=20 name=Series value="<TMPL_VAR 
name="seriestitle">"></td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Site</td>
!               <td><TMPL_VAR name="CGIbranch"></td>
        </tr>
  </table>
! <img src="<TMPL_VAR name="themelang">/images/holder.gif" width=32 height=250 
align=left>
  <table border=1 cellspacing=0 cellpadding=5 width="40%">
!       <tr valign=top bgcolor=#99cc33><td background="<TMPL_VAR 
name="themelang">/images/background-mem.gif" colspan=2><B>DETAILS 
FINANCIERS</B></td></tr>
        <TR VALIGN=TOP>
                <TD>Quantité</td>
!               <td><input type=text size=20 name=quantity value="<TMPL_VAR 
name="quantity">" onchange='update(this.form)' ></td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Fonds</td>
!               <td><TMPL_VAR name="CGIbookfund"></td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Prix fournisseur</td>
!               <td><input type=text size=20 name=list_price value="<TMPL_VAR 
name="listprice">" onchange='update(this.form)'></td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Coût remplacement <br><FONT SIZE=2></td>
!               <td><input type=text size=20 name=rrp value="<TMPL_VAR 
name="rrp">" onchange='update(this.form)'>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Cout budgété<BR><FONT SIZE=2></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>Taxes</td>
!               <td><input type=text size=20 name=GST value="" 
onchange='update(this.form)'></td>
        </tr>
        <TR VALIGN=TOP>
                <TD><B>TOTAL BUDGETE</B></td>
!               <td><input type=text size=20 name=total value="" 
onchange='update(this.form)'></td>
        </tr>
        <TR VALIGN=TOP  bgcolor=#ffffcc>
--- 51,143 ----
  </script>
  <form action=/cgi-bin/koha/acqui/addorder.pl method=post name=frusin>
! <!-- TMPL_UNLESS name="existing" --><input type=hidden name=existing 
value=no><!-- /TMPL_UNLESS -->
! <!-- <!-- TMPL_VAR name="title" --> -->
! <input type=hidden name=ordnum value="<!-- TMPL_VAR name="ordnum" -->">
! <input type=hidden name=basket value="<!-- TMPL_VAR name="basket" -->">
! <input type=hidden name=supplier value="<!-- TMPL_VAR name="id" -->">
! <input type=hidden name=biblio value="<!-- TMPL_VAR name="biblio" -->">
! <input type=hidden name=bibitemnum value="<!-- TMPL_VAR 
name="biblioitemnumber" -->">
! <input type=hidden name=oldtype value="<!-- TMPL_VAR name="itemtype" -->">
! <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" -->">
! <!-- /TMPL_LOOP -->
! <!-- TMPL_IF name="orderexists" --><input type=hidden name=orderexists 
value=oui><!-- /TMPL_IF -->
! <a href="basket.pl?basket=<!-- TMPL_VAR name=basket -->" class="button">Voir 
Panier</a>
! <h1><!-- TMPL_VAR name="ordnum" --> - Commande Details </h1><br>
! Panier pour: <!-- TMPL_VAR name="name" -->
  <P>
  <CENTER>
  <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
        <tr valign=top bgcolor=#99cc33>
!               <td background="<!-- TMPL_VAR name="themelang" 
-->/images/background-mem.gif" colspan=2><B>DETAILS CATALOGUE</B></td>
        </tr>
        <TR VALIGN=TOP>
                <TD><b>Titre *</b></td>
!               <td><input type=text size=20 name=title value="<!-- TMPL_VAR 
name="title" -->"></td>
        </tr>
        <TR VALIGN=TOP>
                <TD>Auteur</td>
!               <td><input type=text size=20 name=author value="<!-- TMPL_VAR 
name="author" -->" ></td>
!       </tr>
!       <TR VALIGN=TOP>
!               <TD> Editeur</td>
!               <td><input type=text size=30 name=publishercode value="<!-- 
TMPL_VAR name="publishercode" -->" ></td>
        </tr>
        <TR VALIGN=TOP>
!       <TD>Date Copyright</td>
!       <td><input type=text size=20 name=copyrightdate value="<!-- TMPL_VAR 
name="copyrightdate" -->">
        </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Format</td>
!               <td><!-- TMPL_VAR name="CGIitemtype" --></td>
        </tr>
        <TR VALIGN=TOP>
                <TD>ISBN</td>
!               <td><input type=text size=20 name=ISBN value="<!-- TMPL_VAR 
name="isbn" -->"></td>
        </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>
!               <TD>Annexe</td>
!               <td><!-- TMPL_VAR name="CGIbranch" --></td>
        </tr>
  </table>
! <img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=32 
height=250 align=left>
  <table border=1 cellspacing=0 cellpadding=5 width="40%">
!       <tr valign=top bgcolor=#99cc33><td background="<!-- TMPL_VAR 
name="themelang" -->/images/background-mem.gif" colspan=2><B>DETAILS 
COMPTABILITE</B></td></tr>
        <TR VALIGN=TOP>
                <TD>Quantité</td>
!               <td><input type=text size=20 name=quantity value="<!-- TMPL_VAR 
name="quantity" -->" onchange='mettre à jour(this.form)' ></td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Comptes</td>
!               <td><!-- TMPL_VAR name="CGIbookfund" --></td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Prix catalogue du fournisseur</td>
!               <td><input type=text size=20 name=list_price value="<!-- 
TMPL_VAR name="listprice" -->" onchange='mettre à jour(this.form)'></td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Frais Remplacement <br><FONT SIZE=2></td>
!               <td><input type=text size=20 name=rrp value="<!-- TMPL_VAR 
name="rrp" -->" onchange='mettre à jour(this.form)'>
        </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='mettre à jour(this.form)'></td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>GST budgeté</td>
!               <td><input type=text size=20 name=GST value="" onchange='mettre 
à jour(this.form)'></td>
        </tr>
        <TR VALIGN=TOP>
                <TD><B>TOTAL BUDGETE</B></td>
!               <td><input type=text size=20 name=total value="" 
onchange='mettre à jour(this.form)'></td>
        </tr>
        <TR VALIGN=TOP  bgcolor=#ffffcc>
***************
*** 153,160 ****
        <TR VALIGN=TOP>
                <TD>Notes</td>
!               <td><input type=text size=20 name=notes value="<TMPL_VAR 
name="notes">"></td>
        </tr>
        <TR VALIGN=TOP>
!               <TD colspan=2><input type=image  name=submit src="<TMPL_VAR 
name="interface">/<TMPL_VAR name="theme">/images/2rightarrow.png" border=0 
align=right>     </td>
        </tr>
  </table>
--- 150,158 ----
        <TR VALIGN=TOP>
                <TD>Notes</td>
!               <td><input type=text size=20 name=notes value="<!-- TMPL_VAR 
name="notes" -->"></td>
        </tr>
        <TR VALIGN=TOP>
!               <TD colspan=2>
!               <input type="submit" value="OK" class="button">
        </tr>
  </table>
***************
*** 162,173 ****
  </center>
  <table>
! <tr><td bgcolor=#cccc99  background="<TMPL_VAR 
name="themelang">/images/background-mem.gif"><B>HELP</B><br>
  <UL>
! <LI>les champs en <B>GRAS</B> doivent être remplis pour créer une nouvelle 
notice et un exemplaire</li>
! <LI>Les champs en italique peuvent être utilisés pour faire une "réception 
rapide" lorsque les exemplaires seront réceptionnés</li>
  </UL>
  </td></tr></table>
  <p> &nbsp; </p>
! <TMPL_INCLUDE name="acquisitions-bottom.inc">
  
  
--- 160,171 ----
  </center>
  <table>
! <tr><td bgcolor=#cccc99  background="<!-- TMPL_VAR name="themelang" 
-->/images/background-mem.gif"><B>AIDE</B><br>
  <UL>
! <LI>Les champs en gras sont obligatoires.<p>
! <LI>Les champs ombrés peuvent être utilisés pour effectuer un retour 
"rapide", quand les ouvrages ont été acheté localement ou reçus en don. Dans ce 
cas, la quantité "commandée" sera aussi affectée dans la base de données à la 
quantité "reçue".
  </UL>
  </td></tr></table>
  <p> &nbsp; </p>
! <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
  
  

Index: order.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/order.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** order.tmpl  17 Sep 2003 13:34:11 -0000      1.3
--- order.tmpl  11 Feb 2004 09:00:47 -0000      1.4
***************
*** 1,17 ****
! <TMPL_INCLUDE name="acquisitions-top.inc">
! <FONT SIZE=6><em>Recherche fournisseur</em></FONT><br />
  <CENTER>
! vous avez cherché le <b>fournisseur <TMPL_VAR name="supplier">,</b> <TMPL_VAR 
name="count"> réponses trouvées<p>
  <table border=0 cellspacing=0 cellpadding=5 width="80%">
  <tr valign=top bgcolor="#ffdf61">
!       <td width="10%"><b>N° cmde</b></td>
!       <td width="10%"><b>Livraison<b></td>
!       <td width="30%"><b>fournisseur</b></td>
        <td width="50%">
                <table width="100%" border=0 cellspacing=0 cellpadding=5>
                        <tr>
                                <td width="15%"><b>Panier</b></td>
!                               <td width="15%"><b>Exemplaire</b></td>
!                               <td width="40%"><b>Saisi par</b></td>
                                <td width="30%"><b>Date</b></td>
                        </tr>
--- 1,17 ----
! <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
! <h1>Résultats de recherche fournisseur</h1><br />
  <CENTER>
! Recherche effectuée sur <b>Fournisseur <!-- TMPL_VAR name="supplier" -->,</b> 
<!-- TMPL_VAR name="count" --> Résultats trouvés<p>
  <table border=0 cellspacing=0 cellpadding=5 width="80%">
  <tr valign=top bgcolor="#ffdf61">
!       <td width="10%"><b>Commande</b></td>
!       <td width="10%"><b>Recevoir<b></td>
!       <td width="30%"><b>Entreprise</b></td>
        <td width="50%">
                <table width="100%" border=0 cellspacing=0 cellpadding=5>
                        <tr>
                                <td width="15%"><b>Panier</b></td>
!                               <td width="15%"><b>Ouvrages</b></td>
!                               <td width="40%"><b>Equipe</b></td>
                                <td width="30%"><b>Date</b></td>
                        </tr>
***************
*** 20,52 ****
  </tr>
  
! <TMPL_LOOP name="loop_suppliers">
!       <tr valign=top bgcolor=<TMPL_VAR name="color">>
                <td>
!                       <a href="basket.pl?id=<TMPL_VAR name="id">"><input 
type=image src="<TMPL_VAR NAME='interface'>/<TMPL_VAR 
name="theme">/images/mail_send.png" title="Passer commande" ALT="Add" BORDER=0 
></a>
                </td>
                <td>
!                       <a href="recieveorder.pl?id=<TMPL_VAR 
name="id">"><input type=image src="<TMPL_VAR NAME='interface'>/<TMPL_VAR 
name="theme">/images/mail_get.png" title="Livraison" ALT="Add" BORDER=0 ></a>
                </td>
!               <td><a href="supplier.pl?id=<TMPL_VAR name="id">"><TMPL_VAR 
name="name"></a></td>
                <td>
                        <table width="100%" cellspacing=0 cellpadding=5 
border=0>
!                               <TMPL_LOOP name="loop_basket">
                                        <tr>
!                                               <td width="15%"><a 
href="/cgi-bin/koha/acqui/basket.pl?basket=<TMPL_VAR 
name="basketno">"><TMPL_VAR name="basketno"></a></td>
                                                <td width="15%"><TMPl_VAR 
name="total"></td>
!                                               <td width="40%"><TMPL_VAR 
name="authorisedby"></td>
!                                               <td width="30%"><TMPL_VAR 
name="entrydate"></td>
                                        </tr>
!                               </TMPL_LOOP>
                        </table>
-               </td>
        </tr>
! </TMPL_LOOP>
! <tr>
! <td colspan=4><br/>
! <a class="button" href="supplier.pl?id=0">Ajouter fournisseur</a>
! <br/><br/>
! </tr>
  </table>
  </CENTER>
! <TMPL_INCLUDE name="acquisitions-bottom.inc">
--- 20,52 ----
  </tr>
  
! <!-- TMPL_LOOP name="loop_suppliers" -->
!       <tr valign=top bgcolor=<!-- TMPL_VAR name="color" -->>
                <td>
!                       <!-- TMPL_IF name="active" -->
!                               <a href="basket.pl?id=<!-- TMPL_VAR name=id 
-->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" 
-->/images/mail_send.png" title="Ajouter order" ALT="Add" BORDER=0 ></a>
!                       <!-- TMPL_ELSE -->
!                               Inactif
!                       <!-- /TMPL_IF -->
                </td>
                <td>
!                       <a href="recieveorder.pl?id=<!-- TMPL_VAR name=id 
-->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" 
-->/images/mail_get.png" title="receive" ALT="Add" BORDER=0 ></a>
                </td>
!               <td><a href="supplier.pl?id=<!-- TMPL_VAR name=id -->"><!-- 
TMPL_VAR name="name" --></a></td>
                <td>
                        <table width="100%" cellspacing=0 cellpadding=5 
border=0>
!                               <!-- TMPL_LOOP name="loop_basket" -->
                                        <tr>
!                                               <td width="15%"><a 
href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR name="basketno" 
-->"><!-- TMPL_VAR name="basketno" --></a></td>
                                                <td width="15%"><TMPl_VAR 
name="total"></td>
!                                               <td width="40%"><!-- TMPL_VAR 
name="authorisedby" --></td>
!                                               <td width="30%"><!-- TMPL_VAR 
name="entrydate" --></td>
                                        </tr>
!                               <!-- /TMPL_LOOP -->
                        </table>
        </tr>
! <!-- /TMPL_LOOP -->
  </table>
  </CENTER>
! <br>
! <a class="button" href="supplier.pl?id=0">Ajouter un fournisseur</a>
! <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: recieveorder.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/recieveorder.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** recieveorder.tmpl   4 Apr 2003 08:29:43 -0000       1.1
--- recieveorder.tmpl   11 Feb 2004 09:00:47 -0000      1.2
***************
*** 1,29 ****
! <TMPL_INCLUDE name="acquisitions-top.inc">
  
! <FONT SIZE=6><em>Réceptionner commande du fournisseur <TMPL_VAR 
name="name"></em></FONT>
  <p>
  <CENTER>
  <form method=get action="receive.pl">
! <input type=hidden name=id value=<TMPL_VAR name="id">>
  <p>
  <table border=1 cellspacing=0 cellpadding=5>
! <tr valign=top bgcolor="#ffdf61"><td  colspan=2><B>INFORMATIONS DE FACTURE 
FOURNISSEUR</B></td></tr>
  <TR VALIGN=TOP >
! <TD>N° commande fournisseur</td>
  <td><input type=text size=20 name=invoice>
  </td>
  </tr>
  <TR VALIGN=TOP bgcolor="#ffffcc">
! <TD>gst</td>
  <td><input type=text size=20 name=gst>
  </td>
  </tr>
  <TR VALIGN=TOP>
! <TD>Port</td>
  <td><input type=text size=20 name=freight>
  </td>
  </tr>
  <TR VALIGN=TOP>
! <td colspan=2 align="center"><input type=image  name=submit src="/<TMPL_VAR 
name="theme">/images/2rightarrow.png" border=0 title="continue" alt="save" 
border=0>
  </td>
  </tr>
--- 1,29 ----
! <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  
! <h1>Réceptionner commandes d'un fournisseur <a 
href="/cgi-bin/koha/acqui/supplier.pl?id=<!-- TMPL_VAR NAME="id" -->"><!-- 
TMPL_VAR name="name" --></a></h1>
  <p>
  <CENTER>
  <form method=get action="receive.pl">
! <input type=hidden name=id value=<!-- TMPL_VAR name="id" -->>
  <p>
  <table border=1 cellspacing=0 cellpadding=5>
! <tr valign=top bgcolor="#ffdf61"><td  colspan=2><B>INFORMATION FACTURE 
FOURNISSEUR</B></td></tr>
  <TR VALIGN=TOP >
! <TD>N° de facture de fournisseur</td>
  <td><input type=text size=20 name=invoice>
  </td>
  </tr>
  <TR VALIGN=TOP bgcolor="#ffffcc">
! <TD>GST</td>
  <td><input type=text size=20 name=gst>
  </td>
  </tr>
  <TR VALIGN=TOP>
! <TD>Fret</td>
  <td><input type=text size=20 name=freight>
  </td>
  </tr>
  <TR VALIGN=TOP>
! <td colspan=2 align="center"><input type="submit" class="button" 
value="Enregistrer">
  </td>
  </tr>
***************
*** 31,33 ****
  </CENTER>
  
! <TMPL_INCLUDE name="acquisitions-bottom.inc">
--- 31,33 ----
  </CENTER>
  
! <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: recieve.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/recieve.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** recieve.tmpl        4 Apr 2003 08:29:43 -0000       1.1
--- recieve.tmpl        11 Feb 2004 09:00:47 -0000      1.2
***************
*** 1,19 ****
! <TMPL_INCLUDE name="acquisitions-top.inc">
  
  <div align=right>
! Facture : <TMPL_VAR name="invoice"><br>
! Réceptionnée par : <TMPL_VAR name="user"><br>
! <TMPL_VAR name="date">
  </div>
! <FONT SIZE=6><em>Réception pour : <TMPL_VAR name="name">, Facture <TMPL_VAR 
name="invoice"></em></FONT>
  <CENTER>
  
  <FORM ACTION="/cgi-bin/koha/acqui/acquire.pl">
! <input type=hidden name=id value="<TMPL_VAR name="id">">
! <input type=hidden name=gst value="<TMPL_VAR name="gst">">
! <input type=hidden name=freight value="<TMPL_VAR name="freight">">
! <input type=hidden name=invoice value="<TMPL_VAR name="invoice">">
  
! <b>Rechercher ISBN or Titre:</b> <INPUT TYPE="text"  SIZE="25"   
NAME="recieve">
  </form>
  <p>
--- 1,19 ----
! <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  
  <div align=right>
! Facture: <!-- TMPL_VAR name="invoice" --><br>
! Reçu par: <!-- TMPL_VAR name="user" --><br>
! <!-- TMPL_VAR name="date" -->
  </div>
! <h1>Sommaire pour : <i><!-- TMPL_VAR name="name" --></i> Facture <i><!-- 
TMPL_VAR name="invoice" --></i></h1>
  <CENTER>
  
  <FORM ACTION="/cgi-bin/koha/acqui/acquire.pl">
! <input type=hidden name=id value="<!-- TMPL_VAR name="id" -->">
! <input type=hidden name=gst value="<!-- TMPL_VAR name="gst" -->">
! <input type=hidden name=freight value="<!-- TMPL_VAR name="freight" -->">
! <input type=hidden name=invoice value="<!-- TMPL_VAR name="invoice" -->">
  
! <b>Rechercher ISBN ou Titre:</b> <INPUT TYPE="text"  SIZE="25"   
NAME="recieve">
  </form>
  <p>
***************
*** 27,47 ****
                <td><b>AUTEUR</b></td>
                <td><b>ACTUEL</b></td>
!               <td><b>Port</b></td>
!               <td><b>QTE</b></td>
                <td><b>TOTAL</b></td>
        </tr>
!       <TMPL_VAR name="count">
!       <TMPL_LOOP name="loop_orders">
!               <tr valign=top bgcolor="<TMPL_VAR name="color">">
!                       <td><TMPL_VAR name="basketno"></td>
!                       <td><TMPL_VAR name="isbn"></td>
!                       <td><a href="acquire.pl?recieve=<TMPL_VAR 
name="ordernumber">&biblio=<TMPL_VAR name="biblionumber">&invoice=<TMPL_VAR 
name="invoice">&gst=<TMPL_VAR name="gst">&freight=<TMPL_VAR 
name="freight">&id=<TMPL_VAR name="id">"><TMPL_VAR name="title"></a></td>
!                       <td><TMPL_VAR name="author"></td>
!                       <td>$<TMPL_VAR name="unitprice"></td>
                        <td></td>
!                       <td><TMPL_VAR name="quantityrecieved"></td>
!                       <td>$<TMPL_VAR name="total"></td>
                </tr>
!       </TMPL_LOOP>
        <tr valign=top bgcolor=white>
                <td colspan=8><hr>
--- 27,47 ----
                <td><b>AUTEUR</b></td>
                <td><b>ACTUEL</b></td>
!               <td><b>P&P</b></td>
!               <td><b>QUANTITE</b></td>
                <td><b>TOTAL</b></td>
        </tr>
!       <!-- TMPL_VAR name="count" -->
!       <!-- TMPL_LOOP name="loop_orders" -->
!               <tr valign=top bgcolor="<!-- TMPL_VAR name="color" -->">
!                       <td><!-- TMPL_VAR name="basketno" --></td>
!                       <td><!-- TMPL_VAR name="isbn" --></td>
!                       <td><a href="acquire.pl?recieve=<!-- TMPL_VAR 
name="ordernumber" -->&biblio=<!-- TMPL_VAR name="biblionumber" 
-->&invoice=<!-- TMPL_VAR name="invoice" -->&gst=<!-- TMPL_VAR name="gst" 
-->&freight=<!-- TMPL_VAR name="freight" -->&id=<!-- TMPL_VAR name="id" 
-->"><!-- TMPL_VAR name="title" --></a></td>
!                       <td><!-- TMPL_VAR name="author" --></td>
!                       <td>$<!-- TMPL_VAR name="unitprice" --></td>
                        <td></td>
!                       <td><!-- TMPL_VAR name="quantityrecieved" --></td>
!                       <td>$<!-- TMPL_VAR name="total" --></td>
                </tr>
!       <!-- /TMPL_LOOP -->
        <tr valign=top bgcolor=white>
                <td colspan=8><hr>
***************
*** 52,73 ****
                <td></td>
                <td></td>
!               <td><b>SUBTOTALS</b></td>
!               <td>$<TMPL_VAR name="totalprice"></td>
!               <td><TMPL_VAR name="totalfreight"></td>
!               <td><TMPL_VAR name="totalquantity"></td>
!               <td>$<TMPL_VAR name="tototal"></td>
        </tr>
        <tr valign=top bgcolor=white>
                <td colspan=5 rowspan=2  bgcolor="#ffdf61">
                <b>AIDE</b>
!               <br>Le total en bas de la page doit être le même que sur la 
facture à quelques cents près.</p>
!                Quand vous avez terminé, enregistrez les modifications
                </td>
                <td colspan=2 align=right><b>GST</b></td>
!               <td>?<TMPL_VAR name="gst"></td>
        </tr>
        <tr valign=top bgcolor=white>
                <td colspan=2 align=right ><b>TOTAL</b></td>
!               <td>?<TMPL_VAR name="grandtot"></td>
        </tr>
  </table>
--- 52,74 ----
                <td></td>
                <td></td>
!               <td><b>SOUS-TOTAUX</b></td>
!               <td>$<!-- TMPL_VAR name="totalprice" --></td>
!               <td><!-- TMPL_VAR name="totalfreight" --></td>
!               <td><!-- TMPL_VAR name="totalquantity" --></td>
!               <td>$<!-- TMPL_VAR name="tototal" --></td>
        </tr>
        <tr valign=top bgcolor=white>
                <td colspan=5 rowspan=2  bgcolor="#ffdf61">
                <b>AIDE</b>
!               <br>
!               Le total au fond de la page devrait correspondre à quelques 
centimes au total de la facture.<p>
!               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>
        <tr valign=top bgcolor=white>
                <td colspan=2 align=right ><b>TOTAL</b></td>
!               <td>$<!-- TMPL_VAR name="grandtot" --></td>
        </tr>
  </table>

Index: supplier.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/supplier.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** supplier.tmpl       17 Sep 2003 13:34:11 -0000      1.4
--- supplier.tmpl       11 Feb 2004 09:00:47 -0000      1.5
***************
*** 1,159 ****
! <TMPL_INCLUDE name="acquisitions-top.inc">
  
  <form action=updatesupplier.pl method=post>
  
! <input type=hidden name=id value=<TMPL_VAR name="id">>
! <FONT SIZE=6><em>Modification : <TMPL_VAR name="name"></em></FONT>
  <P>
  <CENTER>
  <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
        <tr valign=top bgcolor="#ffdf61">
!               <td colspan=2><B>DETAIL FOURNISSEUR </B></td>
        </tr>
        <TR VALIGN=TOP>
!               <TD><b>Nom fournisseur</b></td>
!               <td><input type=text size=20 name=company value="<TMPL_VAR 
name="name">">
                </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Adresse</td>
                <td>
!                       <textarea name=company_postal cols=20 rows=3><TMPL_VAR 
name="postal">
!                       </textarea>
                </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Adresse siège</td>
!               <td><textarea name=physical cols=20 rows=4><TMPL_VAR 
name="address1">
!                       <TMPL_VAR name="address2">
!                       <TMPL_VAR name="address3">
!                       <TMPL_VAR name="address4">
!                       </textarea>
                </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Tel</td>
!               <td><input type=text size=20 name=company_phone 
value="<TMPL_VAR name="phone">">
                </td>
        </tr>
        <TR VALIGN=TOP>
                <TD>Fax</td>
!               <td><input type=text size=20 name=company_fax value="<TMPL_VAR 
name="fax">">
                </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>site web</td>
!               <td><input type=text size=20 name=website value="<TMPL_VAR 
name="url">">
                </td>
        </tr>
        <tr valign=top bgcolor="#ffdf61">
!               <td colspan=2><B>CONTACT</B></td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Nom</td>
!               <td><input type=text size=20 name=company_contact_name 
value="<TMPL_VAR name="contact">"></td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>fonction</td>
!               <td><input type=text size=20 name=company_contact_position 
value="<TMPL_VAR name="contpos">">
                </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Tel</td>
!               <td><input type=text size=20 name=contact_phone 
value="<TMPL_VAR name="contphone">">
                </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Autre tel</td>
!               <td><input type=text size=20 name=contact_phone_2 
value="<TMPL_VAR name="contaltphone">">
                </td>
        </tr>
        <TR VALIGN=TOP>
                <TD>Fax</td>
!               <td><input type=text size=20 name=contact_fax value="<TMPL_VAR 
name="contfax">">
                </td>
        </tr>
        <TR VALIGN=TOP>
                <TD>E-mail</td>
!               <td><input type=text size=20 name=company_email 
value="<TMPL_VAR name="contemail">">
                </td>
        </tr>
        <TR VALIGN=TOP>
                <TD>Notes</td>
!               <td><textarea name=notes cols=20 rows=4><TMPL_VAR 
name="contnotes"></textarea>
                </td>
        </tr>
-       <tr>
-               <td colspan=2 align="center"><input type=submit 
value="Enregistrer" class="button"></td>
-       </tr>
  </table>
  
  <table border=1 cellspacing=0 cellpadding=5 width="40%">
        <tr valign=top bgcolor="#ffdf61">
!               <td colspan=2><B>STATUT</B></td>
        </tr>
        <TR VALIGN=TOP>
                <TD>Le fournisseur est</td>
!               <td><input type="radio" name="status" value="1" <TMPL_IF 
name="active">checked</TMPL_IF>>Actif
!                       <input type="radio" name="status" value="0" 
<TMPL_UNLESS name="active">checked</TMPL_UNLESS>>Inactif</td>
        </tr>
        <tr valign=top bgcolor="#ffdf61">
!               <td colspan=2><B>INFORMATIONS COMMANDE</B></td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Publications</td>
!               <td><textarea name="publishers_imprints" cols=20 
rows=4><TMPL_VAR name="specialty"></textarea>
                </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Les prix sont en </td>
                <td>
                        <select name=list_currency size=1>
!                       <TMPL_LOOP name="loop_pricescurrency">
!                               <TMPL_VAR name="currency">
!                       </TMPL_LOOP>
                        </select>
                </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Les factures sont en </td>
                <td>
                        <select name=invoice_currency size=1>
!                       <TMPL_LOOP name="loop_invoicecurrency">
!                               <TMPL_VAR name="currency">
!                       </TMPL_LOOP>
                        </select>
                </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>GST</td>
                <td>
!                       <input type=radio name=gst value=1 <TMPL_IF 
name="gstreg">checked</TMPL_IF>>Oui
!                       <input type=radio name=gst value=0 <TMPL_UNLESS 
name="gstreg">checked</TMPL_UNLESS>>Non
                </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Prix incluent la TVA</td>
                <td>
!                       <input type=radio name=list_gst <TMPL_IF 
name="listincgst">checked</TMPL_IF>>Oui
!                       <input type=radio name=list_gst value=0 <TMPL_UNLESS 
name="listincgst">checked</TMPL_UNLESS>>Non
                </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Le prix des factures incluent la TVA</td>
                <td>
!                       <input type=radio name=invoice_gst value=1 <TMPL_IF 
name= "invoiceincgst">checked</TMPL_IF>>Oui
!                       <input type=radio name=invoice_gst value=0 <TMPL_UNLESS 
name="invoiceincgst">checked</TMPL_UNLESS>>Non
                </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>remise</td>
!               <td><input type=text size=8 name=discount value=<TMPL_VAR 
name="discount">> %
        </tr>
  </table>
! 
  </form>
  </center>
  
  
! <TMPL_INCLUDE name="acquisitions-bottom.inc">
--- 1,164 ----
! <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  
  <form action=updatesupplier.pl method=post>
  
! <input type=hidden name=id value=<!-- TMPL_VAR name="id" -->>
! 
! <!-- TMPL_IF NAME=id -->
!       <h1>Mettre à jour: <!-- TMPL_VAR name="name" --></h1>
! <!-- TMPL_ELSE -->
!       <h1><em>Ajouter un fournisseur</h1>
! <!-- /TMPL_IF -->
! 
  <P>
  <CENTER>
  <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
        <tr valign=top bgcolor="#ffdf61">
!               <td colspan=2><B>DETAILS ENTREPRISE</B></td>
        </tr>
        <TR VALIGN=TOP>
!               <TD><b>Nom Entreprise</b></td>
!               <td><input type=text size=20 name=company value="<!-- TMPL_VAR 
name="name" -->">
                </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Adresse postale</td>
                <td>
!                       <textarea name=company_postal cols=20 rows=3><!-- 
TMPL_VAR name="postal" --></textarea>
                </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Adresse physique</td>
!               <td><textarea name=physical cols=20 rows=4><!-- TMPL_VAR 
name="address1" --><!-- TMPL_VAR name="address2" --><!-- TMPL_VAR 
name="address3" --><!-- TMPL_VAR name="address4" --></textarea>
                </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Téléphone</td>
!               <td><input type=text size=20 name=company_phone value="<!-- 
TMPL_VAR name="phone" -->">
                </td>
        </tr>
        <TR VALIGN=TOP>
                <TD>Fax</td>
!               <td><input type=text size=20 name=company_fax value="<!-- 
TMPL_VAR name="fax" -->">
                </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Site Web</td>
!               <td><input type=text size=20 name=website value="<!-- TMPL_VAR 
name="url" -->">
                </td>
        </tr>
        <tr valign=top bgcolor="#ffdf61">
!               <td colspan=2><B>DETAILS CONTACT</B></td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Nom du contact</td>
!               <td><input type=text size=20 name=company_contact_name 
value="<!-- TMPL_VAR name="contact" -->"></td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Position</td>
!               <td><input type=text size=20 name=company_contact_position 
value="<!-- TMPL_VAR name="contpos" -->">
                </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Téléphone</td>
!               <td><input type=text size=20 name=contact_phone value="<!-- 
TMPL_VAR name="contphone" -->">
                </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Autre téléphone</td>
!               <td><input type=text size=20 name=contact_phone_2 value="<!-- 
TMPL_VAR name="contaltphone" -->">
                </td>
        </tr>
        <TR VALIGN=TOP>
                <TD>Fax</td>
!               <td><input type=text size=20 name=contact_fax value="<!-- 
TMPL_VAR name="contfax" -->">
                </td>
        </tr>
        <TR VALIGN=TOP>
                <TD>E-mail</td>
!               <td><input type=text size=20 name=company_email value="<!-- 
TMPL_VAR name="contemail" -->">
                </td>
        </tr>
        <TR VALIGN=TOP>
                <TD>Notes</td>
!               <td><textarea name=notes cols=20 rows=4><!-- TMPL_VAR 
name="contnotes" --></textarea>
                </td>
        </tr>
  </table>
  
  <table border=1 cellspacing=0 cellpadding=5 width="40%">
        <tr valign=top bgcolor="#ffdf61">
!               <td colspan=2><B>STATUT ACTUEL</B></td>
        </tr>
        <TR VALIGN=TOP>
                <TD>Le fournisseur est</td>
!               <td>
!                        <!-- TMPL_IF name="active" -->
!                               <input type="radio" name="status" value="1" 
checked>Actif
!                               <input type="radio" name="status" 
value="0">Inactif</td>
!                       <!-- TMPL_ELSE -->
!                               <input type="radio" name="status" 
value="1">Actif
!                               <input type="radio" name="status" 
value="0"checked>Inactif</td>
!                       <!-- /TMPL_IF -->
        </tr>
        <tr valign=top bgcolor="#ffdf61">
!               <td colspan=2><B>INFORMATION COMMANDES</B></td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Edition</td>
!               <td><textarea name="publishers_imprints" cols=20 rows=4><!-- 
TMPL_VAR name="specialty" --></textarea>
                </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Prix catalogue sont</td>
                <td>
                        <select name=list_currency size=1>
!                       <!-- TMPL_LOOP name="loop_pricescurrency" -->
!                               <!-- TMPL_VAR name="currency" -->
!                       <!-- /TMPL_LOOP -->
                        </select>
                </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Prix facturés sont</td>
                <td>
                        <select name=invoice_currency size=1>
!                       <!-- TMPL_LOOP name="loop_invoicecurrency" -->
!                               <!-- TMPL_VAR name="currency" -->
!                       <!-- /TMPL_LOOP -->
                        </select>
                </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>GST enregistré</td>
                <td>
!                       <input type=radio name=gst value=1 <!-- TMPL_IF 
name="gstreg" -->checked<!-- /TMPL_IF -->>Oui
!                       <input type=radio name=gst value=0 <!-- TMPL_UNLESS 
name="gstreg" -->checked<!-- /TMPL_UNLESS -->>Non
                </td>
        </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
!                       <input type=radio name=list_gst value=0 <!-- 
TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>Non
                </td>
        </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
!                       <input type=radio name=invoice_gst value=0 <!-- 
TMPL_UNLESS name="invoiceincgst" -->checked<!-- /TMPL_UNLESS -->>Non
                </td>
        </tr>
        <TR VALIGN=TOP>
!               <TD>Rabais</td>
!               <td><input type=text size=3 name=discount value=<!-- TMPL_VAR 
name="discount" -->> %
        </tr>
  </table>
! <br/>
! <br/><input type=image  name=submit src="/<!-- TMPL_VAR name="theme" 
-->/images/filesave.png" border=0 title="Enregistrer" alt="Enregistrer" 
class="button">
  </form>
  </center>
  
  
! <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->




reply via email to

[Prev in Thread] Current Thread [Next in Thread]