[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui... [dev_week]
Ryan Higgins
rch at liblime.com
Tue Feb 13 15:53:36 CET 2007
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Ryan Higgins <rych> 07/02/13 14:53:36
Modified files:
koha-tmpl/intranet-tmpl/npl/en/acqui: acqui-home.tmpl
acquire.tmpl basket.tmpl
histsearch.tmpl
newbasket2.tmpl
newbiblio.tmpl
recieveorder.tmpl
recieve.tmpl supplier.tmpl
Log message:
Add acqui nav links, fix typos, add display, changes to accomodate .pl commits.
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.3&r2=1.3.2.3.2.4
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.5&r2=1.1.2.3.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.4.2.5&r2=1.2.2.4.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.7&r2=1.1.2.7.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/newbasket2.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.1&r2=1.1.2.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.5.2.2&r2=1.2.2.5.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/recieveorder.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3.2.1&r2=1.1.2.3.2.2
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.3&r2=1.1.2.3.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/supplier.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3.2.2&r2=1.1.2.3.2.3
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.3
retrieving revision 1.3.2.3.2.4
diff -u -b -r1.3.2.3.2.3 -r1.3.2.3.2.4
--- acqui-home.tmpl 1 Jan 2007 00:41:07 -0000 1.3.2.3.2.3
+++ acqui-home.tmpl 13 Feb 2007 14:53:36 -0000 1.3.2.3.2.4
@@ -23,7 +23,7 @@
<!-- /TMPL_IF -->
-<!-- currencies-->
+<!-- currencies
<div class="details">
<!-- TMPL_IF NAME="loop_currency" -->
<h4>Currencies</h4>
@@ -47,7 +47,7 @@
</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">
<h4>Pending Suggestions</h4>
@@ -94,14 +94,17 @@
</tfoot>
</tr>
</table><!-- /TMPL_IF -->
-<p> 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.</p>
+<!-- <p> 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.</p> -->
<div class="help">
- <h4>Help</h4> <p>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).</p>
+ <h4>Help</h4> <p>To start an acquisition, whether an order, local purchase or donation first search on the supplier.</p>
+ <p>Create a new "shopping basket" or add book orders to an existing basket. (A basket is associated with a user and a supplier). </p>
<p>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. </p>
<p>To start a new shopping basket with a new supplier return to this page and just start a new supplier search.</p>
- <p>To close off a shopping basket click on "view shopping baskets" or search above, and the click on "confirm basket".</p>
+ <p>To close off a shopping basket click on "view shopping baskets" or search above, and the click on "close basket".</p>
+ <p>Orders are received into parcels, identified by a supplier invoice # (and optionally a local PO number).</p>
+ <p>If an order arrives in multiple shipments, it will be split into separate orders (with an supplier invoice number for each).</p>
</div></div>
<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
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.5
retrieving revision 1.1.2.3.2.6
diff -u -b -r1.1.2.3.2.5 -r1.1.2.3.2.6
--- acquire.tmpl 1 Jan 2007 01:43:50 -0000 1.1.2.3.2.5
+++ acquire.tmpl 13 Feb 2007 14:53:36 -0000 1.1.2.3.2.6
@@ -46,11 +46,13 @@
<div id="main">
-<h1>Receipt Summary for: <i><!-- TMPL_VAR NAME="name" --></i> Invoice <i><!-- TMPL_VAR NAME="invoice" --></i></h1>
-
+<h1>Receipt Summary </h1>
+<h2>Supplier: <i><!-- TMPL_VAR NAME="name" --></i></h2>
+<h2> Invoice: <i><!-- TMPL_VAR NAME="invoice" --></i></h2>
+<hr />
<!-- TMPL_IF name="count" -->
<form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post">
- <h1><!-- TMPL_VAR NAME="ordernumber" --> - Receive Order</h1>
+ <h2>Order # <!-- TMPL_VAR NAME="ordernumber" --></h2>
<h4>Shopping Basket For: <!-- TMPL_VAR NAME="name" --></h4>
<h5>Order placed: <!-- TMPL_VAR NAME="date" --></h5>
<div class="box">
@@ -115,7 +117,7 @@
</div>
<div class="box">
- <h2>Accounting details</h2>
+ <h2>Accounting details (per item)</h2>
<table><tr>
<td><strong>Bookfund:</strong></td><td>
<!-- TMPL_VAR NAME="bookfund" -->
@@ -126,7 +128,7 @@
<input type="hidden" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" />
</td></tr>
<tr>
- <td><label for="">Total Items Received: (including previous parcels)</label></td>
+ <td><label for="">Total Items Received: </label></td>
<td><input id="quantityrec" READONLY type="text" size="20" name="quantityrec" value="<!-- TMPL_IF NAME="quantityreceived" --><!-- TMPL_VAR NAME="quantityreceivedplus1" --><!-- TMPL_ELSE -->1<!-- /TMPL_IF -->" />
<input id="origquantityrec" READONLY type="hidden" name="origquantityrec" value="<!-- TMPL_IF NAME="quantityreceived" --><!-- TMPL_VAR NAME="quantityreceived" --><!-- TMPL_ELSE -->0<!-- /TMPL_IF -->" />
</td></tr>
@@ -140,7 +142,7 @@
</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><input type="text" size="20" name="cost" value="<!-- TMPL_IF name="unitprice"--><!-- TMPL_VAR NAME="unitprice" --><!-- TMPL_ELSE --><!-- TMPL_VAR name="ecost" --><!-- /TMPL_IF -->">
</td></tr>
<tr>
<td><strong>Invoice Number:</strong></td>
@@ -158,7 +160,7 @@
<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>
+<p><input type="submit" class="submit" value="Save"> </p>
</div>
</form>
<!-- TMPL_ELSE -->
Index: basket.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/basket.tmpl,v
retrieving revision 1.2.2.4.2.5
retrieving revision 1.2.2.4.2.6
diff -u -b -r1.2.2.4.2.5 -r1.2.2.4.2.6
--- basket.tmpl 1 Jan 2007 01:12:31 -0000 1.2.2.4.2.5
+++ basket.tmpl 13 Feb 2007 14:53:36 -0000 1.2.2.4.2.6
@@ -4,7 +4,7 @@
<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
<div id="main">
- <h1><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket <b><!-- TMPL_VAR NAME="basketno" --> </b>for <a href="supplier.pl?id=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1><br />
+ <h1><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket <b><!-- TMPL_VAR NAME="basketno" --> </b>for <a href="supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->&op=display"><!-- TMPL_VAR NAME="name" --></a></h1><br />
<div class="data"><!-- TMPL_UNLESS name="closedate" -->
<!-- TMPL_IF name="basketno" -->
@@ -139,7 +139,7 @@
<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" -->">
- <ul><li>From an existing record: <input type="text" size="25" name="search"><input type="submit" value="Search" class="submit"></li>
+ <ul><li>From an existing record: <input type="text" size="25" name="search"><input type="submit" value="Title Search" class="submit"></li>
<li><a href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->">From a Suggestion</a></li>
<li><a href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->">New Record</a></li>
</ul>
Index: histsearch.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/histsearch.tmpl,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.7.2.1
diff -u -b -r1.1.2.7 -r1.1.2.7.2.1
--- histsearch.tmpl 5 Jan 2006 22:44:23 -0000 1.1.2.7
+++ histsearch.tmpl 13 Feb 2007 14:53:36 -0000 1.1.2.7.2.1
@@ -5,26 +5,14 @@
<div id="main">
<h1>Order search</h3>
- <div class="results"><!-- TMPL_VAR Name ="numresults" --> orders were found.</div>
- <form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
<div class="data">
+ <form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
<table>
<thead><tr>
- <th scope="col"> </th>
- <th scope="col">Supplier</th>
- <th scope="col">Title/Author</th>
- <th scope="col">Placed on</th>
- <th scope="col">Recieved on</th>
- <th scope="col">Quantity ordered</th>
- <th scope="col">Quantity received</th>
- <th scope="col">Unit cost</th>
- <th scope="col"> </th>
- </tr>
- <tr>
-
<th scope="col">Filter By:</th>
- <th scope="col"><input type="text" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
- <th scope="col"><input type="text" name="title" value="<!-- TMPL_VAR name="title"-->" /> <input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
+ <th scope="col"><label for="supplier">Supplier</label><input type="text" id="supplier" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
+ <th scope="col"><label for="title">Title</label><input type="text" id="title" name="title" value="<!-- TMPL_VAR name="title"-->" /> </th>
+ <th scope="col"><label for="author">Author</label><input type="text" id="author" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
<th scope="col"> From <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
<input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->">
<script language="JavaScript" type="text/javascript">
@@ -84,10 +72,25 @@
</script></th>
<th scope="col"> </th>
<th scope="col"> </th>
- <th scope="col"> </th>
- <th scope="col"> </th>
<th scope="col"><input type="submit" class="submit" value="Set Filter" /></th>
</tr></thead>
+ </table></form>
+</div>
+ <div class="results"><h2>Order Search Results:</h2>
+ <!-- TMPL_VAR Name ="numresults" --> orders were found.</div>
+<div class="data">
+ <table>
+ <thead><tr>
+ <th scope="col">Basket No</th>
+ <th scope="col">Supplier</th>
+ <th scope="col">Title/Author</th>
+ <th scope="col">Placed on</th>
+ <th scope="col">Recieved on</th>
+ <th scope="col">Quantity ordered</th>
+ <th scope="col">Quantity received</th>
+ <th scope="col">Unit cost</th>
+ <th scope="col"> </th>
+ </tr>
<tfoot><tr>
<td> </td>
<td> </td>
@@ -106,7 +109,7 @@
<!-- TMPL_ELSE -->
<tr>
<!-- /TMPL_IF -->
- <td><!-- TMPL_VAR NAME="count" --></td>
+ <td><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="basketno" --></a></td>
<td><!-- TMPL_VAR NAME="name" --></td>
<td><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
</td>
@@ -119,6 +122,6 @@
</tr>
<!-- /TMPL_LOOP -->
</tbody>
- </table></div></form>
-</div>
+ </table></div>
+ </div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: newbasket2.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/newbasket2.tmpl,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -b -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- newbasket2.tmpl 11 Jul 2006 14:03:23 -0000 1.1.2.1.2.1
+++ newbasket2.tmpl 13 Feb 2007 14:53:36 -0000 1.1.2.1.2.2
@@ -66,9 +66,13 @@
<!-- /TMPL_LOOP -->
</table>
-
+ <!-- TMPL_IF name="previous" -->
+ <a class="nav" href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR NAME="num" -->&offset=<!-- TMPL_VAR NAME="previous" -->&type=<!-- TMPL_VAR NAME="type" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&search=<!-- TMPL_VAR NAME="title" -->&author=<!-- TMPL_VAR NAME="author" -->">
+ < Previous
+ </a>
+ <!-- /TMPL_IF -->
<!-- TMPL_IF name="offsetover" -->
-<a class="nav" href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR name="num" -->&offset=<!-- TMPL_VAR name="offset" -->&type=<!-- TMPL_VAR name="type" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&search=<!-- TMPL_VAR name="title" -->&author=<!-- TMPL_VAR name="author" -->">Next</a>
+<a class="nav" href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR name="num" -->&offset=<!-- TMPL_VAR name="offset" -->&type=<!-- TMPL_VAR name="type" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&search=<!-- TMPL_VAR name="title" -->&author=<!-- TMPL_VAR name="author" -->">Next ></a>
<!-- /TMPL_IF -->
</div>
Index: newbiblio.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/newbiblio.tmpl,v
retrieving revision 1.2.2.5.2.2
retrieving revision 1.2.2.5.2.3
diff -u -b -r1.2.2.5.2.2 -r1.2.2.5.2.3
--- newbiblio.tmpl 1 Jan 2007 01:11:59 -0000 1.2.2.5.2.2
+++ newbiblio.tmpl 13 Feb 2007 14:53:36 -0000 1.2.2.5.2.3
@@ -156,8 +156,8 @@
<tr><th><label for="ecost">Budgeted Cost</label></th><td><input type="text" size="20" id="ecost" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->"<!-- TMPL_IF name="close" --> readonly="readonly"<!--/TMPL_IF--> /></td></tr>
<!-- TMPL_IF NAME="GST" --><tr><th><label for="GST">Budgeted GST</label></th><td><input type="text" size="20" id="GST" name="GST" value=""<!-- TMPL_IF name="close" --> readonly="readonly"<!--/TMPL_IF--> /></td></tr><!-- TMPL_ELSE --><input type="hidden" name="GST" value="0" /><!-- /TMPL_IF -->
<tr><th><label for="total"><strong>BUDGETED TOTAL</strong></label></th><td><input type="text" size="20" id="total" name="total" value=""<!-- TMPL_IF name="close" --> readonly="readonly"<!--/TMPL_IF--> /></td></tr>
- <tr><th><label for="cost">Actual Cost</label></th><td><input type="text" size="20" id="cost" name="cost" value="<!-- TMPL_VAR name="ecost"-->"<!-- TMPL_IF name="close" --> readonly="readonly"<!--/TMPL_IF--> /></td></tr>
- <tr><th><label for="invoice">Invoice Number *</label></th><td><input type="text" size="20" id="invoice" name="invoice" value="<!-- TMPL_VAR name="invoice" -->" /></td></tr>
+ <tr><th><label for="cost">Actual Cost</label></th><td><input type="text" size="20" id="cost" name="cost" value="<!-- TMPL_VAR name="ecost"-->" readonly="readonly" style="background-color:#ccc;" /></td></tr>
+ <tr><th><label for="invoice">Invoice Number</label></th><td><input type="text" size="20" id="invoice" name="invoice" value="<!-- TMPL_VAR name="invoice" -->" readonly="readonly" style="background-color:#ccc;" /></td></tr>
<tr><th><label for="notes-details">Notes</label></th><td><input type="text" size="20" id="notes-details" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" /></td></tr>
<tr><th><label for="sort1">Sort field 1</label></th><td>
<!-- TMPL_IF Name="CGIsort1" -->
Index: recieveorder.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/recieveorder.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
--- recieveorder.tmpl 20 Dec 2006 06:09:01 -0000 1.1.2.3.2.1
+++ recieveorder.tmpl 13 Feb 2007 14:53:36 -0000 1.1.2.3.2.2
@@ -1,10 +1,10 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receive Orders From Supplier <!-- TMPL_VAR name="name" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
+<!-- TMPL_INCLUDE NAME="acqui-full-topmenu.inc" --><!-- TMPL_INCLUDE name="intranet-nav.inc" -->
<div id="main">
-<h1>Receive Orders From Supplier <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
+<h1>Receive Orders From Supplier <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&op=display"><!-- TMPL_VAR NAME="name" --></a></h1>
<!-- TMPL_IF NAME="count" --><p> <!-- TMPL_VAR NAME="count" --> parcels found</p><!--/TMPL_IF-->
<div id="resultnumber">
@@ -28,48 +28,55 @@
<form method="post" action="recieveorder.pl">
<table>
<tr>
- <th>Number</th>
- <th>Code</th>
- <th>Date Received</th>
- <th>Item Count</th>
- <th>Biblio count</th>
- <th>Items expected</th>
-</tr>
- <tr>
-<th> <input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->" /></th><th><input type="text" size="20" name="filter" value="<!-- TMPL_VAR NAME="filter" -->" /></th>
-<th>From :<input type="text" size="9" name="datefrom" value="<!-- TMPL_VAR NAME="datefrom" -->" /> <p>To :<input type="text" size="9" name="dateto" value="<!-- TMPL_VAR NAME="dateto" -->" /></th><th> </th><th>Sort by :<select name="orderby">
-<option value="aqorders.booksellerinvoicenumber"> Code</option>
+<th><input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->" />
+<p><label for="datefrom">From :</label><input type="text" size="9" name="datefrom" value="<!-- TMPL_VAR NAME="datefrom" -->" /></p>
+<p><label for="dateto">To :</label><input type="text" size="9" name="dateto" value="<!-- TMPL_VAR NAME="dateto" -->" /></p></th>
+<th><label for="filter">Invoice</label>
+<input type="text" size="20" name="filter" value="<!-- TMPL_VAR NAME="filter" -->" /></th>
+<th><label for="orderby">Sort by :</label><select name="orderby">
+<option value="aqorders.booksellerinvoicenumber"> Invoice</option>
+<option value="aqorders.purchaseordernumber"> PO Number</option>
<option value="datereceived"> Date Received</option>
<option value="datereceived desc"> Date Received reverse</option>
-<option value="aqorders.booksellerinvoicenumber desc"> Code reverse</option>
-</select><br />
+<option value="aqorders.booksellerinvoicenumber desc"> Invoice reverse</option>
+</select></th>
+<th>
Results per page :<select name="resultsperpage" value ="<!--TMPL_VAR Name="resultsperpage"-->" size="1">
<option value="20">20</option>
<option value="30">30</option>
<option value="50">50</option>
<option value="100">100</option>
</select>
-</th><th><input type="submit" class="submit" value="Filter" />
</th>
+<th><input type="submit" class="submit" value="Filter" />
+</th>
+</tr>
+</table>
+<table>
+<tr>
+ <th>Date Received</th>
+ <th>Invoice</th>
+ <th>PO Number</th>
+ <th>Item Count</th>
+ <th>Biblio count</th>
+<!-- <th>Invoice Total</th> -->
</tr>
<!-- Actual Search Results -->
<!-- TMPL_LOOP NAME="searchresults" -->
<!-- TMPL_IF NAME="even" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+ <td><a href="/cgi-bin/koha/acqui/receive.pl?type=intra&supplierid=<!-- TMPL_VAR NAME="supplierid" ESCAPE=URL -->&datereceived=<!-- TMPL_VAR NAME="raw_datereceived" ESCAPE=URL --><!--TMPL_IF Name="code"-->&code=<!--TMPL_VAR Name="code" ESCAPE=URL --><!--/TMPL_IF-->">
+ <!-- TMPL_VAR NAME="datereceived" -->
+ </a></td>
<td>
- <a href="/cgi-bin/koha/acqui/receive.pl?type=intra&supplierid=<!-- TMPL_VAR NAME="supplierid" ESCAPE=URL -->&datereceived=<!-- TMPL_VAR NAME="raw_datereceived" ESCAPE=URL --><!--TMPL_IF Name="code"-->&code=<!--TMPL_VAR Name="code" ESCAPE=URL --><!--/TMPL_IF-->">
- <!-- TMPL_VAR NAME="number" -->
- </a>
+ <!--TMPL_IF Name="code"--><!--TMPL_VAR Name="code" --><!--/TMPL_IF-->
</td>
<td>
- <!--TMPL_IF Name="code"--><!--TMPL_VAR Name="code" --><!--/TMPL_IF-->
+ <!--TMPL_IF Name="ponum"--><!--TMPL_VAR Name="ponum" --><!--/TMPL_IF-->
</td>
- <td><a href="/cgi-bin/koha/acqui/receive.pl?type=intra&supplierid=<!-- TMPL_VAR NAME="supplierid" ESCAPE=URL -->&datereceived=<!-- TMPL_VAR NAME="raw_datereceived" ESCAPE=URL --><!--TMPL_IF Name="code"-->&code=<!--TMPL_VAR Name="code" ESCAPE=URL --><!--/TMPL_IF-->">
- <!-- TMPL_VAR NAME="datereceived" -->
- </a></td>
<td> <!-- TMPL_VAR NAME="reccount" --> </td>
<td><!-- TMPL_VAR NAME="bibcount" -->
</td>
- <td><!-- TMPL_VAR NAME="itemcount" -->
+<!-- <td><!-- TMPL_VAR NAME="invoiceTotal" --> -->
</td>
</tr>
<!-- /TMPL_LOOP -->
@@ -78,16 +85,20 @@
<!--/TMPL_IF-->
<div class="data">
<h2> Receive a new Parcel </h2>
- <form method="get" action="receive.pl">
+ <form method="get" action="receive.pl" onsubmit=" if( this.invoice.value =='' ) { alert('You must enter an invoice #.'); return false;} ">
- <table><tr><th><input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->" />
- <label for="invoice">Parcel Code</label></th>
+ <table>
+ <tr><th><input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->" />
+ <label for="invoice">Supplier Invoice *</label></th>
<td><input type="text" size="20" id="invoice" name="invoice" /></td></tr>
+ <tr><th><label for="pordernum">Purchase Order Number </label></th>
+ <td><input type="text" size="20" id="pordernum" name="pordernum" /></td></tr>
+
<!-- TMPL_IF NAME="GST" --> <tr><th><label for="gst">GST</label></th>
<td> <input type="text" size="20" id="gst" name="gst" /></td></tr><!-- TMPL_ELSE --><input type="hidden" name="gst" value="0" /><!-- /TMPL_IF -->
- <tr><th><label for="freight">Freight</label></th>
+ <tr><th><label for="freight">Shipping</label></th>
<td><input type="text" size="20" id="freight" name="freight" /></td></tr>
</table>
<p><input type="submit" class="submit" value="Save" /></p>
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.3
retrieving revision 1.1.2.3.2.4
diff -u -b -r1.1.2.3.2.3 -r1.1.2.3.2.4
--- recieve.tmpl 1 Jan 2007 00:41:07 -0000 1.1.2.3.2.3
+++ recieve.tmpl 13 Feb 2007 14:53:36 -0000 1.1.2.3.2.4
@@ -3,16 +3,16 @@
<!-- TMPL_INCLUDE NAME="acqui-full-topmenu.inc" --><!-- TMPL_INCLUDE name="intranet-nav.inc" -->
<div id="main">
- <h1>Receipt parcel for <em><!-- TMPL_VAR NAME="name" --></em></h1>
+ <h1>Receipt: parcel from <em><!-- TMPL_VAR NAME="name" --></em></h1>
<ul class="notes">
<li><strong>Invoice:</strong> <!-- TMPL_VAR NAME="invoice" --></li>
- <li>Received by: <!-- TMPL_VAR name="user" --></li>
+ <li>Received by: <!-- TMPL_VAR name="loggedinusername" --></li>
<li><strong>Date:</strong> <!-- TMPL_VAR name="formatteddatereceived"--></li>
</ul>
<div class="basket">
- <h2> Items in parcel</h2>
+ <h2> Items in parcel</h2> <a href="/cgi-bin/koha/acqui/recieveorder.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->">[Back to parcel list]</a>
<p>
<!-- TMPL_VAR NAME="countreceived" --> records received
</p>
@@ -21,9 +21,8 @@
<tr>
<th>Basket</th>
<th>Title</th>
- <th>Est. cost</th>
- <th>Qty ordered</th>
- <th>P&P</th>
+ <th>Budgeted cost</th>
+ <!-- <th>Still on order</th> -->
<th>Actual</th>
<th>Qty</th>
<th>Total</th>
@@ -31,21 +30,22 @@
<!-- TMPL_LOOP NAME="loop_received" -->
<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><!-- <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" -->"> </a> --><!-- TMPL_VAR NAME="title" --></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="stillonorder" --></td> -->
<td class="number"><!-- TMPL_VAR NAME="unitprice" --></td>
- <td class="number"><!-- TMPL_VAR NAME="quantityrecieved" --></td>
+ <td class="number"><!-- TMPL_VAR NAME="quantityreceived" --></td>
<td class="number"><!-- TMPL_VAR NAME="total" --></td>
</tr>
<!-- /TMPL_LOOP -->
<tr>
- <td colspan="5" rowspan="3">
+ <td colspan="3" rowspan="3">
</td>
+ <!-- TMPL_IF NAME="gst" -->
<td colspan="2" class="total"><b>GST:</b></td>
<td><!-- TMPL_VAR NAME="gst" --></td>
+ <!-- /TMPL_IF -->
</tr>
<tr>
<td colspan="2" class="total"><b>FREIGHT:</b></td>
@@ -57,7 +57,7 @@
</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.
+ <!-- <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>
@@ -78,7 +78,7 @@
<tr>
<th>Basket</th>
<th>Title</th>
- <th>Ordered</th>
+ <th>On Order</th>
<th>Received</th>
<th> </th>
</tr>
@@ -88,8 +88,8 @@
<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>
+ <td class="number"><!-- TMPL_VAR NAME="quantityreceived" --></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">Receive</td>
</tr>
<!-- /TMPL_LOOP -->
</table>
Index: supplier.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/supplier.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
--- supplier.tmpl 3 Dec 2006 21:47:32 -0000 1.1.2.3.2.2
+++ supplier.tmpl 13 Feb 2007 14:53:36 -0000 1.1.2.3.2.3
@@ -1,6 +1,6 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF NAME=id -->Update: <!-- TMPL_VAR name="name" --><!-- TMPL_ELSE -->Add supplier<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
+<!-- TMPL_INCLUDE NAME="acqui-full-topmenu.inc" --><!-- TMPL_INCLUDE name="intranet-nav.inc" -->
<div id="main">
<!--TMPL_IF Name="enter"-->
More information about the Koha-cvs
mailing list