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

[Ryan Higgins]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Ryan Higgins <rych>     06/12/03 21:55:35

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

Log message:
        merging with rel_2_2

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

Patches:
Index: basket.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/basket.tmpl,v
retrieving revision 1.2.2.4.2.2
retrieving revision 1.2.2.4.2.3
diff -u -b -r1.2.2.4.2.2 -r1.2.2.4.2.3
--- basket.tmpl 19 Sep 2006 13:22:11 -0000      1.2.2.4.2.2
+++ basket.tmpl 3 Dec 2006 21:55:35 -0000       1.2.2.4.2.3
@@ -4,9 +4,9 @@
 
 <div id="main">
        <h1><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS 
-->Shopping Basket <b><!-- TMPL_VAR NAME="basketno" --> </b>for <a 
href="supplier.pl?id=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR 
NAME="name" --></a></h1><br />
-       
                <div class="data"><!-- TMPL_UNLESS name="closedate" -->
        <!-- TMPL_IF name="basketno" -->
+               
                        <table>
                        <caption>Basket Details</caption>
                        <tr><th>Managed By:</th><td><!-- TMPL_VAR 
NAME="authorisedbyname" --></td></tr>
@@ -27,6 +27,12 @@
                <tr><td><!-- TMPL_VAR name="address3" --></td></tr>
                <tr><td><!-- TMPL_VAR name="address4" --></td></tr>
                </table>
+               
+               <table>
+               <tr><th rowspan="4">For Branch:</th><td><!-- TMPL_VAR 
name="branchname" --></td></tr>
+          <tr><td><!-- TMPL_VAR name="branchaddress1" --></td></tr>
+          <tr><td><!-- TMPL_VAR name="branchaddress2" --></td></tr>
+          <tr><td><!-- TMPL_VAR name="branchaddress3" --></td></tr></table>
                </div>  
                
        <div class="data">
@@ -43,8 +49,10 @@
                                <th scope="col">Total</th>
                                <th scope="col"><a href="basket.pl?basket=<!-- 
TMPL_VAR name="basketno" 
-->&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">Fund</a></th>
                                        <!-- TMPL_IF name="active" -->
+                                               <!-- TMPL_UNLESS 
name="closedate" -->
                                        <th scope="col">Remove</th>
                                        <th scope="col">Edit</th>
+                                               <!-- /TMPL_UNLESS -->
                                        <!-- /TMPL_IF -->
                        </tr>
                        <!-- TMPL_LOOP NAME="books_loop" -->
@@ -75,6 +83,7 @@
                                        <td><!-- TMPL_VAR NAME="line_total" 
--></td>
                                        <td><!-- TMPL_VAR NAME="bookfundid" 
--></td>
                                        <!-- TMPL_IF name="active" -->
+                                               <!-- TMPL_UNLESS 
name="closedate" -->
                                        <td>
                                                        <form 
action="addorder.pl" method="get"><input type="hidden" name="ordnum" 
value="<!-- TMPL_VAR NAME="ordernumber" -->" /><input type="hidden" 
name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" /><input 
type="hidden" name="quantity" value="0" /><input type="hidden" name="biblio" 
value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" 
class="delete" value="Delete" /></form>
                                                </td>
@@ -82,12 +91,13 @@
                                                <form action="newbiblio.pl" 
method="get"><input type="hidden" name="sub" value="" /><input type="hidden" 
name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->" /><input 
type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" 
/><input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" 
-->" /><input type="hidden" name="ordnum" value="<!-- TMPL_VAR 
NAME="ordernumber" -->" /><!--TMPL_IF name="closedate"--><input type="hidden" 
name="close" value="1" /><!--/TMPL_IF --><input type="submit" class="submit" 
value="Edit" />
                                                        </form>
                                                </td>
+                                               <!-- /TMPL_UNLESS -->
                                                <!-- /TMPL_IF -->
                                </tr>
                        <!-- /TMPL_LOOP -->
                        
-                       <tr>
-                               <td colspan="2" rowspan="3">&nbsp;</td>
+<!-- TMPL_IF NAME="GST" -->                    <tr>
+                               <td colspan="2">&nbsp;</td>
                                <th>SubTotal</th>
                                <th><!-- TMPL_VAR NAME="sub_total_est" --></th>
                                <th>&nbsp;</th>
@@ -97,13 +107,16 @@
                                
                        </tr>
                        <tr>
+                               <td colspan="2">&nbsp;</td>
                                <th>GST</th>
                                <th><!-- TMPL_VAR NAME="gist_est" --></th>
                                <th>&nbsp;</th>
                                <th>&nbsp;</th>
                                <th><!-- TMPL_VAR NAME="gist" --></th>
                        </tr>
+<!-- /TMPL_IF -->
                        <tr>
+                               <td colspan="2">&nbsp;</td>
                                <th>TOTAL  (<!-- TMPL_VAR NAME="currency" 
-->)</th>
                                <th><!-- TMPL_VAR NAME="grand_total_est" 
--></th>
                                <th>&nbsp;</th>