[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/acqui recie... [dev_week]

[Joshua Ferraro]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Joshua Ferraro <kados>  06/08/03 13:21:16

Modified files:
        koha-tmpl/intranet-tmpl/npl/en/acqui: recieve.tmpl 

Log message:
        sync with rel_2_2

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3&r2=1.1.2.3.2.1

Patches:
Index: recieve.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.2.1
diff -u -b -r1.1.2.3 -r1.1.2.3.2.1
--- recieve.tmpl        7 Mar 2006 16:56:04 -0000       1.1.2.3
+++ recieve.tmpl        3 Aug 2006 13:21:16 -0000       1.1.2.3.2.1
@@ -10,8 +10,8 @@
        
 <ul>
 <li>Invoice: <!-- TMPL_VAR name="invoice" --></li>
-<li>Received By: <!-- TMPL_VAR name="user" --></li>
-<li>Date: <!-- TMPL_VAR name="date" --></li>
+<li>Received by: <!-- TMPL_VAR name="user" --></li>
+<li>Date: <!-- TMPL_VAR name="formatteddatereceived"--></li>
 </ul>
        
        <h2> Items in parcel</h2>
@@ -35,7 +35,7 @@
                        <!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr 
class="highlight"><!-- /TMPL_IF -->
                                <td><!-- TMPL_VAR NAME="basketno" --></td>
                                <td><!-- TMPL_VAR NAME="isbn" --></td>
-                               <td><a href="acquire.pl?recieve=<!-- TMPL_VAR 
NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" 
-->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR 
NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- 
TMPL_VAR NAME="supplierid" -->&catview=yes"><!-- TMPL_VAR NAME="title" 
--></a></td>
+                               <td><a href="acquire.pl?recieve=<!-- TMPL_VAR 
NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" 
-->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR 
NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- 
TMPL_VAR NAME="supplierid" -->&catview=yes&amp;datereceived=<!-- TMPL_VAR 
name="datereceived" -->"><!-- TMPL_VAR NAME="title" --></a></td>
                                <td><!-- TMPL_VAR NAME="author" --></td>
                                <td><!-- TMPL_VAR NAME="ecost" --></td>
                                <td><!-- TMPL_VAR NAME="quantity" --></td>
@@ -66,6 +66,10 @@
                        <td><!-- TMPL_VAR NAME="gst" --></td>
                </tr>
                <tr>
+                       <td colspan="2" scope="row">FREIGHT</td>
+                       <td><!-- TMPL_VAR NAME="freight" --></td>
+               </tr>
+               <tr>
                        <td colspan="2" scope="row">TOTAL</td>
                        <td><!-- TMPL_VAR NAME="grandtot" --></td>
                </tr>
@@ -95,7 +99,7 @@
                        <tr 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" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" 
-->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR 
NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- 
TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+                               <td><a href="acquire.pl?recieve=<!-- TMPL_VAR 
NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" 
-->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR 
NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- 
TMPL_VAR NAME="supplierid" -->&amp;datereceived=<!-- TMPL_VAR 
name="datereceived"-->&amp;catview=yes""><!-- TMPL_VAR NAME="title" --></a></td>
                                <td><!-- TMPL_VAR NAME="author" --></td>
                        </tr>
                <!-- /TMPL_LOOP -->