From ed9616f474205f95c147867af4760ca3b9649858 Mon Sep 17 00:00:00 2001 From: tipaul Date: Thu, 4 Aug 2005 09:52:32 +0000 Subject: [PATCH] synch'ing 2.2 and head --- acqui/basket.pl | 6 +++--- acqui/histsearch.pl | 1 + acqui/newbiblio.pl | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/acqui/basket.pl b/acqui/basket.pl index 3ac1257e85..c5135fad81 100755 --- 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 baca8dc7b6..75e910842d 100755 --- 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 151a11fe09..b90c615e00 100755 --- 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, -- 2.39.5