Fixed merge conflict

Merging into Development (no code review needed)

PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs

@@ -528,9 +528,11 @@ namespace VEPROMS.CSLA.Library
 			string mstr = (MyConfig as DocVersionConfig).Unit_ProcedureNumber;
 			string[] units = mstr.Split(",".ToCharArray());
 			string[] fromdata = fromunitdes.Split(",".ToCharArray());
-
 			// SelectedSlave is > 0 if a unit has been selected, for example from print or approve.  It represents that index into the list of units.  
-			if (DocVersionConfig.SelectedSlave > 0)
+			// F2023-098: depending on where this is called from & how data is set, the DocVersionConfig.SelectedSlave may be 0, but the
+			//	procInfoSelectedChildToPrint will always have the correct value, i.e. 0 if not printing & the selected slave from the print selection.
+			//	Check for procInfoSelectedChildToPrint > 0 also:
+			if (DocVersionConfig.SelectedSlave > 0 || procInfoSelectedChildToPrint > 0)
 			{
 				prefix = units[0].Replace("#", "");
 				if (str.ToUpper().IndexOf(@"<U-") > -1) return prefix + Regex.Replace(str, @"\<[uU]-[a-zA-Z]+\>", fromunitdes);