From 28fb20d9a8044921eebaa742d20c9240b6981599 Mon Sep 17 00:00:00 2001
From: scdlyon3 <kohabac@kohaly3b.scdmanu.univ-lyon3.fr>
Date: Tue, 28 Feb 2012 13:27:41 +0100
Subject: [PATCH] Tax rate calculation in reception summary page

In the Already received table, the total was wrong due to
an erroneous calculation of tax rate
---
 acqui/parcel.pl                                    |    7 ++++---
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |    4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/acqui/parcel.pl b/acqui/parcel.pl
index c256c60..e70bdff 100755
--- a/acqui/parcel.pl
+++ b/acqui/parcel.pl
@@ -284,7 +284,7 @@ if ($count>$resultsperpage){
 
 #$totalfreight=$freight;
 $tototal = $tototal + $freight;
-
+my $addgst = $tototal * $gst;
 $template->param(
     invoice               => $invoice,
     datereceived          => $datereceived->output('iso'),
@@ -304,8 +304,9 @@ $template->param(
     totalquantity         => $totalquantity,
     tototal               => sprintf($cfstr, $tototal),
     ordergrandtotal       => sprintf($cfstr, $ordergrandtotal),
-    gst                   => $gst,
-    grandtot              => sprintf($cfstr, $tototal + $gst),
+    gstpercent            => sprintf( "%.2f", $gst * 100 ) . '%',
+    addgst                => sprintf($cfstr,$addgst),
+    grandtot              => sprintf($cfstr, $tototal + $addgst),
     totalPunitprice       => sprintf("%.2f", $totalPunitprice),
     totalPquantity        => $totalPquantity,
     totalPqtyrcvd         => $totalPqtyrcvd,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
index eb5492e..a73eb79 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -337,8 +337,8 @@
 		    The total at the bottom of the page should be within a few cents of the total for the invoice.
 		</p>
 		</td>
-			    <td><b>Tax rate</b></td>
-		<td>[% gst %]</td>
+			    <td><b>Tax rate ([% gstpercent %])</b></td>
+		<td>[% addgst %]</td>
 	    	</tr> 
 	    [% END %]
 	    <tr>
-- 
1.7.2.5