More 2.1 patron collections excempt cleanup

* Removes new permission from ugprade script
* Removes new permission and feature description from release notes

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/Open-ILS/src/sql/Pg/2.0-2.1-upgrade-db.sql b/Open-ILS/src/sql/Pg/2.0-2.1-upgrade-db.sql
index 1acebc3..de7d363 100644 (file)
--- a/Open-ILS/src/sql/Pg/2.0-2.1-upgrade-db.sql
+++ b/Open-ILS/src/sql/Pg/2.0-2.1-upgrade-db.sql
@@ -6765,23 +6765,6 @@ BEGIN
 END;
 $func$ LANGUAGE PLPGSQL;
 
-INSERT INTO config.upgrade_log (version) VALUES ('0563');
-
-INSERT INTO permission.perm_list ( id, code, description ) 
-    VALUES ( 510, 'UPDATE_PATRON_COLLECTIONS_EXEMPT', oils_i18n_gettext(510,
-    'Allows a user to indicate that a patron is exempt from collections processing', 'ppl', 'description'));
-
---- stock Circulation Administrator group
-
-INSERT INTO permission.grp_perm_map ( grp, perm, depth, grantable )
-    SELECT
-        4,
-        id,
-        0,
-        't'
-    FROM permission.perm_list
-    WHERE code in ('UPDATE_PATRON_COLLECTIONS_EXEMPT');
-
 INSERT INTO config.upgrade_log (version) VALUES ('0566');
 
 CREATE OR REPLACE FUNCTION unapi.bre ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$

diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 6df7e8a..6198ee3 100644 (file)
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -59,8 +59,6 @@ Circulation improvements
   Zombies", but as it is a new edition it must be cataloged as a new
   bibliographic record; however, you would like to spread out some of the holds
   queue from your current edition to the new edition.
-* Mark patron as exempt from billing collections: It is now possible to mark a
-  patron as being exempt from being sent to collections.
 * Hold-driven recalls: It is now possible to define a loan
   period threshold (such as 60 days) so that if a hold is placed on an item with
   a loan period beyond that threshold, the system will automatically shorten the
@@ -293,7 +291,6 @@ New user permissions
 | UPDATE_BIB_PTYPE                 | Update Bibliographic Record Peer Type
 | UPDATE_HOLD_REQUEST_TIME         | Allows editing of a hold's request time, and/or its Cut-in-line/Top-of-queue flag.
 | UPDATE_MONOGRAPH_PART            | Update monograph part definition.
-| UPDATE_PATRON_COLLECTIONS_EXEMPT | Allows a user to indicate that a patron is exempt from collections processing
 | UPDATE_PICKLIST                  | Allows update/re-use of an acquisitions pick/selection list.
 | UPDATE_VOLUME_PREFIX             | Update prefix label definition.
 | UPDATE_VOLUME_SUFFIX             | Update suffix label definition.