Anpassung UID Prüfung

initATLASAufschubkonten/frmStartOptions.Designer.vb

@@ -22,8 +22,10 @@ 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.cbxVermerk = New System.Windows.Forms.CheckBox()
         Me.cbxDatevTest = New System.Windows.Forms.CheckBox()
         Me.cbxDatevOpen = New System.Windows.Forms.CheckBox()
         Me.cbxDatevBuchungen = New System.Windows.Forms.CheckBox()
@@ -125,7 +127,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.dgvMRN = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.clmnMRN = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.txtVRGOut_MRN = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtVRGOut_FilialenNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -170,7 +172,6 @@ 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.cbxVermerk = New System.Windows.Forms.CheckBox()
         Me.pnl.SuspendLayout()
         CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.tbcntr.SuspendLayout()
@@ -272,6 +273,18 @@ Partial Class frmStartOptions
         Me.pnl.Size = New System.Drawing.Size(861, 827)
         Me.pnl.TabIndex = 0
         '
+        'cbxVermerk
+        '
+        Me.cbxVermerk.AutoSize = True
+        Me.cbxVermerk.Checked = True
+        Me.cbxVermerk.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxVermerk.Location = New System.Drawing.Point(151, 178)
+        Me.cbxVermerk.Name = "cbxVermerk"
+        Me.cbxVermerk.Size = New System.Drawing.Size(100, 17)
+        Me.cbxVermerk.TabIndex = 76
+        Me.cbxVermerk.Text = "autom. Vermerk"
+        Me.cbxVermerk.UseVisualStyleBackColor = True
+        '
         'cbxDatevTest
         '
         Me.cbxDatevTest.AutoSize = True
@@ -2088,16 +2101,6 @@ Partial Class frmStartOptions
         Me.txtGJ_UNISPED.Size = New System.Drawing.Size(53, 20)
         Me.txtGJ_UNISPED.TabIndex = 68
         '
-        'cbxVermerk
-        '
-        Me.cbxVermerk.AutoSize = True
-        Me.cbxVermerk.Location = New System.Drawing.Point(151, 178)
-        Me.cbxVermerk.Name = "cbxVermerk"
-        Me.cbxVermerk.Size = New System.Drawing.Size(100, 17)
-        Me.cbxVermerk.TabIndex = 76
-        Me.cbxVermerk.Text = "autom. Vermerk"
-        Me.cbxVermerk.UseVisualStyleBackColor = True
-        '
         'frmStartOptions
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

initATLASAufschubkonten/frmStartOptions.vb

@@ -2298,10 +2298,10 @@ Public Class frmStartOptions
 
 
     Function getUID_Pruefung(maxAnz As Integer) As Boolean
-        getUID_Pruefung(maxAnz, "VERAG", "UID Prüfung VERAG", "as@verag.ag;ih@verag.ag;kb@verag.ag", "al@verag.ag")
+        getUID_Pruefung(maxAnz, "VERAG", "UID Prüfung VERAG", "as@verag.ag;ih@verag.ag;kb@verag.ag", "al@verag.ag",,, True)
-        getUID_Pruefung(maxAnz, "IMEX", "UID Prüfung IMEX", "Viktoria.Leirich@imex-group.at;as@verag.ag;kb@verag.ag", "al@verag.ag")
+        getUID_Pruefung(maxAnz, "IMEX", "UID Prüfung IMEX", "Viktoria.Leirich@imex-group.at;as@verag.ag;kb@verag.ag", "al@verag.ag",,, True)
-        getUID_Pruefung(maxAnz, "AMBAR", "UID Prüfung AMBAR", "as@verag.ag", "al@verag.ag")
+        getUID_Pruefung(maxAnz, "AMBAR", "UID Prüfung AMBAR", "as@verag.ag", "al@verag.ag",,, True)
-        getUID_Pruefung(maxAnz, "UNISPED", "UID Prüfung UNISPED", "al@verag.ag", "al@verag.ag")
+        getUID_Pruefung(maxAnz, "UNISPED", "UID Prüfung UNISPED", "al@verag.ag", "al@verag.ag",,, True)
         'getUID_Pruefung(maxAnz, "VERAG", "UID Prüfung VERAG", "mm@verag.ag;la@verag.ag", "al@verag.ag")
 
     End Function
@@ -2397,7 +2397,7 @@ Public Class frmStartOptions
 
                                     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
+                                    " VALUES(" & kunde.KundenNr & ",'ALLG' ,'" & textUIDVermerk & "'," & "4" & ",'" & "AUTO" & "','" & Now() & "',1,1,0)", "FMZOLL") Then
                                         setUIDToNull(kunde)
 
                                     End If
@@ -2449,12 +2449,16 @@ Public Class frmStartOptions
             Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
             Dim steuersatz = SQL.DLookup("[Steuersatz %]", "[Steuertabelle]", "[Steuerschlüssel]='" & kunde.Steuerschlüssel & "'", "FMZOLL", -1)
 
+
+            Dim Filiale As New VERAG_PROG_ALLGEMEIN.cFilialen(kunde.FilialenNr)
             If steuersatz = 0 Then
-                Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.GET_LAND
+                Select Case Filiale.LandKz
-                    Case "AT"
+                    Case "A", "AT"
                         kunde.Steuerschlüssel = 2
-                    Case "DE"
+                    Case "D", "DE"
                         kunde.Steuerschlüssel = 19
+                    Case "GB"
+                        kunde.Steuerschlüssel = 20
                 End Select
                 kunde.SAVE()
             Else