Version 1.4.4.0

MultiTool.Common/Documents/DocumentLoader.vb

@@ -98,8 +98,8 @@ Namespace Documents
                 oDocument = LoadDocumentData(oDocument, pTemplate, TemplateConfig)
 
             Catch ex As Exception
-                Throw ex
                 Logger.Error(ex)
+                Throw ex
 
             End Try
 
@@ -107,8 +107,8 @@ Namespace Documents
                 oDocument = Await MatchDataFromWinLine(oDocument, Winline.Mandators, pMandator, pTemplate)
 
             Catch ex As Exception
-                Throw ex
                 Logger.Error(ex)
+                Throw ex
 
             End Try
 
@@ -116,8 +116,8 @@ Namespace Documents
                 oDocument = MarkRequiredFields(oDocument)
 
             Catch ex As Exception
-                Throw ex
                 Logger.Error(ex)
+                Throw ex
 
             End Try
 

MultiTool.Common/Winline/WinlineData.vb

@@ -89,7 +89,8 @@ Namespace Winline
                     [c075] -- EAN
                     FROM [{pMandator.Server}].[{pMandator.Database}].[dbo].[v021] 
                     WHERE 
-                    mesocomp = '{pMandator.Id}' AND mesoyear = {oYear}"
+                    c038 IS NULL -- Nur Aktive Artikel
+                    AND mesocomp = '{pMandator.Id}' AND mesoyear = {oYear}"
 
                 Dim oTable = Await Database.GetDatatableAsync(oSQL)
                 Dim oArticles As New List(Of Article)
@@ -531,7 +532,7 @@ Namespace Winline
                     FROM [{pMandator.Database}].[dbo].[v021]
                     WHERE 
                     [c075] = '{pEAN}'
-                    AND [c038] IS NULL -- Aktiv
+                    AND [c038] IS NULL -- Nur Aktive Artikel
                     AND [mesocomp] = '{pMandator.Id}' AND [mesoyear] = {oYear}"
                 Dim oTable As DataTable = Database.GetDatatable(oSQL)
 
@@ -636,6 +637,7 @@ Namespace Winline
                     [c123]  -- Ersatzartikelnummer
                     FROM [{pMandator.Database}].[dbo].[v021]
                     WHERE [c011] = '{pArticleNumber}'
+                    AND c038 IS NULL -- Nur Aktive Artikel
                     AND [mesocomp] = '{pMandator.Id}' AND [mesoyear] = {oYear}"
                 Dim oTable As DataTable = Database.GetDatatable(oSQL)
 

MultiTool.Form/My Project/AssemblyInfo.vb

@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("WebService Multitool")>
 <Assembly: AssemblyCopyright("Copyright © 2023")>
-<Assembly: AssemblyTrademark("1.4.3.0")>
+<Assembly: AssemblyTrademark("1.4.4.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' indem Sie "*" wie unten gezeigt eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.4.3.0")>
+<Assembly: AssemblyVersion("1.4.4.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>

MultiTool.Form/frmConfig.vb

@@ -192,18 +192,22 @@ Public Class frmConfig
     Private Sub GridViewTables_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles GridViewTables.FocusedRowChanged
         Try
             If GridViewTables.FocusedRowHandle < 0 Then
+                Logger.Debug("No row selected. Exiting.")
                 Exit Sub
             End If
 
             Dim oRow As DataRow = GridViewTables.GetDataRow(GridViewTables.FocusedRowHandle)
 
             If oRow Is Nothing Then
+                Logger.Debug("Invalid row handle. Exiting.")
                 Exit Sub
             End If
 
             Dim oTableId = oRow.Item("GUID")
+            Logger.Debug("Loading Items for Table [{0}]", oTableId)
             TBMT_TEMPLATE_ITEMSTableAdapter.Fill(DS_DD_ECM.TBMT_TEMPLATE_ITEMS, oTableId)
         Catch ex As Exception
+            Logger.Error(ex)
             FormHelper.ShowError(ex, "Laden der Tabelle")
         End Try
     End Sub