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

(-)a/acqui/basketgroup.pl (-4 / +13 lines)
Lines 77-85 sub BasketTotal { Link Here
77
    my @orders = GetOrders($basketno);
77
    my @orders = GetOrders($basketno);
78
    for my $order (@orders){
78
    for my $order (@orders){
79
        $total = $total + ( $order->{ecost} * $order->{quantity} );
79
        $total = $total + ( $order->{ecost} * $order->{quantity} );
80
        if ($bookseller->{invoiceincgst} && ! $bookseller->{listincgst} && ( $bookseller->{gstrate} // C4::Context->preference("gist") )) {
80
        if ( $bookseller->{invoiceincgst} && !$bookseller->{listincgst} ) {
81
            my $gst = $bookseller->{gstrate} // C4::Context->preference("gist");
81
            my $gst = $bookseller->{gstrate};
82
            $total = $total * ( $gst / 100 +1);
82
            unless ( defined $gst ) {
83
                ($gst) = split /\|/, C4::Context->preference("gist");
84
            }
85
            $gst //= 0;
86
            $total = $total * ( $gst / 100 + 1 );
83
        }
87
        }
84
    }
88
    }
85
    $total .= " " . ($bookseller->{invoiceprice} // 0);
89
    $total .= " " . ($bookseller->{invoiceprice} // 0);
Lines 225-231 sub printbasketgrouppdf{ Link Here
225
        -type       => 'application/pdf',
229
        -type       => 'application/pdf',
226
        -attachment => ( $basketgroup->{name} || $basketgroupid ) . '.pdf'
230
        -attachment => ( $basketgroup->{name} || $basketgroupid ) . '.pdf'
227
    );
231
    );
228
    my $pdf = printpdf($basketgroup, $bookseller, $baskets, \%orders, $bookseller->{gstrate} // C4::Context->preference("gist")) || die "pdf generation failed";
232
    my $gstrate = $bookseller->{gstrate};
233
    unless ( defined $gstrate ) {
234
        ( $gstrate ) = split /\|/, C4::Context->preference("gist");
235
    }
236
237
    my $pdf = printpdf($basketgroup, $bookseller, $baskets, \%orders, $gstrate) || die "pdf generation failed";
229
    print $pdf;
238
    print $pdf;
230
239
231
}
240
}
(-)a/acqui/parcel.pl (-2 lines)
Lines 146-152 unless( $invoiceid and $invoice->{invoiceid} ) { Link Here
146
146
147
my $booksellerid = $invoice->{booksellerid};
147
my $booksellerid = $invoice->{booksellerid};
148
my $bookseller = GetBookSellerFromId($booksellerid);
148
my $bookseller = GetBookSellerFromId($booksellerid);
149
my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
150
my $datereceived = C4::Dates->new();
149
my $datereceived = C4::Dates->new();
151
150
152
my $cfstr         = "%.2f";                                                           # currency format string -- could get this from currency table.
151
my $cfstr         = "%.2f";                                                           # currency format string -- could get this from currency table.
153
- 

Return to bug 11733