[Koha-cvs] CVS: koha/acqui basket.pl,1.24.2.3,1.24.2.4

[Paul POULAIN]

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

Modified Files:
      Tag: rel_2_2
        basket.pl 
Log Message:
fix for #958 : showing notes in order list screen. The note can be used for 
whatever the library want, and should be seen here.
The table has been improved :
* title / isbn / author / note are on the same column, as in marc search
* alternate colors working

Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.24.2.3
retrieving revision 1.24.2.4
diff -C2 -r1.24.2.3 -r1.24.2.4
*** basket.pl   7 Jun 2005 11:03:52 -0000       1.24.2.3
--- basket.pl   7 Jun 2005 12:56:36 -0000       1.24.2.4
***************
*** 73,76 ****
--- 73,78 ----
  my $grand_total_est; # $subttotal + $gist
  
+ my $qty_total;
+ 
  my @books_loop;
  for (my $i=0;$i<$count;$i++){
***************
*** 81,90 ****
        $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'};
--- 83,88 ----
        $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'};
***************
*** 93,96 ****
--- 91,95 ----
        $line{basketno}=$basketno;
        $line{title} = $results[$i]->{'title'};
+       $line{notes} = $results[$i]->{'notes'};
        $line{author} = $results[$i]->{'author'};
        $line{i} = $i;
***************
*** 102,105 ****
--- 101,105 ----
        $line{biblionumber} = $results[$i]->{'biblionumber'};
        $line{bookfundid} = $results[$i]->{'bookfundid'};
+       $line{odd} = $i %2;
        push @books_loop, \%line;
  }
***************
*** 131,134 ****
--- 131,135 ----
                                grand_total_est =>$grand_total_est,
                                currency => $booksellers[0]->{'listprice'},
+                               qty_total => $qty_total,
                                );
  output_html_with_http_headers $query, $cookie, $template->output;