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

(-)a/C4/Acquisition.pm (+1 lines)
Lines 2037-2042 sub GetLateOrders { Link Here
2037
    my @query_params = ();
2037
    my @query_params = ();
2038
    my $select = "
2038
    my $select = "
2039
    SELECT aqbasket.basketno,
2039
    SELECT aqbasket.basketno,
2040
        aqbasket.basketgroupid,
2040
        aqorders.ordernumber,
2041
        aqorders.ordernumber,
2041
        DATE(aqbasket.closedate)  AS orderdate,
2042
        DATE(aqbasket.closedate)  AS orderdate,
2042
        aqorders.rrp              AS unitpricesupplier,
2043
        aqorders.rrp              AS unitpricesupplier,
(-)a/acqui/lateorders.pl (-2 / +4 lines)
Lines 155-162 if ($estimateddeliverydateto_dt) { Link Here
155
my @lateorders = GetLateOrders( @parameters );
155
my @lateorders = GetLateOrders( @parameters );
156
156
157
my $total;
157
my $total;
158
foreach (@lateorders){
158
for my $order ( @lateorders ) {
159
	$total += $_->{subtotal};
159
    $total += $order->{subtotal};
160
    $order->{basketgroup} = GetBasketgroup( $order->{basketgroupid} )
161
        if $order->{basketgroupid};
160
}
162
}
161
163
162
my @letters;
164
my @letters;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-2 / +7 lines)
Lines 117-122 $(document).ready(function() { Link Here
117
            <th>Information</th>
117
            <th>Information</th>
118
            <th>Total cost</th>
118
            <th>Total cost</th>
119
            <th>Basket</th>
119
            <th>Basket</th>
120
            <th>Basket group</th>
120
            <th>Claims count</th>
121
            <th>Claims count</th>
121
            <th>Claimed date</th>
122
            <th>Claimed date</th>
122
        </tr>
123
        </tr>
Lines 163-168 $(document).ready(function() { Link Here
163
                 </p>
164
                 </p>
164
                 <p title="branch">[% lateorder.branch %]</p>
165
                 <p title="branch">[% lateorder.branch %]</p>
165
            </td>
166
            </td>
167
            <td>
168
              [% IF lateorder.basketgroup.id %]
169
                [% lateorder.basketgroup.name %] ([% lateorder.basketgroup.id %]) [% IF lateorder.basketgroup.closeddate %]closed on [% lateorder.basketgroup.closeddate %].[% END %]
170
              [% END %]
171
            </td>
166
            <td>[% lateorder.claims_count %]</td>
172
            <td>[% lateorder.claims_count %]</td>
167
            <td>[% lateorder.claimed_date %]</td>
173
            <td>[% lateorder.claimed_date %]</td>
168
        </tr>
174
        </tr>
Lines 172-178 $(document).ready(function() { Link Here
172
        <tr>
178
        <tr>
173
            <th colspan="5">Total</th>
179
            <th colspan="5">Total</th>
174
            <th>[% total %]</th>
180
            <th>[% total %]</th>
175
            <th colspan="3">&nbsp;</th>
181
            <th colspan="4">&nbsp;</th>
176
        </tr>
182
        </tr>
177
      </tfoot>
183
      </tfoot>
178
    </table>
184
    </table>
179
- 

Return to bug 11988