[Koha-cvs] CVS: koha/acqui acqui-home.pl,1.3,1.4 basket.pl,1.25,1.26 histsearch.pl,1.2,1.3

[Paul POULAIN]

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

Modified Files:
	acqui-home.pl basket.pl histsearch.pl 
Log Message:
synch'ing 2.2 and head

Index: acqui-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acqui-home.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** acqui-home.pl	13 Jul 2004 12:53:00 -0000	1.3
--- acqui-home.pl	20 Jun 2005 13:15:46 -0000	1.4
***************
*** 64,68 ****
  						totspent => sprintf("%.2f",$totspent),
  						totcomtd => sprintf("%.2f",$totcomtd),
! 						totavail => sprintf("%.2f",$totavail));
  
  output_html_with_http_headers $query, $cookie, $template->output;
--- 64,69 ----
  						totspent => sprintf("%.2f",$totspent),
  						totcomtd => sprintf("%.2f",$totcomtd),
! 						totavail => sprintf("%.2f",$totavail),
! 						nobudget => $#results==-1?1:0);
  
  output_html_with_http_headers $query, $cookie, $template->output;

Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** basket.pl	4 May 2005 08:45:03 -0000	1.25
--- basket.pl	20 Jun 2005 13:15:46 -0000	1.26
***************
*** 56,59 ****
--- 56,61 ----
  my ($count2, at booksellers)=bookseller($booksellerid);
  
+ # get librarian branch...
+ 
  # if new basket, pre-fill infos
  $basket->{creationdate} = "" unless ($basket->{creationdate});
***************
*** 66,69 ****
--- 68,78 ----
  my $grand_total; # $subttotal + $gist
  
+ # my $line_total_est; # total of each line
+ my $sub_total_est; # total of line totals
+ my $gist_est;      # GST
+ my $grand_total_est; # $subttotal + $gist
+ 
+ my $qty_total;
+ 
  my @books_loop;
  for (my $i=0;$i<$count;$i++){
***************
*** 71,82 ****
  	$rrp=curconvert($results[$i]->{'currency'},$rrp);
  
  	$line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'};
  	$sub_total+=$line_total;
  	my %line;
- 	if ($i % 2){
- 		$line{highlight}=1;
- 	} else {
- 		$line{highlight}=0;
- 	}
  	$line{ordernumber} = $results[$i]->{'ordernumber'};
  	$line{publishercode} = $results[$i]->{'publishercode'};
--- 80,88 ----
  	$rrp=curconvert($results[$i]->{'currency'},$rrp);
  
+ 	$sub_total_est+=$results[$i]->{'quantity'}*$results[$i]->{'rrp'};
  	$line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'};
  	$sub_total+=$line_total;
+ 	$qty_total += $results[$i]->{'quantity'};
  	my %line;
  	$line{ordernumber} = $results[$i]->{'ordernumber'};
  	$line{publishercode} = $results[$i]->{'publishercode'};
***************
*** 85,88 ****
--- 91,95 ----
  	$line{basketno}=$basketno;
  	$line{title} = $results[$i]->{'title'};
+ 	$line{notes} = $results[$i]->{'notes'};
  	$line{author} = $results[$i]->{'author'};
  	$line{i} = $i;
***************
*** 94,97 ****
--- 101,105 ----
  	$line{biblionumber} = $results[$i]->{'biblionumber'};
  	$line{bookfundid} = $results[$i]->{'bookfundid'};
+ 	$line{odd} = $i %2;
  	push @books_loop, \%line;
  }
***************
*** 99,102 ****
--- 107,112 ----
  $gist=sprintf("%.2f",$sub_total*$prefgist);
  $grand_total=$sub_total+$gist;
+ $grand_total_est = $sub_total_est+sprintf("%.2f",$sub_total_est*$prefgist);
+ $gist_est = sprintf("%.2f",$sub_total_est*$prefgist);
  $template->param(basketno => $basketno,
  				creationdate => $basket->{creationdate},
***************
*** 107,110 ****
--- 117,124 ----
  				booksellerid=> $booksellers[0]->{'id'},
  				name => $booksellers[0]->{'name'},
+ 				address1 => $booksellers[0]->{'address1'},
+ 				address2 => $booksellers[0]->{'address2'},
+ 				address3 => $booksellers[0]->{'address3'},
+ 				address4 => $booksellers[0]->{'address4'},
  				entrydate => format_date($results[0]->{'entrydate'}),
  				books_loop => \@books_loop,
***************
*** 113,117 ****
--- 127,135 ----
  				gist => $gist,
  				grand_total =>$grand_total,
+ 				sub_total_est => $sub_total_est,
+ 				gist_est => $gist_est,
+ 				grand_total_est =>$grand_total_est,
  				currency => $booksellers[0]->{'listprice'},
+ 				qty_total => $qty_total,
  				);
  output_html_with_http_headers $query, $cookie, $template->output;

Index: histsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/histsearch.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** histsearch.pl	20 Jun 2005 10:14:12 -0000	1.2
--- histsearch.pl	20 Jun 2005 13:15:46 -0000	1.3
***************
*** 13,16 ****
--- 13,18 ----
  my $author = $input->param('author');
  my $name = $input->param('name');
+ my $from_placed_on = $input->param('fromplacedon');
+ my $to_placed_on = $input->param('toplacedon');
  
  my $dbh = C4::Context->dbh;
***************
*** 23,33 ****
  			     debug => 1,
  			     });
! my $order_loop= &histsearch($title,$author,$name);
! 
! $template->param(numresults => scalar(@$order_loop),
! 				suggestions_loop => $order_loop,
  				title => $title,
  				author => $author,
  				name => $name,
  );
  output_html_with_http_headers $input, $cookie, $template->output;
--- 25,35 ----
  			     debug => 1,
  			     });
! my $order_loop= &histsearch($title,$author,$name,$from_placed_on,$to_placed_on);
! $template->param(suggestions_loop => $order_loop,
  				title => $title,
  				author => $author,
  				name => $name,
+ 				from_placed_on =>$from_placed_on,
+ 				to_placed_on =>$to_placed_on
  );
  output_html_with_http_headers $input, $cookie, $template->output;