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

(-)a/acqui/parcels.pl (-3 / +3 lines)
Lines 72-82 use CGI; Link Here
72
use C4::Auth;
72
use C4::Auth;
73
use C4::Output;
73
use C4::Output;
74
74
75
use C4::Dates qw/format_date/;
76
use C4::Acquisition;
75
use C4::Acquisition;
77
use C4::Budgets;
76
use C4::Budgets;
78
77
79
use Koha::Acquisition::Bookseller;
78
use Koha::Acquisition::Bookseller;
79
use Koha::DateUtils qw( dt_from_string );
80
80
81
my $input          = CGI->new;
81
my $input          = CGI->new;
82
my $booksellerid     = $input->param('booksellerid');
82
my $booksellerid     = $input->param('booksellerid');
Lines 145-152 my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid }); Link Here
145
my @parcels = GetInvoices(
145
my @parcels = GetInvoices(
146
    supplierid => $booksellerid,
146
    supplierid => $booksellerid,
147
    invoicenumber => $code,
147
    invoicenumber => $code,
148
    shipmentdatefrom => $datefrom,
148
    ( $datefrom ? ( shipmentdatefrom => dt_from_string($datefrom, 'iso') ) : () ),
149
    shipmentdateto => $dateto,
149
    ( $dateto   ? ( shipmentdateto   => dt_from_string($dateto, 'iso'))    : () ),
150
    order_by => $order
150
    order_by => $order
151
);
151
);
152
my $count_parcels = @parcels;
152
my $count_parcels = @parcels;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-3 / +2 lines)
Lines 209-216 Link Here
209
        <ol>
209
        <ol>
210
            <li> <input type="hidden" name="booksellerid" value="[% booksellerid %]" /></li>
210
            <li> <input type="hidden" name="booksellerid" value="[% booksellerid %]" /></li>
211
            <li><label for="filter">Invoice number:</label><input type="text" size="20" name="filter" value="[% filter %]" id="filter" /></li>
211
            <li><label for="filter">Invoice number:</label><input type="text" size="20" name="filter" value="[% filter %]" id="filter" /></li>
212
            <li><label for="datefrom">From:</label><input type="text" size="9" id="datefrom" name="datefrom" value="[% datefrom %]" /><br /> 
212
            <li><label for="datefrom">From:</label><input type="text" size="9" id="datefrom" name="datefrom" value="[% datefrom %]" class="datepicker" /><br />
213
                <label for="dateto">To:</label><input type="text" size="9" id="dateto" name="dateto" value="[% dateto %]" /></li>
213
                <label for="dateto">To:</label><input type="text" size="9" id="dateto" name="dateto" value="[% dateto %]" class="datepicker" /></li>
214
            <li><label for="orderby">Sort by :</label><select name="orderby" id="orderby">
214
            <li><label for="orderby">Sort by :</label><select name="orderby" id="orderby">
215
                <option value="invoicenumber">Invoice number</option>
215
                <option value="invoicenumber">Invoice number</option>
216
                <option value="shipmentdate">Shipment date</option>
216
                <option value="shipmentdate">Shipment date</option>
217
- 

Return to bug 4402