Stamping 0854: data.min_max_prices

Stamping 0854 and resolving permission ID conflicts due to drift.

Signed-off-by: Jeff Godin <jgodin@tadl.org>

diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 693fab9..62f6da8 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1592,9 +1592,9 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES
         'Allows a user to specify which Server Add-ons get invoked at the current workstation', 'ppl', 'description')),
  ( 552, 'ADMIN_FLOAT_GROUPS', oils_i18n_gettext( 552,
     'Allows administration of floating groups', 'ppl', 'description' )),
- ( 552, 'UPDATE_ORG_UNIT_SETTING.circ.min_item_price', oils_i18n_gettext( 552,
+ ( 553, 'UPDATE_ORG_UNIT_SETTING.circ.min_item_price', oils_i18n_gettext( 553,
     'UPDATE_ORG_UNIT_SETTING.circ.min_item_price', 'ppl', 'description' )),
- ( 553, 'UPDATE_ORG_UNIT_SETTING.circ.max_item_price', oils_i18n_gettext( 553,
+ ( 554, 'UPDATE_ORG_UNIT_SETTING.circ.max_item_price', oils_i18n_gettext( 554,
     'UPDATE_ORG_UNIT_SETTING.circ.max_item_price', 'ppl', 'description' ))
 ;
 

diff --git a/Open-ILS/src/sql/Pg/upgrade/0854.data.min_max_prices.sql b/Open-ILS/src/sql/Pg/upgrade/0854.data.min_max_prices.sql
new file mode 100644 (file)
index 0000000..28d93b7
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0854.data.min_max_prices.sql
@@ -0,0 +1,55 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('0854', :eg_version);
+
+INSERT INTO permission.perm_list ( id, code, description ) VALUES (
+    553,
+    'UPDATE_ORG_UNIT_SETTING.circ.min_item_price',
+    oils_i18n_gettext(
+        553,
+        'UPDATE_ORG_UNIT_SETTING.circ.min_item_price',
+        'ppl',
+        'description'
+    )
+), (
+       554,
+    'UPDATE_ORG_UNIT_SETTING.circ.max_item_price',
+    oils_i18n_gettext(
+        554,
+        'UPDATE_ORG_UNIT_SETTING.circ.max_item_price',
+        'ppl',
+        'description'
+    )
+);
+
+INSERT into config.org_unit_setting_type
+    ( name, grp, label, description, datatype, fm_class )
+VALUES (
+    'circ.min_item_price',
+       'finance',
+    oils_i18n_gettext(
+        'circ.min_item_price',
+        'Minimum Item Price',
+        'coust', 'label'),
+    oils_i18n_gettext(
+        'circ.min_item_price',
+        'When charging for lost items, charge this amount as a minimum.',
+        'coust', 'description'),
+    'currency',
+    NULL
+), (
+    'circ.max_item_price',
+    'finance',
+    oils_i18n_gettext(
+        'circ.max_item_price',
+        'Maximum Item Price',
+        'coust', 'label'),
+    oils_i18n_gettext(
+        'circ.max_item_price',
+        'When charging for lost items, limit the charge to this as a maximum.',
+        'coust', 'description'),
+    'currency',
+    NULL
+);
+
+COMMIT;

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.min_max_prices.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.min_max_prices.sql
deleted file mode 100644 (file)
index acd22ee..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.min_max_prices.sql
+++ /dev/null
@@ -1,55 +0,0 @@
-BEGIN;
-
--- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
-
-INSERT INTO permission.perm_list ( id, code, description ) VALUES (
-    551, -- VERIFY
-    'UPDATE_ORG_UNIT_SETTING.circ.min_item_price',
-    oils_i18n_gettext(
-        551, -- VERIFY
-        'UPDATE_ORG_UNIT_SETTING.circ.min_item_price',
-        'ppl',
-        'description'
-    )
-), (
-       552, -- VERIFY
-    'UPDATE_ORG_UNIT_SETTING.circ.max_item_price',
-    oils_i18n_gettext(
-        552, -- VERIFY
-        'UPDATE_ORG_UNIT_SETTING.circ.max_item_price',
-        'ppl',
-        'description'
-    )
-);
-
-INSERT into config.org_unit_setting_type
-    ( name, grp, label, description, datatype, fm_class )
-VALUES (
-    'circ.min_item_price',
-       'finance',
-    oils_i18n_gettext(
-        'circ.min_item_price',
-        'Minimum Item Price',
-        'coust', 'label'),
-    oils_i18n_gettext(
-        'circ.min_item_price',
-        'When charging for lost items, charge this amount as a minimum.',
-        'coust', 'description'),
-    'currency',
-    NULL
-), (
-    'circ.max_item_price',
-    'finance',
-    oils_i18n_gettext(
-        'circ.max_item_price',
-        'Maximum Item Price',
-        'coust', 'label'),
-    oils_i18n_gettext(
-        'circ.max_item_price',
-        'When charging for lost items, limit the charge to this as a maximum.',
-        'coust', 'description'),
-    'currency',
-    NULL
-);
-
-COMMIT;