[open-ils-commits] [GIT] Evergreen ILS branch master updated. c8dd43e9a3efd26e0439fee7f3d97dec248e970a
Evergreen Git
git at git.evergreen-ils.org
Wed Aug 19 13:35:47 EDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via c8dd43e9a3efd26e0439fee7f3d97dec248e970a (commit)
via a3fd9d7b441f01b002c5668008e8a01a3be53cd9 (commit)
from 402307e9147b5c52d279c951a7ae032fb4ff4da7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c8dd43e9a3efd26e0439fee7f3d97dec248e970a
Author: Jason Stephenson <jstephenson at mvlc.org>
Date: Wed Aug 19 13:34:47 2015 -0400
LP 1479110: Stamping Upgrade Script for Negative Balance Settings
Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 07aa790..ec42825 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -91,7 +91,7 @@ CREATE TRIGGER no_overlapping_deps
BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0931', :eg_version); -- berick/kmlussier
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0932', :eg_version); -- kmlussier/dyrcona
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.update_negative_balance_OUS_descriptions.sql b/Open-ILS/src/sql/Pg/upgrade/0932.data.update_negative_balance_OUS_descriptions.sql
similarity index 96%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.update_negative_balance_OUS_descriptions.sql
rename to Open-ILS/src/sql/Pg/upgrade/0932.data.update_negative_balance_OUS_descriptions.sql
index acfa2d0..280563b 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.update_negative_balance_OUS_descriptions.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0932.data.update_negative_balance_OUS_descriptions.sql
@@ -1,6 +1,6 @@
BEGIN;
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('0932', :eg_version);
UPDATE config.org_unit_setting_type
SET description = 'Default setting to prevent negative balances (refunds) on circulation related bills. Set to "true" to prohibit negative balances at all times or, when used in conjunction with an interval setting, to prohibit negative balances after a set period of time.'
commit a3fd9d7b441f01b002c5668008e8a01a3be53cd9
Author: Kathy Lussier <klussier at masslnc.org>
Date: Thu Aug 6 12:50:11 2015 -0400
lp1479110 Provide more clarity for negative balance settings
Update the descriptions for the negative balance settings so that users know how to use prohibit and interval settings in conjunction with each other.
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Jason Stephenson <jstephenson at mvlc.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 8aee29f..5800d6d 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -5014,7 +5014,7 @@ INSERT into config.org_unit_setting_type
'coust', 'label'),
oils_i18n_gettext(
'bill.prohibit_negative_balance_default',
- 'Default setting to prevent negative balances (refunds) on circulation related bills',
+ 'Default setting to prevent negative balances (refunds) on circulation related bills. Set to "true" to prohibit negative balances at all times or, when used in conjunction with an interval setting, to prohibit negative balances after a set period of time. ',
'coust', 'description'),
'bool', null)
,( 'bill.prohibit_negative_balance_on_overdues', 'finance',
@@ -5024,7 +5024,7 @@ INSERT into config.org_unit_setting_type
'coust', 'label'),
oils_i18n_gettext(
'bill.prohibit_negative_balance_on_overdues',
- 'Prevent negative balances (refunds) on bills for overdue materials',
+ 'Prevent negative balances (refunds) on bills for overdue materials. Set to "true" to prohibit negative balances at all times or, when used in conjunction with an interval setting, to prohibit negative balances after a set period of time.',
'coust', 'description'),
'bool', null)
,( 'bill.prohibit_negative_balance_on_lost', 'finance',
@@ -5034,7 +5034,7 @@ INSERT into config.org_unit_setting_type
'coust', 'label'),
oils_i18n_gettext(
'bill.prohibit_negative_balance_on_lost',
- 'Prevent negative balances (refunds) on bills for lost/long overdue materials',
+ 'Prevent negative balances (refunds) on bills for lost/long overdue materials. Set to "true" to prohibit negative balances at all times or, when used in conjunction with an interval setting, to prohibit negative balances after an interval of time.',
'coust', 'description'),
'bool', null)
,( 'bill.negative_balance_interval_default', 'finance',
@@ -5044,7 +5044,7 @@ INSERT into config.org_unit_setting_type
'coust', 'label'),
oils_i18n_gettext(
'bill.negative_balance_interval_default',
- 'Amount of time after which no negative balances (refunds) are allowed on circulation bills',
+ 'Amount of time after which no negative balances (refunds) are allowed on circulation bills. The "Prohibit negative balance on bills" setting must also be set to "true".',
'coust', 'description'),
'interval', null)
,( 'bill.negative_balance_interval_on_overdues', 'finance',
@@ -5054,7 +5054,7 @@ INSERT into config.org_unit_setting_type
'coust', 'label'),
oils_i18n_gettext(
'bill.negative_balance_interval_on_overdues',
- 'Amount of time after which no negative balances (refunds) are allowed on bills for overdue materials',
+ 'Amount of time after which no negative balances (refunds) are allowed on bills for overdue materials. The "Prohibit negative balance on bills for overdue materials" setting must also be set to "true".',
'coust', 'description'),
'interval', null)
,( 'bill.negative_balance_interval_on_lost', 'finance',
@@ -5064,7 +5064,7 @@ INSERT into config.org_unit_setting_type
'coust', 'label'),
oils_i18n_gettext(
'bill.negative_balance_interval_on_lost',
- 'Amount of time after which no negative balances (refunds) are allowed on bills for lost/long overdue materials',
+ 'Amount of time after which no negative balances (refunds) are allowed on bills for lost/long overdue materials. The "Prohibit negative balance on bills for lost materials" setting must also be set to "true".',
'coust', 'description'),
'interval', null)
;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.update_negative_balance_OUS_descriptions.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.update_negative_balance_OUS_descriptions.sql
new file mode 100644
index 0000000..acfa2d0
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.update_negative_balance_OUS_descriptions.sql
@@ -0,0 +1,26 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+UPDATE config.org_unit_setting_type
+ SET description = 'Default setting to prevent negative balances (refunds) on circulation related bills. Set to "true" to prohibit negative balances at all times or, when used in conjunction with an interval setting, to prohibit negative balances after a set period of time.'
+ WHERE name = 'bill.prohibit_negative_balance_default';
+UPDATE config.org_unit_setting_type
+ SET description = 'Prevent negative balances (refunds) on bills for overdue materials. Set to "true" to prohibit negative balances at all times or, when used in conjunction with an interval setting, to prohibit negative balances after a set period of time.'
+ WHERE name = 'bill.prohibit_negative_balance_on_overdues';
+UPDATE config.org_unit_setting_type
+ SET description = 'Prohibit negative balance on bills for lost materials. Set to "true" to prohibit negative balances at all times or, when used in conjunction with an interval setting, to prohibit negative balances after a set period of time.'
+ WHERE name = 'bill.prohibit_negative_balance_on_lost';
+UPDATE config.org_unit_setting_type
+ SET description = 'Amount of time after which no negative balances (refunds) are allowed on circulation bills. The "Prohibit negative balance on bills" setting must also be set to "true".'
+ WHERE name = 'bill.negative_balance_interval_default';
+UPDATE config.org_unit_setting_type
+ SET description = 'Amount of time after which no negative balances (refunds) are allowed on bills for overdue materials. The "Prohibit negative balance on bills for overdue materials" setting must also be set to "true".'
+ WHERE name = 'bill.negative_balance_interval_on_overdues';
+UPDATE config.org_unit_setting_type
+ SET description = 'Amount of time after which no negative balances (refunds) are allowed on bills for lost/long overdue materials. The "Prohibit negative balance on bills for lost materials" setting must also be set to "true".'
+ WHERE name = 'bill.negative_balance_interval_on_lost';
+
+COMMIT;
+
+
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 12 ++++----
...ta.update_negative_balance_OUS_descriptions.sql | 26 ++++++++++++++++++++
3 files changed, 33 insertions(+), 7 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0932.data.update_negative_balance_OUS_descriptions.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list