From 085a7d3a2ca00f4acac41a38c4cda93b97f568d2 Mon Sep 17 00:00:00 2001
From: David Birmingham <dbirmingham@ptfs.com>
Date: Thu, 11 Dec 2014 18:45:23 -0500
Subject: [PATCH] [#81005450] Edit links from patron details page update
 expiration date SC 48998

Restricted the potential auto calculation of expiration date to only the "Edit"
linked pages that display this field.
---
 cgi/members/memberentry.pl | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/cgi/members/memberentry.pl b/cgi/members/memberentry.pl
index 1378e56307..c60ba3c825 100755
--- a/cgi/members/memberentry.pl
+++ b/cgi/members/memberentry.pl
@@ -190,14 +190,16 @@ BEGIN
     # If dateexpiry was blank - set it to default value, with
     # format specified per $syspref for Koha variable "dateformat".
     $newdata{'categorycode'} = $categorycode;
-    if (! defined $newdata{'dateexpiry'} or ! $newdata{'dateexpiry'}) {
-        my $denr = $newdata{'dateenrolled'} // C4::Dates->today('iso');
+    if (($step == 0) || ($step == 3)) { # Pages that can edit dateexpiry
+        if (! defined $newdata{'dateexpiry'} or ! $newdata{'dateexpiry'}) {
+            my $denr = $newdata{'dateenrolled'} // C4::Dates->today('iso');
 
-        if ($denr =~ /$syspref/) {
-            # if match syspref format, then convert to ISO
-            $denr = format_date_in_iso($denr);
+            if ($denr =~ /$syspref/) {
+                # if match syspref format, then convert to ISO
+                $denr = format_date_in_iso($denr);
+            }
+            $newdata{dateexpiry} = GetExpiryDate($newdata{categorycode}, $denr);
         }
-        $newdata{dateexpiry} = GetExpiryDate($newdata{categorycode}, $denr);
     }
     foreach (qw(dateenrolled dateexpiry dateofbirth)) {
         my $userdate = $newdata{$_} or next;