From 7dfd2d97388a8d6082642047c429dad3003514ec Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Mon, 4 Dec 2017 17:05:35 +0000
Subject: [PATCH] B2017-268:  Fix crash when creating a new enhanced procedure
 & linking an existing source procedure to it when the Procedure Numbers were
 different.

---
 .../Extension/ItemInsertExt.cs                | 41 ++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs
index 206c5b00..a147a4ce 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs
@@ -1784,25 +1784,28 @@ namespace VEPROMS.CSLA.Library
 			}
 			else if (IsProcedure)
 			{
-				using (Item ii = this.Get())
-				{
-					ProcedureConfig sc = this.MyConfig as ProcedureConfig;
-					sc.AddEnhancedDocument(enhtype, enhii.ItemID);
-					sc.SaveEnhancedDocuments();
-					ii.MyContent.Config = sc.ToString();
-					ii.Save();
-					RefreshConfig();
-				}
-				using (Item ei = Item.Get(enhii.ItemID))
-				{
-					ProcedureConfig sc = enhii.MyConfig as ProcedureConfig;
-					sc.AddEnhancedDocument(0, this.ItemID);
-					sc.SaveEnhancedDocuments();
-					ei.MyContent.Text = DisplayText;
-					ei.MyContent.Config = sc.ToString();
-					ei.Save();
-					enhii.RefreshConfig();
-				}
+                // To fix B2017-268 the order of the following 2 'usings' had to be changed and the
+                // Content.Number had to be set in the enhanced. 
+                using (Item ei = Item.Get(enhii.ItemID))
+                {
+                    ProcedureConfig sc = enhii.MyConfig as ProcedureConfig;
+                    sc.AddEnhancedDocument(0, this.ItemID);
+                    sc.SaveEnhancedDocuments();
+                    ei.MyContent.Number = MyContent.Number;
+                    ei.MyContent.Text = DisplayText;
+                    ei.MyContent.Config = sc.ToString();
+                    ei.Save();
+                    enhii.RefreshConfig();
+                }
+                using (Item ii = this.Get())
+                {
+                    ProcedureConfig sc = this.MyConfig as ProcedureConfig;
+                    sc.AddEnhancedDocument(enhtype, enhii.ItemID);
+                    sc.SaveEnhancedDocuments();
+                    ii.MyContent.Config = sc.ToString();
+                    ii.Save();
+                    RefreshConfig();
+                }
 			}
 		}
 		#endregion