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

(-)a/acqui/pdfformat/layout3pages.pm (-4 / +4 lines)
Lines 25-30 package pdfformat::layout3pages; Link Here
25
use vars qw($VERSION @ISA @EXPORT);
25
use vars qw($VERSION @ISA @EXPORT);
26
use Number::Format qw(format_price);
26
use Number::Format qw(format_price);
27
use MIME::Base64;
27
use MIME::Base64;
28
use List::MoreUtils qw/uniq/;
28
use strict;
29
use strict;
29
use warnings;
30
use warnings;
30
use utf8;
31
use utf8;
Lines 223-232 sub printbaskets { Link Here
223
        push(@$arrbasket, $bkey);
224
        push(@$arrbasket, $bkey);
224
    }
225
    }
225
    my ($grandtotalrrpgsti, $grandtotalrrpgste, $grandtotalgsti, $grandtotalgste, $grandtotalgstvalue, $grandtotaldiscount);
226
    my ($grandtotalrrpgsti, $grandtotalrrpgste, $grandtotalgsti, $grandtotalgste, $grandtotalgstvalue, $grandtotaldiscount);
226
    my @gst;
227
    # calculate each basket total
227
    # calculate each basket total
228
    push(@$abaskets, $arrbasket);
228
    push(@$abaskets, $arrbasket);
229
    for my $basket (@$hbaskets) {
229
    for my $basket (@$hbaskets) {
230
        my @gst;
230
        $arrbasket = undef;
231
        $arrbasket = undef;
231
        my ($totalrrpgste, $totalrrpgsti, $totalgste, $totalgsti, $totalgstvalue, $totaldiscount);
232
        my ($totalrrpgste, $totalrrpgsti, $totalgste, $totalgsti, $totalgstvalue, $totaldiscount);
232
        my $ords = $orders->{$basket->{basketno}};
233
        my $ords = $orders->{$basket->{basketno}};
Lines 238-246 sub printbaskets { Link Here
238
            $totaldiscount += ($ord->{rrpgste} - $ord->{ecostgste} ) * $ord->{quantity};
239
            $totaldiscount += ($ord->{rrpgste} - $ord->{ecostgste} ) * $ord->{quantity};
239
            $totalrrpgste += $ord->{rrpgste} * $ord->{quantity};
240
            $totalrrpgste += $ord->{rrpgste} * $ord->{quantity};
240
            $totalrrpgsti += $ord->{rrpgsti} * $ord->{quantity};
241
            $totalrrpgsti += $ord->{rrpgsti} * $ord->{quantity};
241
            push @gst, $ord->{gstrate} * 100
242
            push @gst, $ord->{gstrate};
242
                unless grep {$ord->{gstrate} * 100 == $_ ? $_ : ()} @gst;
243
        }
243
        }
244
        @gst = uniq map { $_ * 100 } @gst;
244
        $totalgsti = $num->round($totalgsti);
245
        $totalgsti = $num->round($totalgsti);
245
        $totalgste = $num->round($totalgste);
246
        $totalgste = $num->round($totalgste);
246
        $grandtotalrrpgste += $totalrrpgste;
247
        $grandtotalrrpgste += $totalrrpgste;
247
- 

Return to bug 9506