From 4ad19ae8ddb2eb169bfbc488ec784fec055bb725 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 11 Aug 2011 15:21:35 -0400
Subject: [PATCH] [SIGNED-OFF] Fix for Bug 6712 - Remove memberofinstitution markup from templates until it can be completed
Content-Type: text/plain; charset="utf-8"

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
---
 .../prog/en/modules/circ/circulation.tt            |    4 ----
 .../prog/en/modules/members/memberentrygen.tt      |   20 --------------------
 2 files changed, 0 insertions(+), 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 60c773f..c2043d3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -396,10 +396,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 eea4d25..8a34bb1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -734,26 +734,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 ) %]
 
-- 
1.7.4.1