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

(-)a/C4/Acquisition.pm (-1 / +2 lines)
Lines 2372-2380 sub GetInvoiceDetails { Link Here
2372
    my $invoice = $sth->fetchrow_hashref;
2372
    my $invoice = $sth->fetchrow_hashref;
2373
2373
2374
    $query = qq{
2374
    $query = qq{
2375
        SELECT aqorders.*, biblio.*
2375
        SELECT aqorders.*, biblio.*, aqbasket.*
2376
        FROM aqorders
2376
        FROM aqorders
2377
          LEFT JOIN biblio ON aqorders.biblionumber = biblio.biblionumber
2377
          LEFT JOIN biblio ON aqorders.biblionumber = biblio.biblionumber
2378
          LEFT JOIN aqbasket ON aqorders.basketno = aqbasket.basketno
2378
        WHERE invoiceid = ?
2379
        WHERE invoiceid = ?
2379
    };
2380
    };
2380
    $sth = $dbh->prepare($query);
2381
    $sth = $dbh->prepare($query);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-5 / +12 lines)
Lines 20-26 Link Here
20
            "iCookieDuration": 60*60*24*1000, // 1000 days
20
            "iCookieDuration": 60*60*24*1000, // 1000 days
21
            "aLengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
21
            "aLengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
22
            "aoColumnDefs": [
22
            "aoColumnDefs": [
23
                { "aTargets": [ 3, 8, 9 ], "bSortable": false, "bSearchable": false },
23
                { "aTargets": [ 5, 10, 11 ], "bSortable": false, "bSearchable": false },
24
            ],
24
            ],
25
            "aoColumns": [
25
            "aoColumns": [
26
                { "sType": "num-html" },
26
                { "sType": "num-html" },
Lines 178-183 Link Here
178
    <thead>
178
    <thead>
179
        <tr>
179
        <tr>
180
            <th>Basket</th>
180
            <th>Basket</th>
181
            <th>Basketname</th>
182
            <th>PO no.</th>
181
            <th>Order line</th>
183
            <th>Order line</th>
182
            <th>Summary</th>
184
            <th>Summary</th>
183
            <th>View record</th>
185
            <th>View record</th>
Lines 193-198 Link Here
193
        [% FOREACH loop_order IN loop_orders %]
195
        [% FOREACH loop_order IN loop_orders %]
194
            <tr>
196
            <tr>
195
                <td class="basketfilterclass"><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a></td>
197
                <td class="basketfilterclass"><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a></td>
198
                <td class="basketnamefilterclass"><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketname %]</a></td>
199
                <td class="purchaseordernumberfilterclass">[% loop_order.purchaseordernumber %]</a></td>
196
                <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&amp;booksellerid=[% loop_order.booksellerid %]">[% loop_order.ordernumber %]</a></td>
200
                <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&amp;booksellerid=[% loop_order.booksellerid %]">[% loop_order.ordernumber %]</a></td>
197
                <td class="summaryfilterclass">
201
                <td class="summaryfilterclass">
198
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
202
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
Lines 266-271 Link Here
266
        <thead>
270
        <thead>
267
	    <tr>
271
	    <tr>
268
		<th>Basket</th>
272
		<th>Basket</th>
273
		<th>Basketname</th>
274
		<th>PO no.</th>
269
        <th>Order line</th>
275
        <th>Order line</th>
270
		<th>Summary</th>
276
		<th>Summary</th>
271
        <th>View record</th>
277
        <th>View record</th>
Lines 278-296 Link Here
278
    </thead>
284
    </thead>
279
    <tfoot>
285
    <tfoot>
280
        <tr>
286
        <tr>
281
            <th colspan="7" class="total">Total tax exc.</th>
287
            <th colspan="9" class="total">Total tax exc.</th>
282
            <th>[% total_gste %]</th>
288
            <th>[% total_gste %]</th>
283
            <th></th>
289
            <th></th>
284
        </tr>
290
        </tr>
285
        [% FOREACH book_foot IN book_foot_loop %]
291
        [% FOREACH book_foot IN book_foot_loop %]
286
            <tr>
292
            <tr>
287
                <th colspan="7">Total (GST [% book_foot.gstrate * 100 | format ("%.1f") %]%)</th>
293
                <th colspan="9">Total (GST [% book_foot.gstrate * 100 | format ("%.1f") %]%)</th>
288
                <th>[% book_foot.value %]</th>
294
                <th>[% book_foot.value %]</th>
289
                <th></th>
295
                <th></th>
290
            </tr>
296
            </tr>
291
        [% END %]
297
        [% END %]
292
        <tr>
298
        <tr>
293
            <th colspan="7" class="total">Total tax inc.</th>
299
            <th colspan="9" class="total">Total tax inc.</th>
294
            <th>[% total_gsti %]</th>
300
            <th>[% total_gsti %]</th>
295
            <th></th>
301
            <th></th>
296
        </tr>
302
        </tr>
Lines 299-304 Link Here
299
	    [% FOREACH loop_receive IN loop_received %]
305
	    [% FOREACH loop_receive IN loop_received %]
300
            <tr>
306
            <tr>
301
                <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a></td>
307
                <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a></td>
308
                <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketname %]</a></td>
309
                <td>[% loop_receive.purchaseordernumber %]</td>
302
                <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&amp;booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
310
                <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&amp;booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
303
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a>
311
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a>
304
                [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %]
312
                [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %]
305
- 

Return to bug 10531