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

(-)a/C4/Acquisition.pm (+2 lines)
Lines 1507-1512 sub SearchOrders { Link Here
1507
               aqbasket.closedate,
1507
               aqbasket.closedate,
1508
               aqbasket.creationdate,
1508
               aqbasket.creationdate,
1509
               aqbasket.basketname,
1509
               aqbasket.basketname,
1510
               aqbasketgroups.id as basketgroupid,
1511
               aqbasketgroups.name as basketgroupname,
1510
               aqorders.*
1512
               aqorders.*
1511
        FROM aqorders
1513
        FROM aqorders
1512
            LEFT JOIN aqbasket ON aqorders.basketno = aqbasket.basketno
1514
            LEFT JOIN aqbasket ON aqorders.basketno = aqbasket.basketno
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-5 / +20 lines)
Lines 182-187 Link Here
182
    <thead>
182
    <thead>
183
        <tr>
183
        <tr>
184
            <th>Basket</th>
184
            <th>Basket</th>
185
            <th>Basket group</th>
185
            <th>Order line</th>
186
            <th>Order line</th>
186
            <th>Summary</th>
187
            <th>Summary</th>
187
            <th>View record</th>
188
            <th>View record</th>
Lines 197-202 Link Here
197
        [% FOREACH loop_order IN loop_orders %]
198
        [% FOREACH loop_order IN loop_orders %]
198
            <tr>
199
            <tr>
199
                <td class="basketfilterclass">[% loop_order.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a>)</td>
200
                <td class="basketfilterclass">[% loop_order.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a>)</td>
201
                <td>
202
                  [% IF loop_order.basketgroupid %]
203
                    [% loop_order.basketgroupname %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% loop_order.booksellerid %]">[% loop_order.basketgroupid %]</a>)
204
                  [% ELSE %]
205
                    No basketgroup
206
                  [% END %]
207
                </td>
200
                <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&amp;booksellerid=[% loop_order.booksellerid %]">[% loop_order.ordernumber %]</a></td>
208
                <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&amp;booksellerid=[% loop_order.booksellerid %]">[% loop_order.ordernumber %]</a></td>
201
                <td class="summaryfilterclass">
209
                <td class="summaryfilterclass">
202
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
210
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
Lines 271-277 Link Here
271
    <table id="receivedt">
279
    <table id="receivedt">
272
        <thead>
280
        <thead>
273
	    <tr>
281
	    <tr>
274
		<th>Basket</th>
282
        <th>Basket</th>
283
        <th>Basket group</th>
275
        <th>Order line</th>
284
        <th>Order line</th>
276
		<th>Summary</th>
285
		<th>Summary</th>
277
        <th>View record</th>
286
        <th>View record</th>
Lines 284-302 Link Here
284
    </thead>
293
    </thead>
285
    <tfoot>
294
    <tfoot>
286
        <tr>
295
        <tr>
287
            <th colspan="7" class="total">Total tax exc.</th>
296
            <th colspan="8" class="total">Total tax exc.</th>
288
            <th>[% total_gste %]</th>
297
            <th>[% total_gste %]</th>
289
            <th></th>
298
            <th></th>
290
        </tr>
299
        </tr>
291
        [% FOREACH book_foot IN book_foot_loop %]
300
        [% FOREACH book_foot IN book_foot_loop %]
292
            <tr>
301
            <tr>
293
                <th colspan="7">Total (GST [% book_foot.gstrate * 100 | format ("%.1f") %]%)</th>
302
                <th colspan="8">Total (GST [% book_foot.gstrate * 100 | format ("%.1f") %]%)</th>
294
                <th>[% book_foot.value %]</th>
303
                <th>[% book_foot.value %]</th>
295
                <th></th>
304
                <th></th>
296
            </tr>
305
            </tr>
297
        [% END %]
306
        [% END %]
298
        <tr>
307
        <tr>
299
            <th colspan="7" class="total">Total tax inc.</th>
308
            <th colspan="8" class="total">Total tax inc.</th>
300
            <th>[% total_gsti %]</th>
309
            <th>[% total_gsti %]</th>
301
            <th></th>
310
            <th></th>
302
        </tr>
311
        </tr>
Lines 305-310 Link Here
305
        [% FOREACH loop_receive IN loop_received %]
314
        [% FOREACH loop_receive IN loop_received %]
306
            <tr>
315
            <tr>
307
                <td>[% loop_receive.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a>)</td>
316
                <td>[% loop_receive.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a>)</td>
317
                <td>
318
                  [% IF loop_order.basketgroupid %]
319
                    [% loop_receive.basketgroupname %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% loop_receive.booksellerid %]">[% loop_receive.basketgroupid %]</a>)
320
                  [% ELSE %]
321
                    No basketgroup
322
                  [% END %]
323
                </td>
308
                <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&amp;booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
324
                <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&amp;booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
309
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a>
325
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a>
310
                [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %]
326
                [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %]
311
- 

Return to bug 11111