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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-40 / +39 lines)
Lines 350-371 Link Here
350
350
351
   <form action="/cgi-bin/koha/acqui/parcel.pl" method="get" name="orderform">
351
   <form action="/cgi-bin/koha/acqui/parcel.pl" method="get" name="orderform">
352
    <table id="receivedt">
352
    <table id="receivedt">
353
        <thead>
353
      <thead>
354
	    <tr>
354
        <tr>
355
                <th>Basket</th>
355
          <th>Basket</th>
356
                <th>Basket group</th>
356
          <th>Basket group</th>
357
                <th>Order Line</th>
357
          <th>Order line</th>
358
                <th>Holds</th>
358
          <th>Holds</th>
359
                <th>Summary</th>
359
          <th>Summary</th>
360
                <th>View record</th>
360
          <th>View record</th>
361
                <th>Quantity</th>
361
          <th>Quantity</th>
362
                <th>Fund</th>
362
          <th>Fund</th>
363
                <th>Est cost</th>
363
          <th>Est cost</th>
364
                <th>Actual cost</th>
364
          <th>Actual cost</th>
365
                <th>TOTAL</th>
365
          <th>TOTAL</th>
366
        <th></th>
366
          <th></th>
367
	    </tr>
367
        </tr>
368
    </thead>
368
      </thead>
369
    <tfoot>
369
    <tfoot>
370
        [% FOREACH key IN funds.keys.sort %]
370
        [% FOREACH key IN funds.keys.sort %]
371
            <tr>
371
            <tr>
Lines 396-441 Link Here
396
        </tr>
396
        </tr>
397
    </tfoot>
397
    </tfoot>
398
    <tbody class="filterclass">
398
    <tbody class="filterclass">
399
        [% FOREACH loop_receive IN loop_received %]
399
        [% FOREACH order IN loop_received %]
400
            <tr>
400
            <tr>
401
                <td>[% loop_receive.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a>)</td>
401
                <td>[% order.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% order.basketno %]">[% order.basketno %]</a>)</td>
402
                <td>
402
                <td>
403
                  [% IF loop_order.basketgroupid %]
403
                  [% IF order.basketgroupid %]
404
                    [% loop_receive.basketgroupname %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% loop_receive.booksellerid %]">[% loop_receive.basketgroupid %]</a>)
404
                    [% order.basketgroupname %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% order.booksellerid %]">[% order.basketgroupid %]</a>)
405
                  [% ELSE %]
405
                  [% ELSE %]
406
                    No basket group
406
                    No basket group
407
                  [% END %]
407
                  [% END %]
408
                </td>
408
                </td>
409
                <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&amp;booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
409
                <td><a href="neworderempty.pl?ordernumber=[% order.ordernumber %]&amp;booksellerid=[% booksellerid %]">[% order.ordernumber %]</a></td>
410
                <td>
410
                <td>
411
                  [% IF loop_receive.holds > 0 %]
411
                  [% IF order.holds > 0 %]
412
                    <span class="error"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.holds %]</a></span>
412
                    <span class="error"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% order.biblionumber %]">[% order.holds %]</a></span>
413
                  [% ELSE %]
413
                  [% ELSE %]
414
                    0
414
                    0
415
                  [% END %]
415
                  [% END %]
416
                </td>
416
                </td>
417
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a>
417
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title |html %]</a>
418
                [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %]
418
                [% IF ( order.author ) %] / [% order.author %][% END %]
419
                [% IF ( loop_receive.isbn ) %] - [% loop_receive.isbn %][% END %]
419
                [% IF ( order.isbn ) %] - [% order.isbn %][% END %]
420
                [% IF ( loop_receive.publishercode ) %]<br />Publisher :[% loop_receive.publishercode %][% END %]
420
                [% IF ( order.publishercode ) %]<br />Publisher :[% order.publishercode %][% END %]
421
                [% IF ( loop_receive.suggestionid ) %]
421
                [% IF ( order.suggestionid ) %]
422
                    <br/>
422
                    <br/>
423
                    Suggested by: [% loop_receive.surnamesuggestedby %][% IF ( loop_receive.firstnamesuggestedby ) %], [% loop_receive.firstnamesuggestedby %] [% END %]
423
                    Suggested by: [% order.surnamesuggestedby %][% IF ( order.firstnamesuggestedby ) %], [% order.firstnamesuggestedby %] [% END %]
424
                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% loop_receive.suggestionid %]&amp;op=show">suggestion #[% loop_receive.suggestionid %]</a>)
424
                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% order.suggestionid %]&amp;op=show">suggestion #[% order.suggestionid %]</a>)
425
                [% END %]
425
                [% END %]
426
                </td>
426
                </td>
427
                <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_receive.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% loop_receive.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">Card</a></td>
427
                <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">Card</a></td>
428
                <td>[% loop_receive.quantityreceived %]</td>
428
                <td>[% order.quantityreceived %]</td>
429
                <td>[% loop_receive.budget.budget_name %]</td>
429
                <td>[% order.budget.budget_name %]</td>
430
                <td>[% loop_receive.ecost %]</td>
430
                <td>[% order.ecost %]</td>
431
                <td>[% loop_receive.unitprice %]</td>
431
                <td>[% order.unitprice %]</td>
432
                <td>[% loop_receive.total %]</td>
432
                <td>[% order.total %]</td>
433
                <td>
433
                <td>
434
                    [% IF (loop_receive.cannot_cancel) %]
434
                    [% IF (order.cannot_cancel) %]
435
                        [% span_title = BLOCK %]
435
                        [% span_title = BLOCK %]
436
                            Cannot cancel receipt of this order line because it
436
                            Cannot cancel receipt of this order line because it
437
                            was created from a partial receipt of order line no.
437
                            was created from a partial receipt of order line no.
438
                            [% loop_receive.parent_ordernumber %], which is
438
                            [% order.parent_ordernumber %], which is
439
                            already received. Try cancelling this one first and
439
                            already received. Try cancelling this one first and
440
                            retry.
440
                            retry.
441
                        [% END %]
441
                        [% END %]
Lines 443-449 Link Here
443
                            Can't cancel receipt
443
                            Can't cancel receipt
444
                        </span>
444
                        </span>
445
                    [% ELSE %]
445
                    [% ELSE %]
446
                        <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]&op=cancelreceipt&ordernumber=[% loop_receive.ordernumber %]">Cancel receipt</a>
446
                        <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]&op=cancelreceipt&ordernumber=[% order.ordernumber %]">Cancel receipt</a>
447
                    [% END %]
447
                    [% END %]
448
                </td>
448
                </td>
449
            </tr>
449
            </tr>
450
- 

Return to bug 11864