From ace56609be770ffc75247492c0a8cfe6899f08e0 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Mon, 13 Sep 2004 15:28:58 +0000
Subject: [PATCH] some fixes for acquisition

---
 .../intranet-tmpl/default/en/acqui/newbasket2.tmpl   | 12 ++++++------
 koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl  | 12 +++++++-----
 .../intranet-tmpl/default/en/acqui/recieve.tmpl      |  8 +++++++-
 .../default/en/acqui/suggestion-select.tmpl          |  8 ++------
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl
index c3ccf1daf4..9a1aff263d 100755
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl
@@ -1,14 +1,14 @@
 <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
 <div id="mainbloc">
-	<h1 class="acquisition">Shopping Basket For: <!-- TMPL_VAR NAME="bookselname" --></h1>
-		<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basket=<!-- TMPL_VAR NAME="basket" -->&amp;sub=<!-- TMPL_VAR NAME="parsub" -->">
+	<h1 class="acquisition">Shopping basket <!-- TMPL_VAR name="basketno" --> for: <!-- TMPL_VAR NAME="bookselname" --></h1>
+		<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;sub=<!-- TMPL_VAR NAME="parsub" -->">
 		<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filenew.png" border="0" alt="Add New Biblio"></a>
-	<a href="basket.pl?basket=<!-- TMPL_VAR NAME="basket" -->">
+	<a href="basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">
 		<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1uparrow.png"  border="0" alt="View Basket">
 	</a>
 	<form action="/cgi-bin/koha/acqui/newbasket2.pl">
 	<input type="hidden" name="booksellerid" value=<!-- TMPL_VAR NAME="booksellerid" -->>
-	<input type="hidden" name="basket" value=<!-- TMPL_VAR NAME="basket" -->>
+	<input type="hidden" name="basketno" value=<!-- TMPL_VAR NAME="basketno" -->>
 	<b>New Search: </b><input="text"  size="25"   name="search">
 	<input type="submit" value="Search" class="button acquisition">
 	</form>
@@ -36,7 +36,7 @@
 	<!-- TMPL_LOOP NAME="loopresult" -->
 		<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
 			<td>
-					<a href="/cgi-bin/koha/acqui/newbiblio.pl?sub=<!-- TMPL_VAR NAME="sub" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basket=<!-- TMPL_VAR NAME="basket" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->">
+					<a href="/cgi-bin/koha/acqui/newbiblio.pl?sub=<!-- TMPL_VAR NAME="sub" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->">
 					<!-- TMPL_VAR NAME="title" -->
 					</a>
 			</td>
@@ -84,7 +84,7 @@
 	</table>
 	
 	<!-- TMPL_IF name="offsetover" -->
-	<a href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR NAME="num" -->&amp;offset=<!-- TMPL_VAR NAME="offset" -->&amp;type=<!-- TMPL_VAR NAME="type" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basket=<!-- TMPL_VAR NAME="basket" -->&amp;search=<!-- TMPL_VAR NAME="title" -->&amp;author=<!-- TMPL_VAR NAME="author" -->">
+	<a href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR NAME="num" -->&amp;offset=<!-- TMPL_VAR NAME="offset" -->&amp;type=<!-- TMPL_VAR NAME="type" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;search=<!-- TMPL_VAR NAME="title" -->&amp;author=<!-- TMPL_VAR NAME="author" -->">
 	Next
 	</a>
 	<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl
index 0b34aa3bf4..d867d564a8 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl
@@ -1,8 +1,7 @@
 <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 <div id="mainbloc">
-<h1 class="acquisition">Supplier Search Results</h1>
+<h1 class="acquisition">You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h1>
 <div id="bloc100">
-<h2 class="acquisition">You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h2>
 <table>
 <tr>
 	<th class="acquisition">Order</th>
@@ -12,7 +11,7 @@
 </tr>
 
 <!-- TMPL_LOOP name="loop_suppliers" -->
-	<tr valign=top bgcolor=<!-- TMPL_VAR name="color" -->>
+	<tr valign="top">
 		<td>
 			<!-- TMPL_IF name="active" -->
 				<a href="basket.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/mail_send.png" title="Add order" ALT="Add" BORDER=0 ></a>
@@ -25,7 +24,7 @@
 		</td>
 		<td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><!-- TMPL_VAR name="name" --></a></td>
 		<td>
-			<table width="100%" cellspacing=0 cellpadding=5 border=0>
+			<table>
 					<tr>
 						<th class="acquisition">Basket</th>
 						<th class="acquisition">Items</th>
@@ -37,7 +36,10 @@
 						<tr>
 							<td><!-- TMPL_VAR NAME="basketno" --></a></td>
 							<td><TMPL_VAR NAME="total"></td>
-							<td><!-- TMPL_VAR NAME="authorisedby" --></td>
+							<td>
+								<!-- TMPL_VAR name="firstname" -->
+									<!-- TMPL_VAR name="surname" -->
+							</td>
 							<td><!-- TMPL_VAR NAME="creationdate" --></td>
 							<td>
 								<!-- TMPL_IF name="closedate" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl
index 223dc61dd1..aebb222e19 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl
@@ -1,7 +1,13 @@
 <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
 <div id="mainbloc">
-	<h1 class="acquisition">Receipt Summary for : <i><!-- TMPL_VAR NAME="name" --></i> Invoice <i><!-- TMPL_VAR NAME="invoice" --></i></h1>
+	<h1 class="acquisition">
+		<!-- 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 -->
+	</h1>
 	
 	<div id="bloc25">
 		Invoice: <!-- TMPL_VAR NAME="invoice" --><br>
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl
index 840450f62b..af65240e72 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl
@@ -1,7 +1,5 @@
 <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
 <div id="mainbloc">
-
-<!-- TMPL_IF name="op_else" -->
 	<h1 class="acquisition">Suggestions</h1>
 	<table>
 		<tr>
@@ -50,16 +48,14 @@
 				</td>
 				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
 					<!-- TMPL_IF name="biblionumber" -->
-						<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basket=<!-- TMPL_VAR NAME="basket" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->" class="button acquisition">Order</a>
+						<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->" class="button acquisition">Order</a>
 					<!-- TMPL_ELSE -->
-						<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basket=<!-- TMPL_VAR NAME="basket" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->" class="button acquisition">Order</a>
+						<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->" class="button acquisition">Order</a>
 					<!-- /TMPL_IF -->
 				</td>
 			</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
 	<form>
-
-<!-- /TMPL_IF -->
 </div>
 <!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
\ No newline at end of file
-- 
2.39.5