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

initATLASAufschubkonten/frmStartOptions.Designer.vb

@@ -22,7 +22,6 @@ Partial Class frmStartOptions
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
-        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.cbxDatevTest = New System.Windows.Forms.CheckBox()
@@ -126,7 +125,7 @@ Partial Class frmStartOptions
         Me.Label7 = New System.Windows.Forms.Label()
         Me.LinkLabel27 = New System.Windows.Forms.LinkLabel()
         Me.Label6 = New System.Windows.Forms.Label()
-        Me.dgvMRN = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.dgvMRN = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
         Me.clmnMRN = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.txtVRGOut_MRN = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtVRGOut_FilialenNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -136,6 +135,9 @@ Partial Class frmStartOptions
         Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.txtVRGOut_BezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.TabPage3 = New System.Windows.Forms.TabPage()
+        Me.LinkLabel39 = New System.Windows.Forms.LinkLabel()
+        Me.LinkLabel40 = New System.Windows.Forms.LinkLabel()
+        Me.Label22 = New System.Windows.Forms.Label()
         Me.LinkLabel34 = New System.Windows.Forms.LinkLabel()
         Me.LinkLabel35 = New System.Windows.Forms.LinkLabel()
         Me.Label17 = New System.Windows.Forms.Label()
@@ -168,9 +170,7 @@ Partial Class frmStartOptions
         Me.lklAufschubkontenATLASEZOLL = New System.Windows.Forms.LinkLabel()
         Me.lblRoutineManager = New System.Windows.Forms.Label()
         Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.LinkLabel39 = New System.Windows.Forms.LinkLabel()
+        Me.cbxVermerk = New System.Windows.Forms.CheckBox()
-        Me.LinkLabel40 = New System.Windows.Forms.LinkLabel()
-        Me.Label22 = New System.Windows.Forms.Label()
         Me.pnl.SuspendLayout()
         CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.tbcntr.SuspendLayout()
@@ -202,6 +202,7 @@ Partial Class frmStartOptions
         '
         Me.pnl.BackColor = System.Drawing.Color.White
         Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.pnl.Controls.Add(Me.cbxVermerk)
         Me.pnl.Controls.Add(Me.cbxDatevTest)
         Me.pnl.Controls.Add(Me.cbxDatevOpen)
         Me.pnl.Controls.Add(Me.cbxDatevBuchungen)
@@ -1678,6 +1679,37 @@ Partial Class frmStartOptions
         Me.TabPage3.Text = "Partner-Systeme"
         Me.TabPage3.UseVisualStyleBackColor = True
         '
+        'LinkLabel39
+        '
+        Me.LinkLabel39.AutoSize = True
+        Me.LinkLabel39.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.LinkLabel39.Location = New System.Drawing.Point(11, 267)
+        Me.LinkLabel39.Name = "LinkLabel39"
+        Me.LinkLabel39.Size = New System.Drawing.Size(180, 13)
+        Me.LinkLabel39.TabIndex = 32
+        Me.LinkLabel39.TabStop = True
+        Me.LinkLabel39.Text = "Eingangsnachrichten abrufen PROD"
+        '
+        'LinkLabel40
+        '
+        Me.LinkLabel40.AutoSize = True
+        Me.LinkLabel40.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.LinkLabel40.Location = New System.Drawing.Point(11, 242)
+        Me.LinkLabel40.Name = "LinkLabel40"
+        Me.LinkLabel40.Size = New System.Drawing.Size(177, 13)
+        Me.LinkLabel40.TabIndex = 31
+        Me.LinkLabel40.TabStop = True
+        Me.LinkLabel40.Text = "Eingangsnachrichten abrufen TEST"
+        '
+        'Label22
+        '
+        Me.Label22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label22.Location = New System.Drawing.Point(11, 215)
+        Me.Label22.Name = "Label22"
+        Me.Label22.Size = New System.Drawing.Size(296, 16)
+        Me.Label22.TabIndex = 30
+        Me.Label22.Text = "ATEZ Nachrichtenverarbeitung (NCTS TR):"
+        '
         'LinkLabel34
         '
         Me.LinkLabel34.AutoSize = True
@@ -2056,36 +2088,15 @@ Partial Class frmStartOptions
         Me.txtGJ_UNISPED.Size = New System.Drawing.Size(53, 20)
         Me.txtGJ_UNISPED.TabIndex = 68
         '
-        'LinkLabel39
+        'cbxVermerk
         '
-        Me.LinkLabel39.AutoSize = True
+        Me.cbxVermerk.AutoSize = True
-        Me.LinkLabel39.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.cbxVermerk.Location = New System.Drawing.Point(151, 178)
-        Me.LinkLabel39.Location = New System.Drawing.Point(11, 267)
+        Me.cbxVermerk.Name = "cbxVermerk"
-        Me.LinkLabel39.Name = "LinkLabel39"
+        Me.cbxVermerk.Size = New System.Drawing.Size(100, 17)
-        Me.LinkLabel39.Size = New System.Drawing.Size(180, 13)
+        Me.cbxVermerk.TabIndex = 76
-        Me.LinkLabel39.TabIndex = 32
+        Me.cbxVermerk.Text = "autom. Vermerk"
-        Me.LinkLabel39.TabStop = True
+        Me.cbxVermerk.UseVisualStyleBackColor = True
-        Me.LinkLabel39.Text = "Eingangsnachrichten abrufen PROD"
-        '
-        'LinkLabel40
-        '
-        Me.LinkLabel40.AutoSize = True
-        Me.LinkLabel40.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.LinkLabel40.Location = New System.Drawing.Point(11, 242)
-        Me.LinkLabel40.Name = "LinkLabel40"
-        Me.LinkLabel40.Size = New System.Drawing.Size(177, 13)
-        Me.LinkLabel40.TabIndex = 31
-        Me.LinkLabel40.TabStop = True
-        Me.LinkLabel40.Text = "Eingangsnachrichten abrufen TEST"
-        '
-        'Label22
-        '
-        Me.Label22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label22.Location = New System.Drawing.Point(11, 215)
-        Me.Label22.Name = "Label22"
-        Me.Label22.Size = New System.Drawing.Size(296, 16)
-        Me.Label22.TabIndex = 30
-        Me.Label22.Text = "ATEZ Nachrichtenverarbeitung (NCTS TR):"
         '
         'frmStartOptions
         '
@@ -2279,4 +2290,5 @@ Partial Class frmStartOptions
     Friend WithEvents LinkLabel39 As LinkLabel
     Friend WithEvents LinkLabel40 As LinkLabel
     Friend WithEvents Label22 As Label
+    Friend WithEvents cbxVermerk As CheckBox
 End Class

initATLASAufschubkonten/frmStartOptions.vb

@@ -6,6 +6,8 @@ Imports System.Xml
 Imports DocumentFormat.OpenXml.Drawing.Diagrams
 Imports DocumentFormat.OpenXml.Wordprocessing
 Imports Renci.SshNet
+Imports VERAG_PROG_ALLGEMEIN
+
 
 Public Class frmStartOptions
     Dim WithEvents timer As New Timer
@@ -2360,7 +2362,7 @@ Public Class frmStartOptions
         End Try
     End Function
 
-    Function getUID_Pruefung(maxAnz As Integer, Mail_FIMRA As String, Mail_betreff As String, Mail_To As String, Optional Mail_CC As String = "", Optional Mail_BCC As String = "", Optional TageZurueck As String = "") As Boolean
+    Function getUID_Pruefung(maxAnz As Integer, Mail_FIMRA As String, Mail_betreff As String, Mail_To As String, Optional Mail_CC As String = "", Optional Mail_BCC As String = "", Optional TageZurueck As String = "", Optional setKundenvermerk As Boolean = False) As Boolean
         Dim firmatmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
         Try
             VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = Mail_FIMRA
@@ -2372,13 +2374,53 @@ Public Class frmStartOptions
                     Dim list As New List(Of String)
                     list.Add(PDF)
                     Dim Body = "Anbei befinden sich die Auflistung der geprüfen UID-Nummern.<br>Bei UID-Nummer mit dem Prüfungserbnis 'OK' wurde das Prüfdatum in den Kundenstamm eingetragen. "
-                    Body &= "<br><b>Ungültige UID-Nummern bitte manuell bearbeiten!</b>"
+                    Body &= "<br><b>Ungültige UID-Nummern werden automatisch im Aviso vermerkt!</b>"
                     Body &= "<br><br>Erstellt am: " & Now.ToShortDateString & ", um " & Now.ToShortTimeString
                     Body &= "<br><br>Automatisch generiertes E-Mail."
 
                     VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mail_To, Mail_betreff, Body,,, False, Mail_CC, Mail_BCC, list)
                     '  VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "UID Prüfung", Body,,, False, ,, list)
                 End If
+
+                If setKundenvermerk Then
+
+                    For Each r As DataRow In dt.Rows
+                        If r("Ergebnis") = "UNGÜLTIG" Then
+
+                            Dim kunde As cKunde = New cKunde(r("kdNr"))
+                            Dim KdFirma = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(kunde.FilialenNr)
+                            If KdFirma = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then
+                                Dim kundeErw As cKundenErweitert = New cKundenErweitert(kunde.KundenNr)
+                                Dim textUIDVermerk As String = "UID Nr." & r("UstIdKz") & r("UstIdnr") & " ungültig, zuletzt geprüft wo gültig am " & r("letzte Prüfung") & " lt. monatl. Prüfung!"
+
+                                If kundeErw.kde_BesonderheitenNeu Then
+
+                                    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+                                    If SQL.doSQL("INSERT INTO tblKundenBesonderheiten (kdb_KundenNr,kdb_kategorie,kdb_text,kdb_mitId,kdb_mitName,kdb_EingetragenAm,kdb_visible,kdb_hervorheben,kdb_history) " &
+                                    " VALUES(" & kunde.KundenNr & ",'ALLG' ,'" & textUIDVermerk & "'," & "4" & ",'" & "ADMIN" & "','" & Now() & "',1,1,0)", "FMZOLL") Then
+                                        setUIDToNull(kunde)
+
+                                    End If
+
+                                Else
+
+                                    If kunde.Besonderheiten <> "" Then kunde.Besonderheiten &= vbNewLine
+                                    kunde.Besonderheiten &= textUIDVermerk
+                                    kunde.SAVE()
+                                    setUIDToNull(kunde)
+
+                                End If
+                                changeSteuerschlüssel(kunde)
+                            End If
+
+                        End If
+
+                    Next
+
+
+                End If
+
+
             End If
             VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = firmatmp
             Return True
@@ -2389,6 +2431,39 @@ Public Class frmStartOptions
         End Try
 
     End Function
+
+    Sub setUIDToNull(kunde)
+
+        Dim addressen As cAdressen = New cAdressen(kunde.KundenNr)
+        addressen.UstIdKz = DBNull.Value
+        addressen.UstIdNr = DBNull.Value
+        addressen.UstIdGeprüft = DBNull.Value
+        addressen.SAVE()
+
+    End Sub
+
+    Sub changeSteuerschlüssel(kunde As cKunde)
+
+        If kunde.Steuerschlüssel IsNot Nothing Then
+
+            Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+            Dim steuersatz = SQL.DLookup("[Steuersatz %]", "[Steuertabelle]", "[Steuerschlüssel]='" & kunde.Steuerschlüssel & "'", "FMZOLL", -1)
+
+            If steuersatz = 0 Then
+                Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.GET_LAND
+                    Case "AT"
+                        kunde.Steuerschlüssel = 2
+                    Case "DE"
+                        kunde.Steuerschlüssel = 19
+                End Select
+                kunde.SAVE()
+            Else
+                Exit Sub 'Steuersatz ist hinterlegt, keiner Änderung!
+            End If
+
+        End If
+
+    End Sub
     'Function getUID_PruefungVERAG(maxAnz As Integer) As Boolean
     '    Dim firmatmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
     '    Try
@@ -2741,7 +2816,7 @@ Public Class frmStartOptions
 
     Private Sub LinkLabel20_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel20.LinkClicked
         VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
-        Dim bool = getUID_Pruefung(MyTextBox1.Text, "VERAG", "UID Prüfung VERAG", "as@verag.ag;ih@verag.ag;kb@verag.ag", "al@verag.ag",, MyTextBox2._value)
+        Dim bool = getUID_Pruefung(MyTextBox1.Text, "VERAG", "UID Prüfung VERAG", "as@verag.ag;ih@verag.ag;kb@verag.ag", "al@verag.ag",, MyTextBox2._value, cbxVermerk.Checked)
         'Dim bool = getUID_PruefungVERAG(MyTextBox1.Text)
         showPic(bool, PictureBox12)
     End Sub
@@ -3047,20 +3122,19 @@ Public Class frmStartOptions
                             End If
                             SDL.Sachbearbeiter = "ASFINAG"
 
-                            Dim Validto = SQl.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
+                            Dim Validto = SQL.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
 
-                            SDL.KartenNr = SQl.checkNullStr(oRDR.GetValue("CardNumber"))
+                            SDL.KartenNr = SQL.checkNullStr(oRDR.GetValue("CardNumber"))
                             If Validto <> "" Then
                                 SDL.GültigBis = DateAdd("d", -1, DateAdd("m", 1, DateSerial("20" & Mid(Validto, 1, 2), Mid(Validto, 3, 2), 1)))
                             End If
 
-                            SDL.OBUID = SQl.checkNullStr(oRDR.GetValue("OBUID"))
+                            SDL.OBUID = SQL.checkNullStr(oRDR.GetValue("OBUID"))
-                            SDL.Vertragsabschlussdatum = SQl.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
+                            SDL.Vertragsabschlussdatum = SQL.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
-                            SDL.Kategorie = SQl.checkNullStr(oRDR.GetValue("Kategorie"))
+                            SDL.Kategorie = SQL.checkNullStr(oRDR.GetValue("Kategorie"))
-                            SDL.Schadstoffklasse = SQl.checkNullStr(oRDR.GetValue("Schadstoffklasse"))
+                            SDL.Schadstoffklasse = SQL.checkNullStr(oRDR.GetValue("Schadstoffklasse"))
-                            SDL.Status = SQl.checkNullStr(oRDR.GetValue("Status"))
+                            SDL.Status = SQL.checkNullStr(oRDR.GetValue("Status"))
                             SDL.SAVE()
-
                         End If
 
                     End While