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

(-)a/acqui/parcel.pl (+3 lines)
Lines 215-226 if(!defined $invoice->{closedate}) { Link Here
215
        my $ean      = $input->param('eanfilter') || '';
215
        my $ean      = $input->param('eanfilter') || '';
216
        my $basketname = $input->param('basketfilter') || '';
216
        my $basketname = $input->param('basketfilter') || '';
217
        my $orderno  = $input->param('orderfilter') || '';
217
        my $orderno  = $input->param('orderfilter') || '';
218
        my $basketgroupname = $input->param('basketgroupnamefilter') || '';
218
        $pendingorders = SearchOrders({
219
        $pendingorders = SearchOrders({
219
            booksellerid => $booksellerid,
220
            booksellerid => $booksellerid,
220
            basketname => $basketname,
221
            basketname => $basketname,
221
            ordernumber => $orderno,
222
            ordernumber => $orderno,
222
            search => $search,
223
            search => $search,
223
            ean => $ean,
224
            ean => $ean,
225
            basketgroupname => $basketgroupname,
224
            pending => 1,
226
            pending => 1,
225
        });
227
        });
226
        $template->param(
228
        $template->param(
Lines 228-233 if(!defined $invoice->{closedate}) { Link Here
228
            eanfilter => $ean,
230
            eanfilter => $ean,
229
            basketfilter => $basketname,
231
            basketfilter => $basketname,
230
            orderfilter => $orderno,
232
            orderfilter => $orderno,
233
            basketgroupnamefilter => $basketgroupname,
231
        );
234
        );
232
    }else{
235
    }else{
233
        $pendingorders = SearchOrders({
236
        $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 289-298 Link Here
289
            <th></th>
289
            <th></th>
290
        </tr>
290
        </tr>
291
    </tfoot>
291
    </tfoot>
292
	<tbody class="filterclass">
292
    <tbody class="filterclass">
293
	    [% FOREACH loop_receive IN loop_received %]
293
        [% FOREACH loop_receive IN loop_received %]
294
            <tr>
294
            <tr>
295
                <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a></td>
295
                <td>[% loop_receive.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a>)</td>
296
                <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&amp;booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
296
                <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&amp;booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
297
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a>
297
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a>
298
                [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %]
298
                [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %]
Lines 349-393 Link Here
349
</div>
349
</div>
350
<div class="yui-b">
350
<div class="yui-b">
351
<form action="/cgi-bin/koha/acqui/parcel.pl" id="filterform" method="post">
351
<form action="/cgi-bin/koha/acqui/parcel.pl" id="filterform" method="post">
352
        <fieldset class="brief">
352
  <fieldset class="brief">
353
353
    <h4>Filter</h4>
354
            <h4>Filter</h4>
354
    <ol>
355
355
      <li>
356
	    <ol>
356
        <label for="summaryfilter">ISBN, author or title :</label>
357
357
        <input type="text" name="summaryfilter" id="summaryfilter" value="[% summaryfilter %]"/>
358
		<li>
358
      </li>
359
		    <label for="summaryfilter">ISBN, author or title :</label>
359
      <li>
360
            <input type="text" name="summaryfilter" id="summaryfilter" value="[% summaryfilter %]"/>
360
        <label for="basketfilter">Basket :</label>
361
		</li>
361
        <input type="text" name="basketfilter" id="basketfilter" value="[% basketfilter %]"/>
362
362
      </li>
363
		<li>
363
      <li>
364
		    <label for="basketfilter">Basket :</label>
364
          <label for="basketgroupnamefilter">Basket group name :</label>
365
            <input type="text" name="basketfilter" id="basketfilter" value="[% basketfilter %]"/>
365
          <input type="text" name="basketgroupnamefilter" id="basketgroupnamefilter" value="[% basketgroupnamefilter %]" />
366
		</li>
366
      </li>
367
367
      <li>
368
		<li>
368
        <label for="orderfilter">Order line :</label>
369
            <label for="orderfilter">Order line :</label>
369
        <input type="text" name="orderfilter" id="orderfilter" value="[% orderfilter %]"/>
370
            <input type="text" name="orderfilter" id="orderfilter" value="[% orderfilter %]"/>
370
      </li>
371
		</li>
371
      [% IF (UNIMARC) %]
372
                [% IF (UNIMARC) %]
373
        <li>
372
        <li>
374
            <label for="eanfilter">EAN :</label>
373
          <label for="eanfilter">EAN :</label>
375
            <input type="text" name="eanfilter" id="eanfilter" value="[% eanfilter %]"/>
374
          <input type="text" name="eanfilter" id="eanfilter" value="[% eanfilter %]"/>
376
        </li>
375
        </li>
377
                [% END %]
376
      [% END %]
378
	    </ol>
377
    </ol>
379
		<fieldset class="action">
378
    <fieldset class="action">
380
        <input type="hidden" value="search" name="op" />
379
      <input type="hidden" value="search" name="op" />
381
        <input type="hidden" value="[% invoiceid %]" name="invoiceid" />
380
      <input type="hidden" value="[% invoiceid %]" name="invoiceid" />
382
        <input type="submit" value="Filter" />
381
      <input type="submit" value="Filter" />
383
        <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]">Clear</a>
382
      <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]">Clear</a>
384
		</fieldset>
383
    </fieldset>
385
384
  </fieldset>
386
385
</form>
387
        </fieldset>
388
    </form>
389
[% INCLUDE 'acquisitions-menu.inc' %]
386
[% INCLUDE 'acquisitions-menu.inc' %]
390
</div>
387
</div>
391
</div>
388
</div>
392
[% INCLUDE 'intranet-bottom.inc' %]
389
[% INCLUDE 'intranet-bottom.inc' %]
393
 
394
- 

Return to bug 10124