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

(-)a/C4/Acquisition.pm (+2 lines)
Lines 1678-1683 sub SearchOrders { Link Here
1678
               aqbasket.closedate,
1678
               aqbasket.closedate,
1679
               aqbasket.creationdate,
1679
               aqbasket.creationdate,
1680
               aqbasket.basketname,
1680
               aqbasket.basketname,
1681
               aqbasketgroups.id as basketgroupid,
1682
               aqbasketgroups.name as basketgroupname,
1681
               aqorders.*
1683
               aqorders.*
1682
        FROM aqorders
1684
        FROM aqorders
1683
            LEFT JOIN aqbasket ON aqorders.basketno = aqbasket.basketno
1685
            LEFT JOIN aqbasket ON aqorders.basketno = aqbasket.basketno
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-4 / +22 lines)
Lines 24-29 Link Here
24
            "aoColumns": [
24
            "aoColumns": [
25
                { "sType": "num-html" },
25
                { "sType": "num-html" },
26
                { "sType": "num-html" },
26
                { "sType": "num-html" },
27
                { "sType": "num-html" },
27
                { "sType": "html" },
28
                { "sType": "html" },
28
                null,
29
                null,
29
                null,
30
                null,
Lines 42-47 Link Here
42
                { type: "text" },
43
                { type: "text" },
43
                { type: "text" },
44
                { type: "text" },
44
                { type: "text" },
45
                { type: "text" },
46
                { type: "text" },
45
                null,
47
                null,
46
                { type: "text" },
48
                { type: "text" },
47
                { type: "text" },
49
                { type: "text" },
Lines 204-209 Link Here
204
        <thead>
206
        <thead>
205
          <tr>
207
          <tr>
206
            <th>Basket search</th>
208
            <th>Basket search</th>
209
            <th>Basket group search</th>
207
            <th>Order line search</th>
210
            <th>Order line search</th>
208
            <th>Summary search</th>
211
            <th>Summary search</th>
209
            <th>&nbsp;</th>
212
            <th>&nbsp;</th>
Lines 216-221 Link Here
216
          </tr>
219
          </tr>
217
          <tr>
220
          <tr>
218
            <th>Basket</th>
221
            <th>Basket</th>
222
            <th>Basket group</th>
219
            <th>Order line</th>
223
            <th>Order line</th>
220
            <th>Summary</th>
224
            <th>Summary</th>
221
            <th>View record</th>
225
            <th>View record</th>
Lines 231-236 Link Here
231
        [% FOREACH loop_order IN loop_orders %]
235
        [% FOREACH loop_order IN loop_orders %]
232
            <tr>
236
            <tr>
233
                <td class="basketfilterclass">[% loop_order.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a>)</td>
237
                <td class="basketfilterclass">[% loop_order.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a>)</td>
238
                <td>
239
                  [% IF loop_order.basketgroupid %]
240
                    [% loop_order.basketgroupname %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% loop_order.booksellerid %]">[% loop_order.basketgroupid %]</a>)
241
                  [% ELSE %]
242
                    No basket group
243
                  [% END %]
244
                </td>
234
                <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&amp;booksellerid=[% loop_order.booksellerid %]">[% loop_order.ordernumber %]</a></td>
245
                <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&amp;booksellerid=[% loop_order.booksellerid %]">[% loop_order.ordernumber %]</a></td>
235
                <td class="summaryfilterclass">
246
                <td class="summaryfilterclass">
236
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
247
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
Lines 321-326 Link Here
321
        <thead>
332
        <thead>
322
	    <tr>
333
	    <tr>
323
                <th>Basket</th>
334
                <th>Basket</th>
335
                <th>Basket group</th>
324
                <th>Order Line</th>
336
                <th>Order Line</th>
325
                <th>Holds</th>
337
                <th>Holds</th>
326
                <th>Summary</th>
338
                <th>Summary</th>
Lines 345-363 Link Here
345
            </tr>
357
            </tr>
346
        [% END %]
358
        [% END %]
347
        <tr>
359
        <tr>
348
            <th colspan="9" class="total">Total tax exc.</th>
360
            <th colspan="10" class="total">Total tax exc.</th>
349
            <th>[% total_gste %]</th>
361
            <th>[% total_gste %]</th>
350
            <th></th>
362
            <th></th>
351
        </tr>
363
        </tr>
352
        [% FOREACH book_foot IN book_foot_loop %]
364
        [% FOREACH book_foot IN book_foot_loop %]
353
            <tr>
365
            <tr>
354
                <th colspan="9">Total (GST [% book_foot.gstrate * 100 | format ("%.1f") %]%)</th>
366
                <th colspan="10">Total (GST [% book_foot.gstrate * 100 | format ("%.1f") %]%)</th>
355
                <th>[% book_foot.value %]</th>
367
                <th>[% book_foot.value %]</th>
356
                <th></th>
368
                <th></th>
357
            </tr>
369
            </tr>
358
        [% END %]
370
        [% END %]
359
        <tr>
371
        <tr>
360
            <th colspan="9" class="total">Total tax inc.</th>
372
            <th colspan="10" class="total">Total tax inc.</th>
361
            <th>[% total_gsti %]</th>
373
            <th>[% total_gsti %]</th>
362
            <th></th>
374
            <th></th>
363
        </tr>
375
        </tr>
Lines 366-371 Link Here
366
        [% FOREACH loop_receive IN loop_received %]
378
        [% FOREACH loop_receive IN loop_received %]
367
            <tr>
379
            <tr>
368
                <td>[% loop_receive.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a>)</td>
380
                <td>[% loop_receive.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a>)</td>
381
                <td>
382
                  [% IF loop_order.basketgroupid %]
383
                    [% loop_receive.basketgroupname %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% loop_receive.booksellerid %]">[% loop_receive.basketgroupid %]</a>)
384
                  [% ELSE %]
385
                    No basket group
386
                  [% END %]
387
                </td>
369
                <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&amp;booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
388
                <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&amp;booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
370
                <td>
389
                <td>
371
                  [% IF loop_receive.holds > 0 %]
390
                  [% IF loop_receive.holds > 0 %]
372
- 

Return to bug 11111