Merge branch 'ADMIN' of https://verag.visualstudio.com/ADMIN/_git/ADMIN into ADMIN

2024-03-07 16:58:57 +01:00
parent abe3e45f25 f5cff8abd7
commit 97e0a1fbba
4 changed files with 233 additions and 133 deletions
--- a/initATLASAufschubkonten/RoutineManager.vbproj
+++ b/initATLASAufschubkonten/RoutineManager.vbproj
@@ -112,9 +112,6 @@
    <Reference Include="System.Core" />
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="VERAG_PROG_ALLGEMEIN">
-      <HintPath>..\..\..\Aviso\AVISO\Aviso\bin\Debug\VERAG_PROG_ALLGEMEIN.dll</HintPath>
-    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Import Include="Microsoft.VisualBasic" />
@@ -290,6 +287,10 @@
    <None Include="Resources\start.png" />
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj">
+      <Project>{a3b497bd-842c-4a2b-b398-ed1976849df1}</Project>
+      <Name>VERAG_PROG_ALLGEMEIN</Name>
+    </ProjectReference>
    <ProjectReference Include="..\cNCTSPartnerWorker\NCTSPartnerWorker.vbproj">
      <Project>{2bbd7643-82a1-481f-a014-eb7fcdeed3b5}</Project>
      <Name>NCTSPartnerWorker</Name>
--- a/initATLASAufschubkonten/frmStartOptions.Designer.vb
+++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb
@@ -25,6 +25,8 @@ Partial Class frmStartOptions
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStartOptions))
        Me.pnl = New System.Windows.Forms.Panel()
+        Me.PictureBox22 = New System.Windows.Forms.PictureBox()
+        Me.Button22 = New System.Windows.Forms.Button()
        Me.LinkLabel48 = New System.Windows.Forms.LinkLabel()
        Me.cbxVermerk = New System.Windows.Forms.CheckBox()
        Me.cbxDatevTest = New System.Windows.Forms.CheckBox()
@@ -204,9 +206,12 @@ Partial Class frmStartOptions
        Me.lblRoutineManager = New System.Windows.Forms.Label()
        Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Button21 = New System.Windows.Forms.Button()
-        Me.Button22 = New System.Windows.Forms.Button()
-        Me.PictureBox22 = New System.Windows.Forms.PictureBox()
+        Me.Label27 = New System.Windows.Forms.Label()
+        Me.MyTextBox3 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.LinkLabel51 = New System.Windows.Forms.LinkLabel()
+        Me.PictureBox23 = New System.Windows.Forms.PictureBox()
        Me.pnl.SuspendLayout()
+        CType(Me.PictureBox22, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.tbcntr.SuspendLayout()
        Me.TabPage1.SuspendLayout()
@@ -237,13 +242,17 @@ Partial Class frmStartOptions
        CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.PictureBox22, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.PictureBox23, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'pnl
        '
        Me.pnl.BackColor = System.Drawing.Color.White
        Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.pnl.Controls.Add(Me.PictureBox23)
+        Me.pnl.Controls.Add(Me.Label27)
+        Me.pnl.Controls.Add(Me.MyTextBox3)
+        Me.pnl.Controls.Add(Me.LinkLabel51)
        Me.pnl.Controls.Add(Me.PictureBox22)
        Me.pnl.Controls.Add(Me.Button22)
        Me.pnl.Controls.Add(Me.LinkLabel48)
@@ -317,6 +326,29 @@ Partial Class frmStartOptions
        Me.pnl.Size = New System.Drawing.Size(861, 827)
        Me.pnl.TabIndex = 0
        '
+        'PictureBox22
+        '
+        Me.PictureBox22.BackgroundImage = CType(resources.GetObject("PictureBox22.BackgroundImage"), System.Drawing.Image)
+        Me.PictureBox22.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.PictureBox22.Location = New System.Drawing.Point(830, 344)
+        Me.PictureBox22.Name = "PictureBox22"
+        Me.PictureBox22.Size = New System.Drawing.Size(18, 18)
+        Me.PictureBox22.TabIndex = 84
+        Me.PictureBox22.TabStop = False
+        Me.PictureBox22.Visible = False
+        '
+        'Button22
+        '
+        Me.Button22.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button22.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Button22.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button22.Location = New System.Drawing.Point(718, 342)
+        Me.Button22.Name = "Button22"
+        Me.Button22.Size = New System.Drawing.Size(105, 24)
+        Me.Button22.TabIndex = 78
+        Me.Button22.Text = "Kd-Umsätze akt."
+        Me.Button22.UseVisualStyleBackColor = True
+        '
        'LinkLabel48
        '
        Me.LinkLabel48.AutoSize = True
@@ -2555,28 +2587,59 @@ Partial Class frmStartOptions
        Me.Button21.Text = "AAS Sendung 24h"
        Me.Button21.UseVisualStyleBackColor = True
        '
-        'Button22
+        'Label27
        '
-        Me.Button22.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button22.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.Button22.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button22.Location = New System.Drawing.Point(718, 342)
-        Me.Button22.Name = "Button22"
-        Me.Button22.Size = New System.Drawing.Size(105, 24)
-        Me.Button22.TabIndex = 78
-        Me.Button22.Text = "Kd-Umsätze akt."
-        Me.Button22.UseVisualStyleBackColor = True
+        Me.Label27.AutoSize = True
+        Me.Label27.Location = New System.Drawing.Point(181, 211)
+        Me.Label27.Name = "Label27"
+        Me.Label27.Size = New System.Drawing.Size(71, 13)
+        Me.Label27.TabIndex = 87
+        Me.Label27.Text = "älter als Tage"
        '
-        'PictureBox22
+        'MyTextBox3
        '
-        Me.PictureBox22.BackgroundImage = CType(resources.GetObject("PictureBox22.BackgroundImage"), System.Drawing.Image)
-        Me.PictureBox22.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.PictureBox22.Location = New System.Drawing.Point(830, 344)
-        Me.PictureBox22.Name = "PictureBox22"
-        Me.PictureBox22.Size = New System.Drawing.Size(18, 18)
-        Me.PictureBox22.TabIndex = 84
-        Me.PictureBox22.TabStop = False
-        Me.PictureBox22.Visible = False
+        Me.MyTextBox3._DateTimeOnly = False
+        Me.MyTextBox3._numbersOnly = True
+        Me.MyTextBox3._numbersOnlyKommastellen = ""
+        Me.MyTextBox3._numbersOnlyTrennzeichen = True
+        Me.MyTextBox3._Prozent = False
+        Me.MyTextBox3._ShortDateNew = False
+        Me.MyTextBox3._ShortDateOnly = False
+        Me.MyTextBox3._TimeOnly = False
+        Me.MyTextBox3._TimeOnly_Seconds = False
+        Me.MyTextBox3._value = ""
+        Me.MyTextBox3._Waehrung = False
+        Me.MyTextBox3._WaehrungZeichen = True
+        Me.MyTextBox3.ForeColor = System.Drawing.Color.Red
+        Me.MyTextBox3.Location = New System.Drawing.Point(127, 208)
+        Me.MyTextBox3.MaxLineLength = -1
+        Me.MyTextBox3.MaxLines_Warning = ""
+        Me.MyTextBox3.MaxLines_Warning_Label = Nothing
+        Me.MyTextBox3.Name = "MyTextBox3"
+        Me.MyTextBox3.Size = New System.Drawing.Size(53, 20)
+        Me.MyTextBox3.TabIndex = 86
+        '
+        'LinkLabel51
+        '
+        Me.LinkLabel51.AutoSize = True
+        Me.LinkLabel51.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.LinkLabel51.Location = New System.Drawing.Point(17, 211)
+        Me.LinkLabel51.Name = "LinkLabel51"
+        Me.LinkLabel51.Size = New System.Drawing.Size(88, 13)
+        Me.LinkLabel51.TabIndex = 85
+        Me.LinkLabel51.TabStop = True
+        Me.LinkLabel51.Text = "alte Chats inaktiv"
+        '
+        'PictureBox23
+        '
+        Me.PictureBox23.BackgroundImage = CType(resources.GetObject("PictureBox23.BackgroundImage"), System.Drawing.Image)
+        Me.PictureBox23.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.PictureBox23.Location = New System.Drawing.Point(104, 210)
+        Me.PictureBox23.Name = "PictureBox23"
+        Me.PictureBox23.Size = New System.Drawing.Size(18, 18)
+        Me.PictureBox23.TabIndex = 88
+        Me.PictureBox23.TabStop = False
+        Me.PictureBox23.Visible = False
        '
        'frmStartOptions
        '
@@ -2593,6 +2656,7 @@ Partial Class frmStartOptions
        Me.WindowState = System.Windows.Forms.FormWindowState.Minimized
        Me.pnl.ResumeLayout(False)
        Me.pnl.PerformLayout()
+        CType(Me.PictureBox22, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).EndInit()
        Me.tbcntr.ResumeLayout(False)
        Me.TabPage1.ResumeLayout(False)
@@ -2627,7 +2691,7 @@ Partial Class frmStartOptions
        CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.PictureBox22, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.PictureBox23, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)

    End Sub
@@ -2813,4 +2877,8 @@ Partial Class frmStartOptions
    Friend WithEvents Label26 As Label
    Friend WithEvents Button22 As Button
    Friend WithEvents PictureBox22 As PictureBox
+    Friend WithEvents PictureBox23 As PictureBox
+    Friend WithEvents Label27 As Label
+    Friend WithEvents MyTextBox3 As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents LinkLabel51 As LinkLabel
 End Class
--- a/initATLASAufschubkonten/frmStartOptions.resx
+++ b/initATLASAufschubkonten/frmStartOptions.resx
@@ -118,6 +118,30 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="PictureBox23.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
+        oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
+        QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
+        j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
+        VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
+        XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
+        9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
+        VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
+        42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
+        pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
+        lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
+        d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
+        hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
+        LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
+        8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
+        NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
+        ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
+        WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
+        nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
+        CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
+</value>
+  </data>
  <data name="PictureBox22.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
--- a/initATLASAufschubkonten/frmStartOptions.vb
+++ b/initATLASAufschubkonten/frmStartOptions.vb
@@ -512,7 +512,6 @@ Public Class frmStartOptions
                If DELETE_Kundenumsaetze(lastyears) Then
                    INSERT_Kundenumsaetze(lastyears)
                End If
-
                '------------------------------
            Case Else
                'Nur bei manuellem Start wird der fehler ausgegeben
@@ -4175,4 +4174,12 @@ Public Class frmStartOptions
        End If
        showPic(ok, PictureBox22)
    End Sub
+
+    Private Sub LinkLabel51_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel51.LinkClicked
+
+        Dim CHAT As New cMessenger.cMessenger_Chat
+
+        showPic(CHAT.setOldChatsInactiv(MyTextBox3.Text), PictureBox23)
+
+    End Sub
 End Class