koha-cvs
[Top][All Lists]
Advanced

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

[Koha-cvs] koha/koha-tmpl/intranet-tmpl/katipo/en/acqui ac... [dev_week]


From: Robert Lyon
Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/katipo/en/acqui ac... [dev_week]
Date: Tue, 25 Jul 2006 21:06:26 +0000

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Robert Lyon <bob_lyon>  06/07/25 21:06:26

Added files:
        koha-tmpl/intranet-tmpl/katipo/en/acqui: acqui-home.tmpl 
                                                 acquire.tmpl 
                                                 basket.tmpl 
                                                 bookfund.tmpl 
                                                 finishreceive.tmpl 
                                                 histsearch.tmpl 
                                                 newbasket2.tmpl 
                                                 newbiblio.tmpl 
                                                 order.tmpl recieve.tmpl 
                                                 recieveorder.tmpl 
                                                 spent.tmpl 
                                                 suggestion-select.tmpl 
                                                 supplier.tmpl 
                                                 vieworder.tmpl 

Log message:
        Adding in the full acquisition templates used in the katipo template set

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/katipo/en/acqui/acqui-home.tmpl?cvsroot=koha&only_with_tag=dev_week&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/katipo/en/acqui/acquire.tmpl?cvsroot=koha&only_with_tag=dev_week&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/katipo/en/acqui/basket.tmpl?cvsroot=koha&only_with_tag=dev_week&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/katipo/en/acqui/bookfund.tmpl?cvsroot=koha&only_with_tag=dev_week&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/katipo/en/acqui/finishreceive.tmpl?cvsroot=koha&only_with_tag=dev_week&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/katipo/en/acqui/histsearch.tmpl?cvsroot=koha&only_with_tag=dev_week&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/katipo/en/acqui/newbasket2.tmpl?cvsroot=koha&only_with_tag=dev_week&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/katipo/en/acqui/newbiblio.tmpl?cvsroot=koha&only_with_tag=dev_week&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/katipo/en/acqui/order.tmpl?cvsroot=koha&only_with_tag=dev_week&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/katipo/en/acqui/recieve.tmpl?cvsroot=koha&only_with_tag=dev_week&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/katipo/en/acqui/recieveorder.tmpl?cvsroot=koha&only_with_tag=dev_week&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/katipo/en/acqui/spent.tmpl?cvsroot=koha&only_with_tag=dev_week&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/katipo/en/acqui/suggestion-select.tmpl?cvsroot=koha&only_with_tag=dev_week&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/katipo/en/acqui/supplier.tmpl?cvsroot=koha&only_with_tag=dev_week&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/katipo/en/acqui/vieworder.tmpl?cvsroot=koha&only_with_tag=dev_week&rev=1.1.2.1

Patches:
Index: acqui-home.tmpl
===================================================================
RCS file: acqui-home.tmpl
diff -N acqui-home.tmpl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ acqui-home.tmpl     25 Jul 2006 21:06:26 -0000      1.1.2.1
@@ -0,0 +1,146 @@
+<!-- TMPL_INCLUDE NAME="header-start.inc" -->
+Acquisitions
+<!-- TMPL_INCLUDE NAME="header-end.inc" -->
+<!-- TMPL_INCLUDE NAME="topnav.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-start.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-end.inc" -->
+
+
+<div class="breadcrumb"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &gt; 
Acquisitions</div>
+<h1>Start, Receive or Modify an Order</h1>
+<br /><br />
+
+<form action="/cgi-bin/koha/acqui/order.pl" method="post">
+<table cellpadding="0" cellspacing="0" border="0" class="supplier-table">
+<tr><td colspan="3"><div><span class="step-num-large-on">&nbsp;</span> <span 
class="step-header">Pick a supplier</span></div></td></tr>
+<tr><td align="right" width="150"><h4>Supplier ID or Name </h4></td>
+    <td><input type="text" size="25" name="supplier" 
class="form-box-medium"></td>
+    <td><input type="submit" class="button" value="Go"></td></tr>
+<tr><td align="right"><h4>Or</h4></td>
+    <td colspan="2"><a class="button" href="histsearch.pl">Search order 
history</a></td></tr>
+</table>
+</form>
+<br />
+<br />
+<!--
+<h3>Receive or modify a subscription order</h3>
+<form action="/cgi-bin/koha/bull-home.pl" method="post">
+<input type="hidden" name="routing" value="" />
+<input type="hidden" name="searched" value="1" />
+<table cellpadding="0" cellspacing="0" border="0" class="supplier-table">
+<tr><td colspan="3"><div><span class="step-num-large-on">&nbsp;</span> <span 
class="step-header">Title Search</span></div></td></tr>
+<tr><td align="right" width="150"><h4>Title</h4></td>
+    <td><input type="text" size="25" name="title" class="form-box-medium"></td>
+    <td><input type="submit" class="button" value="Go"></td></tr>
+</table>
+</form>
+-->
+<h3>Receive or modify an Order<h3>
+<form action="/cgi-bin/koha/acqui/acquire.pl" method="post">
+<table cellpadding="0" cellspacing="0" border="0" class="supplier-table">
+<tr><td colspan="3"><div><span class="step-num-large-on">&nbsp;</span> <span 
class="step-header">Title Search</span></div></td></tr>
+<tr><td align="right" width="150"><h4>Title</h4></td>
+    <td><input type="text" size="25" name="recieve" 
class="form-box-medium"></td>
+    <td><input type="submit" class="button" value="Go"></td></tr>
+</table>
+</form>
+
+
+<form action="/cgi-bin/koha/acqui/newbiblio.pl" method="post">
+<table cellpadding="0" cellspacing="0" border="0" class="supplier-table">
+<tr><td colspan="3"><div><span class="step-num-large-on">&nbsp;</span> <span 
class="step-header">Order Search</span></div></td></tr>
+<tr><td align="right" width="150"><h4>Order</h4></td>
+    <td><input type="text" size="25" name="ordnum" 
class="form-box-medium"></td>
+    <td><input type="submit" class="button" value="Go"></td></tr>
+</table>
+</form>
+
+
+<form action="/cgi-bin/koha/acqui/basket.pl" method="post">
+<table cellpadding="0" cellspacing="0" border="0" class="supplier-table">
+<tr><td colspan="3"><div><span class="step-num-large-on">&nbsp;</span> <span 
class="step-header">Basket/Invoice No. Search</span></div></td></tr>
+<tr><td align="right" width="150"><h4>Basket</h4></td>
+    <td><input type="text" size="25" name="basket" 
class="form-box-medium"></td>
+    <td><input type="submit" class="button" value="Go"></td></tr>
+</table>
+</form>
+<br />
+<br />
+
+
+<!-- TMPL_IF NAME="suggestion" -->
+<h3>Renewals to check</h3>
+<p>There are <!-- TMPL_VAR NAME="suggestion" --> renewals waiting <a 
href="/cgi-bin/koha/suggestion/acceptorreject.pl" class="button 
acquisition">Manage</a></p>
+<!-- /TMPL_IF -->
+
+<h3>Budgets &amp; Bookfunds</h3>
+<form action="/cgi-bin/koha/search.pl" method="post">
+<table cellspacing="0" cellpadding="0" border="0" id="budgetbookfund" 
class="collapse">
+<tr valign="top">
+    <td class="cell-header">Budgets</td>
+    <td class="cell-header">Total</td>
+    <td class="cell-header">Spent</td>
+    <td class="cell-header">Comtd</td>
+    <td class="cell-header">Avail</td></tr>
+
+<!--TMPL_LOOP NAME="loop_budget"-->
+       <!--TMPL_IF name="toggle"-->
+               <tr valign="top" class="hilighted">
+       <!--TMPL_ELSE-->
+               <tr valign="top" class="hilighted2">
+       <!--/TMPL_IF-->
+    <td class="cell"><!--TMPL_VAR NAME="bookfundname"--></td>
+    <td class="cell" align="right"><a 
href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&aqbudgetid=<!--TMPL_VAR 
NAME="aqbudgetid"-->"><!--TMPL_VAR NAME="budgetamount"--></a></td>
+    <td class="cell" align="right"><!-- <a
+href="/cgi-bin/koha/spent.pl?bookfund=<!--TMPL_VAR
+NAME="bookfundid"-->&start=<!--TMPL_VAR NAME="sdate"-->&end=<!--TMPL_VAR
+NAME="edate"-->">--><!--TMPL_VAR NAME="spent"--><!--</a>--></td>
+    <td class="cell" align="right"><!-- <a
+href="/cgi-bin/koha/bookfund.pl?bookfund=<!--TMPL_VAR
+NAME="bookfundid"-->&start=<!--TMPL_VAR NAME="sdate"-->&end=<!--TMPL_VAR
+NAME="edate"-->">--><!--TMPL_VAR NAME="comtd"--><!--</a>--></td>
+    <td class="cell" align="right"><!--TMPL_VAR NAME="avail"--></td></tr>
+<!--/TMPL_LOOP-->
+
+<tr valign="top">
+    <td class="cell-header">Total</td>
+    <td class="cell-header" align="right"><!--<TMPL_VAR NAME="total">--></td>
+    <td class="cell-header" align="right"><!--<TMPL_VAR 
NAME="totspent">--></td>
+    <td class="cell-header" align="right"><!--<TMPL_VAR 
NAME="totcomtd">--></td>
+    <td class="cell-header" align="right"><!--<TMPL_VAR 
NAME="totavail">--></td></tr>
+</table>
+</form>
+
+<!-- currencies-->
+
+<!--TMPL_IF NAME="loop_currency"-->
+<h3>Exchange Rates</h3>
+<form action="/cgi-bin/koha/currency.pl" method="post">
+<table cellspacing="0" cellpadding="0" border="0">
+<tr valign="top">
+    <td>
+       <input type="hidden" name="type" value="change">
+       <table cellspacing="0" cellpadding="0" border="0" class="collapse">
+       <!--TMPL_LOOP NAME="loop_currency"-->
+       <tr valign="top">
+           <td class="cell"><!--TMPL_VAR NAME="currency"-->&nbsp;</td>
+           <td class="cell"><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" class="cell"><input type="submit" 
value="Save" class="button"></td></tr>
+       </table></td>
+    <td class="tip-area"><span class="tip-big">tip</span> <span 
class="tip">Use your reload button [ctrl + r] to get the most recent figures. 
Committed figures are approximate only, as exchange rates will affect the 
amount actually paid.</span></td></tr>
+</table>
+</form>
+<!--/TMPL_IF-->
+
+<h3>Help</h3>
+<p><b>Ordering:</b> To start an acquisition, whether an order, local purchase 
or donation first search on the supplier, you will be asked to check their 
details, and enter your name which  will set up a "shopping basket" for you. 
(Why is this you might ask... well because we want to know that it's really you 
ordering things - not just your computer).<br />
+<br />
+To order an item you need to establish whether a biblio already exists for it, 
and either add an item, or set up a new biblio then add the item.<br />
+<br />
+To start a new shopping basket with a new supplier return to this page and 
just start a new supplier search.<br />
+<br />
+To close off a shopping basket click on "view shopping baskets" or search 
above, and the click on "confirm basket".</p>
+
+<TMPL_INCLUDE NAME="acquisitions-bottom.inc">

Index: acquire.tmpl
===================================================================
RCS file: acquire.tmpl
diff -N acquire.tmpl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ acquire.tmpl        25 Jul 2006 21:06:26 -0000      1.1.2.1
@@ -0,0 +1,284 @@
+<!-- TMPL_INCLUDE NAME="header-start.inc" -->
+Acquisitions
+<!-- TMPL_INCLUDE NAME="header-end.inc" -->
+<!-- TMPL_INCLUDE NAME="topnav.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-start.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-end.inc" -->
+
+<script language="JavaScript" type="text/javascript">
+
+//display tidys up a number for display: hopefully leaving 2 decimal points
+
+function display(numb){
+  if (parseInt(numb)){
+    if (numb== Math.round(numb)){
+      return ( numb + ".00");
+    }
+    else {
+      numb=(numb + "0");
+      return (numb.substring(0,(numb.indexOf(".")+3)));
+    }
+  }
+  else{
+    return "0.00";
+  }
+}
+
+// update accounting details -- the main function
+
+function update(f){
+  var qtyrec=parseInt(f.quantityrec.value);
+  var rrp=parseFloat(f.rrp.value);
+  var ecost=parseFloat(f.ecost.value);
+  var total=parseFloat(f.cost.value);
+  var gst=parseFloat(f.gst.value);
+  var invoiceinc=0  // parseInt(f.invoiceinc.value);
+  var freight=parseFloat(f.freight.value);
+  var freightperitem=parseFloat(f.freightperitem.value);
+
+  freightperitem=freight/qtyrec;
+
+  // if total needs to exclude GST
+  if(!invoiceinc) {
+     total=total-gst;
+  }
+
+  // to get total cost
+     total=ecost*qtyrec;
+
+  // Returning numbers to form
+  f.freightperitem.value = display(freightperitem);
+  f.rrp.value = display(rrp);
+  f.cost.value = display(total);
+}
+    
+
+
+function update_rrp(f) {
+  // To adjust the rrp if needed
+  var rrp=parseFloat(f.rrp.value);
+  var total=parseFloat(f.cost.value);
+ 
+  rrp = total;
+
+  f.rrp.value = display(rrp);
+}
+    
+function check(f) {
+  var alert_str="";
+  var quantity=f.quantityrec.value;
+  var barcode=f.barcode.value;
+  var total=f.cost.value;
+  if (barcode == "") {
+       alert_str+="Barcode can't be empty\n";
+  }
+  if (quantity ==0 || quantity == "") {
+       alert_str+="Received Quantity must be >0\n";
+  }
+
+  if (total <= 0 || total == "") {
+       alert_str+="Actual Cost must be >0\n";
+  }
+
+  if (alert_str.length==0) {
+  document.frusin.submit();
+  return true;
+  } else {
+  alert(alert_str);
+  return false;    
+  }
+
+}
+    
+
+function update2(f){                                                           
                   
+  //collect values                                                             
                   
+  nocalc=parseInt(f.nocalc.value);                                             
                   
+  if (nocalc){                                                                 
                   
+  } else {                                                                     
                   
+  listprice=f.cost.value;                                                      
                   
+  invoicedisc=parseInt(f.invoicedisc.value);                                   
                   
+  discount=f.discount.value;                                                   
                   
+  invoiceinc=parseInt(f.invoiceinc.value);                                     
                   
+  applygst=parseInt(f.applygst.value);                                         
                   
+  freight=f.freightperitem.value/1;                                            
                   
+  exchangerate=f.currency.value;                                               
                   
+  quantity=f.quantityrec.value;                                                
                   
+  actual=listprice/exchangerate;                                               
                   
+//  actual=actual/quantity;                                                    
                   
+  listprice=actual;                                                            
                   
+  if (!invoicedisc){                                                           
                   
+    actual=actual*((100-discount)/100);                                        
                   
+  }                                                                            
                   
+  if (applygst && invoiceinc){                                                 
                   
+    actual=actual/1.125;                                                       
                   
+  }                                                                            
                   
+  actual=actual+freight;   
+                                                                       
+ f.cost.value=display(actual);                                                 
                  
+//  f.cost.value=actual;
+  rrp=listprice/((100-discount)/100);                                          
                   
+  if (applygst && !invoiceinc){                                                
                   
+    rrp=rrp*1.125;                                                             
                   
+  } else {                                                                     
                   
+                                                                               
                   
+  }                                                                            
                   
+  rrp=(rrp) + freight;                                                         
                   
+  f.rrp.value=display(rrp);                                                    
                   
+  }                                                                            
                   
+}
+    
+</script>
+
+
+<div class="breadcrumb"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &gt; <a 
href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &gt; <a 
href="/cgi-bin/koha/acqui/order.pl">Suppliers</a> &gt; <a 
href="/cgi-bin/koha/acqui/recieveorder.pl?supplierid=<TMPL_VAR 
NAME="booksellerid">">Receive Order</a> &gt; <a 
href="/cgi-bin/koha/acqui/receive.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" 
-->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR 
NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="totalfreight" -->">Order 
Details</a> &gt; Receipt Summary</div>
+
+<br /><br />
+
+<div><span class="step-num-large-on">&nbsp;</span> <span 
class="step-header">Complete details</span></div>
+
+<br /><br />
+
+<!-- TMPL_IF name="count" -->
+<form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post" 
name="frusin" onsubmit="return check(frusin)">
+<h3>Receive Order for Order Number <!-- TMPL_VAR NAME="ordernumber" --></h3>
+Shopping Basket: <a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR 
NAME="basketno" -->">
+<!-- TMPL_VAR NAME="basketno" --></a> For: <!-- TMPL_VAR NAME="name" --> | 
Order placed: <!-- TMPL_VAR NAME="date" -->
+
+<br /><br />
+
+<h3>Catalogue Details</h3>
+       <table cellpadding="0" cellspacing="5" border="0" width="400">
+       <tr valign="top">
+           <td width="50%"><label class="label100">Title </label></td>
+           <td width="50%"><input type="text" size="20" name="title" 
value="<!-- TMPL_VAR NAME="title" -->" 
class="form-box-medium-required"></td></tr>
+       <tr valign="top">
+           <td><label class="label100">Author</label></td>
+           <td><input type="text" size="20" name="author" value="<!-- TMPL_VAR 
NAME="author" -->" class="form-box-medium"></td></tr>
+       <tr valign="top">
+           <td><label class="label100">Copyright Date</label></td>
+           <td><input type="text" size="20" name="copyrightdate" value="<!-- 
TMPL_VAR NAME="copyrightdate" -->" class="form-box-medium"></td></tr>
+       <tr valign="top">
+           <td><label class="label100">Format</label></td>
+           <td class="select-box-required"><!-- TMPL_VAR NAME="CGIitemtype" 
--></td></tr>
+       <tr valign="top">
+           <td><label class="label100">ISBN</label></td>
+           <td><input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR 
NAME="isbn" -->" class="form-box-medium"></td></tr>
+       <tr valign="top">
+           <td><label class="label100">Series</label></td>
+           <td><input type="text" size="20" name="series" value="<!-- TMPL_VAR 
NAME="seriestitle" -->" class="form-box-medium"></td></tr>
+       <tr valign="top">
+           <td><label class="label100">Branch</label></td>
+           <td class="select-box"><!-- TMPL_VAR NAME="CGIbranch" --></td></tr>
+       <tr valign="top">
+           <td><label class="label100">Volume Info</label></td>
+           <td><input type="text" size="20" name="volinf" value="<!-- TMPL_VAR 
NAME="volinf" -->" class="form-box-medium"></td></tr>
+       <tr valign="top">
+           <td><label class="label100">Item Barcode *</label></td>
+           <td>
+
+       <!-- TMPL_IF name="catview" -->
+           <!-- TMPL_IF NAME="set_barcode" -->
+               <input type="hidden" name="barcode" value="<!-- TMPL_VAR 
name="set_barcode" -->"><!-- TMPL_VAR name="set_barcode" -->
+           <!-- TMPL_ELSE -->
+               <input type="text" size="20" name="barcode" value="<!-- 
TMPL_VAR name="barcode" -->" class="form-box-medium-required">      
+           <!-- /TMPL_IF -->
+       <!-- TMPL_ELSE -->
+               <input type="text" size="20" name="barcode" value="<!-- 
TMPL_VAR name="barcode" -->" class="form-box-medium-required">
+       <!-- /TMPL_IF --></td></tr>
+       </table>
+<h3>Accounting Details</h3>
+       <table cellpadding="0" cellspacing="5" border="0" width="400">
+       <tr valign="top">
+           <td width="50%"><label class="label100">Bookfund</label></td>
+           <td width="50%" class="select-box"><!-- TMPL_VAR NAME="CGIbookfund" 
--></td></tr>
+       <tr valign="top">
+           <td><label class="label100">Quantity Ordered</label></td>
+           <td><input type="hidden" name="quantity" value="<!-- TMPL_VAR 
NAME="quantity" -->"><!-- TMPL_VAR NAME="quantity" --></td></tr>
+       <tr valign="top">
+           <td><label class="label100">Quantity Received *</label></td>
+           <td><input type="text" size="20" name="quantityrec" value="<!-- 
TMPL_VAR NAME="quantityreceived" -->" class="form-box-medium-required" 
onkeyup="return update2(this.form)"></td></tr>
+       <tr valign="top">
+           <td><label class="label100">Actual Cost *</label></td>
+           <td><input type="text" size="20" name="cost" value="<!-- TMPL_IF 
name="unitprice"--><!-- TMPL_VAR NAME="unitprice" --><!-- TMPL_ELSE --><!-- 
TMPL_VAR name="rrp" --><!-- /TMPL_IF -->" class="form-box-medium-required" 
onchange='update2(this.form)'></td></tr>
+       <tr valign="top">
+           <td><label class="label100">Replacement Cost</label></td>
+           <td><input type="text" size="20" name="rrp" value="<!-- TMPL_VAR 
NAME="rrp" -->" class="form-box-medium"></td></tr>
+       <tr valign="top">
+           <td><label class="label100">Budgeted Cost </label></td>
+           <td><input type="text" size="20" name="ecost" value="<!-- TMPL_VAR 
NAME="ecost" -->" class="form-box-medium"></td></tr>
+       <tr valign="top">
+           <td><label class="label100">Invoice Number</label></td>
+           <td><input type="text" size="20" name="invoice"  value="<!-- 
TMPL_VAR NAME="invoice" -->" class="form-box-medium"></td></tr>
+<tr valign="top">
+<td><label class="label100">Freight per Item</label></td>
+<td><TMPL_VAR NAME="freightperitem">
+<input type=hidden name=freightperitem value="<TMPL_VAR 
NAME="freightperitem">">
+</td></tr>
+       <tr valign="top">
+           <td><label class="label100">Notes</label></td>
+           <td><input type="text" size="20" name="notes" value="<!-- TMPL_VAR 
NAME="notes" -->" class="form-box-medium"> <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="supplierid" value="<!-- TMPL_VAR NAME="supplierid" 
-->">
+<input type="hidden" name="freight" value="<!-- TMPL_VAR NAME="freight" -->">
+<input type="hidden" name="gst" value="<!-- TMPL_VAR NAME="gst" -->">
+<input type="hidden" name="items" value="<!-- TMPL_VAR NAME="noitems" -->">
+<input type=hidden name="nocalc" value="<!-- TMPL_VAR NAME="nocalc"-->"> 
+<input type=hidden name=invoicedisc value="<!-- TMPL_VAR 
NAME="invoicedisc"-->">
+<input type=hidden name=applygst value="<!--TMPL_VAR NAME="applygst"-->"> 
+<input type=hidden name=invoiceinc value="<!--TMPL_VAR NAME="invoiceinc"-->">
+<input type=hidden name=discount value="<!--TMPL_VAR NAME="discount"-->">
+<input type=hidden name="currency" value="<!--TMPL_VAR NAME="currency"-->">
+<input type=hidden name="catview" value="<!--TMPL_VAR NAME="catview"-->">
+</td></tr>
+       <tr valign="top">
+           <td></td>
+           <td><b>NOTE:</b> All costs are per item <br /><br />
+       <!-- TMPL_IF name="catview" -->
+       <input type="submit" class="button" value="save">
+       <!-- TMPL_ELSE -->
+               <!-- TMPL_IF name="barcode" -->
+               <a class="button" 
href="/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" 
-->&amp;booksellerid=<!-- TMPL_VAR NAME="supplierid" -->">Edit</a>
+               <!-- TMPL_ELSE -->
+               <input type="submit" class="button" value="save">
+               <!-- /TMPL_IF -->
+       <!-- /TMPL_IF --></td></tr>
+       </table>
+</form>
+
+<!-- TMPL_ELSE -->
+
+<table cellpadding="0" cellspacing="0" border="0" class="grey-box">
+<tr valign="top">
+    <td colspan="6"><h3>Receipt Summary for: <!-- TMPL_VAR NAME="name" -->, 
Invoice <!-- TMPL_VAR NAME="invoice" --></h3></td></tr>
+<tr valign="top">
+    <td class="grey-box-header">Basket</td>
+    <td class="grey-box-header">ISBN</td>
+    <td class="grey-box-header">Title</td>
+    <td class="grey-box-header">Author</td>
+    <td class="grey-box-header">Qty</td>
+    <td class="grey-box-header-right">Received</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"
+-->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!--
+TMPL_VAR NAME="invoice" -->&amp;freight=<!-- TMPL_VAR NAME="freight"
+-->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;supplierid=<!-- TMPL_VAR
+NAME="supplierid" -->&items=<!--TMPL_VAR NAME="noitems"-->"><!-- TMPL_VAR 
NAME="title" --></a>
+<!-- TMPL_IF NAME="vol" -->
+ : <!-- TMPL_VAR NAME="vol" -->
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="volinf" -->
+ : <!-- TMPL_VAR NAME="volinf" -->
+<!-- /TMPL_IF --></td>
+    <td><!-- TMPL_VAR NAME="author" --></td>
+    <td class="grey-box-vline" align="right"><!-- TMPL_VAR NAME="quantity" 
--></td>
+    <td align="right"><!-- TMPL_VAR NAME="quantityrecieved" --></td></tr>
+<!-- /TMPL_LOOP -->
+</table>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: basket.tmpl
===================================================================
RCS file: basket.tmpl
diff -N basket.tmpl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ basket.tmpl 25 Jul 2006 21:06:26 -0000      1.1.2.1
@@ -0,0 +1,132 @@
+<!-- TMPL_INCLUDE NAME="header-start.inc" -->
+Acquisitions
+<!-- TMPL_INCLUDE NAME="header-end.inc" -->
+<!-- TMPL_INCLUDE NAME="topnav.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-start.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-end.inc" -->
+
+<div class="breadcrumb"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &gt; <a 
href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &gt; <a 
href="/cgi-bin/koha/acqui/order.pl">Suppliers</a> &gt; <!--TMPL_IF 
NAME="basketno"-->
+<a href="/cgi-bin/koha/acqui/basket.pl?basket=<TMPL_VAR 
NAME="basketno">">Shopping Basket</a>
+<!--TMPL_ELSE-->
+New Shopping Basket
+<!--/TMPL_IF--></div>
+
+<br /><br />
+
+
+
+
+<TMPL_IF NAME="active">
+       <TMPL_UNLESS NAME="closedate">
+
+
+<form action="/cgi-bin/koha/acqui/newbasket2.pl" method="post">
+<input type="hidden" name="booksellerid" value="<TMPL_VAR 
NAME="booksellerid">">
+<input type="hidden" name="basketno" value="<TMPL_VAR NAME="basketno">">
+
+<table cellpadding="0" cellspacing="0" border="0" class="supplier-table">
+<tr><td colspan="3"><div><span class="step-num-large-on">&nbsp;</span> <span 
class="step-header">Title Search</span></div></td></tr>
+<tr valign="top">
+    <td><h4>Enter Title (or first part of title):</h4></td>
+    <td><input type="text" size="25" name="search" 
class="form-box-medium"></td>
+    <td><input type="submit" class="button" value="Search"></td></tr>
+<tr><td colspan="3" align="right"><!-- or <a 
href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<TMPL_VAR 
NAME="booksellerid">&amp;basketno=<TMPL_VAR NAME="basketno">" 
class="button">From a suggestion</a> &nbsp; &nbsp; &nbsp; <a 
href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<TMPL_VAR 
NAME="booksellerid">&amp;basketno=<TMPL_VAR NAME="basketno">" 
class="button">New biblio</a> --></td></tr>
+</table>
+</form>
+
+       </TMPL_UNLESS>
+</TMPL_IF>
+
+<br />
+
+<TMPL_UNLESS NAME="closedate">
+
+<table border="0" cellpadding="0" cellspacing="0" class="grey-box">
+<tr><td colspan="10"><h3><TMPL_UNLESS NAME="basketno">New 
</TMPL_UNLESS>Shopping Basket <TMPL_VAR NAME="basketno"> for <a 
href="supplier.pl?supplierid=<TMPL_VAR NAME="booksellerid">"><TMPL_VAR 
NAME="name"></a></h3>
+Invoice No: <TMPL_VAR NAME="booksellerinvoicenumber"> | Authorised by: 
<TMPL_VAR NAME="authorisedbyname"> | Opened: <TMPL_VAR NAME="creationdate">
+       <TMPL_IF NAME="closedate">
+       | Closed: <TMPL_VAR NAME="closedate">
+       <TMPL_ELSE>
+       | <a href="/cgi-bin/koha/acqui/order.pl?op=close&amp;basket=<TMPL_VAR 
NAME="basketno">&amp;supplier=<TMPL_VAR NAME="booksellerid">">Close</a>
+       </TMPL_IF>
+    <br />&nbsp;
+    </td></tr>
+<TMPL_ELSE>
+
+<table border="0" cellpadding="0" cellspacing="0" class="grey-box">
+<tr><td colspan="10"><h3>Shopping Basket <TMPL_VAR NAME="basketno"> for 
<TMPL_VAR NAME="name"><br /></h3>
+Invoice No: <TMPL_VAR NAME="booksellerinvoicenumber"> | Authorised by: 
<TMPL_VAR NAME="authorisedbyname"> | Opened: <TMPL_VAR NAME="creationdate"> | 
Closed: <TMPL_VAR NAME="closedate">
+    <br />&nbsp;
+    </td></tr>
+</TMPL_UNLESS>
+
+<TMPL_IF NAME="books_loop">
+<tr valign="top">
+       <TMPL_IF NAME="active">
+               <TMPL_UNLESS NAME="closedate">
+               <td class="grey-box-header">Action</td>
+               <TMPL_ELSE>
+               <td class="grey-box-header">&nbsp;</td>
+               </TMPL_UNLESS>
+       <TMPL_ELSE>
+       <td class="grey-box-header">&nbsp;</td>
+       </TMPL_IF>
+
+
+    <td class="grey-box-header">Order</td>
+    <td class="grey-box-header">Fund <a href="basket.pl?basket=<TMPL_VAR 
NAME="basketno">&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">Sort</a></td>
+    <td class="grey-box-header">Isbn</td>
+    <td class="grey-box-header">Title</td>
+    <td class="grey-box-header">Author</td>
+    <td class="grey-box-header">rrp</td>
+    <td class="grey-box-header">est</td>
+    <td class="grey-box-header">Qty</td>
+    <td class="grey-box-header-right">Total</td>
+</tr>
+
+       <TMPL_LOOP NAME="books_loop">
+<tr valign="top" bgcolor="<TMPL_VAR NAME="color">">
+
+       <TMPL_IF NAME="active">
+               <TMPL_UNLESS NAME="closedate">
+    <td><a href="newbiblio.pl?ordnum=<TMPL_VAR 
NAME="ordernumber">&amp;booksellerid=<TMPL_VAR 
NAME="booksellerid">&amp;basketno=<TMPL_VAR NAME="basketno">">Edit</a> | <a 
href="addorder.pl?ordnum=<TMPL_VAR NAME="ordernumber">&amp;basketno=<TMPL_VAR 
NAME="basketno">&amp;quantity=0&amp;biblio=<TMPL_VAR 
NAME="biblionumber">">Remove</a></td>
+               <TMPL_ELSE>
+               <td>&nbsp;</td>
+               </TMPL_UNLESS>
+       <TMPL_ELSE>
+       <td>&nbsp;</td>
+       </TMPL_IF>
+
+    <td><TMPL_VAR NAME="ordernumber"></td>
+    <td><TMPL_VAR NAME="bookfundid"></td>
+    <td><TMPL_VAR NAME="isbn"></td>
+    <td><TMPL_VAR NAME="title"></td>
+    <td><TMPL_VAR NAME="author"></td>
+    <td><TMPL_VAR NAME="rrp"></td>
+    <td><TMPL_VAR NAME="ecost"></td>
+    <td class="grey-box-vline"><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="basketno">">
+
+<tr><td colspan="5" rowspan="3">&nbsp;</td>
+    <td class="grey-box-vline" colspan="4" align="right"><b>Sub Total</b></td>
+    <td><TMPL_VAR NAME="currency"> <TMPL_VAR NAME="sub_total"></td></tr>
+<tr><td class="grey-box-vline" colspan="4" align="right"><b>GST</b></td>
+    <td><TMPL_VAR NAME="currency"> <TMPL_VAR NAME="gist"></td></tr>
+<tr><td class="grey-box-vline" colspan="4" align="right"><b>TOTAL</b></td>
+    <td><TMPL_VAR NAME="currency"> <TMPL_VAR NAME="grand_total"></td></tr>
+
+
+<TMPL_ELSE>
+<tr><td colspan="10">Basket empty</td></tr>
+</TMPL_IF>
+
+</table>
+
+
+<TMPL_INCLUDE NAME="acquisitions-bottom.inc">

Index: bookfund.tmpl
===================================================================
RCS file: bookfund.tmpl
diff -N bookfund.tmpl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ bookfund.tmpl       25 Jul 2006 21:06:26 -0000      1.1.2.1
@@ -0,0 +1,99 @@
+<!-- TMPL_INCLUDE NAME="header-start.inc" -->
+Acquisitions
+<!-- TMPL_INCLUDE NAME="header-end.inc" -->
+<!-- TMPL_INCLUDE NAME="topnav.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-start.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-end.inc" -->
+
+<div class="breadcrumb"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &gt; 
Acquisitions</div>
+<h1>Budgets &amp; Bookfunds</h1>
+<h2>Committed</h2>
+<br /><br />
+
+
+<table cellspacing="0" cellpadding="0" border="0" id="spent" class="collapse">
+<tr valign="top">
+   <td class="cell-header">
+               Title
+       </td>
+       <td class="cell-header">
+               Order
+       </td>
+       <td class="cell-header">
+               Itemtype
+       </td>
+       <td class="cell-header">
+               Left on Order
+       </td>
+       <td class="cell-header">
+               Estimated cost per unit
+       </td>
+       <td class="cell-header">
+               Budget Date
+       </td>
+       <td class="cell-header">
+               Subtotal
+       </td>
+</tr>
+
+<!--TMPL_LOOP NAME="commitedloop"-->
+       <!--TMPL_IF name="toggle"-->
+               <tr valign="top" class="hilighted">
+       <!--TMPL_ELSE-->
+               <tr valign="top" class="hilighted2">
+       <!--/TMPL_IF-->
+       <tr valign="top">
+               <td class="cell">
+                       <!--TMPL_VAR NAME="title"-->    
+               </td>
+               <td class="cell">
+                               <a 
href=/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!--TMPL_VAR 
NAME="ordnum"-->&id=<!--TMPL_VAR NAME="booksellerid"-->&basket=<!--TMPL_VAR 
NAME="basketno"-->><!--TMPL_VAR NAME="ordnum"--></a>
+               </td>
+               <td class="cell">
+                       <!--TMPL_VAR NAME="itemtype"--> 
+               </td>
+               <td class="cell">
+                       <!--TMPL_VAR NAME="left"-->     
+               </td>
+               <td class="cell">
+                       <!--TMPL_VAR NAME="ecost"-->    
+               </td>
+               <td class="cell">
+                       <!--TMPL_VAR NAME="budgetdate"-->       
+               </td>
+               <td class="cell">
+                       <!--TMPL_VAR NAME="subtotal"-->         
+               </td>
+</tr>
+<!--/TMPL_LOOP-->
+
+<tr valign="top">
+   <td class="cell-header">
+               Total
+       </td>
+       <td class="cell-header">
+               
+       </td>
+       <td class="cell-header">
+               
+       </td>
+       <td class="cell-header">
+               
+       </td>
+       <td class="cell-header">
+               
+       </td>
+       <td class="cell-header">
+               
+       </td>
+       <td class="cell-header">
+               <!--TMPL_VAR NAME="total"-->
+       </td>
+</tr>
+
+</table>
+
+
+
+<TMPL_INCLUDE NAME="acquisitions-bottom.inc">

Index: finishreceive.tmpl
===================================================================
RCS file: finishreceive.tmpl
diff -N finishreceive.tmpl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ finishreceive.tmpl  25 Jul 2006 21:06:26 -0000      1.1.2.1
@@ -0,0 +1,49 @@
+<!-- TMPL_INCLUDE NAME="header-start.inc" -->
+Acquisitions
+<!-- TMPL_INCLUDE NAME="header-end.inc" -->
+<!-- TMPL_INCLUDE NAME="topnav.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-start.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-end.inc" -->
+
+<TMPL_IF NAME="error_making_item">
+
+<div class="needsconfirm">
+                       <p><span class="error"><h3>
+                        An error occured making the new item
+                        </h3></span></p>
+The barcode: '<TMPL_VAR Name="barcode">' is incorrect or already exists.
+<br><br>
+Click the 'Back' button in your browser, and enter a new barcode in the 
previous screen.
+<br><br>
+
+</div>
+
+<TMPL_ELSE>
+
+<div class="needsconfirm">
+                       <p><span class="error"><h3>There is a reserve on this 
item.</h3></span>
+                       </p>
+
+Reserved for: <b><TMPL_VAR Name="firstname">
+                 <TMPL_VAR Name="surname">
+                 </b>, Card Number: <b>
+                 <a href=/cgi-bin/koha/members/moremember.pl?bornum=
+                                                                    <TMPL_VAR 
Name="borrowernumber">>
+                                                                    <TMPL_VAR 
Name="cardnumber">
+                 </a></b><p>
+<br>
+<a href=/cgi-bin/koha/acqui/receive.pl?invoice=
+                                               <TMPL_VAR Name="invoice">&
+                                               id=<TMPL_VAR Name="id">&
+                                               freight=<TMPL_VAR 
Name="freight">&
+                                               gst=<TMPL_VAR Name="gst">&
+                                               items=<TMPL_VAR Name="items">
+                                               class="button">
+                                               Continue
+</a>
+</div>
+
+</TMPL_IF>
+
+<TMPL_INCLUDE name="acquisitions-bottom.inc">

Index: histsearch.tmpl
===================================================================
RCS file: histsearch.tmpl
diff -N histsearch.tmpl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ histsearch.tmpl     25 Jul 2006 21:06:26 -0000      1.1.2.1
@@ -0,0 +1,47 @@
+<!-- TMPL_INCLUDE NAME="header-start.inc" -->
+Acquisitions
+<!-- TMPL_INCLUDE NAME="header-end.inc" -->
+<!-- TMPL_INCLUDE NAME="topnav.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-start.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-end.inc" -->
+
+<div class="breadcrumb"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &gt; <a 
href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &gt; Supplier History 
Search</div>
+
+<h1>Order search</h1>
+
+<form method="post" action="">
+
+<p><b>Filter on:</b> Title: <input type="text" name="title" value="<TMPL_VAR 
NAME="title">">  Author: <input type="text" name="author" value="<TMPL_VAR 
NAME="author">"> Supplier: <input type="text" name="name" value="<TMPL_VAR 
NAME="name">"> <input type="submit" class="button" value="Set Filter">
+<br />
+<table border="0" cellspacing="0" cellpadding="0" class="collapse">
+<tr valign="top">
+    <th class="cell-header">Order No:</th>
+    <th class="cell-header">Title</th>
+    <th class="cell-header">Author</th>
+    <th class="cell-header">Supplier</th>
+    <th class="cell-header">Placed on</th>
+    <th class="cell-header">Received on</th>
+    <th class="cell-header">Quantity ordered</th>
+    <th class="cell-header">Unit cost</th></tr>
+
+<TMPL_LOOP NAME="suggestions_loop">
+<tr valign="top">
+    <td class="cell"><a href="newbiblio.pl?ordnum=<TMPL_VAR 
NAME="ordernumber">"><TMPL_VAR NAME="ordernumber"></a></td> 
+    <td class="cell"><a href="basket.pl?basket=<TMPL_VAR 
NAME="basketno">"><TMPL_VAR NAME="title"></a></td>
+    <td class="cell"><TMPL_VAR NAME="author"> &nbsp;</td>
+    <td class="cell"><TMPL_VAR NAME="name"></td>
+    <td class="cell"><TMPL_VAR name="creationdate"></td>
+    <td class="cell"><TMPL_VAR name="datereceived"> &nbsp;</td>
+    <td class="cell"><TMPL_VAR name="quantity"></td>
+    <td class="cell"><TMPL_VAR name="ecost"></td>
+       <!--
+       FIELD NOT SHOWING 
+       <td class="cell"><TMPL_VAR name="removed"></td>
+       -->
+</tr>
+</TMPL_LOOP>
+</table>
+</form>
+
+<TMPL_INCLUDE name="acquisitions-bottom-order.inc">

Index: newbasket2.tmpl
===================================================================
RCS file: newbasket2.tmpl
diff -N newbasket2.tmpl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ newbasket2.tmpl     25 Jul 2006 21:06:26 -0000      1.1.2.1
@@ -0,0 +1,102 @@
+<!-- TMPL_INCLUDE NAME="header-start.inc" -->
+Acquisitions
+<!-- TMPL_INCLUDE NAME="header-end.inc" -->
+<!-- TMPL_INCLUDE NAME="topnav.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-start.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-end.inc" -->
+
+<div class="breadcrumb"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &gt; <a 
href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &gt; Shopping 
Basket</div>
+
+<h1 class="acquisition">Shopping basket <TMPL_VAR NAME="basketno"> for: 
<TMPL_VAR NAME="bookselname"></h1>
+<p><a href="basket.pl?basket=<TMPL_VAR NAME="basketno">">View Basket</a></p>
+
+
+<TMPL_IF NAME="invalidsearch">
+<p><span style="color:red;font-weight:bold">You must enter something to search 
on</span>
+<TMPL_ELSE>
+<p>You searched on: <b>
+    <TMPL_LOOP NAME="loopsearch">
+        <!-- <TMPL_VAR NAME="key"> --> <TMPL_VAR NAME="value">
+    </TMPL_LOOP>
+    <TMPL_IF NAME="loopresult">
+    <TMPL_ELSE>, No matching record found</TMPL_IF>
+</TMPL_IF>
+</b>
+</p>
+
+<TMPL_IF NAME="loopresult">
+<p>Results <b><TMPL_VAR NAME="dispnum"></b> to <b><TMPL_VAR 
NAME="offset2"></b> of <TMPL_VAR NAME="count">.</p>
+
+<h3>Existing Bibliographic Records</h3>
+
+<table cellpadding="0" cellspacing="0" border="0" class="collapse">
+<tr valign="top">
+    <th class="cell-header">Title</th>
+    <th class="cell-header">Author</th>
+    <th class="cell-header">&copy;</th>
+    <th class="cell-header">Count</th>
+    <th class="cell-header">Location</th>
+    <th class="cell-header">Action</th></tr>
+
+<TMPL_LOOP NAME="loopresult">
+<TMPL_IF NAME="toggle">
+<tr class="hilighted">
+<TMPL_ELSE>
+<tr class="hilighted2">
+</TMPL_IF>
+
+    <td class="cell"><a target="new" href="/cgi-bin/koha/detail.pl?bib=<!-- 
TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>&nbsp;</td>
+    <td class="cell"><!-- TMPL_VAR NAME="author" -->&nbsp;</td>
+    <td class="cell"><!-- TMPL_VAR NAME="copyright" -->&nbsp;</td>
+    <td class="cell"><!-- TMPL_VAR NAME="itemcount" -->&nbsp;</td>
+    <td class="cell">
+<TMPL_IF name="use-location-flags-p">
+<TMPL_IF name="location-only"><TMPL_VAR NAME="location-only"><br></TMPL_IF>
+<TMPL_IF name="on-loan-p">On Loan<br></TMPL_IF>
+<TMPL_IF name="lost-p">Lost<br></TMPL_IF>
+<TMPL_IF name="mending-p">Mending<br></TMPL_IF>
+<TMPL_IF name="in-transit-p">In Transit<br></TMPL_IF>
+<TMPL_ELSE>
+<TMPL_VAR NAME="location">
+</TMPL_IF>&nbsp;
+    </td>
+    <td class="cell"><a href="/cgi-bin/koha/acqui/newbiblio.pl?sub=<!-- 
TMPL_VAR NAME="sub -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" 
-->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;biblio=<!-- TMPL_VAR 
NAME="biblionumber" -->">Add to Order</a></td></tr>
+</TMPL_LOOP>
+
+<tr>
+<TMPL_IF NAME="offset">
+<td>
+<a href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR NAME="num" 
-->&amp;offset=<!-- TMPL_VAR NAME="offset" -->&amp;type=<!-- TMPL_VAR 
NAME="type" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" 
-->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;search=<!-- TMPL_VAR 
NAME="title" -->&amp;author=<!-- TMPL_VAR NAME="author" -->">Prev</a>
+</td>
+</TMPL_IF>
+
+<TMPL_IF NAME="offsetover">
+<td colspan="6" align="right">
+<a href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR NAME="num" 
-->&amp;offset=<!-- TMPL_VAR NAME="offset2" -->&amp;type=<!-- TMPL_VAR 
NAME="type" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" 
-->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;search=<!-- TMPL_VAR 
NAME="title" -->&amp;author=<!-- TMPL_VAR NAME="author" -->">Next</a>
+</td>
+</TMPL_IF>
+</tr>
+</table>
+</TMPL_IF>
+
+<br /><br />
+
+<form action="/cgi-bin/koha/acqui/newbasket2.pl" method="post">
+<input type="hidden" name="booksellerid" value="<TMPL_VAR 
NAME="booksellerid">">
+<input type="hidden" name="basketno" value="<TMPL_VAR NAME="basketno">">
+
+<table cellpadding="0" cellspacing="0" border="0" class="supplier-table">
+<tr valign="top">
+    <td><h4>New Search:</h4></td>
+    <td><input type="text" size="20" name="search" 
class="form-box-medium"></td>
+    <td><input type="submit" class="button" value="Search"></td></tr>
+</table>
+</form>
+
+<br />
+<h3>Create A New Record</h3>
+
+<a class="button" href="newbiblio.pl?booksellerid=<TMPL_VAR 
NAME="booksellerid">&amp;basketno=<TMPL_VAR NAME="basketno">&amp;sub=<TMPL_VAR 
NAME="parsub">">Add New Biblio</a>
+
+<TMPL_INCLUDE NAME="acquisitions-bottom.inc">

Index: newbiblio.tmpl
===================================================================
RCS file: newbiblio.tmpl
diff -N newbiblio.tmpl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ newbiblio.tmpl      25 Jul 2006 21:06:26 -0000      1.1.2.1
@@ -0,0 +1,231 @@
+<!-- TMPL_INCLUDE NAME="header-start.inc" -->
+Acquisitions
+<!-- TMPL_INCLUDE NAME="header-end.inc" -->
+<!-- TMPL_INCLUDE NAME="topnav.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-start.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-end.inc" -->
+
+<script language="javascript" type="text/javascript">
+<!--
+function update(f){
+  //collect values
+  var nocalc=parseInt(f.nocalc.value);
+  if (nocalc){
+  
+  } else {
+  var quantity=f.quantity.value;
+  var discount=f.discount.value;
+  var listinc=parseInt(f.listinc.value);
+  var currency=f.currency.value;
+  var applygst=parseInt(f.applygst.value);
+  var invoicedisc=parseInt(f.invoicedisc.value);
+  var invoiceinc=parseInt(f.invoiceinc.value);
+  var listprice=f.list_price.value;
+  
+  subs=f.sub.value;
+  if (subs == 'yes'){
+    listprice=listprice/quantity;
+  }
+  exchangerate=f.elements[currency].value      //get exchange rate  
+  var gst_on=(!listinc && applygst);
+  //do real stuff  
+
+  var rrp=listprice/exchangerate;
+
+  // if needing to add GST on
+  if (gst_on){
+    rrp=rrp*1.125;
+  } 
+
+  // discounted cost
+  var ecost=rrp*(100-discount)/100;
+  
+  // calculate GST if needed
+  var GST=0;
+  if (applygst){
+      GST=ecost*0.125
+  }
+
+  var total=(ecost)*quantity;    
+  f.rrp.value=display(rrp);
+  if (subs == 'yes'){
+     f.ecost.value=ecost;
+     f.list_price.value=display(listprice);
+  } else {
+    f.ecost.value=display(ecost);
+  }
+  f.GST.value=display(GST);
+  f.total.value=display(total);
+
+  }
+}
+
+//display tidys up a number for display: hopefully leaving 2 decimal points
+
+function display(numb){
+  if (parseInt(numb)){
+    if (numb== Math.round(numb)){
+      return ( numb + ".00");
+    }
+    else {
+      numb=(numb + "0");
+      return (numb.substring(0,(numb.indexOf(".")+3)));
+    }
+  }
+  else{
+    return "0.00";
+  }
+}
+
+function check(f) {
+  var alert_str="";
+  var quantity=f.quantity.value;
+  var title=f.title.value;
+  if (title == "") {
+       alert_str+="Title can't be empty\n";
+  }
+  if (quantity ==0 || quantity == "") {
+       alert_str+="Quantity must be >0\n";
+  }
+
+  if (alert_str.length==0) {
+  document.frusin.submit();
+  return true;
+  } else {
+  alert(alert_str);
+  return false;    
+  }
+
+}
+
+var nav4 = window.Event ? true : false;
+
+function mypress(e) {
+  if (nav4) // Navigator 4.0x
+    var whichCode = e.which
+  else // Internet Explorer 4.0x
+    if (e.type == "keypress") // the user entered a character
+      var whichCode = e.keyCode
+
+  if (whichCode==13){
+      f=document.frusin;
+      check(f);
+  }
+}
+
+//-->
+
+</script>
+
+<div class="breadcrumb"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &gt; <a 
href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &gt; <a 
href="/cgi-bin/koha/acqui/order.pl">Suppliers</a> &gt; 
+<TMPL_IF NAME="basketno">
+<a href="/cgi-bin/koha/acqui/basket.pl?basket=<TMPL_VAR 
NAME="basketno">">Shopping Basket</a>
+<TMPL_ELSE>
+New Shopping Basket
+</TMPL_IF>
+<TMPL_IF NAME="ordnum">
+ &gt; <a href="/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR 
NAME="ordnum" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" 
-->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->">Edit Order</a>
+<TMPL_ELSE>
+ &gt; New Order
+</TMPL_IF></div>
+
+<br /><br />
+
+<div><span class="step-num-large-on">&nbsp;</span> <span 
class="step-header">Add title <!-- TMPL_VAR NAME="title" --> to basket</span> 
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 
+<!--TMPL_IF NAME="basketno"--><a href="basket.pl?basket=<!-- TMPL_VAR 
NAME="basketno" -->" class="button">View Basket</a>
+<!--/TMPL_IF-->
+</div>
+
+<form action="/cgi-bin/koha/acqui/addorder.pl" method="post" name="frusin"  
onsubmit="return check(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="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
+<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR 
NAME="booksellerid" -->">
+<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblio" -->">
+<input type="hidden" name="bibitemnum" value="<!-- TMPL_VAR 
NAME="biblioitemnumber" -->">
+<input type="hidden" name="nocalc" value="<!-- TMPL_VAR NAME="nocalc" -->">
+<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="invoiceinc" value="<!-- TMPL_VAR NAME="invoiceinc" 
-->">
+<input type="hidden" name="invoicedisc" value="<!-- TMPL_VAR 
NAME="invoicedisc" -->">
+<input type="hidden" name="currency" value="<!-- TMPL_VAR NAME="currency" -->">
+<input type="hidden" name="applygst" value="<!-- TMPL_VAR NAME="gstreg" -->">
+<input type="hidden" name="suggestionid" value="<!-- TMPL_VAR 
NAME="suggestionid" -->">
+<input type="hidden" name="sub" value="">
+<input type="hidden" name="donation" value="<!--TMPL_VAR NAME="donation"-->">
+
+<!-- TMPL_LOOP NAME="loop_currencies" -->
+       <input type="hidden" name="<!-- TMPL_VAR NAME="currency" -->" 
value="<!-- TMPL_VAR NAME="rate" -->">
+<!-- /TMPL_LOOP -->
+
+<!-- TMPL_IF name="ordnum" -->
+<h1>Modify order details <!-- (line #<!-- TMPL_VAR NAME="ordnum" -->) --></h1>
+<!-- TMPL_ELSE -->
+<h1>New order</h1>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="suggestionid" -->(defined from suggestion #<!-- TMPL_VAR 
NAME="suggestionid" -->)<!-- /TMPL_IF -->
+<h3>Shopping Basket For <!-- TMPL_VAR NAME="name" --></h3>
+
+<table cellpadding="0" cellspacing="5" border="0">
+<tr><td colspan="2"><h3>Catalogue details</h3></td></tr>
+<tr valign="top">
+    <td width="40%"><label class="label100"><b>Title *</b></label></td>
+    <td width="60%"><input type="text" size="20" name="title" value="<!-- 
TMPL_VAR NAME="title" -->" class="form-box-medium-required"></td></tr>
+<tr><td><label class="label100">Author</label></td>
+    <td>       <input type="text" size="20" name="author" value="<!-- TMPL_VAR 
NAME="author" -->" class="form-box-medium"></td></tr>
+<tr><td><label class="label100"> Publisher</label></td>
+    <td>       <input type="text" size="20" name="publishercode" value="<!-- 
TMPL_VAR NAME="publishercode" -->" class="form-box-medium"></td></tr>
+<tr><td><label class="label100">Copyright Date</label></td>
+    <td>       <input type="text" size="20" name="copyrightdate" value="<!-- 
TMPL_VAR NAME="copyrightdate" -->" class="form-box-medium"></td></tr>
+<tr><td><label class="label100">Format</label></td>
+    <td class="select-box-required"><!-- TMPL_VAR NAME="CGIitemtype" 
--></td></tr>
+<tr><td><label class="label100">ISBN</label></td>
+    <td>       <input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR 
NAME="isbn" -->" class="form-box-medium"></td></tr>
+<tr><td><label class="label100">Series</label></td>
+    <td>       <input type="text" size="20" name="series" value="<!-- TMPL_VAR 
NAME="seriestitle" -->" class="form-box-medium"></td></tr>
+<tr><td></td>
+    <td><p>Assign a Barcode if you're also receiving the item</p></td></tr>
+<tr><td><label class="label100">Barcode</label></td>
+    <td>       <input type="text" size="20" name="barcode" value="<!-- 
TMPL_VAR NAME="barcode" -->" class="form-box-medium-optional"></td></tr>
+<tr><td><label class="label100">Branch</label></td>
+    <td class="select-box-optional"><!-- TMPL_VAR NAME="CGIbranch" 
--></td></tr>
+
+<tr><td colspan="2"><h3>Accounting details</h3></td></tr>
+<tr><td><label class="label100">Quantity</label></td>
+    <td><input type="text" size="20" name="quantity" value="<!-- TMPL_VAR 
NAME="quantity" -->" onkeyup="update(this.form);"  
class="form-box-medium-required"></td></tr>
+<tr><td><label class="label100">Bookfund</label></td>
+    <td class="select-box"><!-- TMPL_VAR NAME="CGIbookfund" --></td></tr>
+<tr><td><label class="label100">Suppliers List Price</label></td>
+    <td><input type="text" size="20" name="list_price" value="<!-- TMPL_VAR 
NAME="listprice" -->" onkeyup="return update(this.form)"  
class="form-box-medium-required"></td></tr>
+<tr><td><label class="label100">Replacement Cost </label></td>
+    <td><input type="text" size="20" name="rrp" value="<!-- TMPL_VAR 
NAME="rrp" -->" onchange="update(this.form)"  class="form-box-medium"></td></tr>
+<tr><td><label class="label100">Budgeted Cost</label></td>
+    <td><input type="text" size="20" name="ecost" value="<!-- TMPL_VAR 
NAME="ecost" -->" onchange="update(this.form)" 
class="form-box-medium"></td></tr>
+<tr><td><label class="label100">Budgeted GST</label></td>
+    <td><input type="text" size="20" name="GST" value="" 
onchange="update(this.form)" class="form-box-medium"></td></tr>
+<tr><td><label class="label100"><b>BUDGETED TOTAL</b></label></td>
+    <td><input type="text" size="20" name="total" value="" 
onchange="update(this.form)" class="form-box-medium"></td></tr>
+<tr><td><label class="label100">Actual Cost</label></td>
+    <td><input type="text" size="20" name="cost" value="<!-- TMPL_VAR 
name="ecost"-->" class="form-box-medium-optional"></td></tr>
+<tr><td><label class="label100">Invoice Number</label></td>
+    <td><input type="text" size="20" name="invoice" value="<!-- TMPL_VAR 
name="invoice" -->" class="form-box-medium-optional"></td></tr>
+<tr><td><label class="label100">Notes</label></td>
+    <td><input type="text" size="20" name="notes" value="<!-- TMPL_VAR 
NAME="notes" -->" class="form-box-medium"></td></tr>
+<tr><td colspan="2">The 2 following fields are available for your own 
usage.<br />They can be useful for stat purposes</td></tr>
+<tr><td><label class="label100">Sort field 1</label></td>
+    <td><input type="text" size="20" name=sort1 value="<!-- TMPL_VAR 
NAME="sort1" -->" class="form-box-medium"></td></tr>
+<tr><td><label class="label100">Sort field 2</label></td>
+    <td><input type="text" size="20" name=sort2 value="<!-- TMPL_VAR 
NAME="sort2" -->" class="form-box-medium"></td></tr>
+<tr><td>&nbsp;</td>
+    <td><input type="submit" value="OK" class="button"></td></tr>
+</table>
+</form>
+
+<TMPL_INCLUDE name="acquisitions-bottom.inc">

Index: order.tmpl
===================================================================
RCS file: order.tmpl
diff -N order.tmpl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ order.tmpl  25 Jul 2006 21:06:26 -0000      1.1.2.1
@@ -0,0 +1,78 @@
+<!-- TMPL_INCLUDE NAME="header-start.inc" -->
+Acquisitions
+<!-- TMPL_INCLUDE NAME="header-end.inc" -->
+<!-- TMPL_INCLUDE NAME="topnav.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-start.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-end.inc" -->
+
+<div class="breadcrumb"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &gt; <a 
href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &gt; <a 
href="/cgi-bin/koha/acqui/order.pl">Suppliers</a></div>
+
+
+<br /><br />
+
+<div><span class="step-num-large-on">&nbsp;</span> <span 
class="step-header">Pick a Supplier</span></div>
+
+
+<h1>You searched on <b>supplier <TMPL_VAR NAME="supplier">,</b> <TMPL_VAR 
NAME="count"> results found</h1>
+
+<TMPL_IF NAME="loop_suppliers">
+<table cellpadding="0" cellspacing="0" class="collapse">
+<tr valign="top">
+    <th class="cell-header">Order</th>
+    <th class="cell-header">Receive</th>
+    <th class="cell-header">Company</th>
+    <th class="cell-header">&nbsp;</th></tr>
+
+<TMPL_LOOP NAME="loop_suppliers">
+<tr valign="top">
+    <td class="cell-add">
+       <TMPL_IF NAME="active">
+       <a class="button" href="basket.pl?supplierid=<TMPL_VAR 
NAME=supplierid>">Add</a>
+       <TMPL_ELSE>
+       Inactive
+       </TMPL_IF>
+    </td>
+    <td class="cell-add"><a class="button" 
href="recieveorder.pl?supplierid=<TMPL_VAR name=supplierid>">Receive</a></td>
+    <td class="cell"><a href="supplier.pl?supplierid=<TMPL_VAR 
name=supplierid>"><TMPL_VAR name="name"></a></td>
+    <td class="cell">
+       <table cellpadding="0" cellspacing="0" border="0" class="collapse">
+       <tr valign="top">
+           <th class="cell-header">Basket</th>
+           <th class="cell-header">Items</th>
+           <th class="cell-header">Created by</th>
+           <th class="cell-header">Date</th>
+           <th class="cell-header">&nbsp;</th></tr>
+       <TMPL_LOOP NAME="loop_basket">
+       <tr valign="top">
+           <td class="cell"><TMPL_VAR NAME="basketno"></td>
+           <td class="cell"><TMPL_VAR NAME="total"></td>
+           <td class="cell"><TMPL_VAR name="authorisedby"><TMPL_VAR 
name="firstname"> <TMPL_VAR name="surname"></td>
+           <td class="cell"><TMPL_VAR NAME="creationdate"></td>
+           <td class="cell">
+               <TMPL_IF name="closedate">
+               closed on <TMPL_VAR NAME="closedate"> <a 
href="/cgi-bin/koha/acqui/basket.pl?basket=<TMPL_VAR NAME="basketno">">View</a>
+               <TMPL_ELSE>
+                       <TMPL_IF name="active">
+                       <a href="/cgi-bin/koha/acqui/basket.pl?basket=<TMPL_VAR 
NAME="basketno">">modify</a>
+                       <TMPL_ELSE>
+                       <a href="/cgi-bin/koha/acqui/basket.pl?basket=<TMPL_VAR 
NAME="basketno">">View</a>
+                       </TMPL_IF>
+               </TMPL_IF>
+           </td></tr>
+       </TMPL_LOOP>
+       </table>
+</tr>
+</TMPL_LOOP>
+<tr><td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" 
border="0" width="60" height="1" border="0" alt="" /></td>
+    <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" 
border="0" width="88" height="1" border="0" alt="" /></td>
+    <td></td>
+    <td></td></tr>
+</table>
+<TMPL_ELSE>
+<h4>Please try another search or add a new supplier by clicking 'Add Supplier' 
below</h4>
+</TMPL_IF>
+<br />
+<a class="button" href="supplier.pl?supplierid=0">Add supplier</a>
+
+<TMPL_INCLUDE name="acquisitions-bottom-order.inc">

Index: recieve.tmpl
===================================================================
RCS file: recieve.tmpl
diff -N recieve.tmpl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ recieve.tmpl        25 Jul 2006 21:06:26 -0000      1.1.2.1
@@ -0,0 +1,76 @@
+<!-- TMPL_INCLUDE NAME="header-start.inc" -->
+Acquisitions
+<!-- TMPL_INCLUDE NAME="header-end.inc" -->
+<!-- TMPL_INCLUDE NAME="topnav.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-start.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-end.inc" -->
+
+<div class="breadcrumb"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &gt; <a 
href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &gt; <a 
href="/cgi-bin/koha/acqui/order.pl">Suppliers</a> &gt; <a 
href="/cgi-bin/koha/acqui/recieveorder.pl?supplierid=<TMPL_VAR 
NAME="supplierid">">Receive Order</a> &gt; <a 
href="/cgi-bin/koha/acqui/receive.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" 
-->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR 
NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="totalfreight" -->">Order 
Details</a></div>
+
+<br /><br />
+
+<form action="/cgi-bin/koha/acqui/acquire.pl" method="post">
+<input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" 
-->">
+<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" -->">
+
+<table cellpadding="0" cellspacing="0" border="0" class="supplier-table">
+<tr><td colspan="3"><div><span class="step-num-large-on">&nbsp;</span> <span 
class="step-header">Complete details</span></div></td></tr>
+<tr valign="top">
+    <td><h4>Search ISBN or Title:</h4></td>
+    <td><input type="text" size="25" name="recieve" 
class="form-box-medium"></td>
+    <td><input type="submit" class="button" value="Search"></td></tr>
+</table>
+</form>
+
+<!-- <!-- TMPL_VAR NAME="count" --> -->
+<br />
+
+<table border="0" cellpadding="0" cellspacing="0" class="grey-box">
+<tr><td colspan="8">
+<!-- TMPL_IF NAME="invoice" -->
+<h3>Receipt Summary for <!-- TMPL_VAR NAME="name" -->, Invoice <!-- TMPL_VAR 
NAME="invoice" --></h3>
+<!-- TMPL_ELSE -->
+<h3>Orders not yet recieved for <!-- TMPL_VAR NAME="name" --></h3>
+<!-- /TMPL_IF -->
+Invoice: <!-- TMPL_VAR NAME="invoice" --> | Received By: <!-- TMPL_VAR 
NAME="user" --> | <!-- TMPL_VAR NAME="date" --><br /><br /></td></tr>
+<tr valign="top">
+    <td class="grey-box-header">Basket</td>
+    <td class="grey-box-header">ISBN</td>
+    <td class="grey-box-header">Title</td>
+    <td class="grey-box-header">Author</td>
+    <td class="grey-box-header">Actual</td>
+    <td class="grey-box-header">P&amp;P</td>
+    <td class="grey-box-header">QTY</td>
+    <td class="grey-box-header-right">Total</td></tr>
+
+<!-- TMPL_LOOP NAME="loop_orders" -->
+<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><!-- TMPL_VAR NAME="author" --></td>
+   <td align="right"><!-- TMPL_VAR NAME="unitprice" --></td>
+   <td></td>
+   <td class="grey-box-vline" align="right"><!-- TMPL_VAR 
NAME="quantityrecieved" --></td>
+   <td align="right"><!-- TMPL_VAR NAME="total" --></td></tr>
+<!-- /TMPL_LOOP -->
+<tr><td colspan="3">&nbsp;</td>
+    <td align="right">Sub Totals</td>
+    <td align="right"><!-- TMPL_VAR NAME="totalprice" --></td>
+    <td align="right"><!-- TMPL_VAR NAME="totalfreight" --></td>
+    <td class="grey-box-vline" align="right"><!-- TMPL_VAR 
NAME="totalquantity" --></td>
+    <td align="right"><!-- TMPL_VAR NAME="tototal" --></td></tr>
+
+<tr><td class="tip-area" colspan="4" rowspan="2">
+<span class="tip-big">help</span> <span class="tip">The total at the bottom of 
the page should be<br />
+within a few cents of the total for the invoice.</span></td>
+    <td class="grey-box-vline" colspan="3" align="right"><b>GST</b></td>
+    <td align="right"><!-- TMPL_VAR NAME="gst" --></td></tr>
+<tr><td class="grey-box-vline" colspan="3" align="right"><b>TOTAL</b></td>
+    <td align="right"><!-- TMPL_VAR NAME="grandtot" --></td></tr>
+</table>
+
+<TMPL_INCLUDE name="acquisitions-bottom.inc">

Index: recieveorder.tmpl
===================================================================
RCS file: recieveorder.tmpl
diff -N recieveorder.tmpl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ recieveorder.tmpl   25 Jul 2006 21:06:26 -0000      1.1.2.1
@@ -0,0 +1,32 @@
+<!-- TMPL_INCLUDE NAME="header-start.inc" -->
+Acquisitions
+<!-- TMPL_INCLUDE NAME="header-end.inc" -->
+<!-- TMPL_INCLUDE NAME="topnav.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-start.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-end.inc" -->
+
+<div class="breadcrumb"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &gt; <a 
href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &gt; <a 
href="/cgi-bin/koha/acqui/order.pl">Suppliers</a> &gt; <a 
href="/cgi-bin/koha/acqui/recieveorder.pl?supplierid=<TMPL_VAR 
NAME="booksellerid">">Receive Order</a></div>
+
+<br /><br />
+
+<div><span class="step-num-large-on">&nbsp;</span> <span 
class="step-header">Invoice Info</span></div>
+
+<h1>Receive Orders From Supplier <a 
href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR 
NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
+
+<form method="get" action="receive.pl">
+<input type="hidden" name="supplierid" value=<!-- TMPL_VAR NAME="supplierid" 
-->>
+<h3>Supplier invoice information</h3>
+       <table cellpadding="0" cellspacing="5" border="0">
+       <tr><td><label>Supplier Invoice Number</label></td>
+           <td><input type="text" size="20" name="invoice"></td></tr>
+       <tr><td><label>GST</label></td>
+           <td><input type="text" size="20" name="gst"></td></tr>
+       <tr><td><label>Freight</label></td>
+           <td><input type="text" size="20" name="freight"></td></tr>
+       <tr><td>&nbsp;</td> 
+           <td align="right"><input type="submit" class="button" 
value="save"></td></tr>
+       </table>
+</form>
+
+<TMPL_INCLUDE NAME="acquisitions-bottom.inc">

Index: spent.tmpl
===================================================================
RCS file: spent.tmpl
diff -N spent.tmpl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ spent.tmpl  25 Jul 2006 21:06:26 -0000      1.1.2.1
@@ -0,0 +1,118 @@
+<!-- TMPL_INCLUDE NAME="header-start.inc" -->
+Acquisitions
+<!-- TMPL_INCLUDE NAME="header-end.inc" -->
+<!-- TMPL_INCLUDE NAME="topnav.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-start.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-end.inc" -->
+
+<div class="breadcrumb"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &gt; 
Acquisitions</div>
+<h1>Budgets &amp; Bookfunds</h1>
+<h2>Spent</h2>
+
+<br /><br />
+
+
+<table cellspacing="0" cellpadding="0" border="0" id="spent" class="collapse">
+<tr valign="top">
+   <td class="cell-header">
+               Title
+       </td>
+       <td class="cell-header">
+               Order
+       </td>
+       <td class="cell-header">
+               Supplier
+       </td>
+       <td class="cell-header">
+               Invoice
+       </td>
+       <td class="cell-header">
+               Itemtype
+       </td>
+       <td class="cell-header">
+               Receieved
+       </td>
+       <td class="cell-header">
+               Unit Price
+       </td>
+       <td class="cell-header">
+               Date Received
+       </td>
+       <td class="cell-header">
+               Subtotal
+       </td>
+</tr>
+
+<!--TMPL_LOOP NAME="SPENTLOOP"-->
+       <!--TMPL_IF name="toggle"-->
+               <tr valign="top" class="hilighted">
+       <!--TMPL_ELSE-->
+               <tr valign="top" class="hilighted2">
+       <!--/TMPL_IF-->
+       
+               <td class="cell">
+                       <!--TMPL_VAR NAME="title"-->    
+               </td>
+               <td class="cell">
+                  <a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!--TMPL_VAR 
NAME="ordnum"-->&biblio=<!--TMPL_VAR 
NAME="biblionumber"-->&invoice=<!--TMPL_VAR 
NAME="booksellerinvoicenumber"-->&supplierid=<!--TMPL_VAR 
NAME="booksellerid"-->&catview=yes"><TMPL_VAR NAME="ordnum"--></a>
+               </td>
+               <td class="cell">
+                       <!--TMPL_VAR NAME="booksellerid"-->     
+               </td>
+               <td class="cell">
+                               <a 
href=/cgi-bin/koha/acqui/receive.pl?invoice=<!--TMPL_VAR 
NAME="booksellerinvoicenumber"-->&supplierid=<!--TMPL_VAR 
NAME="booksellerid"-->><!--TMPL_VAR NAME="booksellerinvoicenumber"--></a>
+               </td>
+               <td class="cell">
+                       <!--TMPL_VAR NAME="itemtype"--> 
+               </td>
+               <td class="cell">
+                       <!--TMPL_VAR NAME="qrev"-->     
+               </td>
+               <td class="cell">
+                       <!--TMPL_VAR NAME="unitprice"-->                
+               </td>
+               <td class="cell">
+                       <!--TMPL_VAR NAME="datereceived"-->             
+               </td>
+               <td class="cell">
+                       <!--TMPL_VAR NAME="subtotal"-->         
+               </td>
+</tr>
+<!--/TMPL_LOOP-->
+
+<tr valign="top">
+   <td class="cell-header">
+               Total
+       </td>
+       <td class="cell-header">
+               
+       </td>
+       <td class="cell-header">
+               
+       </td>
+       <td class="cell-header">
+               
+       </td>
+       <td class="cell-header">
+               
+       </td>
+       <td class="cell-header">
+               
+       </td>
+       <td class="cell-header">
+               
+       </td>
+       <td class="cell-header">
+               
+       </td>
+       <td class="cell-header">
+               <!--TMPL_VAR NAME="total"-->
+       </td>
+</tr>
+
+</table>
+
+
+
+<TMPL_INCLUDE NAME="acquisitions-bottom.inc">

Index: suggestion-select.tmpl
===================================================================
RCS file: suggestion-select.tmpl
diff -N suggestion-select.tmpl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ suggestion-select.tmpl      25 Jul 2006 21:06:26 -0000      1.1.2.1
@@ -0,0 +1,57 @@
+<!-- TMPL_INCLUDE NAME="header-start.inc" -->
+Acquisitions
+<!-- TMPL_INCLUDE NAME="header-end.inc" -->
+<!-- TMPL_INCLUDE NAME="topnav.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-start.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-end.inc" -->
+
+<div class="breadcrumb"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &gt; <a 
href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &gt; <a 
href="/cgi-bin/koha/acqui/order.pl">Suppliers</a> &gt; <a 
href="/cgi-bin/koha/acqui/basket.pl?basket=<TMPL_VAR NAME="basketno">">Shopping 
Basket</a> &gt; <a 
href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<TMPL_VAR 
NAME="booksellerid">&amp;basketno=<TMPL_VAR 
NAME="basketno">">Suggestions</a></div>
+
+<br /><br />
+
+<form action="/cgi-bin/koha/acqui/newbasket2.pl" method="post">
+<input type="hidden" name="booksellerid" value="<TMPL_VAR 
NAME="booksellerid">">
+<input type="hidden" name="basketno" value="<TMPL_VAR NAME="basketno">">
+
+<div><span class="step-num-large-on">&nbsp;</span> <span 
class="step-header">Suggestions</span></div>
+
+
+<TMPL_IF NAME="suggestions_loop">
+<form action="" method="post">
+<p><b>Filter on:</b><br />
+<label class="label100">Title:</label> <input type="text" name="title" 
value="<!-- TMPL_VAR NAME="title"-->"><br />
+<label class="label100">Author:</label> <input type="text" name="author" 
value="<!-- TMPL_VAR NAME="author" -->"><br />
+<label class="label100">Publisher:</label> <input type="text" 
name="publishercode" value="<!-- TMPL_VAR NAME="publishercode"-->">
+<input type="submit" class="button" value="Set Filter">
+</form>
+
+<table cellpadding="0" cellspacing="2" border="0">
+<tr><th class="cell-header">Suggestion</th>
+    <th class="cell-header">Suggested by</th>
+    <th class="cell-header">Accepted by</th>
+    <th class="cell-header">&nbsp;</th></tr>
+       <TMPL_LOOP NAME="suggestions_loop">
+<tr><td class="cell"><p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR 
NAME="author" --></p>
+       <p><!-- TMPL_IF name="copyrightdate" -->copy. year:<!-- TMPL_VAR 
NAME="copyrightdate" --> <!-- /TMPL_IF -->
+       <!-- TMPL_IF name="volumedesc" -->volume:<i><!-- TMPL_VAR 
NAME="volumedesc" --></i> <!-- /TMPL_IF -->
+       <!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR NAME="isbn" --></i> 
<!-- /TMPL_IF -->
+       <!-- TMPL_IF name="publishercode" --><br/>published by:<!-- TMPL_VAR 
NAME="publishercode" --> <!-- /TMPL_IF -->
+       <!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR 
NAME="publicationyear" --></i> <!-- /TMPL_IF -->
+       <!-- TMPL_IF name="place" --> at <i><!-- TMPL_VAR NAME="place" --></i> 
<!-- /TMPL_IF -->
+       <!-- TMPL_IF name="note" --><p><i>(<!-- TMPL_VAR NAME="note" 
-->)</i></p> <!-- /TMPL_IF --></td>
+    <td class="cell"><!-- TMPL_VAR NAME="surnamesuggestedby" --><!-- TMPL_IF 
name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR 
NAME="firstnamesuggestedby" --></td>
+    <td class="cell"><!-- TMPL_VAR NAME="surnamemanagedby" --><!-- TMPL_IF 
name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR 
NAME="firstnamemanagedby" --></td>
+    <td class="cell">
+               <!-- TMPL_IF name="biblionumber" --> <a 
href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" 
-->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- 
TMPL_VAR NAME="suggestionid" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->" 
class="button">Order</a>
+               <!-- TMPL_ELSE -->
+               <a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR 
NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" 
-->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->" 
class="button">Order</a>
+               <!-- /TMPL_IF --></td></tr>
+       </TMPL_LOOP>
+</table>
+<TMPL_ELSE>
+<p>There are currently no suggestions to chose from</p>
+</TMPL_IF>
+
+
+<TMPL_INCLUDE NAME="acquisitions-bottom.inc">

Index: supplier.tmpl
===================================================================
RCS file: supplier.tmpl
diff -N supplier.tmpl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ supplier.tmpl       25 Jul 2006 21:06:26 -0000      1.1.2.1
@@ -0,0 +1,135 @@
+<!-- TMPL_INCLUDE NAME="header-start.inc" -->
+Acquisitions
+<!-- TMPL_INCLUDE NAME="header-end.inc" -->
+<!-- TMPL_INCLUDE NAME="topnav.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-start.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-end.inc" -->
+
+<div class="breadcrumb"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &gt; <a 
href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &gt; <TMPL_IF 
NAME="id">Update: <TMPL_VAR NAME="name"></h1>
+<TMPL_ELSE>Add Supplier</TMPL_IF></div>
+
+<TMPL_IF NAME="id">
+
+
+<TMPL_ELSE>
+
+<br /><br />
+
+</TMPL_IF>
+
+<form action="updatesupplier.pl" method="post">
+<input type="hidden" name="id" value=<TMPL_VAR NAME="id">>
+
+<TMPL_IF NAME="id">
+<h1>Update: <TMPL_VAR NAME="name"></h1>
+<TMPL_ELSE>
+<h1>Add supplier</h1>
+</TMPL_IF>
+
+
+
+<h3>CURRENT STATUS</h3>
+<table cellpadding="0" cellspacing="4" border="0">
+<tr valign="top">
+    <td><label>Supplier is</label></td>
+    <td>
+       <TMPL_IF name="active">
+       <input type="radio" name="status" value="1" checked>Active
+       <input type="radio" name="status" value="0">Inactive</td>
+       <TMPL_ELSE>
+       <input type="radio" name="status" value="1">Active
+       <input type="radio" name="status" value="0" checked>Inactive</td>
+       </TMPL_IF>
+    </td></tr>
+</table>
+
+<table cellpadding="0" cellspacing="4" border="0">
+<tr valign="top">
+    <td colspan="2"><h3>COMPANY DETAILS</h3></td></tr>
+<tr valign="top">
+    <td><label>Company Name</label></td>
+    <td><input type="text" class="form-box-large" size="40" name="company" 
value="<TMPL_VAR NAME="name">"></td></tr>
+<tr valign="top">
+    <td><label>Postal Address</label></td>
+    <td><textarea class="form-box-large" name="company_postal" cols="40" 
rows="3"><TMPL_VAR NAME="postal"></textarea></td></tr>
+<tr valign="top">
+    <td><label>Physical Address</label></td>
+    <td><textarea class="form-box-large" name="physical" cols="40" 
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><label>Phone</label></td>
+    <td><input type="text" class="form-box-large" size="20" 
name="company_phone" value="<TMPL_VAR NAME="phone">"></td></tr>
+<tr valign="top">
+    <td><label>Fax</label></td>
+    <td><input type="text" class="form-box-large" size="20" name="company_fax" 
value="<TMPL_VAR NAME="fax">"></td></tr>
+<tr valign="top">
+    <td><label>Website</label></td>
+    <td><input type="text" class="form-box-large" size="40" name="website" 
value="<TMPL_VAR NAME="url">"></td></tr>
+<tr valign="top">
+    <td colspan="2"><h3>CONTACT DETAILS</h3></td></tr>
+<tr valign="top">
+    <td><label>Contact Name</label></td>
+    <td><input type="text" class="form-box-large" size="40" 
name="company_contact_name" value="<TMPL_VAR NAME="contact">"></td></tr>
+<tr valign="top">
+    <td><label>Position</label></td>
+    <td><input type="text" class="form-box-large" size="40" 
name="company_contact_position" value="<TMPL_VAR NAME="contpos">"></td></tr>
+<tr valign="top">
+    <td><label>Phone</label></td>
+    <td><input type="text" class="form-box-large" size="20" 
name="contact_phone" value="<TMPL_VAR NAME="contphone">"></td></tr>
+<tr valign="top">
+    <td><label>Alternative phone</label></td>
+    <td><input type="text" class="form-box-large" size="20" 
name="contact_phone_2" value="<TMPL_VAR NAME="contaltphone">"></td></tr>
+<tr valign="top">
+    <td><label>Fax</label></td>
+    <td><input type="text" class="form-box-large" size="20" name="contact_fax" 
value="<TMPL_VAR NAME="contfax">"></td></tr>
+<tr valign="top">
+    <td><label>E-mail</label></td>
+    <td><input type="text" class="form-box-large" size="40" 
name="company_email" value="<TMPL_VAR NAME="contemail">"></td></tr>
+<tr valign="top">
+    <td><label>Notes</label></td>
+    <td><textarea class="form-box-large" name="notes" cols="40" 
rows="4"><TMPL_VAR NAME="contnotes"></textarea></td></tr>
+<tr valign="top">
+    <td colspan="2"><h3>ORDERING INFORMATION</h3></td></tr>
+<tr valign="top">
+    <td><label>Publishers and Imprints</label></td>
+    <td><textarea class="form-box-large" name="publishers_imprints" cols="20" 
rows="4"><TMPL_VAR NAME="specialty"></textarea></td></tr>
+<tr valign="top">
+    <td><label class="label100">List Prices are</label></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><label class="label100">Invoice Prices are</label></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><label class="label100">GST Registered</label></td>
+    <td><input type="radio" name="gst" value="1" <TMPL_IF 
name="gstreg">checked</TMPL_IF>>Yes
+       <input type="radio" name="gst" value="0" <TMPL_UNLESS 
name="gstreg">checked</TMPL_UNLESS>>No
+    </td></tr>
+<tr valign="top">
+    <td><label class="label100">List Item Price Includes GST</label></td>
+    <td><input type="radio" name="list_gst" value="1" <TMPL_IF 
name="listincgst">checked</TMPL_IF>>Yes
+       <input type="radio" name="list_gst" value="0" <TMPL_UNLESS 
name="listincgst">checked</TMPL_UNLESS>>No
+    </td></tr>
+<tr valign="top">
+    <td><label class="label100">Invoice Item Price Includes GST</label></td>
+    <td><input type="radio" name="invoice_gst" value="1" <TMPL_IF name= 
"invoiceincgst">checked</TMPL_IF>>Yes
+       <input type="radio" name="invoice_gst" value="0" <TMPL_UNLESS 
name="invoiceincgst">checked</TMPL_UNLESS>>No
+    </td></tr>
+<tr valign="top">
+    <td><label class="label100">Discount</label></td>
+    <td><input type="text" class="form-box-tiny" size="3" name="discount" 
value="<TMPL_VAR NAME="discount">"> %</td></tr>
+<tr valign="top">
+    <td colspan="2" align="right"><input type="submit" name="submit" 
value="Save" class="button"></td></tr>
+</table>
+</form>
+
+<TMPL_INCLUDE name="acquisitions-bottom-order.inc">

Index: vieworder.tmpl
===================================================================
RCS file: vieworder.tmpl
diff -N vieworder.tmpl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ vieworder.tmpl      25 Jul 2006 21:06:26 -0000      1.1.2.1
@@ -0,0 +1,231 @@
+<!-- TMPL_INCLUDE NAME="header-start.inc" -->
+Acquisitions
+<!-- TMPL_INCLUDE NAME="header-end.inc" -->
+<!-- TMPL_INCLUDE NAME="topnav.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-start.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions.inc" -->
+<!-- TMPL_INCLUDE NAME="leftnav-end.inc" -->
+
+<script language="javascript" type="text/javascript">
+<!--
+function update(f){
+  //collect values
+  var nocalc=parseInt(f.nocalc.value);
+  if (nocalc){
+  
+  } else {
+  var quantity=f.quantity.value;
+  var discount=f.discount.value;
+  var listinc=parseInt(f.listinc.value);
+  var currency=f.currency.value;
+  var applygst=parseInt(f.applygst.value);
+  var invoicedisc=parseInt(f.invoicedisc.value);
+  var invoiceinc=parseInt(f.invoiceinc.value);
+  var listprice=f.list_price.value;
+  
+  subs=f.sub.value;
+  if (subs == 'yes'){
+    listprice=listprice/quantity;
+  }
+  exchangerate=f.elements[currency].value      //get exchange rate  
+  var gst_on=(!listinc && applygst);
+  //do real stuff  
+
+  var rrp=listprice/exchangerate;
+
+  // if needing to add GST on
+  if (gst_on){
+    rrp=rrp*1.125;
+  } 
+
+  // discounted cost
+  var ecost=rrp*(100-discount)/100;
+  
+  // calculate GST if needed
+  var GST=0;
+  if (applygst){
+      GST=ecost*0.125
+  }
+
+  var total=(ecost)*quantity;    
+  f.rrp.value=display(rrp);
+  if (subs == 'yes'){
+     f.ecost.value=ecost;
+     f.list_price.value=display(listprice);
+  } else {
+    f.ecost.value=display(ecost);
+  }
+  f.GST.value=display(GST);
+  f.total.value=display(total);
+
+  }
+}
+
+//display tidys up a number for display: hopefully leaving 2 decimal points
+
+function display(numb){
+  if (parseInt(numb)){
+    if (numb== Math.round(numb)){
+      return ( numb + ".00");
+    }
+    else {
+      numb=(numb + "0");
+      return (numb.substring(0,(numb.indexOf(".")+3)));
+    }
+  }
+  else{
+    return "0.00";
+  }
+}
+
+function check(f) {
+  var alert_str="";
+  var quantity=f.quantity.value;
+  var title=f.title.value;
+  if (title == "") {
+       alert_str+="Title can't be empty\n";
+  }
+  if (quantity ==0 || quantity == "") {
+       alert_str+="Quantity must be >0\n";
+  }
+
+  if (alert_str.length==0) {
+  document.frusin.submit();
+  return true;
+  } else {
+  alert(alert_str);
+  return false;    
+  }
+
+}
+
+var nav4 = window.Event ? true : false;
+
+function mypress(e) {
+  if (nav4) // Navigator 4.0x
+    var whichCode = e.which
+  else // Internet Explorer 4.0x
+    if (e.type == "keypress") // the user entered a character
+      var whichCode = e.keyCode
+
+  if (whichCode==13){
+      f=document.frusin;
+      check(f);
+  }
+}
+
+//-->
+
+</script>
+
+<div class="breadcrumb"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &gt; <a 
href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &gt; <a 
href="/cgi-bin/koha/acqui/order.pl">Suppliers</a> &gt; 
+<TMPL_IF NAME="basketno">
+<a href="/cgi-bin/koha/acqui/basket.pl?basket=<TMPL_VAR 
NAME="basketno">">Shopping Basket</a>
+<TMPL_ELSE>
+New Shopping Basket
+</TMPL_IF>
+<TMPL_IF NAME="ordnum">
+ &gt; <a href="/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR 
NAME="ordnum" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" 
-->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->">Edit Order</a>
+<TMPL_ELSE>
+ &gt; New Order
+</TMPL_IF></div>
+
+<br /><br />
+
+<div><span class="step-num-large-on">&nbsp;</span> <span 
class="step-header">Add title <!-- TMPL_VAR NAME="title" --> to basket</span> 
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 
+<!--TMPL_IF NAME="basketno"--><a href="basket.pl?basket=<!-- TMPL_VAR 
NAME="basketno" -->" class="button">View Basket</a>
+<!--/TMPL_IF-->
+</div>
+
+<form action="/cgi-bin/koha/acqui/addorder.pl" method="post" name="frusin"  
onsubmit="return check(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="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
+<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR 
NAME="booksellerid" -->">
+<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblio" -->">
+<input type="hidden" name="bibitemnum" value="<!-- TMPL_VAR 
NAME="biblioitemnumber" -->">
+<input type="hidden" name="nocalc" value="<!-- TMPL_VAR NAME="nocalc" -->">
+<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="invoiceinc" value="<!-- TMPL_VAR NAME="invoiceinc" 
-->">
+<input type="hidden" name="invoicedisc" value="<!-- TMPL_VAR 
NAME="invoicedisc" -->">
+<input type="hidden" name="currency" value="<!-- TMPL_VAR NAME="currency" -->">
+<input type="hidden" name="applygst" value="<!-- TMPL_VAR NAME="gstreg" -->">
+<input type="hidden" name="suggestionid" value="<!-- TMPL_VAR 
NAME="suggestionid" -->">
+<input type="hidden" name="sub" value="">
+<input type="hidden" name="donation" value="<!--TMPL_VAR NAME="donation"-->">
+
+<!-- TMPL_LOOP NAME="loop_currencies" -->
+       <input type="hidden" name="<!-- TMPL_VAR NAME="currency" -->" 
value="<!-- TMPL_VAR NAME="rate" -->">
+<!-- /TMPL_LOOP -->
+
+<!-- TMPL_IF name="ordnum" -->
+<h1>Modify order details <!-- (line #<!-- TMPL_VAR NAME="ordnum" -->) --></h1>
+<!-- TMPL_ELSE -->
+<h1>New order</h1>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="suggestionid" -->(defined from suggestion #<!-- TMPL_VAR 
NAME="suggestionid" -->)<!-- /TMPL_IF -->
+<h3>Shopping Basket For <!-- TMPL_VAR NAME="name" --></h3>
+
+<table cellpadding="0" cellspacing="5" border="0">
+<tr><td colspan="2"><h3>Catalogue details</h3></td></tr>
+<tr valign="top">
+    <td width="40%"><label class="label100"><b>Title *</b></label></td>
+    <td width="60%"><input type="text" size="20" name="title" value="<!-- 
TMPL_VAR NAME="title" -->" class="form-box-medium-required"></td></tr>
+<tr><td><label class="label100">Author</label></td>
+    <td>       <input type="text" size="20" name="author" value="<!-- TMPL_VAR 
NAME="author" -->" class="form-box-medium"></td></tr>
+<tr><td><label class="label100"> Publisher</label></td>
+    <td>       <input type="text" size="20" name="publishercode" value="<!-- 
TMPL_VAR NAME="publishercode" -->" class="form-box-medium"></td></tr>
+<tr><td><label class="label100">Copyright Date</label></td>
+    <td>       <input type="text" size="20" name="copyrightdate" value="<!-- 
TMPL_VAR NAME="copyrightdate" -->" class="form-box-medium"></td></tr>
+<tr><td><label class="label100">Format</label></td>
+    <td class="select-box-required"><!-- TMPL_VAR NAME="CGIitemtype" 
--></td></tr>
+<tr><td><label class="label100">ISBN</label></td>
+    <td>       <input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR 
NAME="isbn" -->" class="form-box-medium"></td></tr>
+<tr><td><label class="label100">Series</label></td>
+    <td>       <input type="text" size="20" name="series" value="<!-- TMPL_VAR 
NAME="seriestitle" -->" class="form-box-medium"></td></tr>
+<tr><td></td>
+    <td><p>Assign a Barcode if you're also receiving the item</p></td></tr>
+<tr><td><label class="label100">Barcode</label></td>
+    <td>       <input type="text" size="20" name="barcode" value="<!-- 
TMPL_VAR NAME="barcode" -->" class="form-box-medium-optional"></td></tr>
+<tr><td><label class="label100">Branch</label></td>
+    <td class="select-box-optional"><!-- TMPL_VAR NAME="CGIbranch" 
--></td></tr>
+
+<tr><td colspan="2"><h3>Accounting details</h3></td></tr>
+<tr><td><label class="label100">Quantity</label></td>
+    <td><input type="text" size="20" name="quantity" value="<!-- TMPL_VAR 
NAME="quantity" -->" onkeyup="update(this.form);"  
class="form-box-medium-required"></td></tr>
+<tr><td><label class="label100">Bookfund</label></td>
+    <td class="select-box"><!-- TMPL_VAR NAME="CGIbookfund" --></td></tr>
+<tr><td><label class="label100">Suppliers List Price</label></td>
+    <td><input type="text" size="20" name="list_price" value="<!-- TMPL_VAR 
NAME="listprice" -->" onkeyup="return update(this.form)"  
class="form-box-medium-required"></td></tr>
+<tr><td><label class="label100">Replacement Cost </label></td>
+    <td><input type="text" size="20" name="rrp" value="<!-- TMPL_VAR 
NAME="rrp" -->" onchange="update(this.form)"  class="form-box-medium"></td></tr>
+<tr><td><label class="label100">Budgeted Cost</label></td>
+    <td><input type="text" size="20" name="ecost" value="<!-- TMPL_VAR 
NAME="ecost" -->" onchange="update(this.form)" 
class="form-box-medium"></td></tr>
+<tr><td><label class="label100">Budgeted GST</label></td>
+    <td><input type="text" size="20" name="GST" value="" 
onchange="update(this.form)" class="form-box-medium"></td></tr>
+<tr><td><label class="label100"><b>BUDGETED TOTAL</b></label></td>
+    <td><input type="text" size="20" name="total" value="" 
onchange="update(this.form)" class="form-box-medium"></td></tr>
+<tr><td><label class="label100">Actual Cost</label></td>
+    <td><input type="text" size="20" name="cost" value="<!-- TMPL_VAR 
name="ecost"-->" class="form-box-medium-optional"></td></tr>
+<tr><td><label class="label100">Invoice Number</label></td>
+    <td><input type="text" size="20" name="invoice" value="<!-- TMPL_VAR 
name="invoice" -->" class="form-box-medium-optional"></td></tr>
+<tr><td><label class="label100">Notes</label></td>
+    <td><input type="text" size="20" name="notes" value="<!-- TMPL_VAR 
NAME="notes" -->" class="form-box-medium"></td></tr>
+<tr><td colspan="2">The 2 following fields are available for your own 
usage.<br />They can be useful for stat purposes</td></tr>
+<tr><td><label class="label100">Sort field 1</label></td>
+    <td><input type="text" size="20" name=sort1 value="<!-- TMPL_VAR 
NAME="sort1" -->" class="form-box-medium"></td></tr>
+<tr><td><label class="label100">Sort field 2</label></td>
+    <td><input type="text" size="20" name=sort2 value="<!-- TMPL_VAR 
NAME="sort2" -->" class="form-box-medium"></td></tr>
+<tr><td>&nbsp;</td>
+    <td><input type="submit" value="OK" class="button"></td></tr>
+</table>
+</form>
+
+<TMPL_INCLUDE name="acquisitions-bottom.inc">




reply via email to

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