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

(-)a/acqui/parcel.pl (+3 lines)
Lines 219-230 if(!defined $invoice->{closedate}) { Link Here
219
        my $ean      = $input->param('eanfilter') || '';
219
        my $ean      = $input->param('eanfilter') || '';
220
        my $basketname = $input->param('basketfilter') || '';
220
        my $basketname = $input->param('basketfilter') || '';
221
        my $orderno  = $input->param('orderfilter') || '';
221
        my $orderno  = $input->param('orderfilter') || '';
222
        my $basketgroupname = $input->param('basketgroupnamefilter') || '';
222
        $pendingorders = SearchOrders({
223
        $pendingorders = SearchOrders({
223
            booksellerid => $booksellerid,
224
            booksellerid => $booksellerid,
224
            basketname => $basketname,
225
            basketname => $basketname,
225
            ordernumber => $orderno,
226
            ordernumber => $orderno,
226
            search => $search,
227
            search => $search,
227
            ean => $ean,
228
            ean => $ean,
229
            basketgroupname => $basketgroupname,
228
            pending => 1,
230
            pending => 1,
229
        });
231
        });
230
        $template->param(
232
        $template->param(
Lines 232-237 if(!defined $invoice->{closedate}) { Link Here
232
            eanfilter => $ean,
234
            eanfilter => $ean,
233
            basketfilter => $basketname,
235
            basketfilter => $basketname,
234
            orderfilter => $orderno,
236
            orderfilter => $orderno,
237
            basketgroupnamefilter => $basketgroupname,
235
        );
238
        );
236
    }else{
239
    }else{
237
        $pendingorders = SearchOrders({
240
        $pendingorders = SearchOrders({
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-41 / +36 lines)
Lines 186-192 Link Here
186
    <tbody class="filterclass">
186
    <tbody class="filterclass">
187
        [% FOREACH loop_order IN loop_orders %]
187
        [% FOREACH loop_order IN loop_orders %]
188
            <tr>
188
            <tr>
189
                <td class="basketfilterclass"><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a></td>
189
                <td class="basketfilterclass">[% loop_order.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a>)</td>
190
                <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&amp;booksellerid=[% loop_order.booksellerid %]">[% loop_order.ordernumber %]</a></td>
190
                <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&amp;booksellerid=[% loop_order.booksellerid %]">[% loop_order.ordernumber %]</a></td>
191
                <td class="summaryfilterclass">
191
                <td class="summaryfilterclass">
192
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
192
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
Lines 304-313 Link Here
304
            <th></th>
304
            <th></th>
305
        </tr>
305
        </tr>
306
    </tfoot>
306
    </tfoot>
307
	<tbody class="filterclass">
307
    <tbody class="filterclass">
308
	    [% FOREACH loop_receive IN loop_received %]
308
        [% FOREACH loop_receive IN loop_received %]
309
            <tr>
309
            <tr>
310
                <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a></td>
310
                <td>[% loop_receive.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a>)</td>
311
                <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&amp;booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
311
                <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&amp;booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
312
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a>
312
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a>
313
                [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %]
313
                [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %]
Lines 364-408 Link Here
364
</div>
364
</div>
365
<div class="yui-b">
365
<div class="yui-b">
366
<form action="/cgi-bin/koha/acqui/parcel.pl" id="filterform" method="post">
366
<form action="/cgi-bin/koha/acqui/parcel.pl" id="filterform" method="post">
367
        <fieldset class="brief">
367
  <fieldset class="brief">
368
368
    <h4>Filter</h4>
369
            <h4>Filter</h4>
369
    <ol>
370
370
      <li>
371
	    <ol>
371
        <label for="summaryfilter">ISBN, author or title :</label>
372
372
        <input type="text" name="summaryfilter" id="summaryfilter" value="[% summaryfilter %]"/>
373
		<li>
373
      </li>
374
		    <label for="summaryfilter">ISBN, author or title :</label>
374
      <li>
375
            <input type="text" name="summaryfilter" id="summaryfilter" value="[% summaryfilter %]"/>
375
        <label for="basketfilter">Basket :</label>
376
		</li>
376
        <input type="text" name="basketfilter" id="basketfilter" value="[% basketfilter %]"/>
377
377
      </li>
378
		<li>
378
      <li>
379
		    <label for="basketfilter">Basket :</label>
379
          <label for="basketgroupnamefilter">Basket group name :</label>
380
            <input type="text" name="basketfilter" id="basketfilter" value="[% basketfilter %]"/>
380
          <input type="text" name="basketgroupnamefilter" id="basketgroupnamefilter" value="[% basketgroupnamefilter %]" />
381
		</li>
381
      </li>
382
382
      <li>
383
		<li>
383
        <label for="orderfilter">Order line :</label>
384
            <label for="orderfilter">Order line :</label>
384
        <input type="text" name="orderfilter" id="orderfilter" value="[% orderfilter %]"/>
385
            <input type="text" name="orderfilter" id="orderfilter" value="[% orderfilter %]"/>
385
      </li>
386
		</li>
386
      [% IF (UNIMARC) %]
387
                [% IF (UNIMARC) %]
388
        <li>
387
        <li>
389
            <label for="eanfilter">EAN :</label>
388
          <label for="eanfilter">EAN :</label>
390
            <input type="text" name="eanfilter" id="eanfilter" value="[% eanfilter %]"/>
389
          <input type="text" name="eanfilter" id="eanfilter" value="[% eanfilter %]"/>
391
        </li>
390
        </li>
392
                [% END %]
391
      [% END %]
393
	    </ol>
392
    </ol>
394
		<fieldset class="action">
393
    <fieldset class="action">
395
        <input type="hidden" value="search" name="op" />
394
      <input type="hidden" value="search" name="op" />
396
        <input type="hidden" value="[% invoiceid %]" name="invoiceid" />
395
      <input type="hidden" value="[% invoiceid %]" name="invoiceid" />
397
        <input type="submit" value="Filter" />
396
      <input type="submit" value="Filter" />
398
        <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]">Clear</a>
397
      <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]">Clear</a>
399
		</fieldset>
398
    </fieldset>
400
399
  </fieldset>
401
400
</form>
402
        </fieldset>
403
    </form>
404
[% INCLUDE 'acquisitions-menu.inc' %]
401
[% INCLUDE 'acquisitions-menu.inc' %]
405
</div>
402
</div>
406
</div>
403
</div>
407
[% INCLUDE 'intranet-bottom.inc' %]
404
[% INCLUDE 'intranet-bottom.inc' %]
408
 
409
- 

Return to bug 10124