Fix for 1599 getting expiry date prepopulating on member entry

[koha_gimpoz] / members / memberentry.pl

diff --git a/members/memberentry.pl b/members/memberentry.pl
index c2ac533..67a9ccf 100755 (executable)
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -232,10 +232,10 @@ if ((!$nok) and ($op eq 'insert' or $op eq 'save')){
                        delete $newdata{'password'};
                        delete $newdata{'userid'};
                }
-               &ModMember(%newdata);   # this is the last server-changing line.  the rest is "presentation"
+               &ModMember(%newdata);    
        }
        print scalar ($destination eq "circ") ? 
-               $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$data{'cardnumber'}") :
+               $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber") :
                $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber") ;
        exit;           # You can only send 1 redirect!  After that, content or other headers don't matter.
 }
@@ -264,7 +264,10 @@ if (C4::Context->preference("IndependantBranches")) {
   }
 }
 if ($op eq 'add'){
-  $template->param( updtype => 'I',step_1=>1,step_2=>1,step_3=>1);
+       my $arg2 = $newdata{'dateenrolled'} || sprintf('%04d-%02d-%02d', Today()); 
+       $data{'dateexpiry'} = GetExpiryDate($newdata{'categorycode'},$arg2);
+       $template->param( updtype => 'I',step_1=>1,step_2=>1,step_3=>1);
+       
 } 
 if ($op eq "modify")  {
   $template->param( updtype => 'M',modify => 1 );
@@ -322,9 +325,6 @@ if ($select_city eq '' ){
 }
 my($cityid);
 ($cityid,$name_city)=GetCities();
-if ($cityid) {
-       warn "hey hey waht the?";
-       }
 $template->param( city_cgipopup => 1) if ($cityid );
 my $citypopup = CGI::popup_menu(-name=>'select_city',
         -id => 'select_city',