Tweaking holds screen, trying to get additional patron information to show up in...
[koha_fer] / members / memberentry.pl
index 035e9aa..e5fe443 100755 (executable)
@@ -1,14 +1,7 @@
 #!/usr/bin/perl
-# NOTE: This file uses standard 8-space tabs
-#       DO NOT SET TAB SIZE TO 4
-
 # $Id$
 
-#script to set up screen for modification of borrower details
-#written 20/12/99 by chris@katipo.co.nz
-
-
-# Copyright 2000-2002 Katipo Communications
+# Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
 #
 # This file is part of Koha.
 #
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
+# pragma
 use strict;
+
+# external modules
+use Date::Calc qw/Today/;
+use CGI;
+use Digest::MD5 qw(md5_base64);
+
+# internal modules
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
-use CGI;
-use C4::Search;
 use C4::Members;
 use C4::Koha;
-use HTML::Template;
-use Date::Manip;
 use C4::Date;
 use C4::Input;
+use C4::Log;
+use C4::Branch; # GetBranches
 
 my $input = new CGI;
+my %data;
 
 my $dbh = C4::Context->dbh;
 
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/memberentry.tmpl",
-                            query => $input,
-                            type => "intranet",
-                            authnotrequired => 0,
-                            flagsrequired => {borrowers => 1},
-                            debug => 1,
-                            });
 
+
+my $step=$input->param('step') || 0;
+my ($template, $loggedinuser, $cookie)
+    = get_template_and_user({template_name => "members/memberentrygen.tmpl",
+           query => $input,
+           type => "intranet",
+           authnotrequired => 0,
+           flagsrequired => {borrowers => 1},
+           debug => 1,
+           });
+my $guarantorid=$input->param('guarantorid');
 my $borrowernumber=$input->param('borrowernumber');
 my $actionType=$input->param('actionType') || '';
 my $modify=$input->param('modify');
 my $delete=$input->param('delete');
 my $op=$input->param('op');
-my $categorycode=$input->param('categorycode');
 my $destination=$input->param('destination');
+my $cardnumber=$input->param('cardnumber');
+my $check_member=$input->param('check_member');
+my $name_city=$input->param('name_city');
+my $nodouble=$input->param('nodouble');
+my $select_city=$input->param('select_city');
+my $nok=$input->param('nok');
+my $guarantorinfo=$input->param('guarantorinfo');
+my @errors;
+my $default_city;
+# $check_categorytype contains the value of duplicate borrowers category type to redirect in good template in step =2
+my $check_categorytype=$input->param('check_categorytype');
+# NOTE: Alert for ethnicity and ethnotes fields, they are unvalided in all borrowers form
+my $borrower_data;
+
+
+$template->param("uppercasesurnames" => C4::Context->preference('uppercasesurnames'));
+
+#function  to automatic setup the mandatory  fields (visual with css)
+my $check_BorrowerMandatoryField=C4::Context->preference("BorrowerMandatoryField");
+my @field_check=split(/\|/,$check_BorrowerMandatoryField);
+foreach (@field_check) {
+$template->param( "mandatory$_" => 1);    
+}
+$template->param("add"=>1) if ($op eq 'add');
+$template->param("checked" => 1) if ($nodouble eq 1);
+my $categorycode=$input->param('categorycode');
+($borrower_data=GetMember($borrowernumber,'borrowernumber')) if ($op eq 'modify' or $op eq 'save');
+$categorycode=$borrower_data->{'categorycode'} unless $categorycode;
+my $category_type;
+$category_type = $input->param('category_type');
+unless ($category_type or !($categorycode)){
+  my $borrowercategory= GetBorrowercategory($categorycode);
+  $category_type = $borrowercategory->{'category_type'};
+}
+$category_type="A" unless $category_type; # FIXME we should display a error message instead of a 500 error !
 
-my $nok;
 # if a add or modify is requested => check validity of data.
-if ($op eq 'add' or $op eq 'modify') {
-       my %data;
-       my @names=$input->param;
-       foreach my $key (@names){
-               $data{$key}=$input->param($key);
-               $data{$key}=~ s/\'/\\\'/g;
-               $data{$key}=~ s/\"/\\\"/g;
-       }
-       my @errors;
-       if ($data{'cardnumber'} eq ''){
-               push @errors,"ERROR_cardnumber";
-               $nok=1;
-       } else {
-               #check cardnumber is valid
-               my $nounique;
-               if ( $op eq "add" )    {
-                       $nounique = 0;
-               } else {
-                       $nounique = 1;
-               }
-               my $valid=checkdigit('',$data{'cardnumber'}, $nounique);
-               if ($valid != 1){
-                       $nok=1;
-                       push @errors, "ERROR_invalid_cardnumber";
-               }
-       }
+%data= %$borrower_data if ($borrower_data);
 
-       if ($data{'sex'} eq '' && $categorycode ne "I"){
-               push @errors, "ERROR_gender";
-               $nok=1;
-       }
-       if ($data{'firstname'} eq '' && $categorycode ne "I"){
-               push @errors,"ERROR_firstname";
-               $nok=1;
-       }
-       if ($data{'surname'} eq ''){
-               push @errors,"ERROR_surname";
-               $nok=1;
-       }
-       if ($data{'streetaddress'} eq ''){
-               push @errors, "ERROR_address";
-               $nok=1;
-       }
-       if ($data{'city'} eq ''){
-               push @errors, "ERROR_city";
+my %newdata;
+if ($op eq 'insert' || $op eq 'modify' || $op eq 'save') {
+    
+    my @names= $borrower_data && $op ne 'save' ? keys %$borrower_data : $input->param();
+    foreach my $key (@names) {
+        $newdata{$key} = $input->param($key) || '';
+        $newdata{$key} =~ s/\"/"/gg unless $key eq 'borrowernotes' or $key eq 'opacnote';
+    }
+
+
+  # WARN : some tests must be done whatever the step, because the librarian can click on any tab.
+  #############test for member being unique #############
+  if ($op eq 'insert'){
+          my $category_type_send=$category_type if ($category_type eq 'I'); 
+          my $check_category; # recover the category code of the doublon suspect borrowers
+          ($check_member,$check_category)= checkuniquemember($category_type_send,($newdata{'surname'}?$newdata{'surname'}:$data{'surname'}),($newdata{'firstname'}?$newdata{'firstname'}:$data{'firstname'}),($newdata{'dateofbirth'}?format_date_in_iso($newdata{'dateofbirth'}):$data{'dateofbirth'}));
+          
+  #   recover the category type if the borrowers is a doublon 
+          my $tmpborrowercategory=GetBorrowercategory($check_category);
+          $check_categorytype=$tmpborrowercategory->{'category_type'};
+  }
+
+  #recover all data from guarantor address phone ,fax... 
+  if ($category_type eq 'C' and $guarantorid ne '' ){
+    my $guarantordata=GetMember($guarantorid);
+    $guarantorinfo=$guarantordata->{'surname'}." , ".$guarantordata->{'firstname'};
+    if (($data{'contactname'} eq '' or $data{'contactname'} ne $guarantordata->{'surname'})) {
+      $newdata{'contactfirstname'}=$guarantordata->{'firstname'}; 
+      $newdata{'contactname'}=$guarantordata->{'surname'};
+      $newdata{'contacttitle'}=$guarantordata->{'title'};  
+      map {$newdata{$_}=$guarantordata->{$_}}('streetnumber','address','streettype','address2','zipcode','city','phone','phonepro','mobile','fax','email','emailpro');
+    }
+  }
+
+  # CHECKS step by step
+# STEP 1
+    if ($op eq 'insert' && checkcardnumber($cardnumber)){ 
+      push @errors, 'ERROR_cardnumber';
+      $nok = 1;
+    } 
+    ###############test to take the right zipcode and city name ##############
+    if ( $guarantorid eq ''){
+      if ($select_city){
+        my ($borrower_city,$borrower_zipcode)=&getzipnamecity($select_city);
+        $newdata{'city'}= $borrower_city;
+        $newdata{'zipcode'}=$borrower_zipcode;
+        }
+    }
+    my $dateofbirthmandatory=0;
+    map {$dateofbirthmandatory=1 if $_ eq "dateofbirth"} @field_check;
+    if ($category_type ne 'I' && $newdata{dateofbirth} && $dateofbirthmandatory) {
+      my $age = GetAge(format_date_in_iso($data{dateofbirth}));
+      my $borrowercategory=GetBorrowercategory($data{'categorycode'});   
+      if (($age > $borrowercategory->{'upperagelimit'}) or ($age < $borrowercategory->{'dateofbirthrequired'})) {
+        push @errors, 'ERROR_age_limitations';
+        $nok = 1;
+      }
+    }
+
+# STEP 2
+    if ( ($newdata{'userid'} eq '')){
+      my $onefirstnameletter=substr($data{'firstname'},0,1);
+      my $fivesurnameletter=substr($data{'surname'},0,5);
+      $newdata{'userid'}=lc($onefirstnameletter.$fivesurnameletter);
+    }
+#   }
+# STEP 3
+  if ($op eq 'insert'){
+         my $loginexist;
+         # Check if the userid is unique
+         if ( !Check_Userid($data{'userid'},$borrowernumber)) {
+                 push @errors, "ERROR_login_exist";
+                 $loginexist = 1;
+                 $nok=1;
+    } else {
+      $borrowernumber = &AddMember(%newdata);
+        if ($data{'organisations'}){            
+          # need to add the members organisations
+          my @orgs=split(/\|/,$data{'organisations'});
+          add_member_orgs($borrowernumber,\@orgs);
+        }
+    }
+
+    unless ($nok) {
+      if($destination eq "circ"){
+        print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$data{'cardnumber'}");
+      } else {
+        if ($loginexist == 0) {
+        print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
+        }
+      }
+    }
+  }
+} 
+  if (C4::Context->preference("IndependantBranches")) {
+    my $userenv = C4::Context->userenv;
+    if ($userenv->{flags} != 1){
+      unless ($userenv->{branch} eq $data{'branchcode'}){
+        push @errors, "ERROR_branch";
+        $nok=1;
+      }
+    }
+  }
+  if ($op eq 'modify' ){
+    unless ($data{'dateexpiry'}){
+      my $today= sprintf('%04d-%02d-%02d', Today());
+      $data{'dateexpiry'} = GetExpiryDate($data{'categorycode'},$today);
+    }
+  }
+# }
+
+if ($op eq 'save'){
+       # test to know if another user have the same password and same login    
+       my $loginexist;                                                                                                                                      
+       # Check if the userid is unique                                                                                                                      
+       if ( !Check_Userid($data{'userid'},$borrowernumber)) {
+               push @errors, "ERROR_login_exist";
+               $loginexist = 1;
                $nok=1;
        }
-       if (C4::Context->preference("IndependantBranches")) {
-               my $userenv = C4::Context->userenv;
-               if ($userenv->{flags} != 1){
-                       unless ($userenv->{branch} eq $data{'branchcode'}){
-                               push @errors, "ERROR_branch";
-                               $nok=1;
-                       }
-               }
-       }
-       if ($nok) {
-               foreach my $error (@errors) {
-                       $template->param( $error => 1);
-               }
-               $template->param(nok => 1);
-       } else {
-               my $query="Select * from borrowers where borrowernumber=?";
-               my $sth=$dbh->prepare($query);
-               $sth->execute($data{'borrowernumber'});
-               if (my $data2=$sth->fetchrow_hashref){
-                       &modmember(%data);
-               }else{
-                       $borrowernumber = &newmember(%data);
-               }
-               
-       if($destination eq "circ"){
-               print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$data{'cardnumber'}");
-       } else {
-               print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber");
-               }
+       if (!$loginexist){
+               &ModMember(%newdata);    
+               print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
        }
 }
+
 if ($delete){
        print $input->redirect("/cgi-bin/koha/deletemem.pl?member=$borrowernumber");
-} else {  # this else goes down the whole script
-       if ($actionType eq 'Add'){
-               $template->param( addAction => 1);
-       } else {
-               $template->param( addAction =>0);
-       }
-       # retrieve previous values : either in DB or in CGI, in case of errors in values
-       my $data;
-       if ($nok) {
-               my @names=$input->param;
-               foreach my $key (@names){
-                       $data->{$key}=$input->param($key);
-               }
-       } else {
-               $data=borrdata('',$borrowernumber);
-       }
-       if (C4::Context->preference("IndependantBranches")) {
-               my $userenv = C4::Context->userenv;
-               if ($userenv->{flags} != 1 && $data->{branchcode}){
-                       unless ($userenv->{branch} eq $data->{'branchcode'}){
-                               print $input->redirect("/cgi-bin/koha/members/members-home.pl");
-                       }
-               }
-       }
-       if ($actionType eq 'Add'){
-               $template->param( updtype => 'I');
-       } else {
-               $template->param( updtype => 'M');
-       }
-       my $cardnumber=$data->{'cardnumber'};
-       $cardnumber=fixup_cardnumber($data->{'cardnumber'}) if $actionType eq 'Add';
-       if ($data->{'sex'} eq 'F'){
-               $template->param(female => 1);
-       }
-       my ($categories,$labels)=ethnicitycategories();
-       my $ethnicitycategoriescount=$#{$categories};
-       my $ethcatpopup;
-       if ($ethnicitycategoriescount>=0) {
-               $ethcatpopup = CGI::popup_menu(-name=>'ethnicity',
-                                       -id => 'ethnicity',
-                                       -values=>$categories,
-                                       -default=>$data->{'ethnicity'},
-                                       -labels=>$labels);
-               $template->param(ethcatpopup => $ethcatpopup); # bad style, has to be fixed
-       }
+}
+if ($nok){
+  $op="add" if ($op eq "insert");
+  $op="modify" if ($op eq "save");
+  %data=%newdata; 
+  $template->param( updtype => ($op eq "insert"?'I':'M'),step_1=>1,step_2=>1,step_3=>1,allsteps=>1);
+} 
+#  else {  # this else goes down the whole script
+  # retrieve previous values : either in DB or in CGI, in case of errors in values
+#   my $data;
+# # test to now if u add or modify a borrower (modify =>to take all carateristic of the borrowers)
+#   if (!$op and !$data{'surname'}) {
+#     $data=GetMember($borrowernumber,'borrowernumber');
+#     %data=%$data;
+#   }
+  if (C4::Context->preference("IndependantBranches")) {
+    my $userenv = C4::Context->userenv;
+    if ($userenv->{flags} != 1 && $data{branchcode}){
+      unless ($userenv->{branch} eq $data{'branchcode'}){
+        print $input->redirect("/cgi-bin/koha/members/members-home.pl");
+      }
+    }
+  }
+  if ($op eq 'add'){
+    $template->param( updtype => 'I',step_1=>1,step_2=>1,step_3=>1,allsteps=>1);
+  } 
+  if ($op eq "modify")  {
+    $template->param( updtype => 'M');
+    $template->param( step_1=>1,step_2=>1,step_3=>1,allsteps=>1) unless $step;
+  }
+# my $cardnumber=$data{'cardnumber'};
+  $data{'cardnumber'}=fixup_cardnumber($data{'cardnumber'}) if $op eq 'add';
+  if ($data{'sex'} eq 'F'){
+    $template->param(female => 1);
+  } elsif ($data{'sex'} eq 'M'){
+     $template->param(male => 1);
+  } else {
+     $template->param(none => 1);
+  }
+  my ($categories,$labels)=ethnicitycategories();
+    
+  my $ethnicitycategoriescount=$#{$categories};
+  my $ethcatpopup;
+  if ($ethnicitycategoriescount>=0) {
+    $ethcatpopup = CGI::popup_menu(-name=>'ethnicity',
+          -id => 'ethnicity',
+          -tabindex=>'',
+          -values=>$categories,
+          -default=>$data{'ethnicity'},
+          -labels=>$labels);
+    $template->param(ethcatpopup => $ethcatpopup); # bad style, has to be fixed
+  }
+  
+  
+  my $action="WHERE category_type=?";
+  ($categories,$labels)=GetborCatFromCatType($category_type,$action);
+  
+  if(scalar(@$categories)){
+      #if you modify the borrowers you must have the right value for his category code
+  (my $default_category=$data{'categorycode'}) if ($op  eq 'modify');
+      my $catcodepopup = CGI::popup_menu(
+          -name=>'categorycode',
+      -id => 'categorycode',
+      -values=>$categories,
+        -labels=>$labels,
+      -default=>$default_category
+      );
+      $template->param(catcodepopup=>$catcodepopup);
+  }
+  #test in city
+  $select_city=getidcity($data{'city'}) if ($guarantorid ne '0');
+  ($default_city=$select_city) if ($step eq 0);
+  if ($select_city eq '' ){
+  my $selectcity=&getidcity($data{'city'});
+  $default_city=$selectcity;
+  }
+  my($cityid,$name_city)=GetCities();
+  $template->param( city_cgipopup => 1) if ($cityid );
+  my $citypopup = CGI::popup_menu(-name=>'select_city',
+          -id => 'select_city',
+          -values=>$cityid,
+          -labels=>$name_city,
+#             -override => 1,
+          -default=>$default_city
+          );  
+  
+  my $default_roadtype;
+  $default_roadtype=$data{'streettype'} ;
+  my($roadtypeid,$road_type)=GetRoadTypes();
+    $template->param( road_cgipopup => 1) if ($roadtypeid );
+  my $roadpopup = CGI::popup_menu(-name=>'streettype',
+          -id => 'streettype',
+          -values=>$roadtypeid,
+            -labels=>$road_type,
+            -override => 1,
+          -default=>$default_roadtype
+          );  
 
-       ($categories,$labels)=borrowercategories();
-       my $catcodepopup = CGI::popup_menu(-name=>'categorycode',
-                                       -id => 'categorycode',
-                                       -values=>$categories,
-                                       -default=>$data->{'categorycode'},
-                                       -labels=>$labels);
-
-       my @relationships = ('','workplace', 'relative','friend', 'neighbour');
-       my @relshipdata;
-       while (@relationships) {
-               my $relship = shift @relationships;
-               next unless $relship;
-               my %row = ('relationship' => $relship);
-               if ($data->{'altrelationship'} eq $relship) {
-                       $row{'selected'}=' selected = "selected"';
-               } else {
-                       $row{'selected'}='';
-               }
-               push(@relshipdata, \%row);
-       }
+  my $default_borrowertitle;
+  $default_borrowertitle=$data{'title'} ;
+  my($borrowertitle)=GetTitles();
+  my $borrotitlepopup = CGI::popup_menu(-name=>'title',
+                -id => 'btitle',
+                -values=>$borrowertitle,
+                -override => 1,
+                -default=>$default_borrowertitle
+          );    
 
-       # %flags: keys=$data-keys, datas=[formname, HTML-explanation]
-       my %flags = ('gonenoaddress' => ['gna', 'Gone no address'],
-                               'lost'          => ['lost', 'Lost'],
-                               'debarred'      => ['debarred', 'Debarred']);
-
-       my @flagdata;
-       foreach (keys(%flags)) {
-       my $key = $_;
-       my %row =  ('key'   => $key,
-                       'name'  => $flags{$key}[0],
-                       'html'  => $flags{$key}[1]);
-       if ($data->{$key}) {
-               $row{'yes'}=' checked="checked"';
-               $row{'no'}='';
-       } else {
-               $row{'yes'}='';
-               $row{'no'}=' checked="checked"';
-       }
-       push(@flagdata, \%row);
-       }
 
-       if ($modify){
-       $template->param( modify => 1 );
-       }
+  my @relationships = split /,|\|/,C4::Context->preference('BorrowerRelationship');
+  my @relshipdata;
+  while (@relationships) {
+    my $relship = shift @relationships || '';
+    my %row = ('relationship' => $relship);
+    if ($data{'relationship'} eq $relship) {
+      $row{'selected'}=' selected';
+    } else {
+      $row{'selected'}='';
+    }
+    push(@relshipdata, \%row);
+  }
+  my %flags = ( 'gonenoaddress' => ['gonenoaddress', 'Gone no address '],
+          'lost'          => ['lost', 'Lost'],
+          'debarred'      => ['debarred', 'Debarred']);
 
-       #Convert dateofbirth to correct format
-       $data->{'dateofbirth'} = format_date($data->{'dateofbirth'});
-
-       my @branches;
-       my @select_branch;
-       my %select_branches;
-       my $branches=getbranches();
-       my $default;
-       foreach my $branch (keys %$branches) {
-               if ((not C4::Context->preference("IndependantBranches")) || (C4::Context->userenv->{'flags'} == 1)) {
-                       push @select_branch, $branch;
-                       $select_branches{$branch} = $branches->{$branch}->{'branchname'};
-                       $default = $data->{'branchcode'};
-               } else {
-                               push @select_branch, $branch if ($branch eq C4::Context->userenv->{'branch'});
-                               $select_branches{$branch} = $branches->{$branch}->{'branchname'} if ($branch eq C4::Context->userenv->{'branch'});
-                               $default = C4::Context->userenv->{'branch'};
-               }
-       }
-       
-       my $CGIbranch=CGI::scrolling_list( -name     => 'branchcode',
-                               -id => 'branchcode',
-                               -values   => \@select_branch,
-                               -default  => $data->{'branchcode'},
-                               -labels   => \%select_branches,
-                               -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 @flagdata;
+  foreach (keys(%flags)) {
+  my $key = $_;
+  my %row =  ('key'   => $key,
+      'name'  => $flags{$key}[0],
+      'html'  => $flags{$key}[1]);
+  if ($data{$key}) {
+    $row{'yes'}=' checked';
+    $row{'no'}='';
+  } else {
+    $row{'yes'}='';
+    $row{'no'}=' checked';
+  }
+  push(@flagdata, \%row);
+  }
 
-       my $CGIsort1 = buildCGIsort("Bsort1","sort1",$data->{'sort1'});
-       if ($CGIsort1) {
-               $template->param(CGIsort1 => $CGIsort1);
-       } else {
-               $template->param( sort1 => $data->{'sort1'});
-       }
+  if ($modify){
+  $template->param( modify => 1 );
+  }
 
-       my $CGIsort2 = buildCGIsort("Bsort2","sort2",$data->{'sort2'});
-       if ($CGIsort2) {
-               $template->param(CGIsort2 =>$CGIsort2);
-       } else {
-               $template->param( sort2 => $data->{'sort2'});
-       }
-       
-       $template->param(       actionType              => $actionType,
-                               destination => $destination,
-                               borrowernumber          => $borrowernumber,
-                               address         => $data->{'streetaddress'},
-                               firstname       => $data->{'firstname'},
-                               surname         => $data->{'surname'},
-                               othernames      => $data->{'othernames'},
-                               initials        => $data->{'initials'},
-                               ethcatpopup     => $ethcatpopup,
-                               catcodepopup    => $catcodepopup,
-                               streetaddress   => $data->{'streetaddress'},
-                               physstreet   => $data->{'physstreet'},
-                               zipcode => $data->{'zipcode'},
-                               streetcity      => $data->{'streetcity'},
-                               homezipcode => $data->{'homezipcode'},
-                               city            => $data->{'city'},
-                               phone           => $data->{'phone'},
-                               phoneday        => $data->{'phoneday'},
-                               faxnumber       => $data->{'faxnumber'},
-                               emailaddress    => $data->{'emailaddress'},
-                               textmessaging   => $data->{'textmessaging'},
-                               contactname     => $data->{'contactname'},
-                               altphone        => $data->{'altphone'},
-                               altnotes        => $data->{'altnotes'},
-                               borrowernotes   => $data->{'borrowernotes'},
-                               flagloop        => \@flagdata,
-                               relshiploop     => \@relshipdata,
-                               "title_".$data->{'title'} => " SELECTED ",
-                               joining => format_date($data->{'dateenrolled'}),
-                               expiry          => format_date($data->{'expiry'}),
-                               cardnumber      => $cardnumber,
-                               dateofbirth     => $data->{'dateofbirth'},
-                               dateformat      => display_date_format(),
-                               modify          => $modify,
-                               CGIbranch => $CGIbranch);
-       $template->param(Institution => 1) if ($categorycode eq "I");
-       output_html_with_http_headers $input, $cookie, $template->output;
+  #Convert dateofbirth to correct format
+  my @branches;
+  my @select_branch;
+  my %select_branches;
+  my $branches=GetBranches();
+  my $default;
+  # -----------------------------------------------------
+  #  the value of ip from the branches hash table
+#     my $select_ip;
+  # $ip is the ip of user when is connect to koha 
+#     my $ip = $ENV{'REMOTE_ADDR'};
+  
+  # -----------------------------------------------------
+  foreach my $branch (keys %$branches) {
+    if ((not C4::Context->preference("IndependantBranches")) || (C4::Context->userenv->{'flags'} == 1)) {
+      push @select_branch, $branch;
+      $select_branches{$branch} = $branches->{$branch}->{'branchname'};
+      $default=C4::Context->userenv->{'branch'};
+    } else {
+      push @select_branch,$branch if ($branch eq C4::Context->userenv->{'branch'});
+      $select_branches{$branch} = $branches->{$branch}->{'branchname'} if ($branch eq C4::Context->userenv->{'branch'});
+      $default = C4::Context->userenv->{'branch'};
+    }
+  }
+# --------------------------------------------------------------------------------------------------------
+  #in modify mod :default value from $CGIbranch comes from borrowers table
+  #in add mod: default value come from branches table (ip correspendence)
+  $default=$data{'branchcode'}  if ($op eq 'modify');
+  my $CGIbranch = CGI::scrolling_list(-id    => 'branchcode',
+             -name   => 'branchcode',
+             -values => \@select_branch,
+             -labels => \%select_branches,
+             -size   => 1,
+             -override => 1,  
+                   -multiple =>0,
+             -default => $default,
+          );
+  my $CGIorganisations;
+  my $member_of_institution;
+  if (C4::Context->preference("memberofinstitution")){
+     my $organisations=get_institutions();
+     my @orgs;
+     my %org_labels;
+     foreach my $organisation (keys %$organisations) {
+         push @orgs,$organisation;
+         $org_labels{$organisation}=$organisations->{$organisation}->{'surname'};
+     }
+     $member_of_institution=1;
+     
+     $CGIorganisations = CGI::scrolling_list( -id => 'organisations',
+         -name     => 'organisations',
+         -labels   => \%org_labels,
+         -values   => \@orgs,
+         -size     => 5,
+         -multiple => 'true'
 
+         
+     );
+  }
 
-}
+
+# --------------------------------------------------------------------------------------------------------
+
+  my $CGIsort1 = buildCGIsort("Bsort1","sort1",$data{'sort1'});
+  if ($CGIsort1) {
+    $template->param(CGIsort1 => $CGIsort1);
+    $template->param( sort1 => $data{'sort1'});
+  } 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'});
+  }
+  # increase step to see next page
+  if ($nok) {
+      foreach my $error (@errors) {
+          $template->param( $error => 1);
+      }
+        $template->param(nok => 1);
+  }
+#   else {
+#       $step++ if $op eq 'add';
+#   }
+  #Formatting data for display    
+  
+  if ($data{'dateenrolled'} eq ''){
+    my $today= sprintf('%04d-%02d-%02d', Today());
+    #insert ,in field "dateenrolled" , the current date
+    $data{'dateenrolled'}=$today;
+    $data{'dateexpiry'} = GetExpiryDate($data{'categorycode'},$today);
+  }
+  
+  $data{'surname'}=uc($data{'surname'});
+  $data{'firstname'}=ucfirst(lc $data{'firstname'});
+  $data{'dateenrolled'}=format_date($data{'dateenrolled'});
+  $data{'dateexpiry'}=format_date($data{'dateexpiry'});
+  $data{'contactname'}=uc($data{'contactname'});
+  $data{'contactfirstname'}= ucfirst( lc $data{'contactfirstname'});
+  $data{'dateofbirth'} = format_date($data{'dateofbirth'});
+
+#   warn "$step";
+  $template->param(%data);
+  $template->param(
+    BorrowerMandatoryField => C4::Context->preference("BorrowerMandatoryField"),#field to test with javascript
+    category_type => $category_type,#to know the category type of the borrower
+        DHTMLcalendar_dateformat => get_date_format_string_for_DHTMLcalendar(),
+    select_city => $select_city,
+    "step_$step"  => 1,# associate with step to know where u are
+    "$category_type"  => 1,# associate with step to know where u are
+    step    => $step,
+    destination   => $destination,#to know wher u come from and wher u must go in redirect
+    check_member    => $check_member,#to know if the borrower already exist(=>1) or not (=>0) 
+    flags   =>$data{'flags'},   
+    "op$op"   => 1,
+    nodouble  => $nodouble,
+    borrowernumber  => $borrowernumber,#register number
+    "contacttitle_".$data{'contacttitle'} => "SELECTED" ,
+    guarantorid => $guarantorid,
+    ethcatpopup => $ethcatpopup,
+    relshiploop => \@relshipdata,
+    citypopup => $citypopup,
+    roadpopup => $roadpopup,  
+    borrotitlepopup => $borrotitlepopup,
+    guarantorinfo   => $guarantorinfo,
+    flagloop  => \@flagdata,
+    dateformat      => display_date_format(),
+    check_categorytype =>$check_categorytype,#to recover the category type with checkcategorytype function
+    modify          => $modify,
+    nok     => $nok,#flag to konw if an error 
+    CGIbranch => $CGIbranch,
+          memberofinstution => $member_of_institution,
+          CGIorganisations => $CGIorganisations,
+    
+    );
+  
+  output_html_with_http_headers $input, $cookie, $template->output;
+# }
 
 # Local Variables:
 # tab-width: 8