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

(-)a/C4/Acquisition.pm (+37 lines)
Lines 54-59 BEGIN { Link Here
54
        &GetOrderNumber &GetLateOrders &GetOrderFromItemnumber
54
        &GetOrderNumber &GetLateOrders &GetOrderFromItemnumber
55
        &SearchOrder &GetHistory &GetRecentAcqui
55
        &SearchOrder &GetHistory &GetRecentAcqui
56
        &ModReceiveOrder &ModOrderBiblioitemNumber
56
        &ModReceiveOrder &ModOrderBiblioitemNumber
57
        &GetCancelledOrders
57
58
58
        &NewOrderItem &ModOrderItem
59
        &NewOrderItem &ModOrderItem
59
60
Lines 1041-1046 sub ModOrderBiblioitemNumber { Link Here
1041
    $sth->execute( $biblioitemnumber, $ordernumber, $biblionumber );
1042
    $sth->execute( $biblioitemnumber, $ordernumber, $biblionumber );
1042
}
1043
}
1043
1044
1045
=head3 GetCancelledOrders
1046
1047
  my @orders = GetCancelledOrders($basketno, $orderby);
1048
1049
Returns cancelled orders for a basket
1050
1051
=cut
1052
1053
sub GetCancelledOrders {
1054
    my ( $basketno, $orderby ) = @_;
1055
1056
    return () unless $basketno;
1057
1058
    my $dbh   = C4::Context->dbh;
1059
    my $query = "
1060
        SELECT biblio.*, biblioitems.*, aqorders.*, aqbudgets.*
1061
        FROM aqorders
1062
          LEFT JOIN aqbudgets   ON aqbudgets.budget_id = aqorders.budget_id
1063
          LEFT JOIN biblio      ON biblio.biblionumber = aqorders.biblionumber
1064
          LEFT JOIN biblioitems ON biblioitems.biblionumber = biblio.biblionumber
1065
        WHERE basketno = ?
1066
          AND (datecancellationprinted IS NOT NULL
1067
               AND datecancellationprinted <> '0000-00-00')
1068
    ";
1069
1070
    $orderby = "aqorders.datecancellationprinted desc, aqorders.timestamp desc"
1071
        unless $orderby;
1072
    $query .= " ORDER BY $orderby";
1073
    my $sth = $dbh->prepare($query);
1074
    $sth->execute($basketno);
1075
    my $results = $sth->fetchall_arrayref( {} );
1076
1077
    return @$results;
1078
}
1079
1080
1044
#------------------------------------------------------------#
1081
#------------------------------------------------------------#
1045
1082
1046
=head3 ModReceiveOrder
1083
=head3 ModReceiveOrder
(-)a/acqui/basket.pl (+6 lines)
Lines 343-348 my $total_est_gste; Link Here
343
        last;
343
        last;
344
    }
344
    }
345
345
346
    my @cancelledorders = GetCancelledOrders($basketno);
347
    foreach (@cancelledorders) {
348
        $_->{'line_total'} = sprintf("%.2f", $_->{'ecost'} * $_->{'quantity'});
349
    }
350
346
    $template->param(
351
    $template->param(
347
        basketno             => $basketno,
352
        basketno             => $basketno,
348
        basketname           => $basket->{'basketname'},
353
        basketname           => $basket->{'basketname'},
Lines 359-364 my $total_est_gste; Link Here
359
        name                 => $bookseller->{'name'},
364
        name                 => $bookseller->{'name'},
360
        entrydate            => C4::Dates->new($results[0]->{'entrydate'},'iso')->output,
365
        entrydate            => C4::Dates->new($results[0]->{'entrydate'},'iso')->output,
361
        books_loop           => \@books_loop,
366
        books_loop           => \@books_loop,
367
        cancelledorders_loop => \@cancelledorders,
362
        gist_rate            => sprintf( "%.2f", $gist * 100 ) . '%',
368
        gist_rate            => sprintf( "%.2f", $gist * 100 ) . '%',
363
        total_rrp_gste       => sprintf( "%.2f", $total_rrp_gste ),
369
        total_rrp_gste       => sprintf( "%.2f", $total_rrp_gste ),
364
        total_est_gste       => sprintf( "%.2f", $total_est_gste ),
370
        total_est_gste       => sprintf( "%.2f", $total_est_gste ),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-1 / +44 lines)
Lines 12-17 Link Here
12
                10: { sorter: false }
12
                10: { sorter: false }
13
            }
13
            }
14
        });
14
        });
15
        $("#cancelledorderst").tablesorter();
15
    });
16
    });
16
            function confirm_close() {
17
            function confirm_close() {
17
                var is_confirmed = confirm(_('Are you sure you want to close this basket?'));
18
                var is_confirmed = confirm(_('Are you sure you want to close this basket?'));
Lines 332-337 Link Here
332
        [% IF ( listincgst ) %]<small class="highlight">** Vendor's listings already include tax.</small>
333
        [% IF ( listincgst ) %]<small class="highlight">** Vendor's listings already include tax.</small>
333
        [% END %]
334
        [% END %]
334
        </div>
335
        </div>
336
        [% IF (cancelledorders_loop) %]
337
          <div id="cancelledorders">
338
            <h2>Cancelled orders</h2>
339
            <table id="cancelledorderst">
340
              <thead>
341
                <tr>
342
                  <th>Order</th>
343
                  <th>RRP</th>
344
                  <th>Est.</th>
345
                  <th>Qty.</th>
346
                  <th>Total</th>
347
                  <th>Fund</th>
348
                </tr>
349
              </thead>
350
              <tbody>
351
                [% FOREACH order IN cancelledorders_loop %]
352
                  <tr style="color:grey">
353
                    <td>
354
                      <p>
355
                        [% IF ( order.order_received ) %] (rcvd)[% END %]
356
                        [% IF (order.title) %]
357
                          [% order.title |html %] by [% order.author %]<br />
358
                        [% ELSE %]
359
                          <em>Deleted bibliographic record, can't find title</em><br />
360
                        [% END %]
361
                        [% IF ( order.notes ) %] [% order.notes %][% END %]
362
                        [% IF ( order.isbn ) %] - [% order.isbn %][% END %]
363
                        [% IF ( order.issn ) %] - [% order.issn %][% END %]
364
                        [% IF ( order.publishercode ) %], [% order.publishercode %][% END %]
365
                        [% IF ( order.publicationyear ) %], [% order.publicationyear %][% END %]
366
                      </p>
367
                    </td>
368
                    <td><p>[% order.rrp %]</p></td>
369
                    <td><p>[% order.ecost %]</p></td>
370
                    <td><p>[% order.quantity %]</p></td>
371
                    <td><p>[% order.line_total %]</p></td>
372
                    <td><p>[% order.budget_name %]</p></td>
373
                  </tr>
374
                [% END %]
375
              </tbody>
376
            </table>
377
          </div>
378
        [% END %]
335
        <br />
379
        <br />
336
        [% UNLESS ( closedate ) %]
380
        [% UNLESS ( closedate ) %]
337
        [% INCLUDE 'acquisitions-add-to-basket.inc' %]
381
        [% INCLUDE 'acquisitions-add-to-basket.inc' %]
338
- 

Return to bug 5358