Merge branch 'bug_10044' into 3.14-master
This commit is contained in:
commit
431fcb73b6
2 changed files with 3 additions and 56 deletions
|
@ -136,10 +136,6 @@ my $datereceived = C4::Dates->new();
|
||||||
my $code = $input->param('code');
|
my $code = $input->param('code');
|
||||||
my @rcv_err = $input->param('error');
|
my @rcv_err = $input->param('error');
|
||||||
my @rcv_err_barcode = $input->param('error_bc');
|
my @rcv_err_barcode = $input->param('error_bc');
|
||||||
my $startfrom=$input->param('startfrom');
|
|
||||||
my $resultsperpage = $input->param('resultsperpage');
|
|
||||||
$resultsperpage = 20 unless ($resultsperpage);
|
|
||||||
$startfrom=0 unless ($startfrom);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -281,40 +277,7 @@ if(!defined $invoice->{closedate}) {
|
||||||
my $budget = GetBudget( $line{budget_id} );
|
my $budget = GetBudget( $line{budget_id} );
|
||||||
$line{budget_name} = $budget->{'budget_name'};
|
$line{budget_name} = $budget->{'budget_name'};
|
||||||
|
|
||||||
push @loop_orders, \%line if ($i >= $startfrom and $i < $startfrom + $resultsperpage);
|
push @loop_orders, \%line;
|
||||||
}
|
|
||||||
|
|
||||||
my $count = $countpendings;
|
|
||||||
|
|
||||||
if ($count>$resultsperpage){
|
|
||||||
my $displaynext=0;
|
|
||||||
my $displayprev=$startfrom;
|
|
||||||
if(($count - ($startfrom+$resultsperpage)) > 0 ) {
|
|
||||||
$displaynext = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
my @numbers = ();
|
|
||||||
for (my $i=1; $i<$count/$resultsperpage+1; $i++) {
|
|
||||||
my $highlight=0;
|
|
||||||
($startfrom/$resultsperpage==($i-1)) && ($highlight=1);
|
|
||||||
push @numbers, { number => $i,
|
|
||||||
highlight => $highlight ,
|
|
||||||
startfrom => ($i-1)*$resultsperpage};
|
|
||||||
}
|
|
||||||
|
|
||||||
my $from = $startfrom*$resultsperpage+1;
|
|
||||||
my $to;
|
|
||||||
if($count < (($startfrom+1)*$resultsperpage)){
|
|
||||||
$to = $count;
|
|
||||||
} else {
|
|
||||||
$to = (($startfrom+1)*$resultsperpage);
|
|
||||||
}
|
|
||||||
$template->param(numbers=>\@numbers,
|
|
||||||
displaynext=>$displaynext,
|
|
||||||
displayprev=>$displayprev,
|
|
||||||
nextstartfrom=>(($startfrom+$resultsperpage<$count)?$startfrom+$resultsperpage:$count),
|
|
||||||
prevstartfrom=>(($startfrom-$resultsperpage>0)?$startfrom-$resultsperpage:0)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$template->param(
|
$template->param(
|
||||||
|
@ -337,7 +300,6 @@ $template->param(
|
||||||
book_foot_loop => \@book_foot_loop,
|
book_foot_loop => \@book_foot_loop,
|
||||||
totalprice => sprintf($cfstr, $totalprice),
|
totalprice => sprintf($cfstr, $totalprice),
|
||||||
totalquantity => $totalquantity,
|
totalquantity => $totalquantity,
|
||||||
resultsperpage => $resultsperpage,
|
|
||||||
(uc(C4::Context->preference("marcflavour"))) => 1,
|
(uc(C4::Context->preference("marcflavour"))) => 1,
|
||||||
total_quantity => $total_quantity,
|
total_quantity => $total_quantity,
|
||||||
total_gste => sprintf( "%.2f", $total_gste ),
|
total_gste => sprintf( "%.2f", $total_gste ),
|
||||||
|
|
|
@ -240,23 +240,8 @@
|
||||||
</tr>
|
</tr>
|
||||||
[% END %]
|
[% END %]
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>[% ELSE %]There are no pending orders.[% END %]
|
</table>
|
||||||
<div id="resultnumber">
|
[% ELSE %]There are no pending orders.[% END %]
|
||||||
<!-- Row of numbers corresponding to search result pages -->
|
|
||||||
[% IF ( displayprev ) %]
|
|
||||||
<a href="parcel.pl?invoiceid=[% invoiceid %]&startfrom=[% prevstartfrom %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage %][% END %]#resultnumber"><< Previous</a>
|
|
||||||
[% END %]
|
|
||||||
[% FOREACH number IN numbers %]
|
|
||||||
[% IF ( number.highlight ) %]
|
|
||||||
<span class="current">[% number.number %]</span>
|
|
||||||
[% ELSE %]
|
|
||||||
<a href="parcel.pl?invoiceid=[% invoiceid %]&startfrom=[% number.startfrom %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage %][% END %]#resultnumber">[% number.number %]</a>
|
|
||||||
[% END %]
|
|
||||||
[% END %]
|
|
||||||
[% IF ( displaynext ) %]
|
|
||||||
<a href="parcel.pl?invoiceid=[% invoiceid %]&startfrom=[% nextstartfrom %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage %][% END %]#resultnumber">Next >></a>
|
|
||||||
[% END %]
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
[% ELSE %]
|
[% ELSE %]
|
||||||
<p>
|
<p>
|
||||||
|
|
Loading…
Reference in a new issue