View | Details | Raw Unified | Return to bug 7686
Collapse All | Expand All

(-)a/acqui/parcel.pl (-3 / +4 lines)
Lines 284-290 if ($count>$resultsperpage){ Link Here
284
284
285
#$totalfreight=$freight;
285
#$totalfreight=$freight;
286
$tototal = $tototal + $freight;
286
$tototal = $tototal + $freight;
287
287
my $addgst = $tototal * $gst;
288
$template->param(
288
$template->param(
289
    invoice               => $invoice,
289
    invoice               => $invoice,
290
    datereceived          => $datereceived->output('iso'),
290
    datereceived          => $datereceived->output('iso'),
Lines 304-311 $template->param( Link Here
304
    totalquantity         => $totalquantity,
304
    totalquantity         => $totalquantity,
305
    tototal               => sprintf($cfstr, $tototal),
305
    tototal               => sprintf($cfstr, $tototal),
306
    ordergrandtotal       => sprintf($cfstr, $ordergrandtotal),
306
    ordergrandtotal       => sprintf($cfstr, $ordergrandtotal),
307
    gst                   => $gst,
307
    gstpercent            => sprintf( "%.2f", $gst * 100 ) . '%',
308
    grandtot              => sprintf($cfstr, $tototal + $gst),
308
    addgst                => sprintf($cfstr,$addgst),
309
    grandtot              => sprintf($cfstr, $tototal + $addgst),
309
    totalPunitprice       => sprintf("%.2f", $totalPunitprice),
310
    totalPunitprice       => sprintf("%.2f", $totalPunitprice),
310
    totalPquantity        => $totalPquantity,
311
    totalPquantity        => $totalPquantity,
311
    totalPqtyrcvd         => $totalPqtyrcvd,
312
    totalPqtyrcvd         => $totalPqtyrcvd,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-3 / +2 lines)
Lines 337-344 Link Here
337
		    The total at the bottom of the page should be within a few cents of the total for the invoice.
337
		    The total at the bottom of the page should be within a few cents of the total for the invoice.
338
		</p>
338
		</p>
339
		</td>
339
		</td>
340
			    <td><b>Tax rate</b></td>
340
			    <td><b>Tax rate ([% gstpercent %])</b></td>
341
		<td>[% gst %]</td>
341
		<td>[% addgst %]</td>
342
	    	</tr> 
342
	    	</tr> 
343
	    [% END %]
343
	    [% END %]
344
	    <tr>
344
	    <tr>
345
- 

Return to bug 7686