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..7351ae12 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/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); + + } } } }