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

(-)a/C4/Acquisition.pm (+4 lines)
Lines 2031-2036 sub GetLateOrders { Link Here
2031
    SELECT aqbasket.basketno,
2031
    SELECT aqbasket.basketno,
2032
        aqorders.ordernumber,
2032
        aqorders.ordernumber,
2033
        DATE(aqbasket.closedate)  AS orderdate,
2033
        DATE(aqbasket.closedate)  AS orderdate,
2034
        aqbasket.basketname       AS basketname,
2035
        aqbasket.basketgroupid    AS basketgroupid,
2036
        aqbasketgroups.name       AS basketgroupname,
2034
        aqorders.rrp              AS unitpricesupplier,
2037
        aqorders.rrp              AS unitpricesupplier,
2035
        aqorders.ecost            AS unitpricelib,
2038
        aqorders.ecost            AS unitpricelib,
2036
        aqorders.claims_count     AS claims_count,
2039
        aqorders.claims_count     AS claims_count,
Lines 2051-2056 sub GetLateOrders { Link Here
2051
        LEFT JOIN aqbudgets           ON aqorders.budget_id          = aqbudgets.budget_id,
2054
        LEFT JOIN aqbudgets           ON aqorders.budget_id          = aqbudgets.budget_id,
2052
        aqbasket LEFT JOIN borrowers  ON aqbasket.authorisedby       = borrowers.borrowernumber
2055
        aqbasket LEFT JOIN borrowers  ON aqbasket.authorisedby       = borrowers.borrowernumber
2053
        LEFT JOIN aqbooksellers       ON aqbasket.booksellerid       = aqbooksellers.id
2056
        LEFT JOIN aqbooksellers       ON aqbasket.booksellerid       = aqbooksellers.id
2057
        LEFT JOIN aqbasketgroups      ON aqbasket.basketgroupid      = aqbasketgroups.id
2054
        WHERE aqorders.basketno = aqbasket.basketno
2058
        WHERE aqorders.basketno = aqbasket.basketno
2055
        AND ( datereceived = ''
2059
        AND ( datereceived = ''
2056
            OR datereceived IS NULL
2060
            OR datereceived IS NULL
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-8 / +12 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>
121
            <th>Branch</th>
122
            <th>Fund</th>
120
            <th>Claims count</th>
123
            <th>Claims count</th>
121
            <th>Claimed date</th>
124
            <th>Claimed date</th>
122
        </tr>
125
        </tr>
Lines 154-167 $(document).ready(function() { Link Here
154
            <td>
157
            <td>
155
                   [% lateorder.unitpricesupplier %]x[% lateorder.quantity %] = 
158
                   [% lateorder.unitpricesupplier %]x[% lateorder.quantity %] = 
156
                   [% lateorder.subtotal %]
159
                   [% lateorder.subtotal %]
157
                    <p title="budget">[% lateorder.budget %]</p>
158
            </td>
160
            </td>
159
            <td>
161
            <td>
160
                 <p><a href="basket.pl?basketno=[% lateorder.basketno %]" title="basket">
162
                <a href="basket.pl?basketno=[% lateorder.basketno %]" title="basket">[% lateorder.basketname %] ([% lateorder.basketno %])</a>
161
                        [% lateorder.basketno %]
163
            </td>
162
                 	</a>
164
            <td>
163
                 </p>
165
                <a href="basketgroup.pl?op=add&booksellerid=[% lateorder.supplierid %]&basketgroupid=[% lateorder.basketgroupid %]" title="basketgroup">[% lateorder.basketgroupname %] ([% lateorder.basketgroupid %])</a>
164
                 <p title="branch">[% lateorder.branch %]</p>
166
            </td>
167
            <td>[% lateorder.branch %]
168
            </td>
169
            <td>[% lateorder.budget %]
165
            </td>
170
            </td>
166
            <td>[% lateorder.claims_count %]</td>
171
            <td>[% lateorder.claims_count %]</td>
167
            <td>[% lateorder.claimed_date %]</td>
172
            <td>[% lateorder.claimed_date %]</td>
Lines 172-178 $(document).ready(function() { Link Here
172
        <tr>
177
        <tr>
173
            <th colspan="5">Total</th>
178
            <th colspan="5">Total</th>
174
            <th>[% total %]</th>
179
            <th>[% total %]</th>
175
            <th colspan="3">&nbsp;</th>
180
            <th colspan="6">&nbsp;</th>
176
        </tr>
181
        </tr>
177
      </tfoot>
182
      </tfoot>
178
    </table>
183
    </table>
179
- 

Return to bug 11027