bugfixes for normal acquisition process. seems to work better.

NOTES to 1.2 managers : the 1.2 seems to have problems too :
* when finishrecieve is called, the booksellerid is lost, and you arrive to the "recieve.pl" again, it's with the 1st bookseller from the DB.
* under certain circunstances, the invoice # is lost, and ALL lines from the bookseller are shown. this strange behaviour is fixed too in this commit

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl
index b231d70..5aba0f1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl
@@ -1,5 +1,14 @@
 <TMPL_INCLUDE name="acquisitions-top.inc">
 
+<div align=right>
+Invoice: <TMPL_VAR name="invoice"><br>
+Received By: <TMPL_VAR name="user"><br>
+<TMPL_VAR name="date">
+</div>
+<FONT SIZE=6><em>Receipt Summary for : <TMPL_VAR name="name"> Invoice, <TMPL_VAR name="invoice"></em></FONT>
+<CENTER>
+
+
 <TMPL_IF name="count">
        <script language="javascript" type="text/javascript">
        <!--
@@ -16,7 +25,7 @@
        </script>
        <form action="/cgi-bin/koha/acqui/finishreceive.pl" method=post>
        <input type=hidden name=biblio value=<TMPL_VAR name="biblionumber">>
-       <input type=hidden name=ordnum value=<TMPL_VAR name=""ordernumber">>
+       <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">">
@@ -125,17 +134,25 @@
        <br clear=all>
        <p> &nbsp; </p>
 <TMPL_ELSE>
-       <center><table>
-       <tr valign=top bgcolor=#99cc33>
+       <br />
+       <center>
+       <table width=80%>
+       <tr valign=top bgcolor="#ffdf61">
+               <td><b>Basket</b></td>
                <td><b>ISBN</b></td>
                <td><b>TITLE</b></td>
                <td><b>AUTHOR</b></td>
+               <td><b>Qty</b></td>
+               <td><b>Recieved</b></td>
        </tr>
        <TMPL_LOOP name="loop">
                <tr>
+                       <TD><TMPL_VAR name="basketno"></td>
                        <TD><TMPL_VAR name="isbn"></td>
-                       <td><a href=acquire.pl?recieve=<TMPL_VAR name="ordernumber">&biblio=<TMPL_VAR name="biblionumber">&invoice=<TMPL_VAR name="invoice">&freight=<TMPL_VAR name="freight">&gst=<TMPL_VAR name="gst">><TMPL_VAR name="title"></a></td>
+                       <td><a href=acquire.pl?recieve=<TMPL_VAR name="ordernumber">&biblio=<TMPL_VAR name="biblionumber">&invoice=<TMPL_VAR name="invoice">&freight=<TMPL_VAR name="freight">&gst=<TMPL_VAR name="gst">&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>

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl
index 8afdc0c..f226e9c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl
@@ -5,10 +5,11 @@ Invoice: <TMPL_VAR name="invoice"><br>
 Received By: <TMPL_VAR name="user"><br>
 <TMPL_VAR name="date">
 </div>
-<FONT SIZE=6><em>Receipt Summary For : <a href=whitcoulls.html><TMPL_VAR name="name"></a> </em></FONT>
+<FONT SIZE=6><em>Receipt Summary for : <TMPL_VAR name="name">, Invoice <TMPL_VAR name="invoice"></em></FONT>
 <CENTER>
 
 <FORM ACTION="/cgi-bin/koha/acqui/acquire.pl">
+<input type=hidden name=id value="<TMPL_VAR name="id">">
 <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">">
@@ -16,7 +17,7 @@ Received By: <TMPL_VAR name="user"><br>
 <b>Search ISBN or Title:</b> <INPUT TYPE="text"  SIZE="25"   NAME="recieve">
 </form>
 <p>
-<FORM ACTION="" method=post name=orderform>
+<FORM ACTION="" method=get name=orderform>
 
 <table border=0 cellspacing=0 cellpadding=5>
        <tr valign=top bgcolor="#ffdf61">
@@ -70,17 +71,6 @@ Received By: <TMPL_VAR name="user"><br>
                <td colspan=2 align=right ><b>TOTAL</b></td>
                <td>$<TMPL_VAR name="grandtot"></td>
        </tr>
-       <tr valign=top bgcolor=white>
-               <td></td>
-               <td></td>
-               <td></td>
-               <td></td>
-               <td></td>
-               <td></td>
-               <td colspan=3>
-                       <input type=image  name=submit src=/images/save-changes.gif border=0 width=187 height=42 align=right>
-               </td>
-       </tr>
 </table>
 </CENTER>
 

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl
index c4dad51..064c4b0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl
@@ -3,7 +3,7 @@
 <FONT SIZE=6><em>Receive Orders From Supplier <a href=whitcoulls.html><TMPL_VAR name="name"></a></em></FONT>
 <p>
 <CENTER>
-<form method=post action="receive.pl">
+<form method=get action="receive.pl">
 <input type=hidden name=id value=<TMPL_VAR name="id">>
 <p>
 <table border=1 cellspacing=0 cellpadding=5>