diff --git a/AVISO_CHECKIN/App.config b/AVISO_CHECKIN/App.config index ea2760e..f036bd2 100644 --- a/AVISO_CHECKIN/App.config +++ b/AVISO_CHECKIN/App.config @@ -7,7 +7,7 @@ - + @@ -29,6 +29,10 @@ + + + + \ No newline at end of file diff --git a/Aviso.sln b/Aviso.sln index db5a1af..f208754 100644 --- a/Aviso.sln +++ b/Aviso.sln @@ -47,7 +47,8 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Any CPU.ActiveCfg = Debug|x86 + {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Any CPU.ActiveCfg = Debug|x64 + {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Any CPU.Build.0 = Debug|x64 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Mixed Platforms.Build.0 = Debug|x64 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|x64.ActiveCfg = Debug|x64 @@ -61,7 +62,7 @@ Global {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|x64.Build.0 = Release|x64 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|x86.ActiveCfg = Release|x86 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|x86.Build.0 = Release|x86 - {3B5EAEB2-0477-4899-A893-3049DD458B9B}.Debug|Any CPU.ActiveCfg = Debug|x86 + {3B5EAEB2-0477-4899-A893-3049DD458B9B}.Debug|Any CPU.ActiveCfg = Debug|x64 {3B5EAEB2-0477-4899-A893-3049DD458B9B}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 {3B5EAEB2-0477-4899-A893-3049DD458B9B}.Debug|Mixed Platforms.Build.0 = Debug|x86 {3B5EAEB2-0477-4899-A893-3049DD458B9B}.Debug|x64.ActiveCfg = Debug|x64 @@ -74,7 +75,8 @@ Global {3B5EAEB2-0477-4899-A893-3049DD458B9B}.Release|x64.Build.0 = Release|x64 {3B5EAEB2-0477-4899-A893-3049DD458B9B}.Release|x86.ActiveCfg = Release|x86 {3B5EAEB2-0477-4899-A893-3049DD458B9B}.Release|x86.Build.0 = Release|x86 - {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Any CPU.ActiveCfg = Debug|x86 + {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Any CPU.ActiveCfg = Debug|x64 + {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Any CPU.Build.0 = Debug|x64 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.Build.0 = Debug|x86 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x64.ActiveCfg = Debug|x64 @@ -116,8 +118,8 @@ Global {289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|x64.ActiveCfg = Release|Any CPU {289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|x64.Build.0 = Release|Any CPU {289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|x86.ActiveCfg = Release|Any CPU - {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.ActiveCfg = Debug|x64 + {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.Build.0 = Debug|x64 {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/Aviso/App.config b/Aviso/App.config index 512e467..ae86ce7 100644 --- a/Aviso/App.config +++ b/Aviso/App.config @@ -65,7 +65,7 @@ - + diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index cd8c50a..9bab9e5 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -83,7 +83,8 @@ 5A6BD29D23A7643243CD6EFA1FEF21BAF955E653 - AL20210908.pfx + + true @@ -126,8 +127,11 @@ ..\packages\Common.Logging.Core.3.4.1\lib\net40\Common.Logging.Core.dll - - ..\packages\DocumentFormat.OpenXml.2.7.2\lib\net46\DocumentFormat.OpenXml.dll + + ..\packages\DocumentFormat.OpenXml.2.16.0\lib\net46\DocumentFormat.OpenXml.dll + + + ..\packages\ExcelNumberFormat.1.1.0\lib\net20\ExcelNumberFormat.dll C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.dll diff --git a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb index cb6a341..e333c26 100644 --- a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb +++ b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb @@ -174,6 +174,7 @@ MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED")) MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR")) MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA")) + MyComboBox2.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 673f225..d44d3d3 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmLogin.vb b/Aviso/frmLogin.vb index 5ddacdb..7516291 100644 --- a/Aviso/frmLogin.vb +++ b/Aviso/frmLogin.vb @@ -20,8 +20,8 @@ Public Class frmLogin Icon = cMeineFunktionenAVISO.GetProgrammIcon End Sub - Dim TESTSYSTEM As Boolean = False - + 'Dim TESTSYSTEM As Boolean = False !aus Sicherheitsgünden! + Dim TESTSYSTEM As Boolean = True Private Sub frmLogin_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown If e.Modifiers = Keys.Control And e.KeyCode = Keys.T Then TESTSYSTEM = Not TESTSYSTEM @@ -271,6 +271,8 @@ Public Class frmLogin End Sub Private Sub btnOK_Click(sender As System.Object, e As System.EventArgs) Handles btnOK.Click + + VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG = False 'Auf WARENORT UMSTELLEN diff --git a/Aviso/packages.config b/Aviso/packages.config index 55b1d51..978f97f 100644 --- a/Aviso/packages.config +++ b/Aviso/packages.config @@ -4,16 +4,18 @@ + - + + - + diff --git a/Gemeinsames/Gemeinsames.vbproj b/Gemeinsames/Gemeinsames.vbproj index 37c11a2..987bf8d 100644 --- a/Gemeinsames/Gemeinsames.vbproj +++ b/Gemeinsames/Gemeinsames.vbproj @@ -88,6 +88,9 @@ x64 bin\x64\Release\ + + false + diff --git a/Gemeinsames/My Project/licenses.licx b/Gemeinsames/My Project/licenses.licx index 7483222..e69de29 100644 --- a/Gemeinsames/My Project/licenses.licx +++ b/Gemeinsames/My Project/licenses.licx @@ -1 +0,0 @@ -GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports, Version=15.2.3.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff diff --git a/VERAG_TELEINFO/VERAG_TELEINFO.vbproj b/VERAG_TELEINFO/VERAG_TELEINFO.vbproj index cc505f7..df917ee 100644 --- a/VERAG_TELEINFO/VERAG_TELEINFO.vbproj +++ b/VERAG_TELEINFO/VERAG_TELEINFO.vbproj @@ -322,9 +322,6 @@ 2018.3.9 - - 5.2.0-alpha.156 -