[Koha-cvs] CVS: koha/acqui basket.pl,1.28,1.29 histsearch.pl,1.3,1.4 newbiblio.pl,1.25,1.26

[Paul POULAIN]

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19132/acqui

Modified Files:
	basket.pl histsearch.pl newbiblio.pl 
Log Message:
synch'ing 2.2 and head

Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** basket.pl	28 Jul 2005 07:52:02 -0000	1.28
--- basket.pl	4 Aug 2005 09:52:32 -0000	1.29
***************
*** 108,116 ****
  	$line{author} = $results[$i]->{'author'};
  	$line{i} = $i;
! 	$line{rrp} = $results[$i]->{'rrp'};
! 	$line{ecost} = $results[$i]->{'ecost'};
  	$line{quantity} = $results[$i]->{'quantity'};
  	$line{quantityrecieved} = $results[$i]->{'quantityreceived'};
! 	$line{line_total} = $line_total;
  	$line{biblionumber} = $results[$i]->{'biblionumber'};
  	$line{bookfundid} = $results[$i]->{'bookfundid'};
--- 108,116 ----
  	$line{author} = $results[$i]->{'author'};
  	$line{i} = $i;
! 	$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} = sprintf("%.2f",$line_total);
  	$line{biblionumber} = $results[$i]->{'biblionumber'};
  	$line{bookfundid} = $results[$i]->{'bookfundid'};

Index: histsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/histsearch.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** histsearch.pl	20 Jun 2005 13:15:46 -0000	1.3
--- histsearch.pl	4 Aug 2005 09:52:32 -0000	1.4
***************
*** 27,30 ****
--- 27,31 ----
  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,

Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** newbiblio.pl	14 Jul 2005 09:13:24 -0000	1.25
--- newbiblio.pl	4 Aug 2005 09:52:32 -0000	1.26
***************
*** 32,35 ****
--- 32,36 ----
  use C4::Search;
  use C4::Output;
+ use C4::Input;
  use C4::Interface::CGI::Output;
  use HTML::Template;
***************
*** 145,148 ****
--- 146,150 ----
  			-multiple => 0 );
  
+ #Build sort lists
  my $CGIsort1 = buildCGIsort("Asort1","sort1",$data->{'sort1'});
  if ($CGIsort1) {
***************
*** 158,163 ****
  	$template->param( sort2 => $data->{'sort2'});
  }
! 			
! 			
  # fill template
  $template->param( existing => $biblio,
--- 160,164 ----
  	$template->param( sort2 => $data->{'sort2'});
  }
! 
  # fill template
  $template->param( existing => $biblio,