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

(-)a/C4/Acquisition.pm (+3 lines)
Lines 638-643 sub GetBasketsInfosByBookseller { Link Here
638
    my $query = qq{
638
    my $query = qq{
639
        SELECT aqbasket.*,
639
        SELECT aqbasket.*,
640
          SUM(aqorders.quantity) AS total_items,
640
          SUM(aqorders.quantity) AS total_items,
641
          SUM(
642
            IF ( aqorders.orderstatus = 'cancelled', aqorders.quantity, 0 )
643
          ) AS total_items_cancelled,
641
          COUNT(DISTINCT aqorders.biblionumber) AS total_biblios,
644
          COUNT(DISTINCT aqorders.biblionumber) AS total_biblios,
642
          SUM(
645
          SUM(
643
            IF(aqorders.datereceived IS NULL
646
            IF(aqorders.datereceived IS NULL
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt (-2 / +6 lines)
Lines 115-121 $(document).ready(function() { Link Here
115
                                    [% END %]
115
                                    [% END %]
116
                                        <td>[% basket.basketno %]</td>
116
                                        <td>[% basket.basketno %]</td>
117
                                        <td>[% basket.basketname %]</td>
117
                                        <td>[% basket.basketname %]</td>
118
                                        <td>[% basket.total_items %]</td>
118
                                        <td>
119
                                            [% basket.total_items %]
120
                                            [% IF basket.total_items_cancelled %]
121
                                                ([% basket.total_items_cancelled %] cancelled)
122
                                            [% END %]
123
                                        </td>
119
                                        <td>[% basket.total_biblios %]</td>
124
                                        <td>[% basket.total_biblios %]</td>
120
                                        <td>[% basket.expected_items %]</td>
125
                                        <td>[% basket.expected_items %]</td>
121
                                        <td>
126
                                        <td>
122
- 

Return to bug 11243