diff --git a/.vs/MC_SUPPLYWATCH/v15/.suo b/.vs/MC_SUPPLYWATCH/v15/.suo index 392c8bf..b702b4a 100644 Binary files a/.vs/MC_SUPPLYWATCH/v15/.suo and b/.vs/MC_SUPPLYWATCH/v15/.suo differ diff --git a/.vs/Supplywatch/v15/.suo b/.vs/Supplywatch/v15/.suo index 70ae190..4e1b923 100644 Binary files a/.vs/Supplywatch/v15/.suo and b/.vs/Supplywatch/v15/.suo differ diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..904ba1b --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,7 @@ +{ + "ExpandedNodes": [ + "" + ], + "SelectedNode": "\\MC_SUPPLYWATCH.sln", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index f8a8b61..dd57552 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/Supplywatch/FMMain.resx b/Supplywatch/FMMain.resx index f455c50..981d394 100644 --- a/Supplywatch/FMMain.resx +++ b/Supplywatch/FMMain.resx @@ -267,9 +267,6 @@ 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== - - 17, 17 - 975, 602 @@ -1016,7 +1013,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA2 - CwAAAk1TRnQBSQFMAgEBAwEAAYABIQGAASEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CwAAAk1TRnQBSQFMAgEBAwEAAYgBIQGIASEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/Supplywatch/FMMain.vb b/Supplywatch/FMMain.vb index 02ad2d7..0d2237c 100644 --- a/Supplywatch/FMMain.vb +++ b/Supplywatch/FMMain.vb @@ -540,7 +540,7 @@ Public Class FMMain Gesamtfiles = 0 Dim diPfad As New IO.DirectoryInfo(pathBestellungen) For Each file As IO.FileInfo In diPfad.GetFiles() - If file.Name.EndsWith(".xls") Then + If file.Name.ToUpper.EndsWith(".XLS") Then Gesamtfiles = Gesamtfiles + 1 End If Next @@ -557,7 +557,7 @@ Public Class FMMain Dim Counter As Integer = 0 For Each file As IO.FileInfo In diPfad.GetFiles() ' Dim vDatum As String = "" - If file.Name.EndsWith(".xls") Then + If file.Name.ToUpper.EndsWith(".XLS") Then Anzahl_Dateien = Anzahl_Dateien + 1 Progress += 25 'bwXMLverarbeiten.ReportProgress(Progress) @@ -682,11 +682,11 @@ Public Class FMMain Dim value As New String(_VAS) _VAS = value If chkLogData.Checked Then - Dim msg = "Device: '" & _gerät & "'" & vbNewLine & _ - "Serial: '" & _seriennr & "'" & vbNewLine & _ - "Markt: '" & _markt & "'" & vbNewLine & _ - "OrderSupplyID: '" & _BestellSupplyID & "'" & vbNewLine & _ - "Supply: '" & _gerät & "'" & vbNewLine & _ + Dim msg = "Device: '" & _gerät & "'" & vbNewLine & + "Serial: '" & _seriennr & "'" & vbNewLine & + "Markt: '" & _markt & "'" & vbNewLine & + "OrderSupplyID: '" & _BestellSupplyID & "'" & vbNewLine & + "Supply: '" & _gerät & "'" & vbNewLine & "VAS#: '" & _VAS & "'" ClassLogger.Add(msg, False) End If @@ -739,7 +739,7 @@ Public Class FMMain Next End If - + End If 'For Each DC In DT.Columns @@ -767,8 +767,8 @@ Public Class FMMain 'Instanz des DataSet-Objektes instanzieren Dim ds As New DataSet 'Verbindungszeichenfolge festlegen, der Name der Excel-Datei wird als Parameter übergeben - Dim con As String = "Provider=Microsoft.Jet.OLEDB.4.0;Data Source=" & filepath & ";" & _ - "Extended Properties=""Excel 8.0;""" + Dim con As String = "Provider=Microsoft.Jet.OLEDB.4.0;Data Source=" & filepath & ";" & + "Extended Properties=""Excel 8.0;HDR=YES;""" Dim da As New OleDb.OleDbDataAdapter("SELECT * FROM [" & My.Settings.SheetnameBestellung & "$]", con) 'DataSet füllen da.Fill(ds) @@ -778,6 +778,14 @@ Public Class FMMain Return ds Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei XLSReader:") + Dim newcon As String = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=" + filepath + ";Extended Properties=Excel 12.0;"";" + Dim da As New OleDb.OleDbDataAdapter("SELECT * FROM [" & My.Settings.SheetnameBestellung & "$]", newcon) + 'DataSet füllen + Dim ds As New DataSet + da.Fill(ds) + Dim DT As System.Data.DataTable + DT = ds.Tables(0) + MsgBox("New Connectionw as established") Return Nothing End Try End Function @@ -2049,7 +2057,7 @@ Public Class FMMain Dim diPfad As New IO.DirectoryInfo(pathBestellungen) Dim _count As Integer = 0 For Each file As IO.FileInfo In diPfad.GetFiles() - If file.Name.EndsWith(".xls") Then + If file.Name.ToUpper.EndsWith(".XLS") Then _count = _count + 1 End If Next diff --git a/Supplywatch/My Project/licenses.licx b/Supplywatch/My Project/licenses.licx index 16b05ba..4308626 100644 --- a/Supplywatch/My Project/licenses.licx +++ b/Supplywatch/My Project/licenses.licx @@ -1 +1 @@ -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/Supplywatch/Supplywatch.vbproj b/Supplywatch/Supplywatch.vbproj index 099c54f..07f955a 100644 --- a/Supplywatch/Supplywatch.vbproj +++ b/Supplywatch/Supplywatch.vbproj @@ -71,13 +71,34 @@ My Project\app.manifest - - - - - - - + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Printing.v15.2.Core.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraEditors.v15.2.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraLayout.v15.2.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll + ..\packages\Microsoft.Reporting.WinForms.v11.1.0.0.0\lib\Microsoft.ReportViewer.Common.dll diff --git a/Supplywatch/bin/Debug/DevExpress.Data.v15.2.dll b/Supplywatch/bin/Debug/DevExpress.Data.v15.2.dll index 5eddfd4..45cb78b 100644 Binary files a/Supplywatch/bin/Debug/DevExpress.Data.v15.2.dll and b/Supplywatch/bin/Debug/DevExpress.Data.v15.2.dll differ diff --git a/Supplywatch/bin/Debug/DevExpress.Office.v15.2.Core.dll b/Supplywatch/bin/Debug/DevExpress.Office.v15.2.Core.dll index 3841cae..796563d 100644 Binary files a/Supplywatch/bin/Debug/DevExpress.Office.v15.2.Core.dll and b/Supplywatch/bin/Debug/DevExpress.Office.v15.2.Core.dll differ diff --git a/Supplywatch/bin/Debug/DevExpress.Pdf.v15.2.Core.dll b/Supplywatch/bin/Debug/DevExpress.Pdf.v15.2.Core.dll index 4fbaef9..d6f9665 100644 Binary files a/Supplywatch/bin/Debug/DevExpress.Pdf.v15.2.Core.dll and b/Supplywatch/bin/Debug/DevExpress.Pdf.v15.2.Core.dll differ diff --git a/Supplywatch/bin/Debug/DevExpress.Pdf.v15.2.Drawing.dll b/Supplywatch/bin/Debug/DevExpress.Pdf.v15.2.Drawing.dll index 0f47e43..5b422ae 100644 Binary files a/Supplywatch/bin/Debug/DevExpress.Pdf.v15.2.Drawing.dll and b/Supplywatch/bin/Debug/DevExpress.Pdf.v15.2.Drawing.dll differ diff --git a/Supplywatch/bin/Debug/DevExpress.Printing.v15.2.Core.dll b/Supplywatch/bin/Debug/DevExpress.Printing.v15.2.Core.dll index 758ee26..a69b831 100644 Binary files a/Supplywatch/bin/Debug/DevExpress.Printing.v15.2.Core.dll and b/Supplywatch/bin/Debug/DevExpress.Printing.v15.2.Core.dll differ diff --git a/Supplywatch/bin/Debug/DevExpress.RichEdit.v15.2.Core.dll b/Supplywatch/bin/Debug/DevExpress.RichEdit.v15.2.Core.dll index fc4fabb..36e7901 100644 Binary files a/Supplywatch/bin/Debug/DevExpress.RichEdit.v15.2.Core.dll and b/Supplywatch/bin/Debug/DevExpress.RichEdit.v15.2.Core.dll differ diff --git a/Supplywatch/bin/Debug/DevExpress.Sparkline.v15.2.Core.dll b/Supplywatch/bin/Debug/DevExpress.Sparkline.v15.2.Core.dll index 91cef04..d85fbb7 100644 Binary files a/Supplywatch/bin/Debug/DevExpress.Sparkline.v15.2.Core.dll and b/Supplywatch/bin/Debug/DevExpress.Sparkline.v15.2.Core.dll differ diff --git a/Supplywatch/bin/Debug/DevExpress.Utils.v15.2.dll b/Supplywatch/bin/Debug/DevExpress.Utils.v15.2.dll index f6cc257..00c40cd 100644 Binary files a/Supplywatch/bin/Debug/DevExpress.Utils.v15.2.dll and b/Supplywatch/bin/Debug/DevExpress.Utils.v15.2.dll differ diff --git a/Supplywatch/bin/Debug/DevExpress.XtraBars.v15.2.dll b/Supplywatch/bin/Debug/DevExpress.XtraBars.v15.2.dll index 21c1480..5ea854f 100644 Binary files a/Supplywatch/bin/Debug/DevExpress.XtraBars.v15.2.dll and b/Supplywatch/bin/Debug/DevExpress.XtraBars.v15.2.dll differ diff --git a/Supplywatch/bin/Debug/DevExpress.XtraEditors.v15.2.dll b/Supplywatch/bin/Debug/DevExpress.XtraEditors.v15.2.dll index a1be080..d646962 100644 Binary files a/Supplywatch/bin/Debug/DevExpress.XtraEditors.v15.2.dll and b/Supplywatch/bin/Debug/DevExpress.XtraEditors.v15.2.dll differ diff --git a/Supplywatch/bin/Debug/DevExpress.XtraGrid.v15.2.dll b/Supplywatch/bin/Debug/DevExpress.XtraGrid.v15.2.dll index f230824..e3dbba5 100644 Binary files a/Supplywatch/bin/Debug/DevExpress.XtraGrid.v15.2.dll and b/Supplywatch/bin/Debug/DevExpress.XtraGrid.v15.2.dll differ diff --git a/Supplywatch/bin/Debug/DevExpress.XtraLayout.v15.2.dll b/Supplywatch/bin/Debug/DevExpress.XtraLayout.v15.2.dll index e34cfc5..61f3aa0 100644 Binary files a/Supplywatch/bin/Debug/DevExpress.XtraLayout.v15.2.dll and b/Supplywatch/bin/Debug/DevExpress.XtraLayout.v15.2.dll differ diff --git a/Supplywatch/bin/Debug/DevExpress.XtraPrinting.v15.2.dll b/Supplywatch/bin/Debug/DevExpress.XtraPrinting.v15.2.dll index 4e93d50..43dd63e 100644 Binary files a/Supplywatch/bin/Debug/DevExpress.XtraPrinting.v15.2.dll and b/Supplywatch/bin/Debug/DevExpress.XtraPrinting.v15.2.dll differ diff --git a/Supplywatch/bin/Debug/DevExpress.XtraTreeList.v15.2.dll b/Supplywatch/bin/Debug/DevExpress.XtraTreeList.v15.2.dll index efd31ac..28b1a82 100644 Binary files a/Supplywatch/bin/Debug/DevExpress.XtraTreeList.v15.2.dll and b/Supplywatch/bin/Debug/DevExpress.XtraTreeList.v15.2.dll differ diff --git a/Supplywatch/bin/Debug/SUPPLYWATCH.exe b/Supplywatch/bin/Debug/SUPPLYWATCH.exe index 324a2ba..875fded 100644 Binary files a/Supplywatch/bin/Debug/SUPPLYWATCH.exe and b/Supplywatch/bin/Debug/SUPPLYWATCH.exe differ diff --git a/Supplywatch/bin/Debug/SUPPLYWATCH.pdb b/Supplywatch/bin/Debug/SUPPLYWATCH.pdb index b272c8c..48cc682 100644 Binary files a/Supplywatch/bin/Debug/SUPPLYWATCH.pdb and b/Supplywatch/bin/Debug/SUPPLYWATCH.pdb differ diff --git a/Supplywatch/bin/Debug/de/DevExpress.Data.v15.2.resources.dll b/Supplywatch/bin/Debug/de/DevExpress.Data.v15.2.resources.dll index 8d1eebd..750227c 100644 Binary files a/Supplywatch/bin/Debug/de/DevExpress.Data.v15.2.resources.dll and b/Supplywatch/bin/Debug/de/DevExpress.Data.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/de/DevExpress.Office.v15.2.Core.resources.dll b/Supplywatch/bin/Debug/de/DevExpress.Office.v15.2.Core.resources.dll index 48a6b89..13d360c 100644 Binary files a/Supplywatch/bin/Debug/de/DevExpress.Office.v15.2.Core.resources.dll and b/Supplywatch/bin/Debug/de/DevExpress.Office.v15.2.Core.resources.dll differ diff --git a/Supplywatch/bin/Debug/de/DevExpress.Pdf.v15.2.Core.resources.dll b/Supplywatch/bin/Debug/de/DevExpress.Pdf.v15.2.Core.resources.dll index ebf1950..d2b41af 100644 Binary files a/Supplywatch/bin/Debug/de/DevExpress.Pdf.v15.2.Core.resources.dll and b/Supplywatch/bin/Debug/de/DevExpress.Pdf.v15.2.Core.resources.dll differ diff --git a/Supplywatch/bin/Debug/de/DevExpress.Printing.v15.2.Core.resources.dll b/Supplywatch/bin/Debug/de/DevExpress.Printing.v15.2.Core.resources.dll index eec95c5..dfb414a 100644 Binary files a/Supplywatch/bin/Debug/de/DevExpress.Printing.v15.2.Core.resources.dll and b/Supplywatch/bin/Debug/de/DevExpress.Printing.v15.2.Core.resources.dll differ diff --git a/Supplywatch/bin/Debug/de/DevExpress.RichEdit.v15.2.Core.resources.dll b/Supplywatch/bin/Debug/de/DevExpress.RichEdit.v15.2.Core.resources.dll index 5a86983..a7b5fb9 100644 Binary files a/Supplywatch/bin/Debug/de/DevExpress.RichEdit.v15.2.Core.resources.dll and b/Supplywatch/bin/Debug/de/DevExpress.RichEdit.v15.2.Core.resources.dll differ diff --git a/Supplywatch/bin/Debug/de/DevExpress.Sparkline.v15.2.Core.resources.dll b/Supplywatch/bin/Debug/de/DevExpress.Sparkline.v15.2.Core.resources.dll index 8864173..bccfa77 100644 Binary files a/Supplywatch/bin/Debug/de/DevExpress.Sparkline.v15.2.Core.resources.dll and b/Supplywatch/bin/Debug/de/DevExpress.Sparkline.v15.2.Core.resources.dll differ diff --git a/Supplywatch/bin/Debug/de/DevExpress.Utils.v15.2.resources.dll b/Supplywatch/bin/Debug/de/DevExpress.Utils.v15.2.resources.dll index 1dc1093..1803b1c 100644 Binary files a/Supplywatch/bin/Debug/de/DevExpress.Utils.v15.2.resources.dll and b/Supplywatch/bin/Debug/de/DevExpress.Utils.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/de/DevExpress.XtraBars.v15.2.resources.dll b/Supplywatch/bin/Debug/de/DevExpress.XtraBars.v15.2.resources.dll index 4a0861f..c5cbac6 100644 Binary files a/Supplywatch/bin/Debug/de/DevExpress.XtraBars.v15.2.resources.dll and b/Supplywatch/bin/Debug/de/DevExpress.XtraBars.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/de/DevExpress.XtraEditors.v15.2.resources.dll b/Supplywatch/bin/Debug/de/DevExpress.XtraEditors.v15.2.resources.dll index 868c83c..fff35c9 100644 Binary files a/Supplywatch/bin/Debug/de/DevExpress.XtraEditors.v15.2.resources.dll and b/Supplywatch/bin/Debug/de/DevExpress.XtraEditors.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/de/DevExpress.XtraGrid.v15.2.resources.dll b/Supplywatch/bin/Debug/de/DevExpress.XtraGrid.v15.2.resources.dll index da8a895..6989343 100644 Binary files a/Supplywatch/bin/Debug/de/DevExpress.XtraGrid.v15.2.resources.dll and b/Supplywatch/bin/Debug/de/DevExpress.XtraGrid.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/de/DevExpress.XtraLayout.v15.2.resources.dll b/Supplywatch/bin/Debug/de/DevExpress.XtraLayout.v15.2.resources.dll index e2954fe..73244cc 100644 Binary files a/Supplywatch/bin/Debug/de/DevExpress.XtraLayout.v15.2.resources.dll and b/Supplywatch/bin/Debug/de/DevExpress.XtraLayout.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/de/DevExpress.XtraPrinting.v15.2.resources.dll b/Supplywatch/bin/Debug/de/DevExpress.XtraPrinting.v15.2.resources.dll index 7b60e3c..e0150a4 100644 Binary files a/Supplywatch/bin/Debug/de/DevExpress.XtraPrinting.v15.2.resources.dll and b/Supplywatch/bin/Debug/de/DevExpress.XtraPrinting.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/de/DevExpress.XtraTreeList.v15.2.resources.dll b/Supplywatch/bin/Debug/de/DevExpress.XtraTreeList.v15.2.resources.dll index 328700b..c7b2808 100644 Binary files a/Supplywatch/bin/Debug/de/DevExpress.XtraTreeList.v15.2.resources.dll and b/Supplywatch/bin/Debug/de/DevExpress.XtraTreeList.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/es/DevExpress.Data.v15.2.resources.dll b/Supplywatch/bin/Debug/es/DevExpress.Data.v15.2.resources.dll index e389ab5..eb8de1b 100644 Binary files a/Supplywatch/bin/Debug/es/DevExpress.Data.v15.2.resources.dll and b/Supplywatch/bin/Debug/es/DevExpress.Data.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/es/DevExpress.Office.v15.2.Core.resources.dll b/Supplywatch/bin/Debug/es/DevExpress.Office.v15.2.Core.resources.dll index 5069b13..90ca9c3 100644 Binary files a/Supplywatch/bin/Debug/es/DevExpress.Office.v15.2.Core.resources.dll and b/Supplywatch/bin/Debug/es/DevExpress.Office.v15.2.Core.resources.dll differ diff --git a/Supplywatch/bin/Debug/es/DevExpress.Pdf.v15.2.Core.resources.dll b/Supplywatch/bin/Debug/es/DevExpress.Pdf.v15.2.Core.resources.dll index 77abf22..a8dd79f 100644 Binary files a/Supplywatch/bin/Debug/es/DevExpress.Pdf.v15.2.Core.resources.dll and b/Supplywatch/bin/Debug/es/DevExpress.Pdf.v15.2.Core.resources.dll differ diff --git a/Supplywatch/bin/Debug/es/DevExpress.Printing.v15.2.Core.resources.dll b/Supplywatch/bin/Debug/es/DevExpress.Printing.v15.2.Core.resources.dll index 3d2792e..1340f91 100644 Binary files a/Supplywatch/bin/Debug/es/DevExpress.Printing.v15.2.Core.resources.dll and b/Supplywatch/bin/Debug/es/DevExpress.Printing.v15.2.Core.resources.dll differ diff --git a/Supplywatch/bin/Debug/es/DevExpress.RichEdit.v15.2.Core.resources.dll b/Supplywatch/bin/Debug/es/DevExpress.RichEdit.v15.2.Core.resources.dll index e6a4fc5..cca9020 100644 Binary files a/Supplywatch/bin/Debug/es/DevExpress.RichEdit.v15.2.Core.resources.dll and b/Supplywatch/bin/Debug/es/DevExpress.RichEdit.v15.2.Core.resources.dll differ diff --git a/Supplywatch/bin/Debug/es/DevExpress.Sparkline.v15.2.Core.resources.dll b/Supplywatch/bin/Debug/es/DevExpress.Sparkline.v15.2.Core.resources.dll index 12c6798..7e43c61 100644 Binary files a/Supplywatch/bin/Debug/es/DevExpress.Sparkline.v15.2.Core.resources.dll and b/Supplywatch/bin/Debug/es/DevExpress.Sparkline.v15.2.Core.resources.dll differ diff --git a/Supplywatch/bin/Debug/es/DevExpress.Utils.v15.2.resources.dll b/Supplywatch/bin/Debug/es/DevExpress.Utils.v15.2.resources.dll index eef34a3..ebb0cf6 100644 Binary files a/Supplywatch/bin/Debug/es/DevExpress.Utils.v15.2.resources.dll and b/Supplywatch/bin/Debug/es/DevExpress.Utils.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/es/DevExpress.XtraBars.v15.2.resources.dll b/Supplywatch/bin/Debug/es/DevExpress.XtraBars.v15.2.resources.dll index 73d4e7a..1706e17 100644 Binary files a/Supplywatch/bin/Debug/es/DevExpress.XtraBars.v15.2.resources.dll and b/Supplywatch/bin/Debug/es/DevExpress.XtraBars.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/es/DevExpress.XtraEditors.v15.2.resources.dll b/Supplywatch/bin/Debug/es/DevExpress.XtraEditors.v15.2.resources.dll index e34fc0a..1edf0c4 100644 Binary files a/Supplywatch/bin/Debug/es/DevExpress.XtraEditors.v15.2.resources.dll and b/Supplywatch/bin/Debug/es/DevExpress.XtraEditors.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/es/DevExpress.XtraGrid.v15.2.resources.dll b/Supplywatch/bin/Debug/es/DevExpress.XtraGrid.v15.2.resources.dll index 64d958b..a78cd3e 100644 Binary files a/Supplywatch/bin/Debug/es/DevExpress.XtraGrid.v15.2.resources.dll and b/Supplywatch/bin/Debug/es/DevExpress.XtraGrid.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/es/DevExpress.XtraLayout.v15.2.resources.dll b/Supplywatch/bin/Debug/es/DevExpress.XtraLayout.v15.2.resources.dll index 21a223d..b662042 100644 Binary files a/Supplywatch/bin/Debug/es/DevExpress.XtraLayout.v15.2.resources.dll and b/Supplywatch/bin/Debug/es/DevExpress.XtraLayout.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/es/DevExpress.XtraPrinting.v15.2.resources.dll b/Supplywatch/bin/Debug/es/DevExpress.XtraPrinting.v15.2.resources.dll index a1244c5..768d3d5 100644 Binary files a/Supplywatch/bin/Debug/es/DevExpress.XtraPrinting.v15.2.resources.dll and b/Supplywatch/bin/Debug/es/DevExpress.XtraPrinting.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/es/DevExpress.XtraTreeList.v15.2.resources.dll b/Supplywatch/bin/Debug/es/DevExpress.XtraTreeList.v15.2.resources.dll index fe16358..c2f8ce8 100644 Binary files a/Supplywatch/bin/Debug/es/DevExpress.XtraTreeList.v15.2.resources.dll and b/Supplywatch/bin/Debug/es/DevExpress.XtraTreeList.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/ja/DevExpress.Data.v15.2.resources.dll b/Supplywatch/bin/Debug/ja/DevExpress.Data.v15.2.resources.dll index 29ce70f..d61ae0c 100644 Binary files a/Supplywatch/bin/Debug/ja/DevExpress.Data.v15.2.resources.dll and b/Supplywatch/bin/Debug/ja/DevExpress.Data.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/ja/DevExpress.Office.v15.2.Core.resources.dll b/Supplywatch/bin/Debug/ja/DevExpress.Office.v15.2.Core.resources.dll index 744f026..e5dc843 100644 Binary files a/Supplywatch/bin/Debug/ja/DevExpress.Office.v15.2.Core.resources.dll and b/Supplywatch/bin/Debug/ja/DevExpress.Office.v15.2.Core.resources.dll differ diff --git a/Supplywatch/bin/Debug/ja/DevExpress.Pdf.v15.2.Core.resources.dll b/Supplywatch/bin/Debug/ja/DevExpress.Pdf.v15.2.Core.resources.dll index 50b9850..84add90 100644 Binary files a/Supplywatch/bin/Debug/ja/DevExpress.Pdf.v15.2.Core.resources.dll and b/Supplywatch/bin/Debug/ja/DevExpress.Pdf.v15.2.Core.resources.dll differ diff --git a/Supplywatch/bin/Debug/ja/DevExpress.Printing.v15.2.Core.resources.dll b/Supplywatch/bin/Debug/ja/DevExpress.Printing.v15.2.Core.resources.dll index a5305a8..742f28b 100644 Binary files a/Supplywatch/bin/Debug/ja/DevExpress.Printing.v15.2.Core.resources.dll and b/Supplywatch/bin/Debug/ja/DevExpress.Printing.v15.2.Core.resources.dll differ diff --git a/Supplywatch/bin/Debug/ja/DevExpress.RichEdit.v15.2.Core.resources.dll b/Supplywatch/bin/Debug/ja/DevExpress.RichEdit.v15.2.Core.resources.dll index b5847a4..86c70cd 100644 Binary files a/Supplywatch/bin/Debug/ja/DevExpress.RichEdit.v15.2.Core.resources.dll and b/Supplywatch/bin/Debug/ja/DevExpress.RichEdit.v15.2.Core.resources.dll differ diff --git a/Supplywatch/bin/Debug/ja/DevExpress.Sparkline.v15.2.Core.resources.dll b/Supplywatch/bin/Debug/ja/DevExpress.Sparkline.v15.2.Core.resources.dll index 3104956..3fa11a5 100644 Binary files a/Supplywatch/bin/Debug/ja/DevExpress.Sparkline.v15.2.Core.resources.dll and b/Supplywatch/bin/Debug/ja/DevExpress.Sparkline.v15.2.Core.resources.dll differ diff --git a/Supplywatch/bin/Debug/ja/DevExpress.Utils.v15.2.resources.dll b/Supplywatch/bin/Debug/ja/DevExpress.Utils.v15.2.resources.dll index fcb8fee..e6729ca 100644 Binary files a/Supplywatch/bin/Debug/ja/DevExpress.Utils.v15.2.resources.dll and b/Supplywatch/bin/Debug/ja/DevExpress.Utils.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/ja/DevExpress.XtraBars.v15.2.resources.dll b/Supplywatch/bin/Debug/ja/DevExpress.XtraBars.v15.2.resources.dll index 03d18e6..962afe7 100644 Binary files a/Supplywatch/bin/Debug/ja/DevExpress.XtraBars.v15.2.resources.dll and b/Supplywatch/bin/Debug/ja/DevExpress.XtraBars.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/ja/DevExpress.XtraEditors.v15.2.resources.dll b/Supplywatch/bin/Debug/ja/DevExpress.XtraEditors.v15.2.resources.dll index 5c736f0..524839a 100644 Binary files a/Supplywatch/bin/Debug/ja/DevExpress.XtraEditors.v15.2.resources.dll and b/Supplywatch/bin/Debug/ja/DevExpress.XtraEditors.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/ja/DevExpress.XtraGrid.v15.2.resources.dll b/Supplywatch/bin/Debug/ja/DevExpress.XtraGrid.v15.2.resources.dll index 8155d95..6136cee 100644 Binary files a/Supplywatch/bin/Debug/ja/DevExpress.XtraGrid.v15.2.resources.dll and b/Supplywatch/bin/Debug/ja/DevExpress.XtraGrid.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/ja/DevExpress.XtraLayout.v15.2.resources.dll b/Supplywatch/bin/Debug/ja/DevExpress.XtraLayout.v15.2.resources.dll index dd5e060..5a11df4 100644 Binary files a/Supplywatch/bin/Debug/ja/DevExpress.XtraLayout.v15.2.resources.dll and b/Supplywatch/bin/Debug/ja/DevExpress.XtraLayout.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/ja/DevExpress.XtraPrinting.v15.2.resources.dll b/Supplywatch/bin/Debug/ja/DevExpress.XtraPrinting.v15.2.resources.dll index 1b17eb6..c41e808 100644 Binary files a/Supplywatch/bin/Debug/ja/DevExpress.XtraPrinting.v15.2.resources.dll and b/Supplywatch/bin/Debug/ja/DevExpress.XtraPrinting.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/ja/DevExpress.XtraTreeList.v15.2.resources.dll b/Supplywatch/bin/Debug/ja/DevExpress.XtraTreeList.v15.2.resources.dll index 89dbf0d..223e355 100644 Binary files a/Supplywatch/bin/Debug/ja/DevExpress.XtraTreeList.v15.2.resources.dll and b/Supplywatch/bin/Debug/ja/DevExpress.XtraTreeList.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/ru/DevExpress.Data.v15.2.resources.dll b/Supplywatch/bin/Debug/ru/DevExpress.Data.v15.2.resources.dll index ca996f7..52385e5 100644 Binary files a/Supplywatch/bin/Debug/ru/DevExpress.Data.v15.2.resources.dll and b/Supplywatch/bin/Debug/ru/DevExpress.Data.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/ru/DevExpress.Office.v15.2.Core.resources.dll b/Supplywatch/bin/Debug/ru/DevExpress.Office.v15.2.Core.resources.dll index 8ef16fb..3fb3a85 100644 Binary files a/Supplywatch/bin/Debug/ru/DevExpress.Office.v15.2.Core.resources.dll and b/Supplywatch/bin/Debug/ru/DevExpress.Office.v15.2.Core.resources.dll differ diff --git a/Supplywatch/bin/Debug/ru/DevExpress.Pdf.v15.2.Core.resources.dll b/Supplywatch/bin/Debug/ru/DevExpress.Pdf.v15.2.Core.resources.dll index 88bb08d..2200b82 100644 Binary files a/Supplywatch/bin/Debug/ru/DevExpress.Pdf.v15.2.Core.resources.dll and b/Supplywatch/bin/Debug/ru/DevExpress.Pdf.v15.2.Core.resources.dll differ diff --git a/Supplywatch/bin/Debug/ru/DevExpress.Printing.v15.2.Core.resources.dll b/Supplywatch/bin/Debug/ru/DevExpress.Printing.v15.2.Core.resources.dll index eb8d8be..93f4d4c 100644 Binary files a/Supplywatch/bin/Debug/ru/DevExpress.Printing.v15.2.Core.resources.dll and b/Supplywatch/bin/Debug/ru/DevExpress.Printing.v15.2.Core.resources.dll differ diff --git a/Supplywatch/bin/Debug/ru/DevExpress.RichEdit.v15.2.Core.resources.dll b/Supplywatch/bin/Debug/ru/DevExpress.RichEdit.v15.2.Core.resources.dll index 90471b4..e7ef007 100644 Binary files a/Supplywatch/bin/Debug/ru/DevExpress.RichEdit.v15.2.Core.resources.dll and b/Supplywatch/bin/Debug/ru/DevExpress.RichEdit.v15.2.Core.resources.dll differ diff --git a/Supplywatch/bin/Debug/ru/DevExpress.Sparkline.v15.2.Core.resources.dll b/Supplywatch/bin/Debug/ru/DevExpress.Sparkline.v15.2.Core.resources.dll index 8385ed0..10acb4d 100644 Binary files a/Supplywatch/bin/Debug/ru/DevExpress.Sparkline.v15.2.Core.resources.dll and b/Supplywatch/bin/Debug/ru/DevExpress.Sparkline.v15.2.Core.resources.dll differ diff --git a/Supplywatch/bin/Debug/ru/DevExpress.Utils.v15.2.resources.dll b/Supplywatch/bin/Debug/ru/DevExpress.Utils.v15.2.resources.dll index 97da4a9..0d5299e 100644 Binary files a/Supplywatch/bin/Debug/ru/DevExpress.Utils.v15.2.resources.dll and b/Supplywatch/bin/Debug/ru/DevExpress.Utils.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/ru/DevExpress.XtraBars.v15.2.resources.dll b/Supplywatch/bin/Debug/ru/DevExpress.XtraBars.v15.2.resources.dll index 3a9f862..a419db7 100644 Binary files a/Supplywatch/bin/Debug/ru/DevExpress.XtraBars.v15.2.resources.dll and b/Supplywatch/bin/Debug/ru/DevExpress.XtraBars.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/ru/DevExpress.XtraEditors.v15.2.resources.dll b/Supplywatch/bin/Debug/ru/DevExpress.XtraEditors.v15.2.resources.dll index 5e4ef51..33bd8d7 100644 Binary files a/Supplywatch/bin/Debug/ru/DevExpress.XtraEditors.v15.2.resources.dll and b/Supplywatch/bin/Debug/ru/DevExpress.XtraEditors.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/ru/DevExpress.XtraGrid.v15.2.resources.dll b/Supplywatch/bin/Debug/ru/DevExpress.XtraGrid.v15.2.resources.dll index afc8ec3..72d8649 100644 Binary files a/Supplywatch/bin/Debug/ru/DevExpress.XtraGrid.v15.2.resources.dll and b/Supplywatch/bin/Debug/ru/DevExpress.XtraGrid.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/ru/DevExpress.XtraLayout.v15.2.resources.dll b/Supplywatch/bin/Debug/ru/DevExpress.XtraLayout.v15.2.resources.dll index edf4e1a..b3e8332 100644 Binary files a/Supplywatch/bin/Debug/ru/DevExpress.XtraLayout.v15.2.resources.dll and b/Supplywatch/bin/Debug/ru/DevExpress.XtraLayout.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/ru/DevExpress.XtraPrinting.v15.2.resources.dll b/Supplywatch/bin/Debug/ru/DevExpress.XtraPrinting.v15.2.resources.dll index a9304b3..82f4a0f 100644 Binary files a/Supplywatch/bin/Debug/ru/DevExpress.XtraPrinting.v15.2.resources.dll and b/Supplywatch/bin/Debug/ru/DevExpress.XtraPrinting.v15.2.resources.dll differ diff --git a/Supplywatch/bin/Debug/ru/DevExpress.XtraTreeList.v15.2.resources.dll b/Supplywatch/bin/Debug/ru/DevExpress.XtraTreeList.v15.2.resources.dll index 03e9add..4664f24 100644 Binary files a/Supplywatch/bin/Debug/ru/DevExpress.XtraTreeList.v15.2.resources.dll and b/Supplywatch/bin/Debug/ru/DevExpress.XtraTreeList.v15.2.resources.dll differ diff --git a/Supplywatch/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/Supplywatch/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 961fb48..91d502f 100644 Binary files a/Supplywatch/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache and b/Supplywatch/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Supplywatch/obj/x86/Debug/SUPPLYWATCH.FMMain.resources b/Supplywatch/obj/x86/Debug/SUPPLYWATCH.FMMain.resources index b5db099..4eedafe 100644 Binary files a/Supplywatch/obj/x86/Debug/SUPPLYWATCH.FMMain.resources and b/Supplywatch/obj/x86/Debug/SUPPLYWATCH.FMMain.resources differ diff --git a/Supplywatch/obj/x86/Debug/SUPPLYWATCH.exe b/Supplywatch/obj/x86/Debug/SUPPLYWATCH.exe index 324a2ba..875fded 100644 Binary files a/Supplywatch/obj/x86/Debug/SUPPLYWATCH.exe and b/Supplywatch/obj/x86/Debug/SUPPLYWATCH.exe differ diff --git a/Supplywatch/obj/x86/Debug/SUPPLYWATCH.pdb b/Supplywatch/obj/x86/Debug/SUPPLYWATCH.pdb index b272c8c..48cc682 100644 Binary files a/Supplywatch/obj/x86/Debug/SUPPLYWATCH.pdb and b/Supplywatch/obj/x86/Debug/SUPPLYWATCH.pdb differ diff --git a/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.FileListAbsolute.txt b/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.FileListAbsolute.txt index e003797..ad7b3c5 100644 --- a/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.FileListAbsolute.txt +++ b/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.FileListAbsolute.txt @@ -210,4 +210,3 @@ E:\SchreiberM\Visual Studio\GIT\Supplywatch\Supplywatch\obj\x86\Debug\SUPPLYWATC E:\SchreiberM\Visual Studio\GIT\Supplywatch\Supplywatch\obj\x86\Debug\SUPPLYWATCH.exe E:\SchreiberM\Visual Studio\GIT\Supplywatch\Supplywatch\obj\x86\Debug\SUPPLYWATCH.xml E:\SchreiberM\Visual Studio\GIT\Supplywatch\Supplywatch\obj\x86\Debug\SUPPLYWATCH.pdb -E:\SchreiberM\Visual Studio\GIT\Supplywatch\Supplywatch\obj\x86\Debug\Supplywatch.vbprojResolveAssemblyReference.cache diff --git a/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.GenerateResource.Cache b/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.GenerateResource.Cache index c9585aa..ab022fa 100644 Binary files a/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.GenerateResource.Cache and b/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.GenerateResource.Cache differ diff --git a/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.ResolveComReference.cache b/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.ResolveComReference.cache index d7b3eaf..f394580 100644 Binary files a/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.ResolveComReference.cache and b/Supplywatch/obj/x86/Debug/Supplywatch.vbproj.ResolveComReference.cache differ diff --git a/Supplywatch/obj/x86/Debug/Supplywatch.vbprojResolveAssemblyReference.cache b/Supplywatch/obj/x86/Debug/Supplywatch.vbprojResolveAssemblyReference.cache deleted file mode 100644 index fb2e60e..0000000 Binary files a/Supplywatch/obj/x86/Debug/Supplywatch.vbprojResolveAssemblyReference.cache and /dev/null differ diff --git a/Supplywatch/obj/x86/Debug/supplywatch.exe.licenses b/Supplywatch/obj/x86/Debug/supplywatch.exe.licenses index 0daacde..2149428 100644 Binary files a/Supplywatch/obj/x86/Debug/supplywatch.exe.licenses and b/Supplywatch/obj/x86/Debug/supplywatch.exe.licenses differ diff --git a/Supplywatch/obj/x86/Release/CoreCompileInputs.cache b/Supplywatch/obj/x86/Release/CoreCompileInputs.cache new file mode 100644 index 0000000..8145320 --- /dev/null +++ b/Supplywatch/obj/x86/Release/CoreCompileInputs.cache @@ -0,0 +1 @@ +cdb33d364782c05efad8b9e4ca2ee0ee62f779bd diff --git a/Supplywatch/obj/x86/Release/Supplywatch.vbproj.ResolveComReference.cache b/Supplywatch/obj/x86/Release/Supplywatch.vbproj.ResolveComReference.cache new file mode 100644 index 0000000..f394580 Binary files /dev/null and b/Supplywatch/obj/x86/Release/Supplywatch.vbproj.ResolveComReference.cache differ