Improve Error coloring and conditions

MultiTool.Form/MultiTool.Form.vbproj

@@ -325,6 +325,7 @@
   <ItemGroup>
     <Content Include="CREATE_DATABASE.sql" />
     <Content Include="MultiTool.ico" />
+    <None Include="Resources\actions_delete.svg" />
     <None Include="Resources\support.svg" />
     <None Include="Resources\actions_send3.svg" />
     <None Include="Resources\squarified.svg" />

MultiTool.Form/My Project/Resources.Designer.vb

@@ -100,6 +100,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property actions_delete() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("actions_delete", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>

MultiTool.Form/My Project/Resources.resx

@@ -145,9 +145,6 @@
   <data name="actions_send3" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_send3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="rotatecounterclockwise" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\rotatecounterclockwise.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="preview" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\preview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
@@ -169,11 +166,14 @@
   <data name="squarified" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\squarified.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="actions_reload" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_reload.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="open21" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\open21.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="itemtypechecked" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="parameters" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\parameters.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="bo_product" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bo_product.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -181,8 +181,8 @@
   <data name="paymentrefund" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\paymentrefund.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="open1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="support" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\open1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\support.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="bo_unknown" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bo_unknown.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -202,8 +202,8 @@
   <data name="singlepageview" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="parameters" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="open1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\parameters.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\open1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="export" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\export.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -214,8 +214,8 @@
   <data name="bo_validation" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bo_validation.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_reload" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="rotatecounterclockwise" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_reload.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\rotatecounterclockwise.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="actions_deletecircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -223,6 +223,9 @@
   <data name="actions_arrow4down" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_arrow4down.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="actions_checkcircled1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_checkcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
@@ -259,10 +262,10 @@
   <data name="resetview" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\resetview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_checkcircled1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="itemtypechecked" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_checkcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="support" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="actions_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\support.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\actions_delete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
 </root>

MultiTool.Form/Resources/actions_delete.svg

@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Blue{fill:#1177D7;}
+	.Yellow{fill:#FFB115;}
+	.Black{fill:#727272;}
+	.Green{fill:#039C23;}
+	.Red{fill:#D11C1C;}
+	.st0{opacity:0.75;}
+	.st1{opacity:0.5;}
+</style>
+  <g id="Delete">
+    <g>
+      <path d="M18.8,16l6.9-6.9c0.4-0.4,0.4-1,0-1.4l-1.4-1.4c-0.4-0.4-1-0.4-1.4,0L16,13.2L9.1,6.3c-0.4-0.4-1-0.4-1.4,0    L6.3,7.7c-0.4,0.4-0.4,1,0,1.4l6.9,6.9l-6.9,6.9c-0.4,0.4-0.4,1,0,1.4l1.4,1.4c0.4,0.4,1,0.4,1.4,0l6.9-6.9l6.9,6.9    c0.4,0.4,1,0.4,1.4,0l1.4-1.4c0.4-0.4,0.4-1,0-1.4L18.8,16z" class="Red" />
+    </g>
+    <g>
+      <path d="M18.8,16l6.9-6.9c0.4-0.4,0.4-1,0-1.4l-1.4-1.4c-0.4-0.4-1-0.4-1.4,0L16,13.2L9.1,6.3c-0.4-0.4-1-0.4-1.4,0    L6.3,7.7c-0.4,0.4-0.4,1,0,1.4l6.9,6.9l-6.9,6.9c-0.4,0.4-0.4,1,0,1.4l1.4,1.4c0.4,0.4,1,0.4,1.4,0l6.9-6.9l6.9,6.9    c0.4,0.4,1,0.4,1.4,0l1.4-1.4c0.4-0.4,0.4-1,0-1.4L18.8,16z" class="Red" />
+    </g>
+  </g>
+</svg>

MultiTool.Form/frmImportMain.vb

@@ -219,6 +219,9 @@ Public Class frmImportMain
 
                 CurrentDocument.Rows.Item(oIndex) = oModifiedRow
                 LoadDocument(CurrentDocument)
+
+                ' Refresh Files to update Row color
+                GridViewFiles.RefreshData()
             End If
         Catch ex As Exception
             FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Laden_der_Detailzeilen)

MultiTool.Form/frmRowEditor.Designer.vb

@@ -24,6 +24,7 @@ Partial Class frmRowEditor
         Me.btnSave = New DevExpress.XtraBars.BarButtonItem()
         Me.btnApplyFromWinline = New DevExpress.XtraBars.BarButtonItem()
         Me.btnApplyFromOriginal = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnClearValue = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -44,9 +45,9 @@ Partial Class frmRowEditor
         '
         Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnSave, Me.btnApplyFromWinline, Me.btnApplyFromOriginal})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnSave, Me.btnApplyFromWinline, Me.btnApplyFromOriginal, Me.btnClearValue})
         Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl1.MaxItemId = 4
+        Me.RibbonControl1.MaxItemId = 5
         Me.RibbonControl1.Name = "RibbonControl1"
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
         Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -75,6 +76,13 @@ Partial Class frmRowEditor
         Me.btnApplyFromOriginal.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.redo
         Me.btnApplyFromOriginal.Name = "btnApplyFromOriginal"
         '
+        'btnClearValue
+        '
+        Me.btnClearValue.Caption = "Wert leeren"
+        Me.btnClearValue.Id = 4
+        Me.btnClearValue.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_delete
+        Me.btnClearValue.Name = "btnClearValue"
+        '
         'RibbonPage1
         '
         Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2})
@@ -91,6 +99,7 @@ Partial Class frmRowEditor
         '
         Me.RibbonPageGroup2.ItemLinks.Add(Me.btnApplyFromWinline)
         Me.RibbonPageGroup2.ItemLinks.Add(Me.btnApplyFromOriginal)
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.btnClearValue)
         Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
         Me.RibbonPageGroup2.Text = "RibbonPageGroup2"
         '
@@ -206,4 +215,5 @@ Partial Class frmRowEditor
     Friend WithEvents btnApplyFromWinline As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents btnApplyFromOriginal As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents btnClearValue As DevExpress.XtraBars.BarButtonItem
 End Class

MultiTool.Form/frmRowEditor.vb

@@ -155,25 +155,28 @@ Public Class frmRowEditor
                 End If
 
                 Dim oFieldValue As FieldValue = oField.Value
-                Dim oGridValue As String = Utils.NotNull(oRow.Item(COL_VALUE_FINAL), String.Empty)
+                Dim oValueFromGrid As String = Utils.NotNull(oRow.Item(COL_VALUE_FINAL), String.Empty)
 
-                If oField.Key = "Datum_Auftrag-Bestellung" And oGridValue.Length > 0 Then
+                ' Do the dirtiest date validation of all times
-                    If TryParseDate(oGridValue) Is Nothing Then
+                If oField.Value.DataType = ColumnType.Date And oValueFromGrid.Length > 0 Then
+                    If TryParseDate(oValueFromGrid) Is Nothing Then
                         MsgBox(String.Format(My.Resources.frmRowEditorExtra.Datumswert_für___0___enthält_einen_ungüligen_Wert, oField.Key), MsgBoxStyle.Exclamation, Text)
                         Exit Sub
                     End If
                 End If
 
-                If Not oFieldValue.Final.Equals(oGridValue) Then
+                ' If the value was changed
-                    Dim oValue = Utils.NotNull(oRow.Item(COL_VALUE_FINAL), String.Empty).ToString
+                If Not oFieldValue.Final.Equals(oValueFromGrid) Then
-
                     ' If new value is not empty, any error will be removed.
                     ' Could cause problems in the future because a value might not equal to 'no error'.
-                    If oValue <> String.Empty Then
+                    ' 03.12.21: For now we always remove the error if ANYTHING changed about the field
-                        oFieldValue.Error = FieldError.None
+                    'If oValueFromGrid <> String.Empty Then
-                    End If
+                    '    oFieldValue.Error = FieldError.None
+                    'End If
+                    oFieldValue.Error = FieldError.None
 
-                    oFieldValue.Final = oValue.Trim()
+                    ' Save the grid value to the Field
+                    oFieldValue.Final = oValueFromGrid.Trim()
 
                     If _DocumentRow.Fields.ContainsKey(oField.Key) Then
                         _DocumentRow.Fields.Item(oField.Key) = oFieldValue
@@ -208,16 +211,32 @@ Public Class frmRowEditor
         CopyValueToFinalColumn(COL_VALUE_ORIGINAL)
     End Sub
 
-    Private Sub CopyValueToFinalColumn(pSourceColumnName As String)
+    Private Sub btnClearValue_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnClearValue.ItemClick
+        CopyValueToFinalColumn(String.Empty)
+    End Sub
+
+    Private Sub CopyValueToFinalColumn(pSourceColumnNameOrValue As String)
         Dim oSelectedRow As DataRow = GridView1.GetDataRow(GridView1.FocusedRowHandle)
 
         If oSelectedRow Is Nothing Then
             Exit Sub
         End If
 
-        oSelectedRow.Item(COL_VALUE_FINAL) = oSelectedRow.Item(pSourceColumnName)
+        Select Case pSourceColumnNameOrValue
+            Case COL_VALUE_EXTERNAL
+                oSelectedRow.Item(COL_VALUE_FINAL) = oSelectedRow.Item(pSourceColumnNameOrValue)
+
+            Case COL_VALUE_ORIGINAL
+                oSelectedRow.Item(COL_VALUE_FINAL) = oSelectedRow.Item(pSourceColumnNameOrValue)
+
+            Case Else
+                oSelectedRow.Item(COL_VALUE_FINAL) = pSourceColumnNameOrValue
+
+        End Select
+
         oSelectedRow.AcceptChanges()
         GridView1.CloseEditor()
+        GridView1.RefreshData()
     End Sub
 
     Private Sub GridView1_CustomRowCellEdit(sender As Object, e As CustomRowCellEditEventArgs) Handles GridView1.CustomRowCellEdit
@@ -261,7 +280,7 @@ Public Class frmRowEditor
     Private Sub GridView1_CustomDrawCell(sender As Object, e As DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventArgs) Handles GridView1.CustomDrawCell
         Dim oDataRow As DataRow = GridView1.GetDataRow(e.RowHandle)
         Dim oKey As String = oDataRow.Item(COL_KEY)
-        Dim oValue As String = oDataRow.Item(COL_VALUE_FINAL)
+        Dim oValue As String = Utils.NotNull(oDataRow.Item(COL_VALUE_FINAL), String.Empty)
         Dim oColumn = _Table.Columns.
             Where(Function(c) c.Name = oKey).
             SingleOrDefault()
@@ -279,11 +298,20 @@ Public Class frmRowEditor
             If oField.Value.HasError Then
                 e.Appearance.BackColor = Color.LightCoral
             End If
+
+            ' TODO: Remove this workaround if the conditions for errors are good now
+            'If e.DisplayText = String.Empty And (
+            '    oField.Value.Error = FieldError.AccountNotFound Or
+            '    oField.Value.Error = FieldError.ArticleNotFound) Then
+            '    e.Appearance.BackColor = Color.LightCoral
+            'End If
         End If
 
-        If oField.Value.HasError Then
+
-            e.Appearance.BackColor = Color.LightCoral
+
-        End If
+        'If oField.Value.HasError Then
+        '    e.Appearance.BackColor = Color.LightCoral
+        'End If
     End Sub
 End Class
 

MultiTool.Shared/Documents/DocumentRow.vb

@@ -62,9 +62,11 @@
 
             Public ReadOnly Property HasError As Boolean
                 Get
-                    Return IsRequired = True And (
+                    Return [Error] <> FieldError.None Or (IsRequired And Final = String.Empty)
-                        [Error] <> FieldError.None Or Final = String.Empty
+
-                    )
+                    'Return IsRequired = True And (
+                    '    [Error] <> FieldError.None Or Final = String.Empty
+                    ')
                 End Get
             End Property
 

MultiTool.Shared/Winline/WebServiceData.vb

@@ -117,17 +117,19 @@ Namespace Winline
                         Dim oResponseObject As Templates.Entities.MESOWebServiceResult = oSerializer.Deserialize(oStream)
                         Dim oErrorStrings As New List(Of String)
 
-                        For Each oDetails As Templates.Entities.MESOWebServiceResultResultDetails In oResponseObject.ResultDetails
+                        If oResponseObject.ResultDetails IsNot Nothing Then
+                            For Each oDetails As Templates.Entities.MESOWebServiceResultResultDetails In oResponseObject.ResultDetails
 
-                            If oDetails.Success = True Then
+                                If oDetails.Success = True Then
-                                Logger.Info("KeyValue: [{0}]", oDetails.KeyValue)
+                                    Logger.Info("KeyValue: [{0}]", oDetails.KeyValue)
-                                Logger.Info("VoucherNumber: [{0}]", oDetails.VoucherNumber)
+                                    Logger.Info("VoucherNumber: [{0}]", oDetails.VoucherNumber)
-                            Else
+                                Else
-                                Logger.Warn("ErrorCode: [{0}]", oDetails.ErrorCode)
+                                    Logger.Warn("ErrorCode: [{0}]", oDetails.ErrorCode)
-                                Logger.Warn("ErrorText: [{0}]", oDetails.ErrorText)
+                                    Logger.Warn("ErrorText: [{0}]", oDetails.ErrorText)
-                                oErrorStrings.Add($"[{oDetails.ErrorCode}] {oDetails.ErrorText}")
+                                    oErrorStrings.Add($"[{oDetails.ErrorCode}] {oDetails.ErrorText}")
-                            End If
+                                End If
-                        Next
+                            Next
+                        End If
 
                         If oResponseObject.OverallSuccess = False Then
                             Dim oMessage = $"Request to Webservice was unsuccessful:{vbNewLine}{vbNewLine}{String.Join(vbNewLine, oErrorStrings.ToArray)}"