[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui... [dev_week]
|
From: |
Joshua Ferraro |
|
Subject: |
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui... [dev_week] |
|
Date: |
Tue, 12 Dec 2006 17:19:31 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Joshua Ferraro <kados> 06/12/12 17:19:31
Modified files:
koha-tmpl/intranet-tmpl/npl/en/acqui: acqui-home.tmpl
acquire.tmpl recieve.tmpl
Log message:
synch with rel_2_2 ... this should be tested as there were conflicts .
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.3.2.3.2.1&r2=1.3.2.3.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acquire.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3.2.2&r2=1.1.2.3.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3.2.1&r2=1.1.2.3.2.2
Patches:
Index: acqui-home.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/acqui-home.tmpl,v
retrieving revision 1.3.2.3.2.1
retrieving revision 1.3.2.3.2.2
diff -u -b -r1.3.2.3.2.1 -r1.3.2.3.2.2
--- acqui-home.tmpl 3 Aug 2006 06:55:09 -0000 1.3.2.3.2.1
+++ acqui-home.tmpl 12 Dec 2006 17:19:31 -0000 1.3.2.3.2.2
@@ -26,9 +26,13 @@
<!-- currencies-->
<div class="details">
<!-- TMPL_IF NAME="loop_currency" -->
-<table>
- <caption>Exchange Rates</caption>
+<h4>Currencies</h4>
+<!-- TMPL_ELSE -->
+<h4>No Currencies Configured</h4>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="loop_currency" -->
+<table>
<!-- TMPL_LOOP name="loop_currency" -->
<tr>
<th>
@@ -40,16 +44,13 @@
</td>
</tr>
<!-- /TMPL_LOOP -->
-</table><input type="submit" class="submit" value="Save Exchange Rate" />
-<!-- TMPL_ELSE --><form action="/cgi-bin/koha/admin/currency.pl" method="post">
- <input type="hidden" name="op" value="add_form" /><input type="submit"
class="submit" value="Add Currency" />
-
- </form><!-- /TMPL_IF -->
+</table><input type="submit" class="submit" value="Update Exchange Rates"
/><!-- /TMPL_IF -->
+<a href="/cgi-bin/koha/admin/currency.pl?op=add_form">Add Currency</a>
</div>
<!-- suggestions -->
<div class="details">
- <h3>Pending Suggestions</h3>
+ <h4>Pending Suggestions</h4>
<!-- TMPL_IF name="suggestion" -->
<!--TMPL_VAR NAME="suggestion" --> suggestions waiting
<a href="/cgi-bin/koha/suggestion/acceptorreject.pl">Manage Suggestions</a>
<!-- TMPL_ELSE -->
Index: acquire.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/acquire.tmpl,v
retrieving revision 1.1.2.3.2.2
retrieving revision 1.1.2.3.2.3
diff -u -b -r1.1.2.3.2.2 -r1.1.2.3.2.3
--- acquire.tmpl 3 Dec 2006 21:53:20 -0000 1.1.2.3.2.2
+++ acquire.tmpl 12 Dec 2006 17:19:31 -0000 1.1.2.3.2.3
@@ -4,153 +4,116 @@
<div id="main">
-<h1>Receipt Summary for : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF
NAME="invoice" -->Invoice, <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF
--></h1>
+<h1>Receipt Summary for: <i><!-- TMPL_VAR NAME="name" --></i> Invoice <i><!--
TMPL_VAR NAME="invoice" --></i></h1>
-<ul><li>Invoice: <!-- TMPL_VAR NAME="invoice" --></li>
-<li>Received By: <!-- TMPL_VAR NAME="user" --></li>
-<li>Date: <!-- TMPL_VAR NAME="date" --></li>
-</ul>
-
-<!-- TMPL_IF name="count" -->
- <script language="javascript" type="text/javascript">
- <!--
- function messenger(X,Y,etc){
-
win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0");
- win.focus();
- win.document.close();
- win.document.write("<body link='#333333' bgcolor='#ffffff'
text='#000000'><font size=2><p><br>");
- win.document.write(etc);
- win.document.write("<center><form><input type=button
onclick='self.close()' value=Close></form></center>");
- win.document.write("</font></body></html>");
- }
- //-->
- </script>
+ <!-- TMPL_IF name="count" -->
<form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post">
<h1><!-- TMPL_VAR NAME="ordernumber" --> - Receive Order</h1>
- <div class="data">
- <ul><li>Shopping Basket For: <!-- TMPL_VAR NAME="name" --></li>
- <li>Order placed: <!-- TMPL_VAR NAME="date" --></li>
- </ul>
-
- <table>
- <caption>Catalogue Details</caption>
- <tr>
- <th scope="row"><label for="title"
class="required">Title</label></th>
- <td><input type="text" size="20" name="title"
id="title" value="<!-- TMPL_VAR NAME="title" -->" />
- </td>
- </tr>
- <tr>
- <th scope="row"><label for="author">Author</label></th>
- <td><input type="text" size="20" name="author"
id="author" value="<!-- TMPL_VAR NAME="author" -->" />
- </td>
- </tr>
- <tr>
- <th scope="row"><label for="copyright">Copyright
Date</label></th>
- <td><input type="text" size="20" name="copyright"
id="copyright" value="<!-- TMPL_VAR NAME="copyrightdate" -->" />
- </td>
- </tr>
- <tr>
- <th scope="row"><label for="">Format</label></th>
- <td><!-- TMPL_VAR NAME="CGIitemtype" --></td>
- </tr>
- <tr>
- <th scope="row"><label for="ISBN">ISBN</label></th>
- <td><input type="text" size="20" name="ISBN" id="ISBN"
value="<!-- TMPL_VAR NAME="isbn" -->" /></td>
- </tr>
- <tr>
- <th scope="row"><label for="Series">Series</label></th>
- <td><input type="text" size="20" name="Series"
id="Series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /></td>
- </tr>
- <tr>
- <th scope="row"><label for="branch">Branch</label></th>
+ <h4>Shopping Basket For: <!-- TMPL_VAR NAME="name" --></h4>
+ <h5>Order placed: <!-- TMPL_VAR NAME="date" --></h5>
+ <div class="box">
+ <h2>Catalogue Details</h2>
+ <table><tr>
+ <td><strong>Title:</strong></td><td>
+ <!-- TMPL_VAR NAME="title" -->
+ </td></tr>
+ <tr>
+ <td><strong>Author:</strong></td><td>
+ <!-- TMPL_VAR NAME="author" -->
+ </td></tr>
+ <tr>
+ <td><strong>Copyright Date:</strong></td><td>
+ <!-- TMPL_VAR NAME="copyrightdate" -->
+ </td></tr>
+ <tr>
+ <td><strong>Format:</strong></td><td>
+ <!-- TMPL_VAR NAME="itemtype" -->
+ </td></tr>
+ <tr>
+ <td><strong>ISBN:</strong></td><td>
+ <!-- TMPL_VAR NAME="isbn" -->
+ </td></tr>
+ <tr>
+ <td><strong>Series:</strong></td><td>
+ <!-- TMPL_VAR NAME="seriestitle" -->
+ </td></tr></table>
+ <p>Enter barcode(s) and branch if you want to add
item(s) immediatly</p>
+ <table><tr>
+ <td><label for="">Branch:</label></td>
<td><!-- TMPL_VAR NAME="CGIbranch" --></td>
</tr>
<tr>
- <th scope="row"><label for="barcode"
class="required">Item Barcode </label></th>
- <td><input type="text" size="20" name="barcode"
id="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" /></td>
- </tr>
- <tr>
- <th scope="row"><label for="volinf"
class="required">Volume Info (for serials) </label></th>
- <td><input type="text" size="20" name="volinf"
id="volinf" /></td>
- </tr>
- <tr>
- <td colspan=2 align="center">
- <input type="hidden" name="biblio" value="<!--
TMPL_VAR NAME="biblionumber" -->" />
- <input type="hidden" name="ordnum" value="<!--
TMPL_VAR NAME="ordernumber" -->" />
- <input type="hidden" name="biblioitemnum"
value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" />
- <input type="hidden" name="id" value="<!--
TMPL_VAR NAME="booksellerid" -->" />
- <input type="hidden" name="freight" value="<!--
TMPL_VAR NAME="freight" -->" />
- <input type="hidden" name="gst" value="<!--
TMPL_VAR NAME="gst" -->" />
- <input type="submit" class="submit"
name="submit" value="Save" />
- </td>
- </tr>
- </table>
- <table>
- <caption>Accounting Details</caption>
- <tr>
- <th scope="row"><label for="bookfund"
class="required">Bookfund </label></th>
- <td><!-- TMPL_VAR NAME="CGIbookfund" -->
- </tr>
- <tr>
- <th scope="row"><label for="quantity">Quantity
Ordered</label></th>
- <td><input type="text" size="20" name="quantity"
id="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" />
- </td>
- </tr>
- <tr>
- <th scope="row"><label for="quantityrec"
class="required">Quantity Received </label></th>
- <td><input type="text" size="20" name="quantityrec"
id="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->" />
- </td>
- </tr>
- <tr>
- <th scope="row"><label for="rrp">Replacement
Cost</label></th>
- <td><input type="text" size="20" name="rrp" id="rrp"
value="<!-- TMPL_VAR NAME="rrp" -->" />
- </tr>
- <tr>
- <th scope="row"><label for="ecost">Budgeted
Cost</label> </td>
- <td><input type="text" size="20" name="ecost"
id="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" /></td>
- </tr>
- <tr>
- <th scope="row"><label for="cost"
class="required">Actual Cost </label></th>
- <td><input type="text" size="20" name="cost" id="cost"
value="<!-- TMPL_IF name="unitprice"--><!-- TMPL_VAR NAME="unitprice" --><!--
TMPL_ELSE --><!-- TMPL_VAR name="rrp" --><!-- /TMPL_IF -->" /></td>
- </tr>
- <tr>
- <th scope="row"><label for="invoice">Invoice
Number</label></th>
- <td>
- <!-- TMPL_VAR NAME="invoice" -->
- <input type="hidden" name="invoice" value="<!--
TMPL_VAR NAME="invoice" -->" />
- <input type="hidden" name="datereceived" value="<!-- TMPL_VAR
NAME="datereceived" -->" />
- </td>
- </tr>
- <tr>
- <th scope="row"><label for="aqnotes">Notes</label></th>
- <td><input type="text" size="20" name="notes"
id="aqnotes" value="<!-- TMPL_VAR NAME="notes" -->" /></td>
- </tr>
- </table>
+ <td><label for="">Item Barcode: *</label></td>
+ <td><input type="text" size="20" name="barcode"
value="<!-- TMPL_VAR name="barcode" -->" /></td>
+ </tr></table>
+ </div>
+ <div class="box">
+ <h2>Accounting details</h2>
+ <table><tr>
+ <td><strong>Bookfund:</strong></td><td>
+ <!-- TMPL_VAR NAME="bookfund" -->
+ </td></tr>
+ <tr>
+ <td><strong>Quantity Ordered:</strong></td><td>
+ <!-- TMPL_VAR NAME="quantity" -->
+ <input type="hidden" name="quantity"
value="<!-- TMPL_VAR NAME="quantity" -->" />
+ </td></tr>
+ <tr>
+ <td><label for="">Quantity Received:
*</label></td>
+ <td><input type="text" size="20"
name="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->" />
+ </td></tr>
+ <tr>
+ <td><label for="">Replacement Cost:</label></td>
+ <td><input type="text" size="20" name="rrp"
value="<!-- TMPL_VAR NAME="rrp" -->" />
+ </td></tr>
+ <tr>
+ <td><strong>Budgeted Cost:</strong></td><td>
+ <!-- TMPL_VAR NAME="ecost" -->
+ </td></tr>
+ <tr>
+ <td><label for="">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 -->">
+ </td></tr>
+ <tr>
+ <td><strong>Invoice Number:</strong></td>
+ <td><!-- TMPL_VAR NAME="invoice" -->
+ <input type="hidden" name="invoice" value="<!-- TMPL_VAR
NAME="invoice" -->">
+ <input type="hidden" name="datereceived" value="<!-- TMPL_VAR
NAME="datereceived" -->">
+ </td></tr>
+ <tr>
+ <td><strong>Notes:</strong></td>
+ <td><!-- TMPL_VAR NAME="notes" -->
+ </td></tr></table>
+ <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" -->">
+<p><input type="submit" class="submit" value="Save"> (that all costs are for 1
item)</p>
+ </div>
</form>
-
-<!-- TMPL_ELSE -->
-
+ <!-- TMPL_ELSE -->
<table>
<tr>
<th>Basket</th>
<th>ISBN</th>
- <th>Title</th>
- <th>Author</th>
+ <th>TITLE</th>
+ <th>AUTHOR</th>
<th>Qty</th>
<th>Received</th>
</tr>
- <!-- TMPL_LOOP name="loop" -->
+ <!-- TMPL_LOOP NAME="loop" -->
<tr>
<td><!-- TMPL_VAR NAME="basketno" --></td>
<td><!-- TMPL_VAR NAME="isbn" --></td>
- <td><a href="acquire.pl?recieve=<!-- TMPL_VAR
NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber"
-->&invoice=<!-- TMPL_VAR NAME="invoice" -->&freight=<!-- TMPL_VAR
NAME="freight" -->&gst=<!-- TMPL_VAR NAME="gst" -->&id=<!-- TMPL_VAR
NAME="id" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+ <td><a href="acquire.pl?recieve=<!-- TMPL_VAR
NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber"
-->&invoice=<!-- TMPL_VAR NAME="invoice" -->&freight=<!-- TMPL_VAR
NAME="freight" -->&gst=<!-- TMPL_VAR NAME="gst" -->&supplierid=<!--
TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="title" --></a></td>
<td><!-- TMPL_VAR NAME="author" --></td>
<td><!-- TMPL_VAR NAME="quantity" --></td>
<td><!-- TMPL_VAR NAME="quantityrecieved" --></td>
</tr>
<!-- /TMPL_LOOP -->
</table>
-<!-- /TMPL_IF -->
-</div>
+ <!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
Index: recieve.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/recieve.tmpl,v
retrieving revision 1.1.2.3.2.1
retrieving revision 1.1.2.3.2.2
diff -u -b -r1.1.2.3.2.1 -r1.1.2.3.2.2
--- recieve.tmpl 3 Aug 2006 13:21:16 -0000 1.1.2.3.2.1
+++ recieve.tmpl 12 Dec 2006 17:19:31 -0000 1.1.2.3.2.2
@@ -3,27 +3,24 @@
<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
<div id="main">
+ <h1>Receipt parcel for <em><!-- TMPL_VAR NAME="name" --></em></h1>
- <h1>
- Receipt Summary for <i><!-- TMPL_VAR NAME="name"
--></i> Invoice <i><!-- TMPL_VAR NAME="invoice" --></i>
- </h1>
-
-<ul>
-<li>Invoice: <!-- TMPL_VAR name="invoice" --></li>
-<li>Received by: <!-- TMPL_VAR name="user" --></li>
-<li>Date: <!-- TMPL_VAR name="formatteddatereceived"--></li>
-</ul>
+ <ul class="notes">
+ <li><strong>Invoice:</strong> <!-- TMPL_VAR NAME="invoice"
--></li>
+ <li>Received by: <!-- TMPL_VAR name="user" --></li>
+ <li><strong>Date:</strong> <!-- TMPL_VAR
name="formatteddatereceived"--></li>
+ </ul>
+ <div class="basket">
<h2> Items in parcel</h2>
- <h5>
- <!-- TMPL_VAR NAME="countreceived" --> bibliographic record(s) received
- </h5>
+ <p>
+ <!-- TMPL_VAR NAME="countreceived" --> records received
+ </p>
+
<table>
<tr>
<th>Basket</th>
- <th>ISBN</th>
<th>Title</th>
- <th>Author</th>
<th>Est. cost</th>
<th>Qty ordered</th>
<th>P&P</th>
@@ -32,51 +29,40 @@
<th>Total</th>
</tr>
<!-- TMPL_LOOP NAME="loop_received" -->
- <!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr
class="highlight"><!-- /TMPL_IF -->
- <td><!-- TMPL_VAR NAME="basketno" --></td>
- <td><!-- TMPL_VAR NAME="isbn" --></td>
- <td><a href="acquire.pl?recieve=<!-- TMPL_VAR
NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber"
-->&invoice=<!-- TMPL_VAR NAME="invoice" -->&gst=<!-- TMPL_VAR
NAME="gst" -->&freight=<!-- TMPL_VAR NAME="freight" -->&supplierid=<!--
TMPL_VAR NAME="supplierid" -->&catview=yes&datereceived=<!-- TMPL_VAR
name="datereceived" -->"><!-- TMPL_VAR NAME="title" --></a></td>
- <td><!-- TMPL_VAR NAME="author" --></td>
- <td><!-- TMPL_VAR NAME="ecost" --></td>
- <td><!-- TMPL_VAR NAME="quantity" --></td>
- <td> </td>
- <td><!-- TMPL_VAR NAME="unitprice" --></td>
- <td><!-- TMPL_VAR NAME="quantityrecieved"
--></td>
- <td><!-- TMPL_VAR NAME="total" --></td>
+ <tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
+ <td class="number"><!-- TMPL_VAR
NAME="basketno" --></td>
+ <td><a href="acquire.pl?recieve=<!-- TMPL_VAR
NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber"
-->&invoice=<!-- TMPL_VAR NAME="invoice" -->&gst=<!-- TMPL_VAR
NAME="gst" -->&freight=<!-- TMPL_VAR NAME="freight" -->&supplierid=<!--
TMPL_VAR NAME="supplierid" -->&catview=yes&datereceived=<!-- TMPL_VAR
name="datereceived" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+ <td class="number"><!-- TMPL_VAR NAME="ecost"
--></td>
+ <td class="number"><!-- TMPL_VAR
NAME="quantity" --></td>
+ <td></td>
+ <td class="number"><!-- TMPL_VAR
NAME="unitprice" --></td>
+ <td class="number"><!-- TMPL_VAR
NAME="quantityrecieved" --></td>
+ <td class="number"><!-- TMPL_VAR NAME="total"
--></td>
</tr>
<!-- /TMPL_LOOP -->
<tr>
- <th> </th>
- <th> </th>
- <th> </th>
- <th> </th>
- <th> </th>
- <th> </th>
- <th> </th>
- <th> </th>
- <th> </th>
- <th><!-- TMPL_VAR NAME="tototal" --></th>
- </tr>
- <tr>
- <td colspan="7" rowspan="2">
- <div class="help"><h3>HELP</h3>
- <p>The total at the bottom of the page should
be within a few cents of the total for the invoice.</p></div>
+ <td colspan="5" rowspan="3">
+
</td>
- <td colspan="2" scope="row">GST</td>
+ <td colspan="2" class="total"><b>GST:</b></td>
<td><!-- TMPL_VAR NAME="gst" --></td>
</tr>
<tr>
- <td colspan="2" scope="row">FREIGHT</td>
+ <td colspan="2" class="total"><b>FREIGHT:</b></td>
<td><!-- TMPL_VAR NAME="freight" --></td>
</tr>
<tr>
- <td colspan="2" scope="row">TOTAL</td>
+ <td colspan="2" class="total"><b>TOTAL:</b></td>
<td><!-- TMPL_VAR NAME="grandtot" --></td>
</tr>
</table>
+ <div class="help">
+ <strong>Note: </strong>The total at the bottom of the page should be
within a few cents of the total for the invoice.
+ </div>
+ </div>
- <div class="data">
- <h2>Pending orders </h2>
+ <div class="basket">
+ <h2> Pending orders </h2>
<form action="/cgi-bin/koha/acqui/acquire.pl">
<input type="hidden" name="supplierid" value="<!--
TMPL_VAR NAME="supplierid" -->">
<input type="hidden" name="gst" value="<!-- TMPL_VAR
NAME="gst" -->">
@@ -85,26 +71,36 @@
<b>Search ISBN or Title:</b> <input type="text"
size="25" name="recieve">
</form>
- </div>
+ <p>
+ <form action="" method="get" name="orderform">
- <table>
+ <table class="small">
<tr>
<th>Basket</th>
- <th>ISBN</th>
<th>Title</th>
- <th>Author</th>
+ <th>Ordered</th>
+ <th>Received</th>
+ <th> </th>
</tr>
- <!-- TMPL_VAR NAME="countpending" -->
+ <!-- TMPL_VAR NAME="countpending" --> lines
<!-- TMPL_LOOP NAME="loop_orders" -->
<tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
+<<<<<<< recieve.tmpl
<td><!-- TMPL_VAR NAME="basketno" --></td>
<td><!-- TMPL_VAR NAME="isbn" --></td>
<td><a href="acquire.pl?recieve=<!-- TMPL_VAR
NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber"
-->&invoice=<!-- TMPL_VAR NAME="invoice" -->&gst=<!-- TMPL_VAR
NAME="gst" -->&freight=<!-- TMPL_VAR NAME="freight" -->&supplierid=<!--
TMPL_VAR NAME="supplierid" -->&datereceived=<!-- TMPL_VAR
name="datereceived"-->&catview=yes""><!-- TMPL_VAR NAME="title" --></a></td>
<td><!-- TMPL_VAR NAME="author" --></td>
+=======
+ <td class="number"><!-- TMPL_VAR
NAME="basketno" --></td>
+ <td><!-- TMPL_VAR NAME="title" --></td>
+ <td class="number"><!-- TMPL_VAR
NAME="quantity" --></td>
+ <td class="number"><!-- TMPL_VAR
NAME="quantityrecieved" --></td>
+ <td><a href="acquire.pl?recieve=<!-- TMPL_VAR
NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber"
-->&invoice=<!-- TMPL_VAR NAME="invoice" -->&gst=<!-- TMPL_VAR
NAME="gst" -->&freight=<!-- TMPL_VAR NAME="freight" -->&supplierid=<!--
TMPL_VAR NAME="supplierid" -->&datereceived=<!-- TMPL_VAR
name="datereceived"-->&catview=yes" class="button acquisition">Recieve</td>
+>>>>>>> 1.1.2.7
</tr>
<!-- /TMPL_LOOP -->
</table>
</div>
-
</div>
+
<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->