From f8e7f71cda4490530acb644ee472782dfce24127 Mon Sep 17 00:00:00 2001
From: Chris Sharp <csharp@georgialibraries.org>
Date: Wed, 10 Jun 2015 13:44:55 -0400
Subject: [PATCH] LP#914800: Create friendlier error message when attempting
 merge with user in collections.

As suggested in the bug report, this maps a more informative message to that error text code
in ils_events.xml.

Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
---
 Open-ILS/src/extras/ils_events.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Open-ILS/src/extras/ils_events.xml b/Open-ILS/src/extras/ils_events.xml
index cb860d4535..e246238629 100644
--- a/Open-ILS/src/extras/ils_events.xml
+++ b/Open-ILS/src/extras/ils_events.xml
@@ -927,6 +927,9 @@
 	<event code='7026' textcode='COPY_STATUS_LOST_AND_PAID'>
 	        <desc xml:lang="en-US">Copy is marked as lost and paid</desc>
 	</event>
+    <event code='7027' textcode='MERGED_USER_IN_COLLECTIONS'>
+            <desc xml:lang="en-US">User is in collections and cannot be merged</desc>
+    </event>
 
 
 	<!-- ================================================================ -->
-- 
2.11.0