From 43ba461f3905dc07e7e97bb23dc230fdd69ca2d7 Mon Sep 17 00:00:00 2001
From: Lyon3 Team <koha@univ-lyon3.fr>
Date: Mon, 29 Oct 2012 11:59:44 +0100
Subject: [PATCH] Bug 8978: Patron's dateexpiry erroneously updated when in
 UnwantedField

If dateexpiry field was absent because it has been included in
UnWantedField syspref list, the script assumed that the date has
been forgotten and updated it when clicking on 'save' button.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
---
 .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 7ffefd3ca9..e327d03457 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -1066,7 +1066,7 @@
         [% END %]
 	</ol>
   </fieldset>
-    [% UNLESS nodateenrolled && nodateexpiry &&  noopacnote && noborrowernotes %]
+    [% UNLESS nodateenrolled &&  noopacnote && noborrowernotes %]
 	<fieldset class="rows" id="memberentry_subscription">
 	<legend id="library_setup_lgd">Library set-up</legend><ol>
         [% UNLESS nodateenrolled %]
@@ -1089,6 +1089,9 @@
         [% END %]
         [% UNLESS nodateexpiry %]
 		<li>
+        [% ELSE %]
+                <li style="display:none">
+        [% END %]
 			[% IF ( mandatorydateexpiry ) %]
             <label for="to" class="required">
 			[% ELSE %]
@@ -1112,7 +1115,6 @@
 		[% IF ( ERROR_dateexpiry ) %]<span class="required">(Error)</span>[% END %]
 		<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
 		</li>
-        [% END %]
         [% UNLESS noopacnote %]
 		<li>
 			[% IF ( mandatoryopacnote ) %]
-- 
2.39.5