[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/acqui acqu...
paul poulain
paul at koha-fr.org
Fri Mar 9 15:46:45 CET 2007
CVSROOT: /sources/koha
Module name: koha
Changes by: paul poulain <tipaul> 07/03/09 14:46:45
Modified files:
koha-tmpl/intranet-tmpl/prog/en/acqui: acqui-home.tmpl
basket.tmpl
booksellers.tmpl
histsearch.tmpl
lateorders.tmpl
neworderempty.tmpl
newordersuggestion.tmpl
parcel.tmpl parcels.tmpl
supplier.tmpl
Log message:
rel_3_0 moved to HEAD
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/booksellers.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/newordersuggestion.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl?cvsroot=koha&r1=1.3&r2=1.4
Patches:
Index: acqui-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- acqui-home.tmpl 20 Sep 2006 21:40:41 -0000 1.6
+++ acqui-home.tmpl 9 Mar 2007 14:46:45 -0000 1.7
@@ -4,16 +4,33 @@
<h1>Acquisitions</h1>
<div id="acqui_acqui_home_order">
+ <fieldset>
+ <legend>Start, recieve, or modify any order</legend>
<!-- TMPL_IF name="nobudget" -->
- You must define a budget in parameters
+ <span class="problem">You must define a budget in parameters</span>
+ <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
+ <p><label for="supplier">Supplier </label><input type="text" size="25" name="supplier" id="supplier" />
+ <input type="submit" value="Search" />
+ </p>
+ </form>
<!-- TMPL_ELSE -->
- <form action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
- <h2>Start, recieve, or modify any order</h2>
- <p><label for="supplier">Supplier ID or name</label><input type="text" size="25" name="supplier" id="supplier" />
+ <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
+ <p><label for="supplier">Supplier </label><input type="text" size="25" name="supplier" id="supplier" />
<input type="submit" value="Search" />
</p>
</form>
<!-- /TMPL_IF -->
+ </fieldset>
+</div>
+<div id="acqui_acqui_home_suggestions">
+ <fieldset>
+ <legend>Pending suggestions</legend>
+ <!-- TMPL_IF name="suggestion" -->
+ <!--TMPL_VAR NAME="suggestion" --> suggestions waiting <a href="/cgi-bin/koha/suggestion/acceptorreject.pl">Manage suggestions</a>
+ <!-- TMPL_ELSE -->
+ <p>No suggestions waiting</p>
+ <!-- /TMPL_IF -->
+ </fieldset>
</div>
@@ -41,26 +58,17 @@
<input type="submit" value="Save Exchange Rate" />
</form>
<!-- TMPL_ELSE -->
- <form action="/cgi-bin/koha/admin/currency.pl" method="post">
- <input type="hidden" name="op" value="add_form" /><input type="submit" value="Add Currency" />
- </form>
+ <a href="/cgi-bin/koha/admin/currency.pl?op=add_form" class="button acquisition">
+ Add Currency
+ </a>
<!-- /TMPL_IF -->
</div>
-<div id="acqui_acqui_home_suggestions">
- <h2>Pending Suggestions</h2>
- <!-- TMPL_IF name="suggestion" -->
- <!--TMPL_VAR NAME="suggestion" --> suggestions waiting <a href="/cgi-bin/koha/suggestion/acceptorreject.pl">Manage suggestions</a>
- <!-- TMPL_ELSE -->
- <p>No suggestions waiting</p>
- <!-- /TMPL_IF -->
-</div>
-
<div id="acqui_acqui_home_budgets">
<!-- TMPL_IF name="nobudget" -->
- <p>You must define a budget in parameters</p>
<!-- TMPL_ELSE -->
- <h2>Budgets and bookfunds</h2>
+ <h2>Budgets and Bookfunds</h2>
+ <a href="/cgi-bin/koha/admin/aqbookfund.pl" title="[ Manage Bookfunds ]">[ Manage ]</a>
<table>
<tr>
<th>Budgets</th>
@@ -85,18 +93,22 @@
<td><!-- TMPL_VAR name="totcomtd" --></td>
<td><!-- TMPL_VAR name="totavail" --></td>
</tr>
- </table><!-- /TMPL_IF -->
+ </table>
+ <!-- /TMPL_IF -->
</div>
<div id="acqui_acqui_home_hints">
<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>
<h2>Help</h2>
- <p>To start an acquisition, whether an order, local purchase or donation first search on the supplier, (set donations as a supplier if you wish), and click add order which will set up a "shopping basket" for you.</p>
- <p>To place an order you need to establish whether a biblio already exists for it, or set up a new biblio from scratch or from a suggestion. </p>
- <p>To close a shopping basket click on "confirm Close Basket". After closing a basket it can not be modified or deleted</p>
- <p>To receive an order (a parcel) search for the supplier and click receive. After confirming invoice details you will be asked to create items for the order</p>
-
+ <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>
+ <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>
</div>
+<script type="text/JavaScript">
+ document.findsupplier.supplier.focus();
+</script>
+
<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
Index: basket.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- basket.tmpl 20 Sep 2006 21:40:41 -0000 1.9
+++ basket.tmpl 9 Mar 2007 14:46:45 -0000 1.10
@@ -2,33 +2,24 @@
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
-<script>
-function Searchrecord()
-{
- window.open('/cgi-bin/koha/serials/subscription-bib-search.pl','FindABibIndex','width=500,height=400,toolbar=no,scrollbars=yes');
-}
-</script>
+
<h1><!-- 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></h1>
<div id="acqui_basket_summary">
<h2>Basket Details</h2>
- <table>
- <tr><th>Basket Number:</th><td><!-- TMPL_VAR NAME="basketno" --></td></tr>
- <tr><th>Managed By:</th><td><!-- TMPL_VAR NAME="authorisedbyname" --></td></tr>
- <tr><th>Open On:</th><td><!-- TMPL_VAR NAME="creationdate" --></td></tr>
- <tr><th>For:</th><td>Supplier Id <!-- TMPL_VAR NAME="booksellerid" --></td></tr>
- <tr><th>Invoice Number:</th><td><!-- TMPL_VAR NAME="booksellerinvoicenumber" --></td></tr>
- <tr><th>Purchase Order Number:</th><td><!-- TMPL_VAR NAME="purchaseordernumber" --></td></tr>
- <!-- TMPL_IF name="closedate" --><tr><th>Closed On:</th><td> <!-- TMPL_VAR name="closedate" --></td></tr><!-- /TMPL_IF -->
+ <p><label>Basket number </label> <!-- TMPL_VAR NAME="basketno" --> </p>
+ <p><label>Managed by </label> <!-- TMPL_VAR NAME="authorisedbyname" --> </p>
+ <p><label>Open on </label> <!-- TMPL_VAR NAME="creationdate" --> </p>
+ <p><label>For </label> Supplier Id <!-- TMPL_VAR NAME="booksellerid" --> </p>
+ <p><label>Invoice number </label><!-- TMPL_VAR NAME="booksellerinvoicenumber" --> </p>
+ <!-- TMPL_IF name="closedate" --><p><label>Closed On: </label> <!-- TMPL_VAR name="closedate" --></p><!-- /TMPL_IF -->
</table>
<!-- TMPL_UNLESS name="closedate" -->
- <!-- TMPL_IF NAME="basketno" -->
<form action="/cgi-bin/koha/acqui/booksellers.pl" method="get">
- <input type="hidden" name="op" value="close" />
<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
<input type="hidden" name="supplier" value="<!-- TMPL_VAR name="booksellerid" -->" />
- <input type="submit" value="Confirm Close this Basket" />
+ <input type="hidden" name="op" value="close" />
+ <input type="submit" value="Close this Basket" />
</form>
- <!-- /TMPL_IF-->
<!-- /TMPL_UNLESS -->
</div>
@@ -37,16 +28,22 @@
<!-- TMPL_IF name="books_loop" -->
<table>
<tr>
- <th scope="col">Order</th>
- <th scope="col">Publisher</th>
- <th scope="col"><a href="basket.pl?basketno=<!-- TMPL_VAR name="basketno" -->&order=biblio.title">Title</a></th>
- <th scope="col">RRP</th>
- <th scope="col">Qty.</th>
- <th scope="col">Total</th>
- <th scope="col"><a href="basket.pl?basketno=<!-- TMPL_VAR name="basketno" -->&order=aqorderbreakdown.bookfundid">Fund</a></th>
-<!-- TMPL_IF name="active" -->
-<!-- TMPL_UNLESS name="closedate" -->
- <th scope="col">Remove</th>
+ <th>Order</th>
+ <th><a href="basket.pl?basketno=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode">Publisher</a></th>
+ <th>Title</th>
+ <th>RRP</th>
+ <th>Est.</th>
+ <th>Qty.</th>
+ <th>Total</th>
+ <th class="DoNotPrint">
+ <a href="basket.pl?basketno=<!-- TMPL_VAR name="basketno" -->&order=aqorderbreakdown.bookfundid,biblioitems.publishercode">
+ Fund
+ </a>
+ </th>
+ <!-- TMPL_IF name="active" -->
+ <!-- TMPL_UNLESS name="closedate" -->
+ <th>Modify</th>
+ <th>Delete</th>
<!-- /TMPL_UNLESS -->
<!-- /TMPL_IF -->
</tr>
@@ -65,64 +62,64 @@
<!-- TMPL_ELSE -->
<td>
<p>
- <a href="neworderempty.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
- <!-- TMPL_VAR NAME="author" -->
+ <!-- TMPL_VAR NAME="title" --></p>
+ <p><!-- TMPL_VAR NAME="author" -->
<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="notes" --></p><p><!--TMPL_VAR name="notes" --><!-- /TMPL_IF -->
</p>
</td>
<!-- /TMPL_IF -->
- <td><!-- TMPL_VAR NAME="rrp" --></td>
- <td><!-- TMPL_VAR NAME="quantity" --></td>
- <td><!-- TMPL_VAR NAME="line_total" --></td>
- <td><!-- TMPL_VAR NAME="bookfundid" --></td>
+ <td class="number"><!-- TMPL_VAR NAME="rrp" --></td>
+ <td class="number"><!-- TMPL_VAR NAME="ecost" --></td>
+ <td class="number"><!-- TMPL_VAR NAME="quantity" --></td>
+ <td class="number"><!-- TMPL_VAR NAME="line_total" --></td>
+ <td class="DoNotPrint"><!-- TMPL_VAR NAME="bookfundname" --></td>
<!-- TMPL_IF name="active" -->
<!-- TMPL_UNLESS name="closedate" -->
- <!-- TMPL_UNLESS name="donotdelete" -->
<td>
- <form action="addorder.pl" method="get">
- <input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordernumber" -->" />
- <input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
- <input type="hidden" name="quantity" value="0" />
- <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
- <input type="submit" class="delete" value="Delete" />
- </form>
+ <a href="neworderempty.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->">Modify</a>
+ </td>
+ <td>
+ <a href="addorder.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&quantity=0&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Delete</a>
</td>
- <!-- /TMPL_UNLESS -->
<!-- /TMPL_UNLESS -->
<!-- /TMPL_IF -->
</tr>
<!-- /TMPL_LOOP -->
-
<tr>
<td colspan="2" rowspan="3">
<input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" />
<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
</td>
- <th align="right">SubTotal</th>
+ <th>SubTotal</th>
<th><!-- TMPL_VAR NAME="sub_total_est" --></th>
+ <th><!-- TMPL_VAR NAME="sub_total" --></td>
<th><!-- TMPL_VAR name="qty_total" --></th>
+ <!-- TMPL_IF name="active" -->
+ <!-- TMPL_IF name="closedate" -->
+ <td colspan="2" rowspan="3"> </td>
+ <!-- TMPL_ELSE -->
+ <td colspan="3" rowspan="3"> </td>
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
+
</tr>
- <!--TMPL_IF NAME="disc_est"-->
- <tr>
- <th align="right">Discount</th>
- <th>-<!-- TMPL_VAR NAME="disc_est" --></th>
- </tr>
- <!--/TMPL_IF-->
- <!--TMPL_IF NAME="gist"-->
<tr>
- <th align="right">Tax</th>
+ <th>GST</th>
<th><!-- TMPL_VAR NAME="gist_est" --></th>
+ <th><!-- TMPL_VAR NAME="gist" --></th>
+ <th> </th>
</tr>
- <!--/TMPL_IF-->
- <tr><td></td><td></td>
- <th align="right">TOTAL</th>
+ <tr>
+ <th>TOTAL (<!-- TMPL_VAR NAME="currency" -->)</th>
<th><!-- TMPL_VAR NAME="grand_total_est" --></th>
+ <th><!-- TMPL_VAR NAME="grand_total" --></th>
+ <th> </th>
</tr>
</table>
<!-- TMPL_ELSE -->
<table>
- <tr><td>Basket empty</td></tr>
+ <tr><td>Basket empty</p>
</table>
<!-- /TMPL_IF -->
@@ -130,14 +127,12 @@
</div>
<div id="acqui_basket_add">
<h2>Add To Order</h2>
- <form action="/cgi-bin/koha/acqui/neworderempty.pl" method="get" name="f" id="f">
+ <form action="/cgi-bin/koha/acqui/neworderbiblio.pl" method="post">
<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->" />
<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
- To add from an existing record:
- <li>Enter an existing biblionumber: <input type="text" size="25" name="biblionumber" />
- <input type="submit" value="Add order" /></li>
- <li>or <a href="#" onClick="Searchrecord()">Search for an existing Biblio</a></li>
- <ul><li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->">From a Suggestion</a></li>
+ <ul><li><label for="q">From an existing record: </label><input id="q" type="text" size="25" name="q" />
+ <input type="submit" value="Search" /></li>
+ <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->">From a Suggestion</a></li>
<li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->">New Record</a></li>
</ul>
</form>
Index: booksellers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/booksellers.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- booksellers.tmpl 20 Sep 2006 21:40:41 -0000 1.2
+++ booksellers.tmpl 9 Mar 2007 14:46:45 -0000 1.3
@@ -2,14 +2,14 @@
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
-<h1>You searched on <b>supplier: <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> baskets found</h1>
+<h1>You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h1>
<div id="acqui_order_supplierlist">
<table>
<tr>
<th>Order</th>
+ <th>Order receive</th>
<th>Company</th>
<th> </th>
-
</tr>
<!-- TMPL_LOOP name="loop_suppliers" -->
@@ -21,27 +21,24 @@
Inactive
<!-- /TMPL_IF -->
</td>
-
- <td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><!-- TMPL_VAR name="name" --></a></td>
-
- <!--TMPL_IF NAME="ordcount"-->
<td>
- <a href="parcel.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">Recieve All orders</a>
+ <a href="parcels.pl?supplierid=<!-- TMPL_VAR name=supplierid -->">Receive order</a>
</td>
- <!--/TMPL_IF-->
-
+ <td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><!-- TMPL_VAR name="name" --></a></td>
<td>
- <table><!--TMPL_IF NAME="ordcount"-->
+ <table>
+ <!-- TMPL_IF NAME="loop_basket"-->
+ <tr>
<th>Basket</th>
- <th>Purchase order</th>
+ <th>Items</th>
<th>Created by</th>
<th>Date</th>
<th> </th>
- <!--/TMPL_IF-->
+ </tr>
<!-- TMPL_LOOP NAME="loop_basket" -->
<tr>
<td><!-- TMPL_VAR NAME="basketno" --></td>
- <td><TMPL_VAR NAME="purchaseordernumber"></td>
+ <td><TMPL_VAR NAME="total"></td>
<td>
<!-- TMPL_VAR name="firstname" -->
<!-- TMPL_VAR name="surname" -->
@@ -50,34 +47,27 @@
<td>
<!-- TMPL_IF name="closedate" -->
closed on <!-- TMPL_VAR NAME="closedate" -->
- <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">View</a>
+ <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">View</a>
<!-- TMPL_ELSE -->
<!-- TMPL_IF name="active" -->
- <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">modify</a>
+ <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">modify</a>
<!-- TMPL_ELSE -->
- <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">View</a>
+ <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">View</a>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
</td>
- <td>
- <!--TMPL_IF NAME="ordcount"-->
-
- <a href="parcel.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->">Recieve this order</a>
-
- <!--/TMPL_IF-->
- </td>
</tr>
<!-- /TMPL_LOOP -->
+ <!-- TMPL_ELSE -->
+ <tr><td>No pending basket</td></tr>
+ <!-- /TMPL_IF -->
</table>
</td>
</tr>
<!-- /TMPL_LOOP -->
</table>
</div>
-<div id="acqui_order_add_supplier">
- <form action="supplier.pl">
- <input type="hidden" name="supplierid" value="0" />
- <input type="submit" value="Add supplier" />
- </form>
+<div id="action">
+ <a href="supplier.pl?op=enter">Add supplier</a>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: histsearch.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- histsearch.tmpl 20 Sep 2006 21:40:41 -0000 1.5
+++ histsearch.tmpl 9 Mar 2007 14:46:45 -0000 1.6
@@ -88,7 +88,13 @@
</tr>
<!-- TMPL_LOOP NAME="suggestions_loop" -->
<tr>
- <td> </td>
+ <td>
+ <!-- TMPL_IF NAME="invoicenumber" -->
+ <a href="/cgi-bin/koha/acqui/parcel.pl?code=<!-- TMPL_VAR NAME="invoicenumber"-->&supplierid=<!-- TMPL_VAR NAME="id"-->&datereceived=<!-- TMPL_VAR NAME="datereceived" -->">Parcel</a>
+ <!-- TMPL_ELSE -->
+
+ <!-- /TMPL_IF -->
+ </td>
<td><a href="basket.pl?basketno=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
<td><!-- TMPL_VAR NAME="author" --></td>
<td><!-- TMPL_VAR NAME="name" --></td>
Index: lateorders.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- lateorders.tmpl 20 Jan 2006 16:04:42 -0000 1.2
+++ lateorders.tmpl 9 Mar 2007 14:46:45 -0000 1.3
@@ -4,7 +4,6 @@
<h1 ><!-- TMPL_IF name="Supplier" --><!-- TMPL_VAR name="Supplier" --> : <!--/TMPL_IF -->Late issues</h1>
<div id="acqui_lateorders">
- <form action="lateorders.pl" method="post">
<table>
<tr>
<th>Supplier</th>
@@ -19,9 +18,11 @@
<th>Total cost</th>
<th>Budget</th>
<th> </th>
+ <th> </th>
</tr>
<tr>
<td class="doNotPrint">
+ <form action="lateorders.pl" method="post">
<!-- TMPL_VAR name="CGIsupplier" -->
</td>
<td> </td>
@@ -31,19 +32,24 @@
<td colspan="2">
</td>
- <td class="doNotPrint">
- <select name="branch">
- <!-- TMPL_LOOP name="branchloop" -->
- <option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="branchname" --></option>
- <!-- /TMPL_LOOP -->
- </select>
- </td>
- <td colspan="5">
+ <td colspan="6">
</td>
+
<td class="doNotPrint">
<input type="submit" value="filter" />
+ </form>
+ </td>
+ <td class="doNotPrint">
+ <form name="claim" method="post">
+ <input type="hidden" name="op" value="send_alert" />
+ <select name="letter_code" >
+ <!--TMPL_LOOP Name="letters"-->
+ <option value="<!--TMPL_VAR Name="code"-->"><!--TMPL_VAR Name="name"--></option>
+ <!--/TMPL_LOOP -->
+ </select>
+ <input type="submit" value="Claim Order" />
</td>
</tr>
<!-- TMPL_LOOP name="lateorders" -->
@@ -58,7 +64,9 @@
<!-- TMPL_VAR name="latesince" -->
</td>
<td align="center" class="doNotPrint">
+ <a href="basket.pl?basketno=<!-- TMPL_VAR name="basketno" -->">
<!-- TMPL_VAR name="basketno" -->
+ </a>
</td>
<td >
<b><!-- TMPL_VAR name="title" --></b>
@@ -86,6 +94,9 @@
<td class="doNotPrint">
</td>
+ <td class="doNotPrint">
+ <input type="checkbox" name="claim_for" value="<!--TMPL_VAR Name="ordernumber" -->" />
+ </td>
</tr>
<!-- /TMPL_LOOP -->
<tr>
@@ -103,9 +114,15 @@
<th>
<!-- TMPL_VAR name="total" -->
</th>
+ <td colspan="2">
+
+ </td>
+ <td>
+ <input type="submit" value="Claim Order" />
+ </form>
+ </td>
</tr>
</table>
- </form>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: neworderempty.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- neworderempty.tmpl 20 Sep 2006 21:40:41 -0000 1.2
+++ neworderempty.tmpl 9 Mar 2007 14:46:45 -0000 1.3
@@ -4,45 +4,43 @@
<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
<script language="javascript" type="text/javascript">
-
+<!--
function update(f){
- //collect values
- quantity=f.quantity.value
- if (quantity ==0) {
+//collect values
+quantity=f.quantity.value
+if (quantity ==0) {
alert("Quantity must be >0");
- }
- discount=f.discount.value
- listinc=parseInt(f.listinc.value)
- currency=f.currency.value
- applygst=parseInt(f.applygst.value)
- listprice=f.list_price.value
- // rrp=f.rrp.value
- // ecost=f.ecost.value //budgetted cost
- // GST=f.GST.value
- // total=f.total.value
- //make useful constants out of the above
- exchangerate=f.elements[currency].value //get exchange rate
- gst_on=(applygst);
- //do real stuff
- if (listinc){
-listprice=listprice*100/(100+f.gstrate.value)
-}
- rrp=listprice*exchangerate;
- ecost=rrp*(100-discount)/100
- GST=0;
- if (gst_on){
- // rrp=rrp*(1+f.gstrate.value/100);
- GST=ecost*(f.gstrate.value)/100;
- }
-
- total=(ecost+GST)*quantity
-
- f.rrp.value=rrp;
- f.ecost.value=ecost;
- f.unitprice.value=ecost+GST
- f.GST.value=GST;
- f.total.value=total;
- return true;
+}
+discount=f.discount.value
+listinc=parseInt(f.listinc.value)
+currency=f.currency.value
+applygst=parseInt(f.applygst.value)
+listprice=f.list_price.value
+// rrp=f.rrp.value
+// ecost=f.ecost.value //budgetted cost
+// GST=f.GST.value
+// total=f.total.value
+//make useful constants out of the above
+exchangerate=f.elements[currency].value //get exchange rate
+gst_on=(!listinc && applygst);
+//do real stuff
+rrp=listprice*exchangerate;
+ecost=rrp*(100-discount)/100
+GST=0;
+if (gst_on){
+ rrp=rrp*(1+<!-- TMPL_VAR NAME="gstrate" -->);
+ GST=ecost*(<!-- TMPL_VAR NAME="gstrate" -->);
+}
+
+total=(ecost+GST)*quantity
+
+f.rrp.value=rrp;
+f.ecost.value=ecost;
+f.total.value=total;
+<!-- TMPL_IF NAME="GST"-->
+f.GST.value=GST;
+<!-- /TMPL_IF -->
+return true;
}
@@ -58,29 +56,17 @@
}
function check(f) {
- quantity=f.quantity.value;
- title=f.title.value;
- biblio=f.biblionumber.value;
- invoice=f.purchaseordernumber.value;
-suggestionid="<!--TMPL_VAR NAME="suggestionid"-->";
- if (title == "") {
- alert("Title can't be empty- Have you created the biblio?");
- return false;
- }
- if (biblio == "" && suggestionid=="") {
- alert("A biblio is not created- please create the biblio first?");
+quantity=f.quantity.value
+title=f.title.value
+if (title == "") {
+ alert("Title can't be empty");
return false;
- }
- if (quantity ==0) {
+}
+if (quantity ==0) {
alert("Quantity must be >0");
return false;
- }
-
- document.frusin.submit();
}
-function AddBiblio() {
- window.open("/cgi-bin/koha/cataloguing/addbiblio.pl?fromserials=1&popup=1&suggestionid=<!--TMPL_VAR NAME="suggestionid"-->","AddBiblio",'width=700,height=400,toolbar=no,scrollbars=yes,status=yes');
-
+ document.frusin.submit();
}
</script>
<h1>
@@ -91,30 +77,37 @@
<!-- /TMPL_IF -->
<!-- TMPL_IF name="suggestionid" -->(defined from suggestion #<!-- TMPL_VAR NAME="suggestionid" -->)<!-- /TMPL_IF -->
</h1>
- <div id="acqui_basket_summary">
- <h2>Basket Details</h2>
- <table>
- <tr><th>Basket Number:</th><td><!-- TMPL_VAR NAME="basketno" --></td></tr>
- <tr><th>Managed By:</th><td><!-- TMPL_VAR NAME="authorisedbyname" --></td></tr>
- <tr><th>Open On:</th><td><!-- TMPL_VAR NAME="creationdate" --></td></tr>
- <tr><th>For:</th><td>Supplier Id <!-- TMPL_VAR NAME="booksellerid" --></td></tr>
- <tr><th>Invoice Number:</th><td><!-- TMPL_VAR NAME="booksellerinvoicenumber" --></td></tr>
- <tr><th>Purchase Order Number:</th><td><!-- TMPL_VAR NAME="purchaseordernumber" --></td></tr>
- <!-- TMPL_IF name="closedate" --><tr><th>Closed On:</th><td> <!-- TMPL_VAR name="closedate" --></td></tr><!-- /TMPL_IF -->
- </table>
- </div>
-
-<div id="acqui_newbiblio_edit_catalogue">
- <h2>catalogue details</h2>
- <form action="/cgi-bin/koha/acqui/addorder.pl" method="post" name="frusin">
+
+<fieldset>
+ <legend>Basket Details</legend>
+ <p>
+ <!-- TMPL_IF name="basketno" -->
+ <label>Basket Number</label><!-- TMPL_VAR NAME="basketno" -->
+ <!-- TMPL_ELSE -->
+ New basket
+ <!-- /TMPL_IF -->
+
+ </p>
+ <p><label>Managed By</label><!-- TMPL_VAR NAME="authorisedbyname" --> </p>
+ <p><label>Open On</label><!-- TMPL_VAR NAME="creationdate" --> </p>
+ <p><label>For</label>Supplier Id <!-- TMPL_VAR NAME="booksellerid" --> </p>
+ <p><label>Invoice Number</label><!-- TMPL_VAR NAME="booksellerinvoicenumber" --> </p>
+ <!-- TMPL_IF name="closedate" --><p><label>Closed On:</label> <!-- TMPL_VAR name="closedate" --></p><!-- /TMPL_IF -->
+</fieldset>
+
+<form action="/cgi-bin/koha/acqui/addorder.pl" method="post" name="frusin">
+ <fieldset>
+ <legend>Catalogue details</legend>
<!-- TMPL_UNLESS name="existing" -->
- <input type="hidden" name="existing" value="no" >
+ <input type="hidden" name="existing" value="no" />
<!-- /TMPL_UNLESS -->
<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="biblionumber" id="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+ <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+ <input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" />
<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="currency" value="<!-- TMPL_VAR NAME="currency" -->" />
<input type="hidden" name="applygst" value="<!-- TMPL_VAR NAME="gstreg" -->" />
@@ -122,44 +115,58 @@
<!-- TMPL_LOOP NAME="loop_currencies" -->
<input type="hidden" name="<!-- TMPL_VAR NAME="currency" -->" value="<!-- TMPL_VAR NAME="rate" -->" />
<!-- /TMPL_LOOP -->
-
<p>
<label><b>Title *</b></label>
-
- <input type="text" size="20" name="title" id="title" value="<!-- TMPL_VAR NAME="title" -->" READONLY/>Auto filled
+ <!-- TMPL_IF name="biblio" -->
+ <input type="hidden" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->" /><!-- TMPL_VAR NAME="title" -->
+ <!-- TMPL_ELSE -->
+ <input type="text" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
+ <!-- /TMPL_IF -->
</p>
- <!-- TMPL_IF name="biblionumber" -->
<p>
<label>Author</label>
+ <!-- TMPL_IF name="biblio" -->
<input type="hidden" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" /><!-- TMPL_VAR NAME="author" -->
+ <!-- TMPL_ELSE -->
+ <input type="text" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" />
+ <!-- /TMPL_IF -->
</p>
<p>
<label> Publisher</label>
+ <!-- TMPL_IF name="biblio" -->
<input type="hidden" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" /><!-- TMPL_VAR NAME="publishercode" -->
+ <!-- TMPL_ELSE -->
+ <input type="text" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" />
+ <!-- /TMPL_IF -->
</p>
<p>
<label>Copyright Date</label>
+ <!-- TMPL_IF name="biblio" -->
<input type="hidden" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" /><!-- TMPL_VAR NAME="copyrightdate" -->
-
+ <!-- TMPL_ELSE -->
+ <input type="text" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" />
+ <!-- /TMPL_IF -->
</p>
<p>
<label>Format</label>
- <!-- TMPL_VAR NAME="itemtype" -->
+ <!-- TMPL_VAR NAME="CGIitemtype" -->
</p>
<p>
<label>ISBN</label>
+ <!-- TMPL_IF name="biblio" -->
<input type="hidden" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" /><!-- TMPL_VAR NAME="isbn" -->
-
+ <!-- TMPL_ELSE -->
+ <input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" />
+ <!-- /TMPL_IF -->
</p>
<p>
<label>Series</label>
+ <!-- TMPL_IF name="biblio" -->
<input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /><!-- TMPL_VAR NAME="seriestitle" -->
+ <!-- TMPL_ELSE -->
+ <input type="text" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" />
+ <!-- /TMPL_IF -->
</p>
- <!--TMPL_ELSE-->
- <!--TMPL_UNLESS NAME="suggestionid"--><p><a href="#" onClick="AddBiblio()">First Create a Biblio for this order</a></p><!--/TMPL_UNLESS-->
- <!--/TMPL_IF-->
-
- <h2>Accounting details</h2>
<p>
<label>Branch</label>
<select name="branch">
@@ -168,63 +175,62 @@
<!-- /TMPL_LOOP -->
</select>
</p>
+ </fieldset>
+ <fieldset>
+ <legend>Accounting details</legend>
<p>
<label>Quantity</label>
-
- <input type="text" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" onchange="update(this.form);" <!-- TMPL_IF name="close" -->readonly<!--/TMPL_IF--/>
-
+ <!-- TMPL_IF name="close" -->
+ <input type="hidden" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" /><!-- TMPL_VAR NAME="quantity" -->
+ <!-- TMPL_ELSE -->
+ <input type="text" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" onchange="update(this.form);" />
+ <!--/TMPL_IF-->
</p>
<p>
<label>Bookfund</label>
<!-- TMPL_IF name="close" -->
- <input type="hidden" size="20" name="bookfundid" value="<!-- TMPL_VAR NAME="bookfundid" -->" /><!-- TMPL_VAR NAME="bookfundname" -->
+ <input type="hidden" size="20" name="bookfund" value="<!-- TMPL_VAR NAME="bookfundid" -->" /><!-- TMPL_VAR NAME="bookfundname" -->
<!-- TMPL_ELSE -->
<!-- TMPL_VAR NAME="CGIbookfund" -->
<!--/TMPL_IF-->
</p>
- Note: All figures are in local currency, except the suppliers list price which is indicated.Currency conversion is done automatically
- <!-- TMPL_IF NAME="gstreg" -->
<p>
- <label> Applicable Tax rate</label>
- <input type="text" size="20" name="gstrate" value="<!--TMPL_VAR NAME="gstrate"-->" onchange="update(this.form)" />%
- </p>
+ <label>Supplier price</label>
+ <!-- TMPL_IF name="close" -->
+ <input type="hidden" size="20" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" /><!-- TMPL_VAR NAME="listprice" -->
+ <!-- TMPL_ELSE -->
+ <input type="text" size="20" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" onchange="update(this.form)" />
<!--/TMPL_IF-->
- <p>
- <label>Suppliers List Price</label>
-
- <input type="text" size="20" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" onchange="update(this.form)" <!-- TMPL_IF name="close" -->readonly<!--/TMPL_IF-->/><!-- TMPL_VAR NAME="currency" -->
-
</p>
<p>
<label>Replacement Cost </label>
- <input type="text" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" <!-- TMPL_IF name="close" -->readonly<!--/TMPL_IF--> />
-
- </p>
- <p>
- <label>Discount Applied</label>
- <input type="text" size="20" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" onchange="update(this.form)" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />%
+ <!-- TMPL_IF name="close" -->
+ <input type="hidden" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" /><!-- TMPL_VAR NAME="rrp" -->
+ <!-- TMPL_ELSE -->
+ <input type="text" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" />
+ <!--/TMPL_IF-->
</p>
<p>
<label>Budgeted Cost</label>
- <input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
+ <input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->"<!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
</p>
- <!--TMPL_IF NAME="gstreg"-->
+ <!-- TMPL_IF NAME="GST"-->
<p>
<label>Budgeted GST</label>
- <input type="text" size="20" name="GST" value="<!-- TMPL_VAR NAME="gst" -->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
+ <input type="text" size="20" name="GST" value="" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
</p>
- <!--/TMPL_IF-->
+ <!-- /TMPL_IF -->
<p>
- <label><b>BUDGETED TOTAL</b></label>
- <input type="text" size="20" name="total" value="<!-- TMPL_VAR name="total"-->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
+ <label><b>Total</b></label>
+ <input type="text" size="20" name="total" value="<!-- TMPL_VAR name="total" -->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
</p>
<p>
- <label>Unit Cost</label>
- <input type="text" size="20" name="unitprice" value="<!-- TMPL_VAR name="unitprice"-->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> /><!--TMPL_IF NAME="gstreg"-->includes any applicable tax less any discount<!--/TMPL_IF-->
+ <label>Actual Cost</label>
+ <input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
</p>
<p>
- <label>Purchase Order No </label>
- <input type="text" size="20" name="purchaseordernumber" value="<!-- TMPL_VAR name="purchaseordernumber" -->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> /> (using recommended!)
+ <label>Invoice Number</label>
+ <input type="text" size="20" name="invoice" value="<!-- TMPL_VAR name="invoice" -->" />(usually empty)
</p>
<p>
<label>Notes</label>
@@ -247,8 +253,9 @@
<input type="text" size="20" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
<!--/TMPL_IF -->
</p>
+ </fieldset>
<p>
<input type="button" value="OK" onclick="check(this.form)" />
</p>
- </form>
+</form>
<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
Index: newordersuggestion.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/newordersuggestion.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- newordersuggestion.tmpl 20 Sep 2006 21:40:41 -0000 1.2
+++ newordersuggestion.tmpl 9 Mar 2007 14:46:45 -0000 1.3
@@ -15,7 +15,8 @@
</tr>
<tr>
<th>
- <p>Filter on :
+ Filter on :
+ <p>
title: <input type="text" name="title" value="<!-- TMPL_VAR NAME="title"-->" />
author: <input type="text" name="author" value="<!-- TMPL_VAR NAME="author" -->" />
publisher: <input type="text" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode"-->" /></p>
@@ -52,7 +53,7 @@
</td>
<td>
<!-- TMPL_IF name="biblionumber" -->
- <a href="neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->&biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button acquisition">Order</a>
+ <a href="neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->" class="button acquisition">Order</a>
<!-- TMPL_ELSE -->
<a href="neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->" class="button acquisition">Order</a>
<!-- /TMPL_IF -->
Index: parcel.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- parcel.tmpl 20 Sep 2006 21:40:41 -0000 1.2
+++ parcel.tmpl 9 Mar 2007 14:46:45 -0000 1.3
@@ -2,171 +2,109 @@
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
-<script type="text/javascript">
-function docalculate(){
- //collect values
-received=document.getElementsByName('received');
- actual=document.getElementsByName('actual');
- freight=document.getElementsByName('freight');
-discounts=document.getElementsByName('discount');
-gstrate=document.getElementsByName('gstrate');
-totalreceived=0;
-totalactual=0;
-totalfreight=0;
-totaldiscount=0;
-totalgst=0;
- for (var s=0; s<received.length; s++){
- receivedvalue =received.item(s).value;
- totalreceived +=(receivedvalue*1);
- thisactual =actual.item(s).value*receivedvalue;
- totalactual +=thisactual;
- totalfreight +=freight.item(s).value*receivedvalue;
- thisdiscount =thisactual*discounts.item(s).value/100;
- totaldiscount +=thisdiscount;
- totalgst +=(thisactual - thisdiscount)*gstrate.item(s).value/100;
- }
- document.f.totalreceived.value=totalreceived*1;
- document.f.totalactual.value=totalactual;
- document.f.totalfreight.value=totalfreight*1;
-document.f.actualdiscount.value=totaldiscount;
-includesgst=parseInt(document.f.incgst.value);
- if(includesgst>0){
- document.f.actualgst.value="-inc.-";
- }else{
- document.f.actualgst.value=totalgst;
-}
-document.f.freightgst.value=totalfreight*document.f.freightgstrate.value/100;
-disct=0;
- if ( document.f.actualgst.value>0){
-disct= document.f.actualgst.value;
-}
-document.f.actualtotal.value=totalactual + -totaldiscount +disct*1;
-document.f.actualfreight.value=totalfreight+ document.f.freightgst.value*1;
-document.f.invoicetotal.value=document.f.actualfreight.value*1 +document.f.actualtotal.value*1;
-<!--TMPL_IF NAME="invcurrency"-->
-document.f.localtotal.value=document.f.invoicetotal.value*<!--TMPL_VAR NAME="currencyrate"-->;
-<!--/TMPL_IF-->
- return true;
-}
-function updatetotal(){
-document.f.actualtotal.value= document.f.totalactual.value - document.f.actualdiscount.value + document.f.actualgst.value*1;
-document.f.invoicetotal.value=document.f.actualfreight.value*1+document.f.actualtotal.value*1;
-<!--TMPL_IF NAME="invcurrency"-->
-document.f.localtotal.value=document.f.invoicetotal.value*<!--TMPL_VAR NAME="currencyrate"-->;
-<!--/TMPL_IF-->
- return true;
-}
-function checkform(){
-if (document.f.invoice.value==""){
-alert ("You need a suppliers Invoice number!");
-return false;
-}
-if ( document.f.totalreceived.value==0 || document.f.totalreceived.value==""){
-alert ("no items entered as received !");
-return false;
-}
-document.f.submit();
-}
-</script>
- <h1>
- Orders being recieved from <!-- TMPL_VAR NAME="name" -->
+ <h1>
+ <!-- TMPL_IF name="date" -->
+ Receipt Summary for <i><!-- TMPL_VAR NAME="name" --></i> <!--TMPL_IF Name="invoice"-->Parcel <i><!-- TMPL_VAR NAME="invoice" --></i><!--/TMPL_IF --> on <i><!-- TMPL_VAR NAME="date" --></i>
+ <!-- TMPL_ELSE -->
+ orders not yet recieved for <!-- TMPL_VAR NAME="name" -->
+ <!-- /TMPL_IF -->
</h1>
- <form action="finishreceive.pl" method="post" name="orderform" id="f">
-<input type="hidden" name="supplierid" value="<!--TMPL_VAR NAME="supplierid"-->" />
-<div >
-<p>Received By: <!-- TMPL_VAR NAME="user" --></p>
-<p> Suppliers Invoice No: <input type="text" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->" />
-
- Date received: <input type="text" name="datereceived" value="<!-- TMPL_VAR NAME="date" -->" /></p>
+<div id="acqui_recieve_summary">
+ <p>Parcel: <!-- TMPL_VAR NAME="invoice" --></p>
+ <p>Received by: <!-- TMPL_VAR NAME="loggedinusername" --></p>
+ <p>On: <!-- TMPL_VAR NAME="datereceived" --></p>
</div>
-<div >
+<div id="acqui_recieve_recievelist">
<h2>Recieve list</h2>
- <input type="hidden" name="incgst" value="<!--TMPL_VAR NAME="incgst"-->" />
- <input type="hidden" name="currencyrate" value="<!--TMPL_VAR NAME="currencyrate"-->" />
- <table >
- <tr>Rate of tax used for P&P:<input type="text" size="2" name="freightgstrate" value="<!--TMPL_VAR NAME="gstrate"-->" />%</td>
- <tr> <th align="left">Basket/Order</th>
- <th class="acquisition">ISBN</th>
- <th class="acquisition">Title</th>
- <th class="acquisition">Price</th>
- <th class="acquisition">Actual <!--TMPL_VAR NAME="invcurrency"--></th>
- <th class="acquisition">P&P <!--TMPL_VAR NAME="invcurrency"--></th>
- <th class="acquisition">Qty</th>
- <th class="acquisition">Received</th>
-
+ <form action="" method="get" name="orderform">
+ <table>
+ <tr>
+ <th class="acquisition">BASKET</th>
+ <th class="acquisition">Summary</th>
+ <th class="acquisition">QTY ordered</th>
+ <th class="acquisition">Est Cost</th>
+ <th class="acquisition">ACTUAL</th>
+ <th class="acquisition">P&P</th>
+ <th class="acquisition">QTY received</th>
+ <th class="acquisition">TOTAL</th>
</tr>
- <!-- TMPL_LOOP NAME="loop_orders" -->
- <tr><input type="hidden" name="ordernumber" value="<!-- TMPL_VAR NAME="ordernumber" -->" />
- <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
- <input type="hidden" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
- <td ><!-- TMPL_VAR NAME="basketno" -->/<!-- TMPL_VAR NAME="ordernumber" --></td>
- <td><!-- TMPL_VAR NAME="isbn" --></td>
- <td><!-- TMPL_VAR NAME="title" --></td>
- <td align="right"><!-- TMPL_VAR NAME="rrp" --></td>
- <td align="right"> <input type="text" size="2" name="actual" value="<!-- TMPL_VAR NAME="actualrrp" -->" onChange="docalculate();"/></td>
- <td align="right"> <input type="text" size="2" name="freight" value="0.00" onChange="docalculate();"/></td>
+ <!-- TMPL_LOOP NAME="loop_received" -->
+ <tr>
+ <td><!-- TMPL_VAR NAME="basketno" --></td>
+ <td><a href="orderreceive.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&daterecieved=<!-- TMPL_VAR NAME="datereceived" -->&invoice=<!-- TMPL_VAR NAME="invoice" -->&gst=<!-- TMPL_VAR NAME="gst" -->&freight=<!-- TMPL_VAR NAME="freight" -->&supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="title" --></a>
+ <!-- TMPL_IF NAME="isbn" --><br />ISBN: <!-- TMPL_VAR NAME="isbn" --><!--/TMPL_IF-->
+ <!-- TMPL_IF NAME="author" --><br />author :<!-- TMPL_VAR NAME="author" --><!--/TMPL_IF-->
+ <!-- TMPL_IF NAME="publishercode" --><br />Publisher :<!-- TMPL_VAR NAME="publishercode" --><!--/TMPL_IF-->
+ </td>
<td><!-- TMPL_VAR NAME="quantity" --></td>
- <td> <input type="text" size="2" name="received" value="<!-- TMPL_VAR NAME="toreceive" -->" onChange="docalculate();"/></td>
- <input type="hidden" name="discount" value="<!--TMPL_VAR NAME="discount"-->" />
- <input type="hidden" name="gstrate" value="<!--TMPL_VAR NAME="gst"-->" />
+ <td><!-- TMPL_VAR NAME="ecost" --></td>
+ <td><!-- TMPL_VAR NAME="unitprice" --></td>
+ <td></td>
+ <td><!-- TMPL_VAR NAME="quantityreceived" --></td>
+ <td><!-- TMPL_VAR NAME="total" --></td>
</tr>
<!-- /TMPL_LOOP -->
<tr>
- <td ></td>
- <td></td>
- <th class="acquisition" align="right">SubTotals</th>
- <td align="right"><b><!-- TMPL_VAR NAME="totalprice" --></b></td>
- <td align="right"><b><input type="text" name="totalactual" size="2" value="<!-- TMPL_VAR NAME="totalactual" -->" /></b></td>
- <td align="right"><b><input type="text" size="2" name="totalfreight" /></b></th>
- <td ><b><!-- TMPL_VAR NAME="totalquantity" --></b></td>
- <td ><b><input type="text" size="2" name="totalreceived" value="<!-- TMPL_VAR NAME="totaltoreceive" -->" READONLY /></b></td>
-
+ <th class="acquisition" colspan="3"></th>
+ <th class="acquisition">SUBTOTALS</th>
+ <th class="acquisition"><!-- TMPL_VAR NAME="totalprice" --></th>
+ <th class="acquisition"><!-- TMPL_VAR NAME="totalfreight" --></th>
+ <th class="acquisition"><!-- TMPL_VAR NAME="totalquantity" --></th>
+ <th class="acquisition"><!-- TMPL_VAR NAME="tototal" --></th>
+ </tr>
+ <tr>
+ <td colspan="5">
+ <b>HELP</b>
+ <p>The total at the bottom of the page should be within a few cents of the total for the invoice.</p>
+ </td>
+ <td colspan="2"><b>GST</b></td>
+ <td><!-- TMPL_VAR NAME="gst" --></td>
</tr>
- <!--TMPL_IF NAME="totaldiscount"--> <tr>
- <td > </td>
- <td> </td>
- <th class="acquisition" align="right">- Discount</th>
- <td align="right"><b><!-- TMPL_VAR NAME="totaldiscount" --></b></td>
- <td align="right"><b><input type="text" name="actualdiscount" size="2" value="<!-- TMPL_VAR NAME="actualdiscount" -->" onChange="updatetotal();"/></b></td>
- </tr><!--/TMPL_IF-->
- <!--TMPL_IF NAME="gstreg"--> <tr>
- <td > </td>
- <td> </td>
- <th class="acquisition" align="right">Tax</th>
- <td align="right"><b><!-- TMPL_VAR NAME="totalgst" --></b></td>
- <td align="right"><b><input type="text" name="actualgst" size="2" value="<!-- TMPL_VAR NAME="actualgst" -->"/></b></td>
- <td align="right"><b><input type="text" name="freightgst" size="2" /></td></b>
- </tr><!--/TMPL_IF-->
- <tr>
- <td > </td>
- <td> </td>
- <th class="acquisition" align="right">Totals</th>
- <td align="right"><b><!-- TMPL_VAR NAME="total" --></b></td>
- <td align="right"><b><input type="text" name="actualtotal" size="2" value="<!-- TMPL_VAR NAME="actualtotal" -->" onChange="updatetotal();"/></b></td>
- <td align="right"><b><input type="text" name="actualfreight" size="2" onChange="updatetotal();"/></b></td>
- </tr>
- <tr>
- <td > </td>
- <td > </td>
- <th class="acquisition" align="right" colspan="5">Invoice Total <!--TMPL_VAR NAME="invcurrency"--></th>
- <td ><b><input type="text" name="invoicetotal" size="4" /></b></td>
- </tr>
- <!--TMPL_IF NAME="invcurrency"-->
- <tr>
- <td > </td>
- <td > </td>
- <th class="acquisition" align="right" colspan="5">Invoice Total </th>
- <td ><b><input type="text" name="localtotal" size="4" /></b></td>
+ <tr>
+ <td colspan="5"> </td>
+ <td colspan="2"><b>TOTAL</b></td>
+ <td><!-- TMPL_VAR NAME="grandtot" --></td>
</tr>
- <!--/TMPL_IF-->
</table>
-Note: P&P is per item. If you have a total freight fill the Total P&P only.!
- <p><input type="button" value="Receive" onClick="checkform();" /></p>
</form>
</div>
-<script>
-updatetotal();
-</script>
+<div id="acqui_recieve_search">
+ <h2>Add a book to the receipt</h2>
+ <form action="/cgi-bin/koha/acqui/orderreceive.pl">
+ <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" -->" />
+ <p><b>Search ISBN or Title:</b> <input type="text" size="25" name="recieve" /></p>
+ </form>
+ <table> <caption>or select a pending orders</caption>
+ <tr>
+ <th class="acquisition">BASKET</th>
+ <th class="acquisition">Summary</th>
+ <th class="acquisition">Est. Cost</th>
+ <th class="acquisition">P&P</th>
+ <th class="acquisition">QTY Ordered</th>
+ <th class="acquisition">QTY</th>
+ <th class="acquisition">TOTAL</th>
+ </tr>
+ <!-- TMPL_LOOP NAME="loop_orders" -->
+ <tr>
+ <td><!-- TMPL_VAR NAME="basketno" --></td>
+ <td>
+ <a href="orderreceive.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&daterecieved=<!-- TMPL_VAR NAME="datereceived" -->&invoice=<!-- TMPL_VAR NAME="invoice" -->&gst=<!-- TMPL_VAR NAME="gst" -->&freight=<!-- TMPL_VAR NAME="freight" -->&supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="title" --></a>
+ <!-- TMPL_IF NAME="isbn" --><br />ISBN: <!-- TMPL_VAR NAME="isbn" --><!--/TMPL_IF-->
+ <!-- TMPL_IF NAME="author" --><br />author :<!-- TMPL_VAR NAME="author" --><!--/TMPL_IF-->
+ <!-- TMPL_IF NAME="publishercode" --><br />Publisher :<!-- TMPL_VAR NAME="publishercode" --><!--/TMPL_IF-->
+ </td>
+ <td><!-- TMPL_VAR NAME="unitprice" --></td>
+ <td></td>
+ <td><!-- TMPL_VAR NAME="quantity" --></td>
+ <td><!-- TMPL_VAR NAME="quantityrecieved" --></td>
+ <td><!-- TMPL_VAR NAME="ecost" --></td>
+ </tr>
+ <!-- /TMPL_LOOP -->
+ </table>
+</div>
<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
Index: parcels.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- parcels.tmpl 20 Sep 2006 21:40:41 -0000 1.3
+++ parcels.tmpl 9 Mar 2007 14:46:45 -0000 1.4
@@ -1,8 +1,8 @@
- <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Recieve <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Recieve <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
-<h1 class="acquisition">Receive parcel from supplier <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
+<h1>Receive parcel from supplier <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
<!-- TMPL_IF NAME="count" --><p> <!-- TMPL_VAR NAME="count" --> parcels found</p><!--/TMPL_IF-->
<div id="resultnumber">
@@ -28,38 +28,38 @@
<div id="resultlist">
<!-- Search Results Table -->
-
+<!-- TMPL_IF NAME="count" -->
<form method="post" action="parcels.pl">
<table class="small">
<tr>
- <th class="acquisition">Line</th>
- <th class="acquisition">Code</th>
- <th class="acquisition">Date Received</th>
- <th class="acquisition">Item Count</th>
- <th class="acquisition">Biblio count</th>
- <th class="acquisition">Items expected</th>
+ <th>Line</th>
+ <th>Code</th>
+ <th>Date Received</th>
+ <th>Item Count</th>
+ <th>Biblio count</th>
+ <th>Items expected</th>
</tr>
<tr>
- <th class="acquisition">
+ <th>
<input type="hidden" name="supplierid" value=<!-- TMPL_VAR NAME="supplierid" -->>
</th>
- <th class="acquisition">
+ <th>
<input type="text" size="20" name="filter" value="<!-- TMPL_VAR NAME="filter" -->">
</th>
- <th class="acquisition">
+ <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 class="acquisition">
+ <th>
</th>
- <th class="acquisition">
+ <th>
Sort by :<select name="orderby" size="1">
- <option value="aqorders.booksellerinvoicenumber"> Invoice- Ascending order</option>
+ <option value="aqorders.booksellerinvoicenumber"> Code</option>
<option value="datereceived"> Date Received</option>
<option value="datereceived desc"> Date Received reverse</option>
- <option value="aqorders.booksellerinvoicenumber desc"> Invoice reverse</option>
+ <option value="aqorders.booksellerinvoicenumber desc"> Code reverse</option>
</select><br />
Results per page :<select name="resultsperpage" value ="<!--TMPL_VAR Name="resultsperpage"-->" size="1">
<option value="20">20</option>
@@ -68,7 +68,7 @@
<option value="100">100</option>
</select>
</th>
- <th class="acquisition">
+ <th>
<input type="submit" class="button acquisition" value="Filter">
</th>
</tr>
@@ -101,6 +101,28 @@
<!-- /TMPL_LOOP -->
</table>
</form>
-
-
+<!--/TMPL_IF-->
+ <div id="parcels_new_parcel">
+ <fieldset>
+ <legend>Receive a new Parcel </legend>
+ <form method="get" action="parcel.pl">
+ <p>
+ <input type="hidden" name="supplierid" value=<!-- TMPL_VAR NAME="supplierid" -->>
+ <label>Parcel Code</label>
+ <input type="text" size="20" name="invoice">
+ </p>
+ <p>
+ <label>GST</label>
+ <input type="text" size="20" name="gst">
+ </p>
+ <p>
+ <label>Freight</label>
+ <input type="text" size="20" name="freight">
+ </p>
+ <p>
+ <input type="submit" class="button acquisition" value="save">
+ </p>
+ </form>
+ </fieldset>
+ </div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: supplier.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- supplier.tmpl 20 Sep 2006 21:40:41 -0000 1.3
+++ supplier.tmpl 9 Mar 2007 14:46:45 -0000 1.4
@@ -2,18 +2,21 @@
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+<!--TMPL_IF Name="enter"-->
+ <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 -->
- <form action="updatesupplier.pl" method="post">
- <input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->" />
- <div id="acqui_supplier_company">
- <h2>COMPANY DETAILS</h2>
+ <fieldset>
+ <legend>Company details</legend>
<p>
<label>Company Name</label>
- <input type="text" size="40" name="company" value="<!-- TMPL_VAR NAME="name" -->" />
+ <input type="text" size="40" name="company" value="<!-- TMPL_VAR NAME="name" -->">
</p>
<p>
<label>Postal Address</label>
@@ -21,68 +24,67 @@
</p>
<p>
<label>Physical Address</label>
- <textarea name="physical" cols="40" rows="4"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea>
+ <textarea name="physical" cols="40" rows="3"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea>
</p>
<p>
<label>Phone</label>
- <input type="text" size="20" name="company_phone" value="<!-- TMPL_VAR NAME="phone" -->" />
+ <input type="text" size="20" name="company_phone" value="<!-- TMPL_VAR NAME="phone" -->">
</p>
<p>
<label>Fax</label>
- <input type="text" size="20" name="company_fax" value="<!-- TMPL_VAR NAME="fax" -->" />
+ <input type="text" size="20" name="company_fax" value="<!-- TMPL_VAR NAME="fax" -->">
</p>
<p>
<label>Website</label>
- <input type="text" size="40" name="website" value="<!-- TMPL_VAR NAME="url" -->" />
+ <input type="text" size="40" name="website" value="<!-- TMPL_VAR NAME="url" -->">
</p>
- <h2 class="acquisition">CONTACT DETAILS</h2>
+ </fieldset>
+ <fieldset>
+ <legend>Contact details</legend>
<p>
<label>Contact Name</label>
- <input type="text" size="40" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->" />
+ <input type="text" size="40" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->">
</p>
<p>
<label>Position</label>
- <input type="text" size="40" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->" />
+ <input type="text" size="40" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->">
</p>
<p>
<label>Phone</label>
- <input type="text" size="20" name="contact_phone" value="<!-- TMPL_VAR NAME="contphone" -->" />
+ <input type="text" size="20" name="contact_phone" value="<!-- TMPL_VAR NAME="contphone" -->">
</p>
<p>
<label>Alternative phone</label>
- <input type="text" size="20" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->" />
+ <input type="text" size="20" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->">
</p>
<p>
<label>Fax</label>
- <input type="text" size="20" name="contact_fax" value="<!-- TMPL_VAR NAME="contfax" -->" />
+ <input type="text" size="20" name="contact_fax" value="<!-- TMPL_VAR NAME="contfax" -->">
</p>
<p>
<label>E-mail</label>
- <input type="text" size="40" name="company_email" value="<!-- TMPL_VAR NAME="contemail" -->" />
+ <input type="text" size="40" name="company_email" value="<!-- TMPL_VAR NAME="contemail" -->">
</p>
<p>
<label>Notes</label>
- <textarea name="notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea>
+ <textarea name="contact_notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea>
</p>
- </div>
- <div id="acqui_supplier_status">
- <h2>CURRENT STATUS</h2>
+ </fieldset>
+ <fieldset>
+ <legend>Ordering informations</legend>
<p>
<label>Supplier is</label>
<!-- TMPL_IF name="active" -->
- <input type="radio" name="status" value="1" checked="checked" />Active
- <input type="radio" name="status" value="0" />Inactive
+ <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="checked" />Inactive
+ <input type="radio" name="status" value="1">Active
+ <input type="radio" name="status" value="0" checked>Inactive</td>
<!-- /TMPL_IF -->
</p>
- </div>
- <div id="acqui_supplier_ordering">
- <h2>ORDERING INFORMATION</h2>
<p>
- <label>Publishers and Imprints</label>
- <textarea name="publishers_imprints" cols="20" rows="4"><!-- TMPL_VAR NAME="specialty" --></textarea>
+ <label>Preferred publishers</label>
+ <textarea name="publishers_imprints" cols="40" rows="3"><!-- TMPL_VAR NAME="specialty" --></textarea>
</p>
<p>
<label>List Prices are</label>
@@ -100,42 +102,146 @@
<!-- /TMPL_LOOP -->
</select>
</p>
- <p>
+ <!-- TMPL_IF NAME="GST" --><p>
<label>GST Registered</label>
- <!-- TMPL_IF name="gstreg" -->
- <input type="radio" name="gst" value="1" checked="checked" /> Yes
- <input type="radio" name="gst" value="0" /> No
+ <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
+ </p><!-- TMPL_ELSE --><input type="hidden" name="gst" value="0"><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="GST" --><p>
+ <label>Ordering prices</label>
+ <input type="radio" name="list_gst" value="1" <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>include GST
+ <input type="radio" name="list_gst" value="0" <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>don't include GST
+ </p><!-- TMPL_ELSE --><input type="hidden" name="list_gst" value="0"><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="GST" --><p>
+ <label>Invoice prices</label>
+ <input type="radio" name="invoice_gst" value="1" <!-- TMPL_IF name= "invoiceincgst" -->checked<!-- /TMPL_IF -->>include GST
+ <input type="radio" name="invoice_gst" value="0" <!-- TMPL_UNLESS name="invoiceincgst" -->checked<!-- /TMPL_UNLESS -->>don't include GST
+ </p><!-- TMPL_ELSE --><input type="hidden" name="invoice_gst" value="0"><!-- /TMPL_IF -->
+ <p>
+ <label>Discount</label>
+ <input type="text" size="3" name="discount" value="<!-- TMPL_VAR NAME="discount" -->"> %
+ </p>
+ <p>
+ <label>Notes</label>
+ <textarea cols="40" rows="4" name="notes" ><!-- TMPL_VAR NAME="notes" --></textarea>
+ </p>
+ </fieldset>
+ <p><input type="submit" value="Save" /></p>
+ </form>
+<!--TMPL_ELSE-->
+ <h1>Information for : <!-- TMPL_VAR NAME="name" --></h1>
+ <div id="action">
+ <a href="supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&op=enter">
+ Edit Supplier
+ </a>
+ <a href="booksellers.pl?supplier=<!--TMPL_VAR Name="id"-->">
+ Manage Orders
+ </a>
+ <a href="parcels.pl?supplierid=<!--TMPL_VAR Name="id"-->">
+ Receive Parcel
+ </a>
+ </div>
+ <fieldset>
+ <legend>Company details</legend>
+ <p>
+ <label>Company Name</label>
+ <!-- TMPL_VAR NAME="name" -->
+ </p>
+ <p>
+ <label>Postal Address</label>
+ <!-- TMPL_VAR NAME="postal" -->
+ </p>
+ <p>
+ <label>Physical Address</label>
+ <!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" -->
+ </p>
+ <p>
+ <label>Phone</label>
+ <!-- TMPL_VAR NAME="phone" -->
+ </p>
+ <p>
+ <label>Fax</label>
+ <!-- TMPL_VAR NAME="fax" -->
+ </p>
+ <p>
+ <label>Website</label>
+ <!-- TMPL_VAR NAME="url" -->
+ </p>
+ </fieldset>
+ <fieldset>
+ <legend>Contact details</legend>
+ <p>
+ <label>Contact name</label>
+ <!-- TMPL_VAR NAME="contact" -->
+ </p>
+ <p>
+ <label>Position</label>
+ <!-- TMPL_VAR NAME="contpos" -->
+ </p>
+ <p>
+ <label>Phone</label>
+ <!-- TMPL_VAR NAME="contphone" -->
+ </p>
+ <p>
+ <label>Alternative phone</label>
+ <!-- TMPL_VAR NAME="contaltphone" -->
+ </p>
+ <p>
+ <label>Fax</label>
+ <!-- TMPL_VAR NAME="contfax" -->
+ </p>
+ <p>
+ <label>E-mail</label>
+ <!-- TMPL_VAR NAME="contemail" -->
+ </p>
+ <p>
+ <label>Notes</label>
+ <!-- TMPL_VAR NAME="contnotes" -->
+ </p>
+
+ </fieldset>
+ <fieldset>
+ <legend>Ordering informations</legend>
+ <p>
+ <label>Supplier is</label>
+ <!-- TMPL_IF name="active" -->
+ Active
<!-- TMPL_ELSE -->
- <input type="radio" name="gst" value="1" /> Yes
- <input type="radio" name="gst" value="0" checked="checked" /> No
+ Inactive
<!-- /TMPL_IF -->
</p>
<p>
+ <label>Publishers and Imprints</label>
+ <!-- TMPL_VAR NAME="specialty" -->
+ </p>
+ <p>
+ <label>List Prices are</label><!--TMPL_VAR Name="listprice"-->
+ </p>
+ <p>
+ <label>Invoice Prices are</label><!--TMPL_VAR Name="invoiceprice"-->
+ </p>
+ <p>
+ <label>GST Registered</label>
+ <!-- TMPL_IF name="gstreg" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF -->
+ </p>
+ <p>
<label>List Item Price Includes GST</label>
- <!-- TMPL_IF name="listincgst" -->
- <input type="radio" name="list_gst" value="1" checked="checked" /> Yes
- <input type="radio" name="list_gst" value="0" /> No
- <!-- TMPL_ELSE -->
- <input type="radio" name="list_gst" value="1" /> Yes
- <input type="radio" name="list_gst" value="0" checked="checked" /> No
- <!-- /TMPL_IF -->
+ <!-- TMPL_IF name="listincgst" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF -->
</p>
<p>
<label>Invoice Item Price Includes GST</label>
- <!-- TMPL_IF name="invoiceincgst" -->
- <input type="radio" name="invoiceincgst" value="1" checked="checked" /> Yes
- <input type="radio" name="invoiceincgst" value="0" /> No
- <!-- TMPL_ELSE -->
- <input type="radio" name="invoiceincgst" value="1" /> Yes
- <input type="radio" name="invoiceincgst" value="0" checked="checked" /> No
- <!-- /TMPL_IF -->
+ <!-- TMPL_IF name= "invoiceincgst" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF -->
</p>
<p>
<label>Discount</label>
- <input type="text" size="3" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /> %
+ <!-- TMPL_VAR NAME="discount" --> %
</p>
- </div>
- <input type="submit" name="submit" value="save" />
- </form>
+ <p>
+ <label>Notes</label>
+ <!-- TMPL_VAR NAME="notes" -->
+ </p>
+ </fieldset>
+</div>
+<!--/TMPL_IF-->
<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
More information about the Koha-cvs
mailing list