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

(-)a/acqui/parcels.pl (+14 lines)
Lines 161-166 my @parcels = GetInvoices( Link Here
161
);
161
);
162
my $count_parcels = @parcels;
162
my $count_parcels = @parcels;
163
163
164
unless ($include_closed) {
165
166
    # FIXME Implement and use Koha::Acquisition::Bookseller->invoices;
167
    my $closed_invoices = Koha::Acquisition::Invoices->search(
168
        {
169
            booksellerid => $booksellerid,
170
            ( $datefrom ? ( shipmentdatefrom => $datefrom ) : () ),
171
            ( $dateto   ? ( shipmentdateto   => $dateto )   : () ),
172
            closedate => { '!=' => undef },
173
        }
174
    );
175
    $template->param( closed_invoices => $closed_invoices->count );
176
}
177
164
# multi page display gestion
178
# multi page display gestion
165
$startfrom ||= 0;
179
$startfrom ||= 0;
166
if ( $count_parcels > $resultsperpage ) {
180
if ( $count_parcels > $resultsperpage ) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-1 / +4 lines)
Lines 39-44 Link Here
39
                [% INCLUDE 'messages.inc' %]
39
                [% INCLUDE 'messages.inc' %]
40
<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a></h1>
40
<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a></h1>
41
41
42
    [% IF closed_invoices %]
43
        <p>[% I18N.tnx("There is one closed invoice not included in this search.", "There are {closed_invoices} closed invoices not included in this search.", closed_invoices, { closed_invoices => closed_invoices }) %]</p>
44
    [% END %]
45
42
[% IF ( error_failed_to_create_invoice ) %]
46
[% IF ( error_failed_to_create_invoice ) %]
43
    <div id="error" class="alert alert-warning">
47
    <div id="error" class="alert alert-warning">
44
        <p>An error has occurred. Invoice cannot be created.</p>
48
        <p>An error has occurred. Invoice cannot be created.</p>
45
- 

Return to bug 38343