[open-ils-commits] [GIT] Evergreen ILS branch master updated. ee8b6da78892595c97447cd17f54c2a7dbfa9458

Evergreen Git git at git.evergreen-ils.org
Mon Mar 14 14:50:13 EDT 2016


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  ee8b6da78892595c97447cd17f54c2a7dbfa9458 (commit)
       via  7c99539887f6362371b956509d959c4e28200885 (commit)
      from  663103c674f2aa8d8aea2ef229b7365768800a35 (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 ee8b6da78892595c97447cd17f54c2a7dbfa9458
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon Mar 14 14:46:19 2016 -0400

    LP#1550495: stamp DB update
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 8d6b9cd..36cdbc8 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 ('0971', :eg_version); -- csharp/Dyrcona
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0972', :eg_version); -- jstompro/gmcharlt
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/xxxx.acq.cancel_reason-add-85.sql b/Open-ILS/src/sql/Pg/upgrade/0972.data.acq-cancel_reason-add-85.sql
similarity index 85%
rename from Open-ILS/src/sql/Pg/upgrade/xxxx.acq.cancel_reason-add-85.sql
rename to Open-ILS/src/sql/Pg/upgrade/0972.data.acq-cancel_reason-add-85.sql
index d2e2273..ac27300 100644
--- a/Open-ILS/src/sql/Pg/upgrade/xxxx.acq.cancel_reason-add-85.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0972.data.acq-cancel_reason-add-85.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
--- INSERT INTO config.upgrade_log (version) VALUES ('xxxx');
+SELECT evergreen.upgrade_deps_block_check('0972', :eg_version); -- jstompro/gmcharlt
 
 -- LP#1550495 - Add Baker&Taylor EDI Quantity Cancel Code
 -- Insert EDI Cancel Reason 85 (1200 + 85 = 1285) if it doesn't already exist

commit 7c99539887f6362371b956509d959c4e28200885
Author: Josh Stompro <stomproj at larl.org>
Date:   Fri Mar 4 13:51:34 2016 -0600

    LP#1550495 - Add EDI Cancel Code 85 - used by Baker & Taylor
    
    Baker & Taylor send back a quantity code 85 response when they cancel
    a line item.  This code wasn't included as one of the built in EDI
    codes so those line items were not being canceled automatically in
    evergreen.
    
    The system looks for the response code + 1200 to find the cancel reason,
    so this code is entered as ID 1285 in the acq.cancel_reason table.
    
    I received confirmation from another system that uses B&T as an EDI vendor
    that they also receive code 85 responses when something gets canceled.
    
    Signed-off-by: Josh Stompro <stomproj at larl.org>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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 ffb0787..9e9e09a 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -11482,7 +11482,9 @@ INSERT INTO acq.cancel_reason (org_unit, keep_debits, id, label, description) VA
 (1, 't', 1246, oils_i18n_gettext(1246, 'Delayed: Pieces Delivered', 'acqcr', 'label'),
     oils_i18n_gettext(1246, 'Number of pieces actually received at the final destination.', 'acqcr', 'description')),
 (1, 't', 1283, oils_i18n_gettext(1283, 'Delayed: Backorder', 'acqcr', 'label'),
-    oils_i18n_gettext(1283, 'The quantity of goods that is on back-order.', 'acqcr', 'description'));
+    oils_i18n_gettext(1283, 'The quantity of goods that is on back-order.', 'acqcr', 'description')),
+(1, 'f',( 85+1200), oils_i18n_gettext(1285, 'Canceled: By Vendor', 'acqcr', 'label'),
+    oils_i18n_gettext(1285, 'Line item canceled by vendor', 'acqcr', 'description'));
 
 INSERT INTO config.global_flag (name, label, enabled)
     VALUES (
diff --git a/Open-ILS/src/sql/Pg/upgrade/xxxx.acq.cancel_reason-add-85.sql b/Open-ILS/src/sql/Pg/upgrade/xxxx.acq.cancel_reason-add-85.sql
new file mode 100644
index 0000000..d2e2273
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/xxxx.acq.cancel_reason-add-85.sql
@@ -0,0 +1,18 @@
+BEGIN;
+
+-- INSERT INTO config.upgrade_log (version) VALUES ('xxxx');
+
+-- LP#1550495 - Add Baker&Taylor EDI Quantity Cancel Code
+-- Insert EDI Cancel Reason 85 (1200 + 85 = 1285) if it doesn't already exist
+INSERT INTO acq.cancel_reason 
+   (org_unit, keep_debits, id, label, description)
+   SELECT 
+     1, 'f',( 85+1200),
+     oils_i18n_gettext(1285, 'Canceled: By Vendor', 'acqcr', 'label'),
+     oils_i18n_gettext(1285, 'Line item canceled by vendor', 'acqcr', 'description')
+   WHERE NOT EXISTS (
+    SELECT 1 FROM acq.cancel_reason where id=(85+1200)
+   );
+
+
+COMMIT;
diff --git a/docs/RELEASE_NOTES_NEXT/Acquisitions/add_cancel_reason_85.adoc b/docs/RELEASE_NOTES_NEXT/Acquisitions/add_cancel_reason_85.adoc
new file mode 100644
index 0000000..62ec0c1
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Acquisitions/add_cancel_reason_85.adoc
@@ -0,0 +1,6 @@
+Add Acquisitions Cancel Reason 85 for Baker&Taylor EDI
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Baker & Taylor send back a quantity status code of 85
+when a line item is canceled when using EDI.  That code
+is now included in the system so those cancelations get 
+properly registered. 

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql          |    2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       |    4 +++-
 .../upgrade/0972.data.acq-cancel_reason-add-85.sql |   18 ++++++++++++++++++
 .../Acquisitions/add_cancel_reason_85.adoc         |    6 ++++++
 4 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/0972.data.acq-cancel_reason-add-85.sql
 create mode 100644 docs/RELEASE_NOTES_NEXT/Acquisitions/add_cancel_reason_85.adoc


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list