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

(-)a/C4/Acquisition.pm (-2 / +6 lines)
Lines 819-825 sub GetBasketgroups { Link Here
819
819
820
=head3 GetPendingOrders
820
=head3 GetPendingOrders
821
821
822
$orders = &GetPendingOrders($supplierid,$grouped,$owner,$basketno,$ordernumber,$search,$ean);
822
$orders = &GetPendingOrders($supplierid,$grouped,$owner,$basketno,$ordernumber,$search,$ean,$basketgroupno);
823
823
824
Finds pending orders from the bookseller with the given ID. Ignores
824
Finds pending orders from the bookseller with the given ID. Ignores
825
completed and cancelled orders.
825
completed and cancelled orders.
Lines 845-851 Results are ordered from most to least recent. Link Here
845
=cut
845
=cut
846
846
847
sub GetPendingOrders {
847
sub GetPendingOrders {
848
    my ($supplierid,$grouped,$owner,$basketno,$ordernumber,$search,$ean) = @_;
848
    my ($supplierid,$grouped,$owner,$basketno,$ordernumber,$search,$ean,$basketgroupno) = @_;
849
    my $dbh = C4::Context->dbh;
849
    my $dbh = C4::Context->dbh;
850
    my $strsth = "
850
    my $strsth = "
851
        SELECT ".($grouped?"count(*),":"")."aqbasket.basketno,
851
        SELECT ".($grouped?"count(*),":"")."aqbasket.basketno,
Lines 892-897 sub GetPendingOrders { Link Here
892
        $strsth .= " AND aqbasket.authorisedby=? ";
892
        $strsth .= " AND aqbasket.authorisedby=? ";
893
        push @query_params, $userenv->{'number'};
893
        push @query_params, $userenv->{'number'};
894
    }
894
    }
895
    if ($basketgroupno) {
896
        $strsth .= " AND aqbasket.basketgroupid=? ";
897
        push @query_params, $basketgroupno;
898
    }        
895
    $strsth .= " group by aqbasket.basketno" if $grouped;
899
    $strsth .= " group by aqbasket.basketno" if $grouped;
896
    $strsth .= " order by aqbasket.basketno";
900
    $strsth .= " order by aqbasket.basketno";
897
    my $sth = $dbh->prepare($strsth);
901
    my $sth = $dbh->prepare($strsth);
(-)a/acqui/parcel.pl (-1 / +2 lines)
Lines 220-228 if(!defined $invoice->{closedate}) { Link Here
220
        my $ean      = $input->param('eanfilter') || '';
220
        my $ean      = $input->param('eanfilter') || '';
221
        my $basketno = $input->param('basketfilter') || '';
221
        my $basketno = $input->param('basketfilter') || '';
222
        my $orderno  = $input->param('orderfilter') || '';
222
        my $orderno  = $input->param('orderfilter') || '';
223
	my $basketgroupno  = $input->param('basketgroupfilter') || '';	
223
        my $grouped;
224
        my $grouped;
224
        my $owner;
225
        my $owner;
225
        $pendingorders = GetPendingOrders($booksellerid,$grouped,$owner,$basketno,$orderno,$search,$ean);
226
        $pendingorders = GetPendingOrders($booksellerid,$grouped,$owner,$basketno,$orderno,$search,$ean,$basketgroupno);
226
    }else{
227
    }else{
227
        $pendingorders = GetPendingOrders($booksellerid);
228
        $pendingorders = GetPendingOrders($booksellerid);
228
    }
229
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-14 / +15 lines)
Lines 374-395 Link Here
374
		    <label for="summaryfilter">ISBN, author or title :</label>
374
		    <label for="summaryfilter">ISBN, author or title :</label>
375
            <input type="text" name="summaryfilter" id="summaryfilter" value="[% summaryfilter %]"/>
375
            <input type="text" name="summaryfilter" id="summaryfilter" value="[% summaryfilter %]"/>
376
		</li>
376
		</li>
377
377
                [% IF (UNIMARC) %]
378
                    <li>
379
                        <label for="eanfilter">EAN :</label>
380
			<input type="text" name="eanfilter" id="eanfilter" value="[% eanfilter %]"/>
381
	            </li>
382
                [% END %]		
378
		<li>
383
		<li>
379
		    <label for="basketfilter">Basket :</label>
384
                    <label for="orderfilter">Order line :</label>
380
            <input type="text" name="basketfilter" id="basketfilter" value="[% basketfilter %]"/>
385
                    <input type="text" name="orderfilter" id="orderfilter" value="[% orderfilter %]"/>
381
		</li>
386
		</li>               
382
383
		<li>
387
		<li>
384
            <label for="orderfilter">Order line :</label>
388
		    <label for="basketfilter">Basket number:</label>
385
            <input type="text" name="orderfilter" id="orderfilter" value="[% orderfilter %]"/>
389
                    <input type="text" name="basketfilter" id="basketfilter" value="[% basketfilter %]"/>
390
		</li>		
391
                <li>
392
		    <label for="basketgroupfilter">Basketgroup number:</label>
393
                    <input type="text" name="basketgroupfilter" id="basketgroupfilter" value="[% basketgroupfilter %]"/>
386
		</li>
394
		</li>
387
                [% IF (UNIMARC) %]
388
        <li>
389
            <label for="eanfilter">EAN :</label>
390
            <input type="text" name="eanfilter" id="eanfilter" value="[% eanfilter %]"/>
391
        </li>
392
                [% END %]
393
	    </ol>
395
	    </ol>
394
		<fieldset class="action">
396
		<fieldset class="action">
395
        <input type="hidden" value="search" name="op" />
397
        <input type="hidden" value="search" name="op" />
396
- 

Return to bug 9560