[Koha-cvs] CVS: koha/acqui basket.pl,1.24,1.25 newbasket2.pl,1.15,1.16 recieveorder.pl,1.9,1.10 suggestion-select.pl,1.3,1.4

[Paul POULAIN]

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

Modified Files:
        basket.pl newbasket2.pl recieveorder.pl suggestion-select.pl 
Log Message:
synch'ing 2.2 and head

Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** basket.pl   5 Oct 2004 09:22:16 -0000       1.24
--- basket.pl   4 May 2005 08:45:03 -0000       1.25
***************
*** 65,69 ****
  my $gist;      # GST
  my $grand_total; # $subttotal + $gist
- my $toggle=0;
  
  my @books_loop;
--- 65,68 ----
***************
*** 75,84 ****
        $sub_total+=$line_total;
        my %line;
!       if ($toggle==0){
!               $line{color}='#EEEEEE';
!               $toggle=1;
        } else {
!               $line{color}='white';
!               $toggle=0;
        }
        $line{ordernumber} = $results[$i]->{'ordernumber'};
--- 74,81 ----
        $sub_total+=$line_total;
        my %line;
!       if ($i % 2){
!               $line{highlight}=1;
        } else {
!               $line{highlight}=0;
        }
        $line{ordernumber} = $results[$i]->{'ordernumber'};
***************
*** 107,110 ****
--- 104,108 ----
                                authorisedbyname => $basket->{authorisedbyname},
                                closedate => format_date($basket->{closedate}),
+                               active => $booksellers[0]->{'active'},
                                booksellerid=> $booksellers[0]->{'id'},
                                name => $booksellers[0]->{'name'},

Index: newbasket2.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbasket2.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** newbasket2.pl       13 Sep 2004 15:17:48 -0000      1.15
--- newbasket2.pl       4 May 2005 08:45:04 -0000       1.16
***************
*** 72,76 ****
                             type => "intranet",
                             authnotrequired => 0,
!                            flagsrequired => {superlibrarian => 1},
                             debug => 1,
                             });
--- 72,76 ----
                             type => "intranet",
                             authnotrequired => 0,
!                            flagsrequired => {acquisition => 1},
                             debug => 1,
                             });

Index: recieveorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/recieveorder.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** recieveorder.pl     12 Aug 2004 14:35:22 -0000      1.9
--- recieveorder.pl     4 May 2005 08:45:04 -0000       1.10
***************
*** 33,37 ****
  
  my $input=new CGI;
! my $supplierid=$input->param('supplierid');
  my ($count,@booksellers)=bookseller($supplierid);
  
--- 33,37 ----
  
  my $input=new CGI;
! my $supplierid=$input->param('id');
  my ($count,@booksellers)=bookseller($supplierid);
  

Index: suggestion-select.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/suggestion-select.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** suggestion-select.pl        13 Sep 2004 15:17:48 -0000      1.3
--- suggestion-select.pl        4 May 2005 08:45:04 -0000       1.4
***************
*** 24,28 ****
  my $isbn = $input->param('isbn');
  my $status = 'ACCEPTED';
! my $suggestedbyme = 1;
  my $op = $input->param('op');
  $op = 'else' unless $op;
--- 24,28 ----
  my $isbn = $input->param('isbn');
  my $status = 'ACCEPTED';
! my $suggestedbyme = -1; # search ALL suggestors
  my $op = $input->param('op');
  $op = 'else' unless $op;
***************
*** 34,38 ****
                             query => $input,
                             authnotrequired => 1,
!                            flagsrequired => {borrow => 1},
                         });
  
--- 34,38 ----
                             query => $input,
                             authnotrequired => 1,
!                            flagsrequired => {acquisition => 1},
                         });