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

(-)a/acqui/parcel.pl (+3 lines)
Lines 208-219 if(!defined $invoice->{closedate}) { Link Here
208
        my $ean      = $input->param('eanfilter') || '';
208
        my $ean      = $input->param('eanfilter') || '';
209
        my $basketname = $input->param('basketfilter') || '';
209
        my $basketname = $input->param('basketfilter') || '';
210
        my $orderno  = $input->param('orderfilter') || '';
210
        my $orderno  = $input->param('orderfilter') || '';
211
        my $basketgroupname = $input->param('basketgroupnamefilter') || '';
211
        $pendingorders = SearchOrders({
212
        $pendingorders = SearchOrders({
212
            booksellerid => $booksellerid,
213
            booksellerid => $booksellerid,
213
            basketname => $basketname,
214
            basketname => $basketname,
214
            ordernumber => $orderno,
215
            ordernumber => $orderno,
215
            search => $search,
216
            search => $search,
216
            ean => $ean,
217
            ean => $ean,
218
            basketgroupname => $basketgroupname,
217
            pending => 1,
219
            pending => 1,
218
        });
220
        });
219
        $template->param(
221
        $template->param(
Lines 221-226 if(!defined $invoice->{closedate}) { Link Here
221
            eanfilter => $ean,
223
            eanfilter => $ean,
222
            basketfilter => $basketname,
224
            basketfilter => $basketname,
223
            orderfilter => $orderno,
225
            orderfilter => $orderno,
226
            basketgroupnamefilter => $basketgroupname,
224
        );
227
        );
225
    }else{
228
    }else{
226
        $pendingorders = SearchOrders({
229
        $pendingorders = SearchOrders({
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-41 / +36 lines)
Lines 192-198 Link Here
192
    <tbody class="filterclass">
192
    <tbody class="filterclass">
193
        [% FOREACH loop_order IN loop_orders %]
193
        [% FOREACH loop_order IN loop_orders %]
194
            <tr>
194
            <tr>
195
                <td class="basketfilterclass"><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a></td>
195
                <td class="basketfilterclass">[% loop_order.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a>)</td>
196
                <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&amp;booksellerid=[% loop_order.booksellerid %]">[% loop_order.ordernumber %]</a></td>
196
                <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">
197
                <td class="summaryfilterclass">
198
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
198
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
Lines 295-304 Link Here
295
            <th></th>
295
            <th></th>
296
        </tr>
296
        </tr>
297
    </tfoot>
297
    </tfoot>
298
	<tbody class="filterclass">
298
    <tbody class="filterclass">
299
	    [% FOREACH loop_receive IN loop_received %]
299
        [% FOREACH loop_receive IN loop_received %]
300
            <tr>
300
            <tr>
301
                <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a></td>
301
                <td>[% loop_receive.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a>)</td>
302
                <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&amp;booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
302
                <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>
303
                <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 %]
304
                [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %]
Lines 358-402 Link Here
358
358
359
<div class="yui-b">
359
<div class="yui-b">
360
<form action="/cgi-bin/koha/acqui/parcel.pl" id="filterform" method="post">
360
<form action="/cgi-bin/koha/acqui/parcel.pl" id="filterform" method="post">
361
        <fieldset class="brief">
361
  <fieldset class="brief">
362
362
    <h4>Filter</h4>
363
            <h4>Filter</h4>
363
    <ol>
364
364
      <li>
365
	    <ol>
365
        <label for="summaryfilter">ISBN, author or title :</label>
366
366
        <input type="text" name="summaryfilter" id="summaryfilter" value="[% summaryfilter %]"/>
367
		<li>
367
      </li>
368
		    <label for="summaryfilter">ISBN, author or title :</label>
368
      <li>
369
            <input type="text" name="summaryfilter" id="summaryfilter" value="[% summaryfilter %]"/>
369
        <label for="basketfilter">Basket :</label>
370
		</li>
370
        <input type="text" name="basketfilter" id="basketfilter" value="[% basketfilter %]"/>
371
371
      </li>
372
		<li>
372
      <li>
373
		    <label for="basketfilter">Basket :</label>
373
          <label for="basketgroupnamefilter">Basket group name :</label>
374
            <input type="text" name="basketfilter" id="basketfilter" value="[% basketfilter %]"/>
374
          <input type="text" name="basketgroupnamefilter" id="basketgroupnamefilter" value="[% basketgroupnamefilter %]" />
375
		</li>
375
      </li>
376
376
      <li>
377
		<li>
377
        <label for="orderfilter">Order line :</label>
378
            <label for="orderfilter">Order line :</label>
378
        <input type="text" name="orderfilter" id="orderfilter" value="[% orderfilter %]"/>
379
            <input type="text" name="orderfilter" id="orderfilter" value="[% orderfilter %]"/>
379
      </li>
380
		</li>
380
      [% IF (UNIMARC) %]
381
                [% IF (UNIMARC) %]
382
        <li>
381
        <li>
383
            <label for="eanfilter">EAN :</label>
382
          <label for="eanfilter">EAN :</label>
384
            <input type="text" name="eanfilter" id="eanfilter" value="[% eanfilter %]"/>
383
          <input type="text" name="eanfilter" id="eanfilter" value="[% eanfilter %]"/>
385
        </li>
384
        </li>
386
                [% END %]
385
      [% END %]
387
	    </ol>
386
    </ol>
388
		<fieldset class="action">
387
    <fieldset class="action">
389
        <input type="hidden" value="search" name="op" />
388
      <input type="hidden" value="search" name="op" />
390
        <input type="hidden" value="[% invoiceid %]" name="invoiceid" />
389
      <input type="hidden" value="[% invoiceid %]" name="invoiceid" />
391
        <input type="submit" value="Filter" />
390
      <input type="submit" value="Filter" />
392
        <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]">Clear</a>
391
      <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]">Clear</a>
393
		</fieldset>
392
    </fieldset>
394
393
  </fieldset>
395
394
</form>
396
        </fieldset>
397
    </form>
398
[% INCLUDE 'acquisitions-menu.inc' %]
395
[% INCLUDE 'acquisitions-menu.inc' %]
399
</div>
396
</div>
400
</div>
397
</div>
401
[% INCLUDE 'intranet-bottom.inc' %]
398
[% INCLUDE 'intranet-bottom.inc' %]
402
 
403
- 

Return to bug 10124