Collaboration patch from Joseph Lewis and Michael Peters addressing LP#758007, missin...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20407 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/sql/Pg/upgrade/0529.data.merge_user-ou_settings.sql b/Open-ILS/src/sql/Pg/upgrade/0529.data.merge_user-ou_settings.sql
new file mode 100644 (file)
index 0000000..6bc688f
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0529.data.merge_user-ou_settings.sql
@@ -0,0 +1,29 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0529');
+
+INSERT INTO config.org_unit_setting_type 
+( name, label, description, datatype ) VALUES 
+( 'circ.user_merge.delete_addresses', 
+  'Circ:  Patron Merge Address Delete', 
+  'Delete address(es) of subordinate user(s) in a patron merge', 
+   'bool'
+);
+
+INSERT INTO config.org_unit_setting_type 
+( name, label, description, datatype ) VALUES 
+( 'circ.user_merge.delete_cards', 
+  'Circ: Patron Merge Barcode Delete', 
+  'Delete barcode(s) of subordinate user(s) in a patron merge', 
+  'bool'
+);
+
+INSERT INTO config.org_unit_setting_type 
+( name, label, description, datatype ) VALUES 
+( 'circ.user_merge.deactivate_cards', 
+  'Circ:  Patron Merge Deactivate Card', 
+  'Mark barcode(s) of subordinate user(s) in a patron merge as inactive', 
+  'bool'
+);\r
+
+COMMIT;