[Koha-cvs] CVS: koha/members memberentry.pl,1.14,1.15 member.pl,1.7,1.8 moremember.pl,1.13,1.14

[Paul POULAIN]

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

Modified Files:
        memberentry.pl member.pl moremember.pl 
Log Message:
synch'ing 2.2 and head

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** memberentry.pl      29 Jul 2005 16:12:54 -0000      1.14
--- memberentry.pl      4 Aug 2005 14:14:48 -0000       1.15
***************
*** 61,66 ****
  my $destination=$input->param('destination');
  
- 
- 
  my $nok;
  # if a add or modify is requested => check validity of data.
--- 61,64 ----
***************
*** 144,166 ****
  }
  if ($delete){
!       my @errors;
!       my $nok;
!       my $branch =$input->param('branchcode');
!       if (C4::Context->preference("IndependantBranches")) {
!               my $userenv = C4::Context->userenv;
!               if ($userenv->{flags} == 1){
!                       if ($userenv->{branch} eq $branch){
!                               print 
$input->redirect("/cgi-bin/koha/deletemem.pl?member=$borrowernumber");
!                       } else {
!                               push @errors, "ERROR_branch";
!                               $nok=1;
!                               print 
$input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber");
!                       }
!               } else {
!                       print 
$input->redirect("/cgi-bin/koha/deletemem.pl?member=$borrowernumber");
!               }
!       } else {
!               print 
$input->redirect("/cgi-bin/koha/deletemem.pl?member=$borrowernumber");
!       }
  } else {  # this else goes down the whole script
        if ($actionType eq 'Add'){
--- 142,146 ----
  }
  if ($delete){
!       print 
$input->redirect("/cgi-bin/koha/deletemem.pl?member=$borrowernumber");
  } else {  # this else goes down the whole script
        if ($actionType eq 'Add'){
***************
*** 179,192 ****
                $data=borrdata('',$borrowernumber);
        }
-       if (C4::Context->preference("IndependantBranches")) {
-               my $userenv = C4::Context->userenv;
-               unless ($userenv->{flags} == 1){
-                       warn "userenv=".$userenv->{'branch'}."  member branch 
:".$data->{'branchcode'};
-                       unless ($userenv->{'branch'} eq $data->{'branchcode'}){
-                               print 
$input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber");
-                               exit 1;
-                       }
-               }
-       }
        if ($actionType eq 'Add'){
                $template->param( updtype => 'I');
--- 159,162 ----
***************
*** 289,293 ****
                                -size     => 1,
                                -multiple => 0 );
!                               
  
        my $CGIsort1 = buildCGIsort("Bsort1","sort1",$data->{'sort1'});
--- 259,276 ----
                                -size     => 1,
                                -multiple => 0 );
!       
!       my $CGIsort1 = buildCGIsort("Bsort1","sort1",$data->{'sort1'});
!       if ($CGIsort1) {
!               $template->param(CGIsort1 => $CGIsort1);
!       } else {
!               $template->param( sort1 => $data->{'sort1'});
!       }
!       
!       my $CGIsort2 = buildCGIsort("Bsort2","sort2",$data->{'sort2'});
!       if ($CGIsort2) {
!               $template->param(CGIsort2 =>$CGIsort2);
!       } else {
!               $template->param( sort2 => $data->{'sort2'});
!       }
  
        my $CGIsort1 = buildCGIsort("Bsort1","sort1",$data->{'sort1'});

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** member.pl   21 Jun 2005 07:42:24 -0000      1.7
--- member.pl   4 Aug 2005 14:14:52 -0000       1.8
***************
*** 90,94 ****
    my %row = (
        background => $background,
!               count => $i + 1,
          borrowernumber => $results->[$i]{'borrowernumber'},
          cardnumber => $results->[$i]{'cardnumber'},
--- 90,94 ----
    my %row = (
        background => $background,
!       count => $i+1,
          borrowernumber => $results->[$i]{'borrowernumber'},
          cardnumber => $results->[$i]{'cardnumber'},
***************
*** 107,111 ****
  $template->param( 
                        member          => $member,
!                       numresults      => $count,
                        resultsloop     => address@hidden );
  
--- 107,111 ----
  $template->param( 
                        member          => $member,
!                       numresults              => $count,
                        resultsloop     => address@hidden );
  

Index: moremember.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/moremember.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** moremember.pl       4 Aug 2005 08:54:56 -0000       1.13
--- moremember.pl       4 Aug 2005 14:14:52 -0000       1.14
***************
*** 176,180 ****
        my 
($charge,$itemtype)=calc_charges($dbh,$issue->[$i]{'itemnumber'},$bornum);
        $row{'itemtype'}=&ItemType($itemtype);
!       $row{'charge'}=$charge;
  
        #check item is not reserved
--- 176,180 ----
        my 
($charge,$itemtype)=calc_charges($dbh,$issue->[$i]{'itemnumber'},$bornum);
        $row{'itemtype'}=&ItemType($itemtype);
!       $row{'charge'}= sprintf("%.2f",$charge);
  
        #check item is not reserved