diff --git a/PROMS/Formats/fmtall/BVPS1all.xml b/PROMS/Formats/fmtall/BVPS1all.xml index 6e2aab97..6a3c5585 100644 Binary files a/PROMS/Formats/fmtall/BVPS1all.xml and b/PROMS/Formats/fmtall/BVPS1all.xml differ diff --git a/PROMS/Formats/fmtall/BVPS2all.xml b/PROMS/Formats/fmtall/BVPS2all.xml index 90971a8b..b3d33dac 100644 Binary files a/PROMS/Formats/fmtall/BVPS2all.xml and b/PROMS/Formats/fmtall/BVPS2all.xml differ diff --git a/PROMS/Formats/fmtall/BVPSAOPall.xml b/PROMS/Formats/fmtall/BVPSAOPall.xml index a25e41e1..b51753e3 100644 Binary files a/PROMS/Formats/fmtall/BVPSAOPall.xml and b/PROMS/Formats/fmtall/BVPSAOPall.xml differ diff --git a/PROMS/Formats/fmtall/BVPSAtchall.xml b/PROMS/Formats/fmtall/BVPSAtchall.xml index 7a6bac26..3d1d4595 100644 Binary files a/PROMS/Formats/fmtall/BVPSAtchall.xml and b/PROMS/Formats/fmtall/BVPSAtchall.xml differ diff --git a/PROMS/Formats/fmtall/BVPSBCKall.xml b/PROMS/Formats/fmtall/BVPSBCKall.xml index 13d90216..778c12a4 100644 Binary files a/PROMS/Formats/fmtall/BVPSBCKall.xml and b/PROMS/Formats/fmtall/BVPSBCKall.xml differ diff --git a/PROMS/Formats/fmtall/BVPSDEVall.xml b/PROMS/Formats/fmtall/BVPSDEVall.xml index 5aa1a90e..9552171d 100644 Binary files a/PROMS/Formats/fmtall/BVPSDEVall.xml and b/PROMS/Formats/fmtall/BVPSDEVall.xml differ diff --git a/PROMS/Formats/fmtall/BVPSFlexDEVall.xml b/PROMS/Formats/fmtall/BVPSFlexDEVall.xml index 53162623..d9df9932 100644 Binary files a/PROMS/Formats/fmtall/BVPSFlexDEVall.xml and b/PROMS/Formats/fmtall/BVPSFlexDEVall.xml differ diff --git a/PROMS/Formats/fmtall/BVPSNIBCKall.xml b/PROMS/Formats/fmtall/BVPSNIBCKall.xml index db96f397..2a2df37b 100644 Binary files a/PROMS/Formats/fmtall/BVPSNIBCKall.xml and b/PROMS/Formats/fmtall/BVPSNIBCKall.xml differ diff --git a/PROMS/Formats/fmtall/BVPSSAMGBCKall.xml b/PROMS/Formats/fmtall/BVPSSAMGBCKall.xml index 25fdb768..fa1ef0c9 100644 Binary files a/PROMS/Formats/fmtall/BVPSSAMGBCKall.xml and b/PROMS/Formats/fmtall/BVPSSAMGBCKall.xml differ diff --git a/PROMS/Formats/fmtall/BVPSSAMGDEVall.xml b/PROMS/Formats/fmtall/BVPSSAMGDEVall.xml index bad43d2d..3244d6e4 100644 Binary files a/PROMS/Formats/fmtall/BVPSSAMGDEVall.xml and b/PROMS/Formats/fmtall/BVPSSAMGDEVall.xml differ diff --git a/PROMS/Formats/fmtall/BVPSSAMGall.xml b/PROMS/Formats/fmtall/BVPSSAMGall.xml index a632db64..1b4db53f 100644 Binary files a/PROMS/Formats/fmtall/BVPSSAMGall.xml and b/PROMS/Formats/fmtall/BVPSSAMGall.xml differ diff --git a/PROMS/Formats/fmtall/VEGP1all.xml b/PROMS/Formats/fmtall/VEGP1all.xml index 6640b2c8..bd66c817 100644 Binary files a/PROMS/Formats/fmtall/VEGP1all.xml and b/PROMS/Formats/fmtall/VEGP1all.xml differ diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index cc85c74e..d2422fdc 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 0387eccb..39b977a4 100644 Binary files a/PROMS/Formats/fmtall/VEGPAlrall.xml and b/PROMS/Formats/fmtall/VEGPAlrall.xml differ diff --git a/PROMS/Formats/fmtall/VEGPBckStpsall.xml b/PROMS/Formats/fmtall/VEGPBckStpsall.xml index afdfb3c2..8f3214a0 100644 Binary files a/PROMS/Formats/fmtall/VEGPBckStpsall.xml and b/PROMS/Formats/fmtall/VEGPBckStpsall.xml differ diff --git a/PROMS/Formats/fmtall/VEGPBckall.xml b/PROMS/Formats/fmtall/VEGPBckall.xml index a0005ced..0e560e48 100644 Binary files a/PROMS/Formats/fmtall/VEGPBckall.xml and b/PROMS/Formats/fmtall/VEGPBckall.xml differ diff --git a/PROMS/Formats/genmacall/VEGP2.svg b/PROMS/Formats/genmacall/VEGP2.svg index ea6cf7c3..dcd1c501 100644 Binary files a/PROMS/Formats/genmacall/VEGP2.svg and b/PROMS/Formats/genmacall/VEGP2.svg differ diff --git a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs index 699a2c37..cb715cd3 100644 --- a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs +++ b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs @@ -44,8 +44,11 @@ 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.2402.616")] -[assembly: AssemblyFileVersion("2.1.2402.616")] +[assembly: AssemblyVersion("2.1.2402.2213")] +[assembly: AssemblyFileVersion("2.1.2402.2213")] + + + diff --git a/PROMS/VEPROMS User Interface/dlgExportImport.cs b/PROMS/VEPROMS User Interface/dlgExportImport.cs index 7a44c9ba..66cd2489 100644 --- a/PROMS/VEPROMS User Interface/dlgExportImport.cs +++ b/PROMS/VEPROMS User Interface/dlgExportImport.cs @@ -4173,7 +4173,19 @@ namespace VEPROMS if (glookFor != greplaceWith) { - content.MyGrid.Data = content.MyGrid.Data.Replace(glookFor, greplaceWith); + // B2024-011: For unit RO in grid, old grid data had the ROID in the #Link:ReferencedObject ending in '0000' + // so when compared with the newer format "0041" it was not found and not replaced with updated rousageid + bool hasNewROID = (content.MyGrid.Data.Contains(glookFor)); + if (hasNewROID) + content.MyGrid.Data = content.MyGrid.Data.Replace(glookFor, greplaceWith); + else if (!hasNewROID && glookFor.Contains("0041") && glookFor.Contains("FFFF")) + { + string newGlookFor = glookFor; + newGlookFor = newGlookFor.Replace("0041", "0000"); + if (content.MyGrid.Data.Contains(newGlookFor)) + content.MyGrid.Data = content.MyGrid.Data.Replace(newGlookFor, greplaceWith); + + } } } }