From c1f91af476d3043052350f3b9309c461490c9c7a Mon Sep 17 00:00:00 2001 From: Henri-Damien LAURENT Date: Wed, 7 Apr 2010 15:01:22 +0200 Subject: [PATCH] MT3212 : members modification wipeout dateexpiry Members modification when not in Library information mode would wipe out dateexpiry information Signed-off-by: Henri-Damien LAURENT Signed-off-by: Galen Charlton --- members/memberentry.pl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/members/memberentry.pl b/members/memberentry.pl index 8aff67a964..c99dcb99b2 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -130,6 +130,7 @@ if ($op eq 'insert' || $op eq 'modify' || $op eq 'save') { my $syspref = $dateobject->regexp(); # same syspref format for all 3 dates my $iso = $dateobject->regexp('iso'); # foreach (qw(dateenrolled dateexpiry dateofbirth)) { + next unless exists $newdata{$_}; my $userdate = $newdata{$_} or next; if ($userdate =~ /$syspref/) { $newdata{$_} = format_date_in_iso($userdate); # if they match syspref format, then convert to ISO @@ -274,7 +275,7 @@ if ($op eq 'save' || $op eq 'insert'){ } if ($op eq 'modify' || $op eq 'insert' || $op eq 'save' ){ - unless ($newdata{'dateexpiry'}){ + if (exists ($newdata{'dateexpiry'}) && !($newdata{'dateexpiry'})){ my $arg2 = $newdata{'dateenrolled'} || C4::Dates->today('iso'); $newdata{'dateexpiry'} = GetExpiryDate($newdata{'categorycode'},$arg2); } @@ -373,8 +374,6 @@ if (C4::Context->preference("IndependantBranches")) { } } if ($op eq 'add'){ - my $arg2 = $newdata{'dateenrolled'} || C4::Dates->today('iso'); - $data{'dateexpiry'} = GetExpiryDate($newdata{'categorycode'},$arg2); $template->param( updtype => 'I', step_1=>1, step_2=>1, step_3=>1, step_4=>1, step_5 => 1, step_6 => 1); } if ($op eq "modify") { -- 2.20.1