From 92b914b3943e4da2c4afcd0cb757d11a6af5f908 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Tue, 14 Sep 2004 12:32:13 +0000
Subject: [PATCH] fix to calculate item cost (the / was buggy : everywhere else
 there is the price is the unit price)

---
 acqui/finishreceive.pl                               |  6 +++---
 .../intranet-tmpl/default/en/acqui/acquire.tmpl      |  2 +-
 .../intranet-tmpl/default/en/acqui/recieve.tmpl      | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl
index 11cccb7f88..fe689eda60 100755
--- a/acqui/finishreceive.pl
+++ b/acqui/finishreceive.pl
@@ -44,9 +44,9 @@ my $freight=$input->param('freight');
 my $supplierid = $input->param('supplierid');
 my $branch=$input->param('branch');
 
-if ($quantrec != 0){
-	$cost /= $quantrec;
-}
+# if ($quantrec != 0){
+# 	$cost /= $quantrec;
+# }
 
 if ($quantity != 0) {
 	# save the quantity recieved.
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl
index 462345ce6e..ef41152d66 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl
@@ -88,7 +88,7 @@
 				<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" class="button acquisition" value="save">
+					<input type="submit" class="button acquisition" value="save"> (that all costs are for 1 item)
 				<!-- TMPL_ELSE -->
 					<a class="button acquisition" href="/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;booksellerid=<!-- TMPL_VAR NAME="supplierid" -->">
 						Edit
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl
index aebb222e19..30c327ea2c 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl
@@ -45,10 +45,10 @@
 				<td><!-- TMPL_VAR NAME="isbn" --></td>
 				<td><a href="acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="title" --></a></td>
 				<td><!-- TMPL_VAR NAME="author" --></td>
-				<td>$<!-- TMPL_VAR NAME="unitprice" --></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="total" --></td>
 			</tr>
 		<!-- /TMPL_LOOP -->
 		<tr bgcolor="white">
@@ -56,10 +56,10 @@
 			<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="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>
+			<th class="acquisition"><!-- TMPL_VAR NAME="tototal" --></th>
 		</tr>
 		<tr>
 			<td colspan="5" rowspan=2  bgcolor="#ffdf61">
@@ -69,11 +69,11 @@
 			When you have finished this invoice save the changes.
 			</td>
 			<td colspan="2" align="right"><b>GST</b></td>
-			<td>$<!-- TMPL_VAR NAME="gst" --></td>
+			<td><!-- TMPL_VAR NAME="gst" --></td>
 		</tr>
 		<tr bgcolor="white">
 			<td colspan="2" align="right" ><b>TOTAL</b></td>
-			<td>$<!-- TMPL_VAR NAME="grandtot" --></td>
+			<td><!-- TMPL_VAR NAME="grandtot" --></td>
 		</tr>
 	</table>
 	</div>
-- 
2.39.5