diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index 29bb17a6..9669ab4e 100644 Binary files a/PROMS/Formats/fmtall/VEGP2all.xml and b/PROMS/Formats/fmtall/VEGP2all.xml differ diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml b/PROMS/Formats/fmtall/VEGPAlrall.xml index 48150cbb..3f29a2a5 100644 Binary files a/PROMS/Formats/fmtall/VEGPAlrall.xml and b/PROMS/Formats/fmtall/VEGPAlrall.xml differ diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml.orig b/PROMS/Formats/fmtall/VEGPAlrall.xml.orig new file mode 100644 index 00000000..3f29a2a5 Binary files /dev/null and b/PROMS/Formats/fmtall/VEGPAlrall.xml.orig differ diff --git a/PROMS/Formats/frmFormatCopy.cs b/PROMS/Formats/frmFormatCopy.cs index bd679eb1..d90b34e8 100644 --- a/PROMS/Formats/frmFormatCopy.cs +++ b/PROMS/Formats/frmFormatCopy.cs @@ -147,7 +147,8 @@ namespace Formats } Properties.Settings.Default.FormatPath = txbxPROMSFormatsPath.Text.Substring(0,txbxPROMSFormatsPath.Text.Length-1); // save the copy format path minus the ending backslash Properties.Settings.Default.Save(); - if(MessageBox.Show("Do you want to end the Format Copier?","Formats Copied.", MessageBoxButtons.YesNo, MessageBoxIcon.Question)== DialogResult.Yes)Application.Exit(); + //if(MessageBox.Show("Do you want to end the Format Copier?","Formats Copied.", MessageBoxButtons.YesNo, MessageBoxIcon.Question)== DialogResult.Yes) + Application.Exit(); } private void buttonX2_Click(object sender, EventArgs e) diff --git a/PROMS/Formats/genmacall/VEGP2.svg b/PROMS/Formats/genmacall/VEGP2.svg index 8c0166db..c325606c 100644 Binary files a/PROMS/Formats/genmacall/VEGP2.svg and b/PROMS/Formats/genmacall/VEGP2.svg differ diff --git a/PROMS/Formats/genmacall/VEGPAlr.svg b/PROMS/Formats/genmacall/VEGPAlr.svg index 6c035692..615b2166 100644 Binary files a/PROMS/Formats/genmacall/VEGPAlr.svg and b/PROMS/Formats/genmacall/VEGPAlr.svg differ diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs index b9c96d5c..d4cf5397 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs +++ b/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(@" -1) return prefix + Regex.Replace(str, @"\<[uU]-[a-zA-Z]+\>", fromunitdes);