[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/acqui acqu...
Tumer Garip
tgarip at neu.edu.tr
Wed Sep 20 23:40:41 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Changes by: Tumer Garip <tgarip1957> 06/09/20 21:40:41
Modified files:
koha-tmpl/intranet-tmpl/prog/en/acqui: acqui-home.tmpl
basket.tmpl
booksellers.tmpl
histsearch.tmpl
neworderempty.tmpl
newordersuggestion.tmpl
parcel.tmpl parcels.tmpl
supplier.tmpl
Added files:
koha-tmpl/intranet-tmpl/prog/en/acqui: finishreceive.tmpl
Removed files:
koha-tmpl/intranet-tmpl/prog/en/acqui: neworderbiblio.tmpl
orderreceive.tmpl
Log message:
A new acquisition to handle multiple tax values, and marc creation of biblios and items
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/booksellers.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/newordersuggestion.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/finishreceive.tmpl?cvsroot=koha&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderbiblio.tmpl?cvsroot=koha&r1=1.2&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/orderreceive.tmpl?cvsroot=koha&r1=1.2&r2=0
Patches:
Index: acqui-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- acqui-home.tmpl 1 Aug 2006 15:03:19 -0000 1.5
+++ acqui-home.tmpl 20 Sep 2006 21:40:41 -0000 1.6
@@ -20,7 +20,7 @@
<div id="acqui_acqui_home_currency">
<!-- TMPL_IF NAME="loop_currency" -->
<h2>Exchange rates</h2>
- <form action="/cgi-bin/koha/currency.pl">
+ <form action="/cgi-bin/koha/acqui/currency.pl">
<table>
<tr>
<th>Currency</th>
@@ -92,10 +92,11 @@
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, 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>
+ <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>
+
</div>
<!-- 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- basket.tmpl 6 Sep 2006 16:21:04 -0000 1.8
+++ basket.tmpl 20 Sep 2006 21:40:41 -0000 1.9
@@ -1,9 +1,14 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket (<!-- TMPL_VAR NAME="basketno" -->) for <!-- TMPL_VAR NAME="name" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
-
-
- <h1><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket <!-- TMPL_VAR NAME="basketno" --> for <a href="supplier.pl?id=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
+<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>
@@ -12,14 +17,18 @@
<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>
<!-- 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="Close this Basket" />
+ <input type="submit" value="Confirm Close this Basket" />
</form>
+ <!-- /TMPL_IF-->
<!-- /TMPL_UNLESS -->
</div>
@@ -29,13 +38,12 @@
<table>
<tr>
<th scope="col">Order</th>
- <th scope="col"><a href="basket.pl?basketno=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode">Publisher</a></th>
- <th scope="col">Title</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">Est.</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,biblioitems.publishercode">Fund</a></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>
@@ -46,7 +54,7 @@
<!-- TMPL_IF NAME="highlight" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
<td><!-- TMPL_VAR NAME="ordernumber" --></td>
<td><!-- TMPL_VAR NAME="publishercode" --></td>
-<!-- TMPL_IF name="closedate" -->
+ <!-- TMPL_IF name="closedate" -->
<td><p>
<!-- TMPL_VAR NAME="title" --><br/>
<!-- TMPL_VAR NAME="author" -->
@@ -65,22 +73,23 @@
</td>
<!-- /TMPL_IF -->
<td><!-- TMPL_VAR NAME="rrp" --></td>
- <td><!-- TMPL_VAR NAME="ecost" --></td>
<td><!-- TMPL_VAR NAME="quantity" --></td>
<td><!-- TMPL_VAR NAME="line_total" --></td>
<td><!-- TMPL_VAR NAME="bookfundid" --></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="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+ <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
<input type="submit" class="delete" value="Delete" />
</form>
</td>
<!-- /TMPL_UNLESS -->
+ <!-- /TMPL_UNLESS -->
<!-- /TMPL_IF -->
</tr>
<!-- /TMPL_LOOP -->
@@ -90,24 +99,25 @@
<input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" />
<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
</td>
- <th>SubTotal</th>
+ <th align="right">SubTotal</th>
<th><!-- TMPL_VAR NAME="sub_total_est" --></th>
- <th><!-- TMPL_VAR NAME="sub_total" --></td>
<th><!-- TMPL_VAR name="qty_total" --></th>
- <td colspan="2" rowspan="3"> </td>
-
</tr>
+ <!--TMPL_IF NAME="disc_est"-->
<tr>
- <th>GST</th>
- <th><!-- TMPL_VAR NAME="gist_est" --></th>
- <th><!-- TMPL_VAR NAME="gist" --></th>
- <th> </th>
+ <th align="right">Discount</th>
+ <th>-<!-- TMPL_VAR NAME="disc_est" --></th>
</tr>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF NAME="gist"-->
<tr>
- <th>TOTAL (<!-- TMPL_VAR NAME="currency" -->)</th>
+ <th align="right">Tax</th>
+ <th><!-- TMPL_VAR NAME="gist_est" --></th>
+ </tr>
+ <!--/TMPL_IF-->
+ <tr><td></td><td></td>
+ <th align="right">TOTAL</th>
<th><!-- TMPL_VAR NAME="grand_total_est" --></th>
- <th><!-- TMPL_VAR NAME="grand_total" --></th>
- <th> </th>
</tr>
</table>
<!-- TMPL_ELSE -->
@@ -120,12 +130,14 @@
</div>
<div id="acqui_basket_add">
<h2>Add To Order</h2>
- <form action="/cgi-bin/koha/acqui/neworderbiblio.pl" method="post">
+ <form action="/cgi-bin/koha/acqui/neworderempty.pl" method="get" name="f" id="f">
<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" /></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>
+ 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>
<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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- booksellers.tmpl 1 Aug 2006 15:28:55 -0000 1.1
+++ booksellers.tmpl 20 Sep 2006 21:40:41 -0000 1.2
@@ -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" --> results found</h1>
+<h1>You searched on <b>supplier: <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> baskets found</h1>
<div id="acqui_order_supplierlist">
<table>
<tr>
<th>Order</th>
- <th>Receive</th>
<th>Company</th>
<th> </th>
+
</tr>
<!-- TMPL_LOOP name="loop_suppliers" -->
@@ -21,23 +21,27 @@
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="parcels.pl?supplierid=<!-- TMPL_VAR name=supplierid -->">Recieve order</a>
+ <a href="parcel.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">Recieve All orders</a>
</td>
- <td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><!-- TMPL_VAR name="name" --></a></td>
+ <!--/TMPL_IF-->
+
<td>
- <table>
- <tr>
+ <table><!--TMPL_IF NAME="ordcount"-->
<th>Basket</th>
- <th>Items</th>
+ <th>Purchase order</th>
<th>Created by</th>
<th>Date</th>
<th> </th>
- </tr>
+ <!--/TMPL_IF-->
<!-- TMPL_LOOP NAME="loop_basket" -->
<tr>
<td><!-- TMPL_VAR NAME="basketno" --></td>
- <td><TMPL_VAR NAME="total"></td>
+ <td><TMPL_VAR NAME="purchaseordernumber"></td>
<td>
<!-- TMPL_VAR name="firstname" -->
<!-- TMPL_VAR name="surname" -->
@@ -46,15 +50,22 @@
<td>
<!-- TMPL_IF name="closedate" -->
closed on <!-- TMPL_VAR NAME="closedate" -->
- <a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">View</a>
+ <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">View</a>
<!-- TMPL_ELSE -->
<!-- TMPL_IF name="active" -->
- <a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">modify</a>
+ <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">modify</a>
<!-- TMPL_ELSE -->
- <a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">View</a>
+ <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">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 -->
</table>
Index: histsearch.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- histsearch.tmpl 6 Sep 2006 16:21:04 -0000 1.4
+++ histsearch.tmpl 20 Sep 2006 21:40:41 -0000 1.5
@@ -1,9 +1,9 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Search order
<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
+
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
-
<h1>Order search</h1>
<div id="acqui_histsearch">
<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
@@ -89,7 +89,7 @@
<!-- TMPL_LOOP NAME="suggestions_loop" -->
<tr>
<td> </td>
- <td><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></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>
<td><!-- TMPL_VAR name="creationdate" --></td>
Index: neworderempty.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- neworderempty.tmpl 2 Aug 2006 08:07:42 -0000 1.1
+++ neworderempty.tmpl 20 Sep 2006 21:40:41 -0000 1.2
@@ -4,7 +4,7 @@
<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
<script language="javascript" type="text/javascript">
-<!--
+
function update(f){
//collect values
quantity=f.quantity.value
@@ -22,20 +22,24 @@
// total=f.total.value
//make useful constants out of the above
exchangerate=f.elements[currency].value //get exchange rate
- gst_on=(!listinc && applygst);
+ 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+<!-- TMPL_VAR NAME="gstrate" -->);
- GST=ecost*(<!-- TMPL_VAR NAME="gstrate" -->);
+ // 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;
@@ -54,18 +58,30 @@
}
function check(f) {
- quantity=f.quantity.value
- title=f.title.value
+ 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");
+ 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?");
return false;
}
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');
+
+}
</script>
<h1>
<!-- TMPL_IF name="ordnum" -->
@@ -83,6 +99,7 @@
<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>
@@ -91,15 +108,13 @@
<h2>catalogue details</h2>
<form action="/cgi-bin/koha/acqui/addorder.pl" method="post" name="frusin">
<!-- 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="biblio" value="<!-- TMPL_VAR NAME="biblio" -->" />
- <input type="hidden" name="bibitemnum" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" />
+ <input type="hidden" name="biblionumber" id="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
<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" -->" />
@@ -107,58 +122,44 @@
<!-- 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>
- <!-- 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 -->
+
+ <input type="text" size="20" name="title" id="title" value="<!-- TMPL_VAR NAME="title" -->" READONLY/>Auto filled
</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="CGIitemtype" -->
+ <!-- TMPL_VAR NAME="itemtype" -->
</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">
@@ -167,59 +168,63 @@
<!-- /TMPL_LOOP -->
</select>
</p>
-
- <h2>Accounting details</h2>
<p>
<label>Quantity</label>
- <!-- 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-->
+
+ <input type="text" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" onchange="update(this.form);" <!-- TMPL_IF name="close" -->readonly<!--/TMPL_IF--/>
+
</p>
<p>
<label>Bookfund</label>
<!-- TMPL_IF name="close" -->
- <input type="hidden" size="20" name="bookfund" value="<!-- TMPL_VAR NAME="bookfundid" -->" /><!-- TMPL_VAR NAME="bookfundname" -->
+ <input type="hidden" size="20" name="bookfundid" 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>Suppliers List 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)" />
+ <label> Applicable Tax rate</label>
+ <input type="text" size="20" name="gstrate" value="<!--TMPL_VAR NAME="gstrate"-->" onchange="update(this.form)" />%
+ </p>
<!--/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>
- <!-- 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-->
+ <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--> />%
</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"-->
<p>
<label>Budgeted GST</label>
- <input type="text" size="20" name="GST" value="" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
+ <input type="text" size="20" name="GST" value="<!-- TMPL_VAR NAME="gst" -->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
</p>
+ <!--/TMPL_IF-->
<p>
<label><b>BUDGETED TOTAL</b></label>
- <input type="text" size="20" name="total" value="" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
+ <input type="text" size="20" name="total" value="<!-- TMPL_VAR name="total"-->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
</p>
<p>
- <label>Actual Cost</label>
- <input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
+ <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-->
</p>
<p>
- <label>Invoice Number *</label>
- <input type="text" size="20" name="invoice" value="<!-- TMPL_VAR name="invoice" -->" />
+ <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!)
</p>
<p>
<label>Notes</label>
Index: newordersuggestion.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/newordersuggestion.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- newordersuggestion.tmpl 2 Aug 2006 08:20:32 -0000 1.1
+++ newordersuggestion.tmpl 20 Sep 2006 21:40:41 -0000 1.2
@@ -52,7 +52,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" -->&biblio=<!-- 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" -->&biblionumber=<!-- 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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- parcel.tmpl 13 Jul 2006 15:20:42 -0000 1.1
+++ parcel.tmpl 20 Sep 2006 21:40:41 -0000 1.2
@@ -2,79 +2,171 @@
<!-- 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>
- <!-- TMPL_IF name="invoice" -->
- Receipt Summary for <i><!-- TMPL_VAR NAME="name" --></i> Invoice <i><!-- TMPL_VAR NAME="invoice" --></i>
- <!-- TMPL_ELSE -->
- orders not yet recieved for <!-- TMPL_VAR NAME="name" -->
- <!-- /TMPL_IF -->
+ Orders being recieved from <!-- TMPL_VAR NAME="name" -->
+
</h1>
-<div id="acqui_recieve_summary">
- <p>Invoice: <!-- TMPL_VAR NAME="invoice" --></p>
- <p>Received By: <!-- TMPL_VAR NAME="user" --></p>
- <p>On: <!-- TMPL_VAR NAME="date" --></p>
+ <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>
-<div id="acqui_recieve_recievelist">
+<div >
<h2>Recieve list</h2>
- <form action="" method="get" name="orderform">
- <table>
- <tr>
- <th class="acquisition">BASKET</th>
+ <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">AUTHOR</th>
- <th class="acquisition">ACTUAL</th>
- <th class="acquisition">P&P</th>
- <th class="acquisition">QTY</th>
- <th class="acquisition">TOTAL</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>
+
</tr>
<!-- TMPL_LOOP NAME="loop_orders" -->
- <tr>
- <td><!-- TMPL_VAR NAME="basketno" --></td>
+ <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><a href="orderreceive.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" -->"><!-- TMPL_VAR NAME="title" --></a></td>
- <td><!-- TMPL_VAR NAME="author" --></td>
- <td><!-- TMPL_VAR NAME="unitprice" --></td>
- <td></td>
- <td><!-- TMPL_VAR NAME="quantityrecieved" --></td>
- <td><!-- TMPL_VAR NAME="total" --></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>
+ <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"-->" />
</tr>
<!-- /TMPL_LOOP -->
<tr>
- <th class="acquisition"></th>
- <th class="acquisition"></th>
- <th class="acquisition"></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>
+ <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>
+
+ </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>
- <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>
+ <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 colspan="2"><b>TOTAL</b></td>
- <td><!-- TMPL_VAR NAME="grandtot" --></td>
+ <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>
+ <!--/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>
-<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>
-</div>
+<script>
+updatetotal();
+</script>
<!-- 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- parcels.tmpl 31 Jul 2006 12:49:49 -0000 1.2
+++ parcels.tmpl 20 Sep 2006 21:40:41 -0000 1.3
@@ -28,7 +28,7 @@
<div id="resultlist">
<!-- Search Results Table -->
-<!-- TMPL_IF NAME="count" -->
+
<form method="post" action="parcels.pl">
<table class="small">
<tr>
@@ -56,10 +56,10 @@
</th>
<th class="acquisition">
Sort by :<select name="orderby" size="1">
- <option value="aqorders.booksellerinvoicenumber"> Code</option>
+ <option value="aqorders.booksellerinvoicenumber"> Invoice- Ascending order</option>
<option value="datereceived"> Date Received</option>
<option value="datereceived desc"> Date Received reverse</option>
- <option value="aqorders.booksellerinvoicenumber desc"> Code reverse</option>
+ <option value="aqorders.booksellerinvoicenumber desc"> Invoice reverse</option>
</select><br />
Results per page :<select name="resultsperpage" value ="<!--TMPL_VAR Name="resultsperpage"-->" size="1">
<option value="20">20</option>
@@ -101,26 +101,6 @@
<!-- /TMPL_LOOP -->
</table>
</form>
-<!--/TMPL_IF-->
- <div id="bloc25">
- <h2 class="acquisition"> Receive a new Parcel </h2>
- <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>
- </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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- supplier.tmpl 20 Jan 2006 16:04:42 -0000 1.2
+++ supplier.tmpl 20 Sep 2006 21:40:41 -0000 1.3
@@ -122,7 +122,7 @@
</p>
<p>
<label>Invoice Item Price Includes GST</label>
- <!-- TMPL_IF name="invoice_gst" -->
+ <!-- TMPL_IF name="invoiceincgst" -->
<input type="radio" name="invoiceincgst" value="1" checked="checked" /> Yes
<input type="radio" name="invoiceincgst" value="0" /> No
<!-- TMPL_ELSE -->
@@ -135,7 +135,7 @@
<input type="text" size="3" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /> %
</p>
</div>
- <input type="submit" name="submit" title="save" />
+ <input type="submit" name="submit" value="save" />
</form>
<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
Index: finishreceive.tmpl
===================================================================
RCS file: finishreceive.tmpl
diff -N finishreceive.tmpl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ finishreceive.tmpl 20 Sep 2006 21:40:41 -0000 1.1
@@ -0,0 +1,41 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receipt Summary for : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->Invoice, <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+
+
+<h1>Finish Receiveing Order </h1>
+
+
+
+
+
+<div id="acqui_acquire_orderlist">
+ <table><tr><th colspan="5">Use these values to create the items for this order</th><tr>
+ <tr>
+ <th>Title</th>
+ <th>Supplier</th>
+ <th>Replacement</th>
+ <th>Qty</th>
+
+ </tr>
+ <!-- TMPL_LOOP name="loopbiblios" -->
+ <tr><input type="hidden" name="bibliocount" value="<!--TMPL_VAR NAME="biblionumber"-->"/>
+ <td><!-- TMPL_VAR NAME="title" --></td>
+ <td><!-- TMPL_VAR NAME="supplier" --></td>
+ <td><!-- TMPL_VAR NAME="rrp" --></td>
+ <td><input type="text" name="itemcount" size="1" value="<!-- TMPL_VAR NAME="itemcount" -->" READONLY/></td>
+ <td><div id="<!--TMPL_VAR NAME="biblionumber"-->"><a href="#" onClick="AddItem(<!--TMPL_VAR NAME="biblionumber"-->)">Add item</a></div></td>
+ </tr>
+ <!-- /TMPL_LOOP -->
+ </table>
+</div>
+
+<script type="text/javascript">
+function AddItem(biblionumber) {
+ window.open("/cgi-bin/koha/cataloguing/additem.pl?fromserials=1&serialid=000&biblionumber="+biblionumber,"AddItem",'width=700,height=400,toolbar=no,scrollbars=yes,status=yes');
+
+}
+</script>
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+
Index: neworderbiblio.tmpl
===================================================================
RCS file: neworderbiblio.tmpl
diff -N neworderbiblio.tmpl
--- neworderbiblio.tmpl 2 Aug 2006 08:10:06 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,69 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Shopping Basket For: <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
-
-<h1>Shopping Basket For: <!-- TMPL_VAR name="bookselname" --></h1>
-
-<div id="acqui_newbasket2_add">
- <a href="neworderempty.pl?id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&sub=<!-- TMPL_VAR name="parsub" -->">Add New Biblio</a>
- | <a href="basket.pl?basket=<!-- TMPL_VAR name="basket" -->">View Basket</a> |
- <form class="inline" action="/cgi-bin/koha/acqui/neworderbiblio.pl">
- <input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
- <input type="hidden" name="basket" value="<!-- TMPL_VAR name="basket" -->" />
- New Search: <input type="text" size="25" name="search" /></form>
-</div>
-
-<div id="acqui_newbasket2_search_result">
- <h2>You searched for
- <!-- TMPL_LOOP name="loopsearch" -->
- <!-- TMPL_VAR name="key" --> <!-- TMPL_VAR name="value" -->
- <!-- /TMPL_LOOP -->
- </h2>
- <p>Results <!-- TMPL_VAR name="dispnum" --> to <!-- TMPL_VAR name="offset2" --> of <!-- TMPL_VAR name="count" --> results displayed.</p>
-
- <table>
- <tr>
- <th>Title</th>
- <th>Author</th>
- <th>©</th>
- <th>Count</th>
- <th>Location</th>
- </tr>
-
- <!-- TMPL_LOOP name="loopresult" -->
- <tr>
- <td>
- <a href="/cgi-bin/koha/acqui/neworderempty.pl?sub=<!-- TMPL_VAR name="sub" -->&author=<!-- TMPL_VAR name="author2" -->&copyright=<!-- TMPL_VAR name="copyright" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&title=<!-- TMPL_VAR name="title2" -->">
- <!-- TMPL_VAR name="title" -->
- </a>
- </td>
- <td>
- <a href="/cgi-bin/koha/search.marc/search.pl?author=<!-- TMPL_VAR name="word" -->&type=<!-- TMPL_VAR name="type" -->">
- <!-- TMPL_VAR name="author" -->
- </a>
- </td>
- <td>
- <!-- TMPL_VAR name="copyright" -->
- </td>
- <td>
- <!-- TMPL_VAR name="itemcount" -->
- </td>
- <td>
- <!-- TMPL_VAR name="location" -->
- </td>
- </tr>
-
- <!-- /TMPL_LOOP -->
-
- </table>
-
- <!-- TMPL_IF name="offsetover" -->
- <a href="/cgi-bin/koha/acqui/neworderbiblio.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>
-
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
Index: orderreceive.tmpl
===================================================================
RCS file: orderreceive.tmpl
diff -N orderreceive.tmpl
--- orderreceive.tmpl 2 Aug 2006 08:10:06 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,100 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receipt Summary for : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->Invoice, <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
-
-
-<h1>Receipt Summary for : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->Invoice, <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF --></h1>
-
-<div id="acqui_acquire_summary">
- Invoice: <!-- TMPL_VAR NAME="invoice" --></p>
- <p>Received By: <!-- TMPL_VAR NAME="user" --></p>
- <p>Date: <!-- TMPL_VAR NAME="date" --></p>
-</div>
-
-<!-- TMPL_IF name="count" -->
-<div id="acqui_acquire_neworder">
- <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>
- <form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post">
- <h1><!-- TMPL_VAR NAME="ordernumber" --> - Receive Order</h1>
- <ul><li>Shopping Basket For: <!-- TMPL_VAR NAME="name" --></li>
- <li>Order placed on: <!-- TMPL_VAR NAME="date" --></li>
- </ul>
-
- <h2>Catalogue Details</h2>
- <p><label>Title *</label><input type="text" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->" /></p>
- <p><label>Author</label><input type="text" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" /></p>
- <p><label>Copyright Date</label><input type="text" size="20" name="copyright" value="<!-- TMPL_VAR NAME="copyrightdate" -->" /></p>
- <p><label>Format</label><!-- TMPL_VAR NAME="CGIitemtype" --></p>
- <p><label>ISBN</label><input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" /></p>
- <p><label>Series</label><input type="text" size="20" name="Series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /></p>
- <p><label>Branch</label>
- <select name="branch">
- <!-- TMPL_LOOP name="branchloop" -->
- <option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="branchname" --></option>
- <!-- /TMPL_LOOP -->
- </select>
- </p>
- <p><label>Item Barcode *</label><input type="text" size="20" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" /></p>
- <p><label>Volume Info (for serials) *</label><input type="text" size="20" name="volinf" /></p>
- <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" -->" />
- <!-- TMPL_IF name="catview" -->
- <input type="submit" name="submit" value="Save" />
- <!-- TMPL_ELSE -->
- <a href="/cgi-bin/koha/acqui/neworderempty.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&id=<!-- TMPL_VAR NAME="booksellerid" -->">Edit</a>
- <!-- /TMPL_IF -->
- <h2>Accounting Details</h2>
- <p><label>Bookfund *</label><!-- TMPL_VAR NAME="CGIbookfund" --></p>
- <p><label>Quantity Ordered</label><input type="text" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" /></p>
- <p><label>Quantity Received *</label><input type="text" size="20" name="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->" /></p>
- <p><label>Replacement Cost</label><input type="text" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" /></p>
- <p><label>Budgeted Cost </label><input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" /></p>
- <p><label>Actual Cost *</label><input type="text" size="20" name="cost" value="<!-- TMPL_IF name="unitprice"--><!-- TMPL_VAR NAME="unitprice" --><!-- TMPL_ELSE --><!-- TMPL_VAR name="rrp" --><!-- /TMPL_IF -->" /></p>
- <p><label>Invoice Number</label><!-- TMPL_VAR NAME="invoice" --><input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->" /></p>
- <p><label>Notes</label><input type="text" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" /></p>
- </form>
-</div>
-<!-- TMPL_ELSE -->
-<div id="acqui_acquire_orderlist">
- <table>
- <tr>
- <th>Basket</th>
- <th>ISBN</th>
- <th>Title</th>
- <th>Author</th>
- <th>Qty</th>
- <th>Received</th>
- </tr>
- <!-- TMPL_LOOP name="loop" -->
- <tr>
- <td><!-- TMPL_VAR NAME="basketno" --></td>
- <td><!-- TMPL_VAR NAME="isbn" --></td>
- <td><a href="orderreceive.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><!-- TMPL_VAR NAME="author" --></td>
- <td><!-- TMPL_VAR NAME="quantity" --></td>
- <td><!-- TMPL_VAR NAME="quantityrecieved" --></td>
- </tr>
- <!-- /TMPL_LOOP -->
- </table>
-</div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
-
More information about the Koha-cvs
mailing list