[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui... [dev_week]

[Ryan Higgins]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Ryan Higgins <rych>	06/12/03 21:53:20

Modified files:
	koha-tmpl/intranet-tmpl/npl/en/acqui: acquire.tmpl 

Log message:
	merging with rel_2_2

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acquire.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3.2.1&r2=1.1.2.3.2.2

Patches:
Index: acquire.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/acquire.tmpl,v
retrieving revision 1.1.2.3.2.1
retrieving revision 1.1.2.3.2.2
diff -u -b -r1.1.2.3.2.1 -r1.1.2.3.2.2
--- acquire.tmpl	19 Sep 2006 13:22:11 -0000	1.1.2.3.2.1
+++ acquire.tmpl	3 Dec 2006 21:53:20 -0000	1.1.2.3.2.2
@@ -73,19 +73,18 @@
 			<th scope="row"><label for="volinf" class="required">Volume Info (for serials) </label></th>
 			<td><input type="text" size="20" name="volinf" id="volinf" /></td>
 		</tr>
-</table>
-		<p>		<input type="hidden" name="biblio" id="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-				<input type="hidden" name="ordnum" id="ordnum" value="<!-- TMPL_VAR NAME="ordernumber" -->" />
-				<input type="hidden" name="biblioitemnum" id="biblioitemnum" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" />
-				<input type="hidden" name="id" id="id" value="<!-- TMPL_VAR NAME="booksellerid" -->" />
-				<input type="hidden" name="freight" id="freight" value="<!-- TMPL_VAR NAME="freight" -->" />
-				<input type="hidden" name="gst" id="gst" value="<!-- TMPL_VAR NAME="gst" -->" />
-				<!-- TMPL_IF name="catview" -->
+		<tr>
+			<td colspan=2 align="center">
+				<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" -->" />
 					<input type="submit" class="submit"  name="submit" value="Save" />
-				<!-- TMPL_ELSE -->
-					<a href="/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;id=<!-- TMPL_VAR NAME="booksellerid" -->">Edit</a>
-				<!-- /TMPL_IF --></p>
-		
+			</td>
+		</tr>
+	</table>
 	<table>
 	<caption>Accounting Details</caption>
 		<tr>
@@ -118,7 +117,8 @@
 			<th scope="row"><label for="invoice">Invoice Number</label></th>
 			<td>
 				<!-- TMPL_VAR NAME="invoice" -->
-				<input type="hidden" name="invoice" id="invoice" value="<!-- TMPL_VAR NAME="invoice" -->" />
+				<input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->" />
+                <input type="hidden" name="datereceived" value="<!-- TMPL_VAR NAME="datereceived" -->" />
 			</td>
 		</tr>
 		<tr>