From ad588f2d30ef706aceb6a5cb86733da8089ca52c Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 11 Aug 2011 15:21:35 -0400
Subject: [PATCH] Fix for Bug 6712 - Remove memberofinstitution markup from
 templates until it can be completed

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

To test:
1) Make sure syspref memberofinstitution is turned on
2) Add a new patron of organisation category (example: library)
3) Check that there is no field set 'organisation' showing up
4) Checkout books to any borrower
5) Renew books until no longer possible
6) Scan barcode from renewed book to force renewal
6) Check that the 'no more renewals' message has no empty pull below text message

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bd744e6f2af85110cefa8d9e613393a0a517185b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
---
 .../prog/en/modules/circ/circulation.tt       |  4 ----
 .../prog/en/modules/members/memberentrygen.tt | 20 -------------------
 2 files changed, 24 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index dd4886a045..216c46e4f8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -397,10 +397,6 @@ function refocus(calendar) {
         [% END %]
         </ul>
 
-    [% IF ( memberofinstution ) %]
-    <p>[% CGIorganisations %]</p>
-    [% END %]
-
 </div></div>
 [% ELSE %]
 [% IF ( soundon ) %]
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 f96c27f077..6d3648bdc7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -732,26 +732,6 @@
             </ol>
         </fieldset>
 
-
-  [% IF ( I ) %]
-	[% IF ( memberofinstution ) %]
-	<fieldset class="rows" id="memberentry_organisation">
-		<legend>Organizations</legend><ol>
-		<li>
-			[% IF ( mandatoryphone ) %] 
-			<label for="organisations" class="required">
-			[% ELSE %]
-			<label for="organisations">
-			[% END %]
-			Organization(s): </label>
-			[% CGIorganisations %]
-	  [% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]
-		</li>
-		</ol>
-	</fieldset>
-	[% END %]
-  [% END %]
-              
 [% END %]
 [% IF ( step_3 ) %]
 
-- 
2.39.5