[Koha-cvs] CVS: koha/acqui acqui-home.pl,1.5,1.6 histsearch.pl,1.4,1.5 newbiblio.pl,1.27,1.28

[Paul POULAIN]

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

Modified Files:
	acqui-home.pl histsearch.pl newbiblio.pl 
Log Message:
big commit, still breaking things...

* synch with rel_2_2. Probably the last non manual synch, as rel_2_2 should not be modified deeply.
* code cleaning (cleaning warnings from perl -w) continued

Index: acqui-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acqui-home.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** acqui-home.pl	14 Jul 2005 09:13:24 -0000	1.5
--- acqui-home.pl	26 Oct 2005 09:11:02 -0000	1.6
***************
*** 50,54 ****
  }
  #currencies
! my ($count,$rates)=getcurrencies();
  my @loop_currency = ();
  for (my $i=0;$i<$count;$i++){
--- 50,55 ----
  }
  #currencies
! my $rates;
! ($count,$rates)=getcurrencies();
  my @loop_currency = ();
  for (my $i=0;$i<$count;$i++){

Index: histsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/histsearch.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** histsearch.pl	4 Aug 2005 09:52:32 -0000	1.4
--- histsearch.pl	26 Oct 2005 09:11:02 -0000	1.5
***************
*** 25,30 ****
  			     debug => 1,
  			     });
! 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,
--- 25,32 ----
  			     debug => 1,
  			     });
! my ($order_loop,$total_qty,$total_price)= &histsearch($title,$author,$name,$from_placed_on,$to_placed_on);
  $template->param(suggestions_loop => $order_loop,
+ 				total_qty => $total_qty,
+ 				total_price => sprintf  ("%.2f",$total_price),
  				numresults => scalar(@$order_loop),
  				title => $title,

Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** newbiblio.pl	8 Aug 2005 13:55:52 -0000	1.27
--- newbiblio.pl	26 Oct 2005 09:11:02 -0000	1.28
***************
*** 178,184 ****
  						listprice => $booksellers[0]->{'listprice'},
  						gstreg => $booksellers[0]->{'gstreg'},
!                                                 invoiceinc => $booksellers[0]->{'invoiceincgst'},                              
!                                                 invoicedisc => $booksellers[0]->{'invoicedisc'},                               
!                                                 nocalc => $booksellers[0]->{'nocalc'},
  						name => $booksellers[0]->{'name'},
  						currency => $booksellers[0]->{'listprice'},
--- 178,184 ----
  						listprice => $booksellers[0]->{'listprice'},
  						gstreg => $booksellers[0]->{'gstreg'},
! 						invoiceinc => $booksellers[0]->{'invoiceincgst'},                              
! 						invoicedisc => $booksellers[0]->{'invoicedisc'},                               
! 						nocalc => $booksellers[0]->{'nocalc'},
  						name => $booksellers[0]->{'name'},
  						currency => $booksellers[0]->{'listprice'},