Compare commits
No commits in common. "a2aaba788630a082ee4f4f00b6b9495bf2759198" and "8e0b0ce2a7651b2ad60df6669cc5d6f24d78f2ef" have entirely different histories.
a2aaba7886
...
8e0b0ce2a7
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -147,8 +147,7 @@ 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)
|
||||
|
Binary file not shown.
Binary file not shown.
@ -44,10 +44,8 @@ using System.Runtime.InteropServices;
|
||||
// Revision DHH (day - no leading zero, two digit hour - military time
|
||||
//
|
||||
// ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ********
|
||||
[assembly: AssemblyVersion("2.1.2307.2515")]
|
||||
[assembly: AssemblyFileVersion("2.1.2307.2515")]
|
||||
|
||||
|
||||
[assembly: AssemblyVersion("2.1.2306.2214")]
|
||||
[assembly: AssemblyFileVersion("2.1.2306.2214")]
|
||||
|
||||
|
||||
|
||||
|
@ -528,11 +528,9 @@ 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.
|
||||
// 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)
|
||||
if (DocVersionConfig.SelectedSlave > 0)
|
||||
{
|
||||
prefix = units[0].Replace("#", "");
|
||||
if (str.ToUpper().IndexOf(@"<U-") > -1) return prefix + Regex.Replace(str, @"\<[uU]-[a-zA-Z]+\>", fromunitdes);
|
||||
|
Loading…
x
Reference in New Issue
Block a user