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

(-)a/C4/Acquisition.pm (-1 / +2 lines)
Lines 2131-2137 sub GetLateOrders { Link Here
2131 
    my @query_params = ();
 2131 
    my @query_params = ();
2132 
    my $select = "
 2132 
    my $select = "
2133 
    SELECT aqbasket.basketno,
 2133 
    SELECT aqbasket.basketno,
2134 
        aqorders.ordernumber,
 2134 
        aqorders.ordernumber      AS ordernumber,
2135 
        DATE(aqbasket.closedate)  AS orderdate,
 2135 
        DATE(aqbasket.closedate)  AS orderdate,
2136 
        aqbasket.basketname       AS basketname,
 2136 
        aqbasket.basketname       AS basketname,
2137 
        aqbasket.basketgroupid    AS basketgroupid,
 2137 
        aqbasket.basketgroupid    AS basketgroupid,
Lines 2149-2154 sub GetLateOrders { Link Here
2149 
        biblio.author, biblio.title,
 2149 
        biblio.author, biblio.title,
2150 
        biblioitems.publishercode AS publisher,
 2150 
        biblioitems.publishercode AS publisher,
2151 
        biblioitems.publicationyear,
 2151 
        biblioitems.publicationyear,
2152 
        biblioitems.isbn          AS isbn,
2152 
        ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) AS estimateddeliverydate,
 2153 
        ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) AS estimateddeliverydate,
2153 
    ";
 2154 
    ";
2154 
    my $from = "
 2155 
    my $from = "
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-3 / +8 lines)
Lines 139-144 $(document).ready(function() { Link Here
139 
            [% ELSE %]
 139 
            [% ELSE %]
140 
                <th></th>
 140 
                <th></th>
141 
            [% END %]
 141 
            [% END %]
142 
            <th>Order No.</th>
142 
            <th class="title-string">Order date</th>
 143 
            <th class="title-string">Order date</th>
143 
            <th class="title-string">Estimated delivery date</th>
 144 
            <th class="title-string">Estimated delivery date</th>
144 
            <th>Vendor</th>
 145 
            <th>Vendor</th>
Lines 152-157 $(document).ready(function() { Link Here
152 
            <th class="title-string">Claimed date</th>
 153 
            <th class="title-string">Claimed date</th>
153 
            <th>Internal note</th>
 154 
            <th>Internal note</th>
154 
            <th>Vendor note</th>
 155 
            <th>Vendor note</th>
156 
            <th>ISBN</th>
155 
        </tr>
 157 
        </tr>
156 
      </thead>
 158 
      </thead>
157 
      <tbody>
 159 
      <tbody>
Lines 161-166 $(document).ready(function() { Link Here
161 
                <input type="checkbox" value="[% lateorder.ordernumber %]" data-booksellerid="[% lateorder.supplierid %]" name="ordernumber">
 163 
                <input type="checkbox" value="[% lateorder.ordernumber %]" data-booksellerid="[% lateorder.supplierid %]" name="ordernumber">
162 
            </td>
 164 
            </td>
163 
            <td>
 165 
            <td>
166 
                [% lateorder.ordernumber %]
167 
            </td>
168 
            <td>
164 
                <span title="[% lateorder.orderdate %]">[% lateorder.orderdate | $KohaDates %] ([% lateorder.latesince %] days)</span>
 169 
                <span title="[% lateorder.orderdate %]">[% lateorder.orderdate | $KohaDates %] ([% lateorder.latesince %] days)</span>
165 
            </td>
 170 
            </td>
166 
            <td>
 171 
            <td>
Lines 218-231 $(document).ready(function() { Link Here
218 
            </td>
 223 
            </td>
219 
            <td><input name="internalnote" id="internalnote" type="text" value="[% lateorder.internalnote %]"></td>
 224 
            <td><input name="internalnote" id="internalnote" type="text" value="[% lateorder.internalnote %]"></td>
220 
            <td><input name="vendornote" id="vendornote" type="text" value="[% lateorder.vendornote %]"></td>
 225 
            <td><input name="vendornote" id="vendornote" type="text" value="[% lateorder.vendornote %]"></td>
226 
            <td>[% lateorder.isbn %]</td>
221 
        </tr>
 227 
        </tr>
222 
      [% END %]
 228 
      [% END %]
223 
      </tbody>
 229 
      </tbody>
224 
      <tfoot>
 230 
      <tfoot>
225 
        <tr>
 231 
        <tr>
226 
            <th colspan="5">Total</th>
 232 
            <th colspan="6">Total</th>
227 
            <th>[% total %]</th>
 233 
            <th>[% total %]</th>
228 
            <th colspan="8">&nbsp;</th>
 234 
            <th colspan="9">&nbsp;</th>
229 
        </tr>
 235 
        </tr>
230 
      </tfoot>
 236 
      </tfoot>
231 
    </table>
 237 
    </table>
232 
-

Return to bug 12502