[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui acquire.tmpl,1.1,1.2 recieveorder.tmpl,1.1,1.2 recieve.tmpl,1.1,1.2
Paul POULAIN
tipaul at users.sourceforge.net
Mon Mar 3 18:38:06 CET 2003
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui
In directory sc8-pr-cvs1:/tmp/cvs-serv16276/koha-tmpl/intranet-tmpl/default/en/acqui
Modified Files:
acquire.tmpl recieveorder.tmpl recieve.tmpl
Log Message:
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
Index: acquire.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** acquire.tmpl 27 Feb 2003 16:54:34 -0000 1.1
--- acquire.tmpl 3 Mar 2003 17:38:01 -0000 1.2
***************
*** 1,4 ****
--- 1,13 ----
<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">
***************
*** 17,21 ****
<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=biblioitemnum value=<TMPL_VAR name="biblioitemnumber">>
<input type=hidden name=id value="<TMPL_VAR name="booksellerid">">
--- 26,30 ----
<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=biblioitemnum value=<TMPL_VAR name="biblioitemnumber">>
<input type=hidden name=id value="<TMPL_VAR name="booksellerid">">
***************
*** 126,140 ****
<p> </p>
<TMPL_ELSE>
! <center><table>
! <tr valign=top bgcolor=#99cc33>
<td><b>ISBN</b></td>
<td><b>TITLE</b></td>
<td><b>AUTHOR</b></td>
</tr>
<TMPL_LOOP name="loop">
<tr>
<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><TMPL_VAR name="author"></td>
</tr>
</TMPL_LOOP>
--- 135,157 ----
<p> </p>
<TMPL_ELSE>
! <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">&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>
Index: recieveorder.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** recieveorder.tmpl 13 Feb 2003 17:29:06 -0000 1.1
--- recieveorder.tmpl 3 Mar 2003 17:38:02 -0000 1.2
***************
*** 4,8 ****
<p>
<CENTER>
! <form method=post action="receive.pl">
<input type=hidden name=id value=<TMPL_VAR name="id">>
<p>
--- 4,8 ----
<p>
<CENTER>
! <form method=get action="receive.pl">
<input type=hidden name=id value=<TMPL_VAR name="id">>
<p>
Index: recieve.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** recieve.tmpl 13 Feb 2003 17:29:06 -0000 1.1
--- recieve.tmpl 3 Mar 2003 17:38:02 -0000 1.2
***************
*** 6,13 ****
<TMPL_VAR name="date">
</div>
! <FONT SIZE=6><em>Receipt Summary For : <a href=whitcoulls.html><TMPL_VAR name="name"></a> </em></FONT>
<CENTER>
<FORM ACTION="/cgi-bin/koha/acqui/acquire.pl">
<input type=hidden name=gst value="<TMPL_VAR name="gst">">
<input type=hidden name=freight value="<TMPL_VAR name="freight">">
--- 6,14 ----
<TMPL_VAR name="date">
</div>
! <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">">
***************
*** 17,21 ****
</form>
<p>
! <FORM ACTION="" method=post name=orderform>
<table border=0 cellspacing=0 cellpadding=5>
--- 18,22 ----
</form>
<p>
! <FORM ACTION="" method=get name=orderform>
<table border=0 cellspacing=0 cellpadding=5>
***************
*** 70,84 ****
<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>
--- 71,74 ----
More information about the Koha-cvs
mailing list