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

(-)a/C4/Acquisition.pm (-5 / +3 lines)
Lines 2448-2454 sub GetInvoiceDetails { Link Here
2448
    }
2448
    }
2449
2449
2450
    my $dbh = C4::Context->dbh;
2450
    my $dbh = C4::Context->dbh;
2451
    my $query = qq{
2451
    my $query = q{
2452
        SELECT aqinvoices.*, aqbooksellers.name AS suppliername
2452
        SELECT aqinvoices.*, aqbooksellers.name AS suppliername
2453
        FROM aqinvoices
2453
        FROM aqinvoices
2454
          LEFT JOIN aqbooksellers ON aqinvoices.booksellerid = aqbooksellers.id
2454
          LEFT JOIN aqbooksellers ON aqinvoices.booksellerid = aqbooksellers.id
Lines 2459-2472 sub GetInvoiceDetails { Link Here
2459
2459
2460
    my $invoice = $sth->fetchrow_hashref;
2460
    my $invoice = $sth->fetchrow_hashref;
2461
2461
2462
    $query = qq{
2462
    $query = q{
2463
        SELECT aqorders.*, biblio.*,
2463
        SELECT aqorders.*, biblio.*,
2464
        aqbasket.basketname,
2464
        aqbasket.basketname
2465
        aqorders_items.itemnumber
2466
        FROM aqorders
2465
        FROM aqorders
2467
          LEFT JOIN aqbasket ON aqorders.basketno = aqbasket.basketno
2466
          LEFT JOIN aqbasket ON aqorders.basketno = aqbasket.basketno
2468
          LEFT JOIN biblio ON aqorders.biblionumber = biblio.biblionumber
2467
          LEFT JOIN biblio ON aqorders.biblionumber = biblio.biblionumber
2469
          LEFT JOIN aqorders_items ON aqorders.ordernumber = aqorders_items.ordernumber
2470
        WHERE invoiceid = ?
2468
        WHERE invoiceid = ?
2471
    };
2469
    };
2472
    $sth = $dbh->prepare($query);
2470
    $sth = $dbh->prepare($query);
(-)a/acqui/parcel.pl (-13 / +17 lines)
Lines 147-154 my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0; Link Here
147
my $datereceived = C4::Dates->new();
147
my $datereceived = C4::Dates->new();
148
148
149
my $cfstr         = "%.2f";                                                           # currency format string -- could get this from currency table.
149
my $cfstr         = "%.2f";                                                           # currency format string -- could get this from currency table.
150
my @parcelitems   = @{ $invoice->{orders} };
150
my @orders        = @{ $invoice->{orders} };
151
my $countlines    = scalar @parcelitems;
151
my $countlines    = scalar @orders;
152
my $totalprice    = 0;
152
my $totalprice    = 0;
153
my $totalquantity = 0;
153
my $totalquantity = 0;
154
my $total;
154
my $total;
Lines 159-179 my $total_quantity = 0; Link Here
159
my $total_gste = 0;
159
my $total_gste = 0;
160
my $total_gsti = 0;
160
my $total_gsti = 0;
161
161
162
for my $item ( @parcelitems ) {
162
for my $order ( @orders ) {
163
    $item->{unitprice} = get_value_with_gst_params( $item->{unitprice}, $item->{gstrate}, $bookseller );
163
    $order->{unitprice} = get_value_with_gst_params( $order->{unitprice}, $order->{gstrate}, $bookseller );
164
    $total = ( $item->{'unitprice'} ) * $item->{'quantityreceived'};
164
    $total = ( $order->{unitprice} ) * $order->{quantityreceived};
165
    $item->{'unitprice'} += 0;
165
    $order->{'unitprice'} += 0;
166
    my %line = %{ $item };
166
    my %line = %{ $order };
167
    my $ecost = get_value_with_gst_params( $line{ecost}, $line{gstrate}, $bookseller );
167
    my $ecost = get_value_with_gst_params( $line{ecost}, $line{gstrate}, $bookseller );
168
    $line{ecost} = sprintf( "%.2f", $ecost );
168
    $line{ecost} = sprintf( "%.2f", $ecost );
169
    $line{invoice} = $invoice->{invoicenumber};
169
    $line{invoice} = $invoice->{invoicenumber};
170
    $line{total} = sprintf($cfstr, $total);
170
    $line{total} = sprintf($cfstr, $total);
171
    $line{booksellerid} = $invoice->{booksellerid};
171
    $line{booksellerid} = $invoice->{booksellerid};
172
    my ($count) = &GetReservesFromBiblionumber($line{biblionumber},undef,$item->{itemnumber});
172
    $line{holds} = 0;
173
    $line{holds} = $count;
173
    my @itemnumbers = GetItemnumbersFromOrder( $order->{ordernumber} );
174
    for my $itemnumber ( @itemnumbers ) {
175
        my ( $count ) = &GetReservesFromBiblionumber($line{biblionumber}, undef, $itemnumber);
176
        $line{holds} += $count;
177
    }
174
    $line{budget} = GetBudgetByOrderNumber( $line{ordernumber} );
178
    $line{budget} = GetBudgetByOrderNumber( $line{ordernumber} );
175
    $totalprice += $item->{'unitprice'};
179
    $totalprice += $order->{unitprice};
176
    $line{unitprice} = sprintf( $cfstr, $item->{'unitprice'} );
180
    $line{unitprice} = sprintf( $cfstr, $order->{unitprice} );
177
    my $gste = get_gste( $line{total}, $line{gstrate}, $bookseller );
181
    my $gste = get_gste( $line{total}, $line{gstrate}, $bookseller );
178
    my $gst = get_gst( $line{total}, $line{gstrate}, $bookseller );
182
    my $gst = get_gst( $line{total}, $line{gstrate}, $bookseller );
179
    $foot{$line{gstrate}}{gstrate} = $line{gstrate};
183
    $foot{$line{gstrate}}{gstrate} = $line{gstrate};
Lines 189-195 for my $item ( @parcelitems ) { Link Here
189
193
190
    if ( $line{parent_ordernumber} != $line{ordernumber} ) {
194
    if ( $line{parent_ordernumber} != $line{ordernumber} ) {
191
        if ( grep { $_->{ordernumber} == $line{parent_ordernumber} }
195
        if ( grep { $_->{ordernumber} == $line{parent_ordernumber} }
192
            @parcelitems
196
            @orders
193
            )
197
            )
194
        {
198
        {
195
            $line{cannot_cancel} = 1;
199
            $line{cannot_cancel} = 1;
Lines 200-206 for my $item ( @parcelitems ) { Link Here
200
    $line{budget_name} = $budget->{'budget_name'};
204
    $line{budget_name} = $budget->{'budget_name'};
201
205
202
    push @loop_received, \%line;
206
    push @loop_received, \%line;
203
    $totalquantity += $item->{'quantityreceived'};
207
    $totalquantity += $order->{quantityreceived};
204
208
205
}
209
}
206
push @book_foot_loop, map { $_ } values %foot;
210
push @book_foot_loop, map { $_ } values %foot;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-2 / +7 lines)
Lines 330-336 Link Here
330
            <tr>
330
            <tr>
331
                <td>[% loop_receive.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a>)</td>
331
                <td>[% loop_receive.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a>)</td>
332
                <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&amp;booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
332
                <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&amp;booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
333
                <td>[% IF loop_receive.holds %]<span class="error"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.holds %]</a></span>[% END %]</td>
333
                <td>
334
                  [% IF loop_receive.holds > 0 %]
335
                    <span class="error"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.holds %]</a></span>
336
                  [% ELSE %]
337
                    0
338
                  [% END %]
339
                </td>
334
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a>
340
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a>
335
                [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %]
341
                [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %]
336
                [% IF ( loop_receive.isbn ) %] - [% loop_receive.isbn %][% END %]
342
                [% IF ( loop_receive.isbn ) %] - [% loop_receive.isbn %][% END %]
337
- 

Return to bug 8037