synch'ing 2.2 and head

diff --git a/acqui/basket.pl b/acqui/basket.pl
index 3ac1257..c5135fa 100755 (executable)
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -107,11 +107,11 @@ for (my $i=0;$i<$count;$i++){
        $line{notes} = $results[$i]->{'notes'};
        $line{author} = $results[$i]->{'author'};
        $line{i} = $i;
-       $line{rrp} = $results[$i]->{'rrp'};
-       $line{ecost} = $results[$i]->{'ecost'};
+       $line{rrp} = sprintf("%.2f",$results[$i]->{'rrp'});
+       $line{ecost} = sprintf("%.2f",$results[$i]->{'ecost'});
        $line{quantity} = $results[$i]->{'quantity'};
        $line{quantityrecieved} = $results[$i]->{'quantityreceived'};
-       $line{line_total} = $line_total;
+       $line{line_total} = sprintf("%.2f",$line_total);
        $line{biblionumber} = $results[$i]->{'biblionumber'};
        $line{bookfundid} = $results[$i]->{'bookfundid'};
        $line{odd} = $i %2;

diff --git a/acqui/histsearch.pl b/acqui/histsearch.pl
index baca8dc..75e9108 100755 (executable)
--- a/acqui/histsearch.pl
+++ b/acqui/histsearch.pl
@@ -26,6 +26,7 @@ my ($template, $loggedinuser, $cookie)
                             });
 my $order_loop= &histsearch($title,$author,$name,$from_placed_on,$to_placed_on);
 $template->param(suggestions_loop => $order_loop,
+                               numresults => scalar(@$order_loop),
                                title => $title,
                                author => $author,
                                name => $name,

diff --git a/acqui/newbiblio.pl b/acqui/newbiblio.pl
index 151a11f..b90c615 100755 (executable)
--- a/acqui/newbiblio.pl
+++ b/acqui/newbiblio.pl
@@ -31,6 +31,7 @@ use C4::Acquisition;
 use C4::Suggestions;
 use C4::Search;
 use C4::Output;
+use C4::Input;
 use C4::Interface::CGI::Output;
 use HTML::Template;
 
@@ -144,6 +145,7 @@ my $CGIbookfund=CGI::scrolling_list( -name     => 'bookfund',
                        -size     => 1,
                        -multiple => 0 );
 
+#Build sort lists
 my $CGIsort1 = buildCGIsort("Asort1","sort1",$data->{'sort1'});
 if ($CGIsort1) {
        $template->param(CGIsort1 => $CGIsort1);
@@ -157,8 +159,7 @@ if ($CGIsort2) {
 } else {
        $template->param( sort2 => $data->{'sort2'});
 }
-                       
-                       
+
 # fill template
 $template->param( existing => $biblio,
                                                title => $title,