From fea156670588d1778bb40745d3c04e9aecddf7c9 Mon Sep 17 00:00:00 2001 From: Lebbeous Fogle-Weekley Date: Tue, 26 Feb 2013 15:31:57 -0500 Subject: [PATCH] Corrections to conflict resolutions re perm pinned IDs Signed-off-by: Lebbeous Fogle-Weekley --- Open-ILS/src/sql/Pg/upgrade/XXXX.schema.acq-order-ident.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.acq-order-ident.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.acq-order-ident.sql index c01e348a8e..95465c5b64 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.acq-order-ident.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.acq-order-ident.sql @@ -5,10 +5,10 @@ ALTER TABLE acq.lineitem_attr ADD COLUMN order_ident BOOLEAN NOT NULL DEFAULT FALSE; INSERT INTO permission.perm_list ( id, code, description ) VALUES ( - 543, -- VERIFY + 546, -- VERIFY 'ACQ_ADD_LINEITEM_IDENTIFIER', oils_i18n_gettext( - 543,-- VERIFY + 546,-- VERIFY 'When granted, newly added lineitem identifiers will propagate to linked bib records', 'ppl', 'description' @@ -16,10 +16,10 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES ( ); INSERT INTO permission.perm_list ( id, code, description ) VALUES ( - 544, -- VERIFY + 547, -- VERIFY 'ACQ_SET_LINEITEM_IDENTIFIER', oils_i18n_gettext( - 544,-- VERIFY + 547,-- VERIFY 'Allows staff to change the lineitem identifier', 'ppl', 'description' -- 2.11.0