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

(-)a/acqui/parcel.pl (-3 / +7 lines)
Lines 296-302 if ($count>$resultsperpage){ Link Here
296
296
297
#$totalfreight=$freight;
297
#$totalfreight=$freight;
298
$tototal = $tototal + $freight;
298
$tototal = $tototal + $freight;
299
299
my $gstreg = $bookseller->{gstreg};
300
my $gstpart = ($gstreg)? $tototal - ($tototal / ($gst + 1))  : $tototal * $gst;
301
my $grandtot = ($gstreg)? sprintf($cfstr, $tototal) : sprintf($cfstr, $tototal + $gstpart);
300
$template->param(
302
$template->param(
301
    invoice               => $invoice,
303
    invoice               => $invoice,
302
    datereceived          => $datereceived->output('iso'),
304
    datereceived          => $datereceived->output('iso'),
Lines 316-323 $template->param( Link Here
316
    totalquantity         => $totalquantity,
318
    totalquantity         => $totalquantity,
317
    tototal               => sprintf($cfstr, $tototal),
319
    tototal               => sprintf($cfstr, $tototal),
318
    ordergrandtotal       => sprintf($cfstr, $ordergrandtotal),
320
    ordergrandtotal       => sprintf($cfstr, $ordergrandtotal),
319
    gst                   => $gst,
321
    gstpercent            => sprintf( "%.2f", $gst * 100 ) . '%',
320
    grandtot              => sprintf($cfstr, $tototal + $gst),
322
    gstpart               => sprintf($cfstr,$gstpart),
323
    gstreg                => $gstreg,
324
    grandtot              => $grandtot,
321
    totalPunitprice       => sprintf("%.2f", $totalPunitprice),
325
    totalPunitprice       => sprintf("%.2f", $totalPunitprice),
322
    totalPquantity        => $totalPquantity,
326
    totalPquantity        => $totalPquantity,
323
    totalPqtyrcvd         => $totalPqtyrcvd,
327
    totalPqtyrcvd         => $totalPqtyrcvd,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-3 / +7 lines)
Lines 349-356 Link Here
349
		    The total at the bottom of the page should be within a few cents of the total for the invoice.
349
		    The total at the bottom of the page should be within a few cents of the total for the invoice.
350
		</p>
350
		</p>
351
		</td>
351
		</td>
352
			    <td><b>Tax rate</b></td>
352
                [% IF ( gstreg ) %]
353
		<td>[% gst %]</td>
353
                    <td><b>From which included<br />
354
                    (tax rate [% gstpercent %])</b></td>
355
                [% ELSE %]
356
			    <td><b>Tax rate ([% gstpercent %])</b></td>
357
                [% END %]
358
		<td>[% gstpart %]</td>
354
	    	</tr> 
359
	    	</tr> 
355
	    [% END %]
360
	    [% END %]
356
	    <tr>
361
	    <tr>
357
- 

Return to bug 7686