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

(-)a/Koha/pdfformat/layout2pages.pm (-1 / +1 lines)
Lines 61-67 sub printorders { Link Here
61
    
61
    
62
    my $abaskets;
62
    my $abaskets;
63
    my $arrbasket;
63
    my $arrbasket;
64
    my @keys = ('Basket (No.)', 'Document', 'Qty', 'RRP tax inc.', 'Discount', 'GST', 'Total tax exc.', 'Total tax inc.');
64
    my @keys = ('Basket (no.)', 'Document', 'Qty', 'RRP tax inc.', 'Discount', 'Tax', 'Total tax exc.', 'Total tax inc.');
65
    for my $bkey (@keys) {
65
    for my $bkey (@keys) {
66
        push(@$arrbasket, $bkey);
66
        push(@$arrbasket, $bkey);
67
    }
67
    }
(-)a/Koha/pdfformat/layout3pages.pm (-2 / +2 lines)
Lines 85-91 sub printorders { Link Here
85
        my $pdftable = new PDF::Table();
85
        my $pdftable = new PDF::Table();
86
        my $abaskets;
86
        my $abaskets;
87
        my $arrbasket;
87
        my $arrbasket;
88
        my @keys = ('Document', 'Qty', 'RRP tax exc.', 'RRP tax inc.', 'Discount', 'Discount price', 'GST rate', 'Total tax exc.', 'Total tax inc.');
88
        my @keys = ('Document', 'Qty', 'RRP tax exc.', 'RRP tax inc.', 'Discount', 'Discount price', 'Tax rate', 'Total tax exc.', 'Total tax inc.');
89
        for my $bkey (@keys) {
89
        for my $bkey (@keys) {
90
            push(@$arrbasket, $bkey);
90
            push(@$arrbasket, $bkey);
91
        }
91
        }
Lines 204-210 sub printbaskets { Link Here
204
    my $abaskets;
204
    my $abaskets;
205
    my $arrbasket;
205
    my $arrbasket;
206
    # header of the table
206
    # header of the table
207
    my @keys = ('Lot',  'Basket (No.)','Total RRP tax exc.', 'Total RRP tax inc.', 'GST rate', 'GST', 'Total discount', 'Total tax exc.', 'Total tax inc.');
207
    my @keys = ('Lot',  'Basket (No.)','Total RRP tax exc.', 'Total RRP tax inc.', 'Tax rate', 'Tax', 'Total discount', 'Total tax exc.', 'Total tax inc.');
208
    for my $bkey (@keys) {
208
    for my $bkey (@keys) {
209
        push(@$arrbasket, $bkey);
209
        push(@$arrbasket, $bkey);
210
    }
210
    }

Return to bug 5016