clean up

MultiTool.Common/Winline/WinlineData.vb

@@ -78,8 +78,7 @@ Namespace Winline
                     [c075] -- EAN
                     FROM [{pMandator.Server}].[{pMandator.Database}].[dbo].[v021] 
                     WHERE 
-                    mesocomp = '{pMandator.Id}'
+                    mesocomp = '{pMandator.Id}' AND mesoyear = {oYear}"
-                    AND mesoyear = {oYear}"
 
                 Dim oTable = Await Database.GetDatatableAsync(oSQL)
                 Dim oArticles As New List(Of Article)
@@ -511,7 +510,9 @@ Namespace Winline
                     [c075], -- EAN-Nummer 
                     [c123]  -- Ersatzartikelnummer
                     FROM [{pMandator.Database}].[dbo].[v021]
-                    WHERE [c075] = '{pEAN}'
+                    WHERE 
+                    [c075] = '{pEAN}'
+                    AND [c038] IS NULL -- Aktiv
                     AND [mesocomp] = '{pMandator.Id}' AND [mesoyear] = {oYear}"
                 Dim oTable As DataTable = Database.GetDatatable(oSQL)
 
@@ -678,6 +679,7 @@ Namespace Winline
                         [c123]  -- Ersatzartikelnummer
                         FROM [{oMandator.Database}].[dbo].[v021]
                         WHERE [c075] = '{oEANNumber}'
+                        AND [c038] IS NULL
                         AND [mesocomp] = '{oMandator.Id}' AND [mesoyear] = {oYear}"
                     Dim oTable As DataTable = Database.GetDatatable(oSQL)
 
@@ -928,19 +930,19 @@ Namespace Winline
                 FirstOrDefault()
 
             Select Case oDocumentType
-                Case 1
+                Case 1, -1
                     oDocumentNumber = pDataRow.Item("OFFER_NUMBER")
                     oDocumentDate = pDataRow.Item("OFFER_DATE")
                     oDocumentDateColumn = "c027"
-                Case 2
+                Case 2, -2
                     oDocumentNumber = pDataRow.Item("ORDER_NUMBER")
                     oDocumentDate = pDataRow.Item("ORDER_DATE")
                     oDocumentDateColumn = "c028"
-                Case 3
+                Case 3, -3
                     oDocumentNumber = pDataRow.Item("DELIVERY_NUMBER")
                     oDocumentDate = pDataRow.Item("DELIVERY_DATE")
                     oDocumentDateColumn = "c029"
-                Case 4
+                Case 4, -4
                     oDocumentNumber = pDataRow.Item("INVOICE_NUMBER")
                     oDocumentDate = pDataRow.Item("INVOICE_DATE")
                     oDocumentDateColumn = "c032"

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 © 2022")>
-<Assembly: AssemblyTrademark("1.2.9.2")>
+<Assembly: AssemblyTrademark("1.2.9.3")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' indem Sie "*" wie unten gezeigt eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.2.9.2")>
+<Assembly: AssemblyVersion("1.2.9.3")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>

MultiTool.Form/frmExportMain.Designer.vb

@@ -264,6 +264,7 @@ Partial Class frmExportMain
         Me.GridViewDocuments.OptionsSelection.CheckBoxSelectorField = "IsSelected"
         Me.GridViewDocuments.OptionsSelection.MultiSelect = True
         Me.GridViewDocuments.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect
+        Me.GridViewDocuments.SortInfo.AddRange(New DevExpress.XtraGrid.Columns.GridColumnSortInfo() {New DevExpress.XtraGrid.Columns.GridColumnSortInfo(Me.colNumber, DevExpress.Data.ColumnSortOrder.Descending)})
         '
         'colImported
         '