Lines 89-117
my $resultsperpage = $input->param('resultsperpage');
Link Here
|
89 |
my $op = $input->param('op'); |
89 |
my $op = $input->param('op'); |
90 |
$resultsperpage ||= 20; |
90 |
$resultsperpage ||= 20; |
91 |
|
91 |
|
92 |
my $datefrom_iso = ''; |
|
|
93 |
my $dateto_iso = ''; |
94 |
|
95 |
if ( $datefrom ) { |
96 |
$datefrom_iso = eval { dt_from_string( $datefrom ) }; |
97 |
if ($datefrom_iso ) { |
98 |
$datefrom_iso = output_pref( { dt => $datefrom_iso, dateformat => 'iso', dateonly => 1 } ); |
99 |
} |
100 |
else { |
101 |
$datefrom = ''; |
102 |
} |
103 |
} |
104 |
|
105 |
if ( $dateto ) { |
106 |
$dateto_iso = eval { dt_from_string( $dateto ) }; |
107 |
if ($dateto_iso ) { |
108 |
$dateto_iso = output_pref( { dt => $dateto_iso, dateformat => 'iso', dateonly => 1 } ); |
109 |
} |
110 |
else { |
111 |
$dateto = ''; |
112 |
} |
113 |
} |
114 |
|
115 |
our ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( |
92 |
our ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( |
116 |
{ template_name => 'acqui/parcels.tt', |
93 |
{ template_name => 'acqui/parcels.tt', |
117 |
query => $input, |
94 |
query => $input, |
Lines 169-176
my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
Link Here
|
169 |
my @parcels = GetInvoices( |
146 |
my @parcels = GetInvoices( |
170 |
supplierid => $booksellerid, |
147 |
supplierid => $booksellerid, |
171 |
invoicenumber => $code, |
148 |
invoicenumber => $code, |
172 |
shipmentdatefrom => $datefrom_iso, |
149 |
shipmentdatefrom => ( $datefrom ? ( shipmentdatefrom => output_pref( { dt => dt_from_string($datefrom), dateformat => 'iso' } ) ) : () ), |
173 |
shipmentdateto => $dateto_iso, |
150 |
shipmentdateto => ( $dateto ? ( shipmentdateto => output_pref( { dt => dt_from_string($dateto), dateformat => 'iso' } ) ) : () ), |
174 |
order_by => $order |
151 |
order_by => $order |
175 |
); |
152 |
); |
176 |
my $count_parcels = @parcels; |
153 |
my $count_parcels = @parcels; |
Lines 226-233
foreach my $r (@{$budgets}) {
Link Here
|
226 |
$template->param( |
203 |
$template->param( |
227 |
orderby => $order, |
204 |
orderby => $order, |
228 |
filter => $code, |
205 |
filter => $code, |
229 |
datefrom => $datefrom, |
206 |
( $datefrom ? ( shipmentdatefrom => output_pref({ dt => dt_from_string($datefrom), dateformat => 'iso' }) ) : () ), |
230 |
dateto => $dateto, |
207 |
( $dateto ? ( shipmentdateto => output_pref({ dt => dt_from_string($dateto), dateformat => 'iso' }) ) : () ), |
231 |
resultsperpage => $resultsperpage, |
208 |
resultsperpage => $resultsperpage, |
232 |
name => $bookseller->{'name'}, |
209 |
name => $bookseller->{'name'}, |
233 |
shipmentdate_today => output_pref( { dt => dt_from_string, dateonly =>1 } ), |
210 |
shipmentdate_today => output_pref( { dt => dt_from_string, dateonly =>1 } ), |
234 |
- |
|
|