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

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

Return to bug 7686