From: blake <blake@mobiusconsortium.org>
Date: Fri, 27 Feb 2015 21:38:45 +0000 (-0600)
Subject: LP1331174 Long Overdue needs org unit settings
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fuser%2Fldw%2FLP1331174;p=working%2FEvergreen.git

LP1331174 Long Overdue needs org unit settings

Added a library setting "Assess Billing When Marked Long-Overdue"
Added a few lines of code to respect that setting and skip some
billing matters under the condition. Tested with and without
setting. Lost still functions the same.

Signed-off-by: blake <blake@mobiusconsortium.org>
Signed-off-by: Liam Whalen <liam.whalen@bc.libraries.coop>
---

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 f9da1ddd12..e85c646e58 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -13760,7 +13760,7 @@ INSERT INTO config.org_unit_setting_type
     'circ', 'bool',
     oils_i18n_gettext(
         'circ.longoverdue.assess_billing',
-        'Asses Billing When Marked Long-Overdue',
+        'Assess Billing When Marked Long-Overdue',
         'coust',
         'label'
     ),
diff --git a/Open-ILS/src/sql/Pg/upgrade/0882.data.long-overdue-asses-fines-library-setting.sql b/Open-ILS/src/sql/Pg/upgrade/0882.data.long-overdue-asses-fines-library-setting.sql
deleted file mode 100644
index b7a2f6bece..0000000000
--- a/Open-ILS/src/sql/Pg/upgrade/0882.data.long-overdue-asses-fines-library-setting.sql
+++ /dev/null
@@ -1,30 +0,0 @@
-BEGIN;
-
-SELECT evergreen.upgrade_deps_block_check('0882', :eg_version);
-
-INSERT INTO config.org_unit_setting_type ( name, grp, label, description, datatype ) VALUES (   
-    'circ.longoverdue.assess_billing',
-    'circ',
-    oils_i18n_gettext(
-        'circ.longoverdue.assess_billing',
-        'Assess Billing When Marked Long-Overdue',
-        'coust',
-        'label'
-    ),
-    oils_i18n_gettext(
-        'circ.longoverdue.assess_billing',
-        'When an item is marked long overdue, a bill for the item will be ' ||
-		'assessed unless this setting is false. The default is true. If false, ' ||
-		'"Void Overdue Fines When Items are Marked Long-Overdue" and "Long-Overdue'||
-		' Materials Processing Fee" settings will be ignored.',
-        'coust',
-        'description'
-    ), 'bool'
-)
-;
-
-UPDATE PERMISSION.PERM_LIST SET CODE='COPY_STATUS_LONG_OVERDUE.override' WHERE CODE='COPY_STATUS_LONGOVERDUE.override';
-
-
-
-COMMIT;
\ No newline at end of file
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.long-overdue-asses-fines-library-setting.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.long-overdue-asses-fines-library-setting.sql
new file mode 100644
index 0000000000..c7a89505f8
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.long-overdue-asses-fines-library-setting.sql
@@ -0,0 +1,30 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+INSERT INTO config.org_unit_setting_type ( name, grp, label, description, datatype ) VALUES (   
+    'circ.longoverdue.assess_billing',
+    'circ',
+    oils_i18n_gettext(
+        'circ.longoverdue.assess_billing',
+        'Assess Billing When Marked Long-Overdue',
+        'coust',
+        'label'
+    ),
+    oils_i18n_gettext(
+        'circ.longoverdue.assess_billing',
+        'When an item is marked long overdue, a bill for the item will be ' ||
+		'assessed unless this setting is false. The default is true. If false, ' ||
+		'"Void Overdue Fines When Items are Marked Long-Overdue" and "Long-Overdue'||
+		' Materials Processing Fee" settings will be ignored.',
+        'coust',
+        'description'
+    ), 'bool'
+)
+;
+
+UPDATE PERMISSION.PERM_LIST SET CODE='COPY_STATUS_LONG_OVERDUE.override' WHERE CODE='COPY_STATUS_LONGOVERDUE.override';
+
+
+
+COMMIT;