merge

SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.Designer.vb

@@ -22,8 +22,6 @@ Partial Class usrCntlQualitaetskontrolle
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
-        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
@@ -31,6 +29,8 @@ Partial Class usrCntlQualitaetskontrolle
         Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.Label46 = New System.Windows.Forms.Label()
         Me.Button2 = New System.Windows.Forms.Button()
         Me.Label40 = New System.Windows.Forms.Label()
@@ -62,12 +62,6 @@ Partial Class usrCntlQualitaetskontrolle
         Me.txtFirma = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.Label30 = New System.Windows.Forms.Label()
         Me.dgvPositionen = New System.Windows.Forms.DataGridView()
-        Me.pos = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.anZ_pkgstk = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.art_pkgstk = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.erzeugnis = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.gewicht = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.KNCode = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.txtPackAdresse2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtPackAdresse1 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtPackFirma = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -111,6 +105,13 @@ Partial Class usrCntlQualitaetskontrolle
         Me.Label18 = New System.Windows.Forms.Label()
         Me.btnVermarktungsnorman = New System.Windows.Forms.Button()
         Me.btnPreise = New System.Windows.Forms.Button()
+        Me.pos = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.anZ_pkgstk = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.art_pkgstk = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.erzeugnis = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.gewicht = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.KNCode = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.speziell = New System.Windows.Forms.DataGridViewTextBoxColumn()
         CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.dgvPositionen, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.dgvGebuehren, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -555,58 +556,14 @@ Partial Class usrCntlQualitaetskontrolle
         'dgvPositionen
         '
         Me.dgvPositionen.BackgroundColor = System.Drawing.Color.White
-        Me.dgvPositionen.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable
+        Me.dgvPositionen.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.EnableAlwaysIncludeHeaderText
         Me.dgvPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvPositionen.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.pos, Me.anZ_pkgstk, Me.art_pkgstk, Me.erzeugnis, Me.gewicht, Me.KNCode})
+        Me.dgvPositionen.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.pos, Me.anZ_pkgstk, Me.art_pkgstk, Me.erzeugnis, Me.gewicht, Me.KNCode, Me.speziell})
         Me.dgvPositionen.Location = New System.Drawing.Point(180, 291)
         Me.dgvPositionen.Name = "dgvPositionen"
         Me.dgvPositionen.Size = New System.Drawing.Size(791, 345)
         Me.dgvPositionen.TabIndex = 156
         '
-        'pos
-        '
-        DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
-        DataGridViewCellStyle10.Format = "N0"
-        DataGridViewCellStyle10.NullValue = Nothing
-        Me.pos.DefaultCellStyle = DataGridViewCellStyle10
-        Me.pos.Frozen = True
-        Me.pos.HeaderText = "Position"
-        Me.pos.MaxInputLength = 3
-        Me.pos.Name = "pos"
-        Me.pos.ReadOnly = True
-        Me.pos.Width = 50
-        '
-        'anZ_pkgstk
-        '
-        Me.anZ_pkgstk.HeaderText = "Anz-Packs."
-        Me.anZ_pkgstk.Name = "anZ_pkgstk"
-        '
-        'art_pkgstk
-        '
-        Me.art_pkgstk.HeaderText = "Art-Packs"
-        Me.art_pkgstk.Name = "art_pkgstk"
-        '
-        'erzeugnis
-        '
-        Me.erzeugnis.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        Me.erzeugnis.HeaderText = "Art des Erzeugnisses"
-        Me.erzeugnis.Name = "erzeugnis"
-        '
-        'gewicht
-        '
-        DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
-        DataGridViewCellStyle11.Format = "N2"
-        DataGridViewCellStyle11.NullValue = Nothing
-        Me.gewicht.DefaultCellStyle = DataGridViewCellStyle11
-        Me.gewicht.HeaderText = "Gewicht"
-        Me.gewicht.MaxInputLength = 100
-        Me.gewicht.Name = "gewicht"
-        '
-        'KNCode
-        '
-        Me.KNCode.HeaderText = "KNCode"
-        Me.KNCode.Name = "KNCode"
-        '
         'txtPackAdresse2
         '
         Me.txtPackAdresse2._DateTimeOnly = False
@@ -1119,6 +1076,55 @@ Partial Class usrCntlQualitaetskontrolle
         Me.btnPreise.Text = "Preise"
         Me.btnPreise.UseVisualStyleBackColor = True
         '
+        'pos
+        '
+        DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
+        DataGridViewCellStyle10.Format = "N0"
+        DataGridViewCellStyle10.NullValue = Nothing
+        Me.pos.DefaultCellStyle = DataGridViewCellStyle10
+        Me.pos.Frozen = True
+        Me.pos.HeaderText = "Position"
+        Me.pos.MaxInputLength = 3
+        Me.pos.Name = "pos"
+        Me.pos.ReadOnly = True
+        Me.pos.Width = 50
+        '
+        'anZ_pkgstk
+        '
+        Me.anZ_pkgstk.HeaderText = "Anz-Packs."
+        Me.anZ_pkgstk.Name = "anZ_pkgstk"
+        '
+        'art_pkgstk
+        '
+        Me.art_pkgstk.HeaderText = "Art-Packs"
+        Me.art_pkgstk.Name = "art_pkgstk"
+        '
+        'erzeugnis
+        '
+        Me.erzeugnis.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+        Me.erzeugnis.HeaderText = "Art des Erzeugnisses"
+        Me.erzeugnis.Name = "erzeugnis"
+        '
+        'gewicht
+        '
+        DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
+        DataGridViewCellStyle11.Format = "N2"
+        DataGridViewCellStyle11.NullValue = Nothing
+        Me.gewicht.DefaultCellStyle = DataGridViewCellStyle11
+        Me.gewicht.HeaderText = "Gewicht"
+        Me.gewicht.MaxInputLength = 100
+        Me.gewicht.Name = "gewicht"
+        '
+        'KNCode
+        '
+        Me.KNCode.HeaderText = "KNCode"
+        Me.KNCode.Name = "KNCode"
+        '
+        'speziell
+        '
+        Me.speziell.HeaderText = "spez/allg"
+        Me.speziell.Name = "speziell"
+        '
         'usrCntlQualitaetskontrolle
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1270,12 +1276,13 @@ Partial Class usrCntlQualitaetskontrolle
     Friend WithEvents Preis As DataGridViewTextBoxColumn
     Friend WithEvents Faktor As DataGridViewTextBoxColumn
     Friend WithEvents Betrag As DataGridViewTextBoxColumn
+    Friend WithEvents btnVermarktungsnorman As Button
+    Friend WithEvents btnPreise As Button
     Friend WithEvents pos As DataGridViewTextBoxColumn
     Friend WithEvents anZ_pkgstk As DataGridViewTextBoxColumn
     Friend WithEvents art_pkgstk As DataGridViewTextBoxColumn
     Friend WithEvents erzeugnis As DataGridViewTextBoxColumn
     Friend WithEvents gewicht As DataGridViewTextBoxColumn
     Friend WithEvents KNCode As DataGridViewTextBoxColumn
-    Friend WithEvents btnVermarktungsnorman As Button
+    Friend WithEvents speziell As DataGridViewTextBoxColumn
-    Friend WithEvents btnPreise As Button
 End Class

SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.resx

@@ -135,22 +135,7 @@
   <metadata name="KNCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="pos.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="speziell.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="anZ_pkgstk.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="art_pkgstk.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="erzeugnis.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="gewicht.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="KNCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="Art.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.vb

@@ -218,15 +218,19 @@ Public Class usrCntlQualitaetskontrolle
 
         Dim couter As Integer = 1
         Dim checkKNCode As Boolean = False
+        Dim speziellOderAllg As String = ""
         For Each row As DataRow In dt.Rows
 
-            dgvPositionen.Rows.Add(row("ItNr"), row("Nr"), row("Kind"), row("GdsDes"), row("Net"), row("ComCd"))
-            If row("ComCd") <> "" Then checkKNCode = True
-            couter = +1
 
+            If row("ComCd") <> "" Then
+                checkKNCode = True
+                checkifAllgemeinOderSpeziell(row("ComCd"), speziellOderAllg)
+            End If
+            couter = +1
+            dgvPositionen.Rows.Add(row("ItNr"), row("Nr"), row("Kind"), row("GdsDes"), row("Net"), row("ComCd"), speziellOderAllg)
         Next
 
-        If checkKNCode Then initdgvGebuehren()
+        If checkKNCode Then initdgvGebuehren(True)
 
     End Sub
 
@@ -390,6 +394,7 @@ Public Class usrCntlQualitaetskontrolle
 
             If r IsNot Nothing And r.Cells(5).Value <> "" Then
                 checkKNCode = True
+                checkifAllgemeinOderSpeziell(r.Cells(5).Value, r.Cells(6).Value)
             End If
 
         Next
@@ -397,7 +402,7 @@ Public Class usrCntlQualitaetskontrolle
         txtGewicht.Text = gewicht & " kg"
         txtAnzVerp.Text = colli
 
-        If checkKNCode Then initdgvGebuehren()
+        If checkKNCode Then initdgvGebuehren(True)
 
     End Sub
 
@@ -411,12 +416,12 @@ Public Class usrCntlQualitaetskontrolle
 
     Private Sub dgvPositionen_RowsAdded(sender As Object, e As DataGridViewRowsAddedEventArgs) Handles dgvPositionen.RowsAdded
         berechneDGVSum()
-        initdgvGebuehren()
+        initdgvGebuehren(True)
     End Sub
 
     Private Sub dgvPositionen_RowsRemoved(sender As Object, e As DataGridViewRowsRemovedEventArgs) Handles dgvPositionen.RowsRemoved
         berechneDGVSum()
-        initdgvGebuehren()
+        initdgvGebuehren(True)
     End Sub
 
     Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
@@ -502,19 +507,112 @@ Public Class usrCntlQualitaetskontrolle
 
     End Sub
 
-    Private Sub initdgvGebuehren()
+
+    Private Sub checkifAllgemeinOderSpeziell(ByRef codeKND As String, ByRef speziell As String)
+
+        Dim found As Boolean = False
+
+        If codeKND <> "" Then
+
+            For Each row As DataRow In normenSpeziell.Rows
+                Dim code = row("kncode").ToString.Trim().Replace(" ", "")
+                Dim searchedCode = codeKND
+                If code.Length < searchedCode.Length Then
+                    searchedCode = searchedCode.ToString.Substring(0, code.Length)
+                End If
+
+                If code = searchedCode Then
+                    If speziell <> "spez." Then speziell = "spez."
+
+                    found = True
+                    Exit For
+                End If
+
+            Next
+
+            If Not found Then
+
+                For Each row As DataRow In normenAllg.Rows
+                    Dim code = row("kncode").ToString.Trim().Replace(" ", "")
+                    Dim searchedCode = codeKND
+                    If code.Length < searchedCode.Length Then
+                        searchedCode = searchedCode.ToString.Substring(0, code.Length)
+                    End If
+                    If code = searchedCode Then
+                        If speziell <> "allg" Then speziell = "allg"
+                        found = True
+                        Exit For
+                    End If
+
+                Next
+
+
+            End If
+
+            If Not found Then
+                If speziell <> "allg-NIL" Then speziell = "allg-NIL"
+            End If
+        End If
+
+
+    End Sub
+
+    Private Sub initdgvGebuehren(initDatatable As Boolean)
 
         Try
 
-
+            If dgvGebuehren IsNot Nothing AndAlso dgvGebuehren.Rows.Count > 0 Then dgvGebuehren.Rows.Clear()
-            If dgvGebuehren.Rows.Count > 0 Then dgvGebuehren.Rows.Clear()
             Dim posVorhanden As Boolean = False
 
-            If dgvPositionen.Rows.Count < 1 Then Exit Sub
+            If dgvPositionen.Rows.Count <1 Then Exit Sub
+
 
             If normenSpeziell.Rows.Count < 1 Or normenSpeziell.Rows.Count < 1 Then Exit Sub
 
+            Dim tableResultGroup As New DataTable
 
+            If initDatatable Then
+
+
+                Dim tableResult As New DataTable
+                For Each column As DataGridViewColumn In dgvPositionen.Columns
+                    If column.HeaderText.ToLower().Contains("spez/allg") Then tableResult.Columns.Add(column.HeaderText, GetType(String))
+                    If column.HeaderText.ToLower().Contains("kncode") Then tableResult.Columns.Add(column.HeaderText, GetType(String))
+                    If column.HeaderText.ToLower().Contains("gewicht") Then tableResult.Columns.Add(column.HeaderText, GetType(Double))
+                Next
+
+                For Each row As DataGridViewRow In dgvPositionen.Rows
+                    tableResult.Rows.Add()
+                    For Each cell As DataGridViewCell In row.Cells
+                        If cell.Value IsNot Nothing AndAlso cell.Value.ToString() <> "" Then
+                            If cell.ColumnIndex() = 4 Then tableResult.Rows(tableResult.Rows.Count - 1)(0) = cell.Value.ToString()
+                            If cell.ColumnIndex() = 5 Then tableResult.Rows(tableResult.Rows.Count - 1)(1) = cell.Value.ToString()
+                            If cell.ColumnIndex() = 6 Then tableResult.Rows(tableResult.Rows.Count - 1)(2) = cell.Value.ToString()
+                        End If
+
+                    Next
+                Next
+
+                Dim groups = tableResult.AsEnumerable().
+                    GroupBy(Function(row) New With {
+                    Key .Id = row.Field(Of String)("spez/allg"),
+                    Key .Multi = row.Field(Of String)("kncode")
+                    })
+
+                tableResultGroup = tableResult.Clone()
+
+                For Each grp In groups
+
+                    tableResultGroup.Rows.Add(
+                                         grp.Sum(Function(row)
+                                                     Dim value = 0
+                                                     If Not IsDBNull(row.Item("gewicht")) Then value = row.Item("gewicht")
+                                                     Return value
+                                                 End Function), grp.Key.Multi, grp.Key.Id)
+                Next
+
+
+            End If
             Dim sumNormenAllg As Double = 0
             Dim sumNormenSpez As Double = 0
 
@@ -524,48 +622,19 @@ Public Class usrCntlQualitaetskontrolle
             idk = 39.4
 
 
-            For Each r As DataGridViewRow In dgvPositionen.Rows
+            'If Not posVorhanden Then Exit Sub
 
-                Dim found As Boolean = False
+            For Each r In tableResultGroup.Rows
-
+                If Not IsDBNull(r("gewicht")) AndAlso IsNumeric(r("gewicht")) AndAlso Not IsDBNull(r("spez/allg")) Then
-                If r IsNot Nothing And IsNumeric(r.Cells(4).Value) AndAlso r.Cells(4).Value >= 1000 Then
+                    If r("spez/allg") = "spez." Then
-                    posVorhanden = True
+                        sumNormenSpez += CDbl(r("gewicht"))
-
+                    ElseIf r("spez/allg").ToString.Contains("allg") Then
-                    If r.Cells(5).Value <> "" Then
+                        sumNormenAllg += CDbl(r("gewicht"))
-                        For Each row As DataRow In normenSpeziell.Rows
-                            Dim code = row("kncode").ToString.Trim().Replace(" ", "")
-                            Dim searchedCode = r.Cells(5).Value
-                            searchedCode = searchedCode.ToString.Substring(0, code.Length)
-                            If code = searchedCode Then
-                                sumNormenSpez += r.Cells(4).Value
-                                found = True
-                                Exit For
-                            End If
-
-                        Next
-                        If Not found Then
-
-                            For Each row As DataRow In normenAllg.Rows
-                                Dim code = row("kncode").ToString.Trim().Replace(" ", "")
-                                Dim searchedCode = r.Cells(5).Value
-                                searchedCode = searchedCode.ToString.Substring(0, code.Length)
-                                If code = searchedCode Then
-                                    sumNormenAllg += r.Cells(4).Value
-                                    found = True
-                                    Exit For
-                                End If
-
-                            Next
-
-                        End If
                     End If
-
                 End If
 
             Next
 
-            If Not posVorhanden Then Exit Sub
-
             If sumNormenAllg > 0 Then
                 Dim anzAllg As Integer
                 anzAllg = Math.Ceiling(sumNormenAllg / 1000)
@@ -607,7 +676,7 @@ Public Class usrCntlQualitaetskontrolle
 
     Private Sub cbxVerzicht_CheckedChanged(sender As Object, e As EventArgs) Handles cbxVerzicht.CheckedChanged
 
-        initdgvGebuehren()
+        initdgvGebuehren(True)
 
     End Sub
 End Class

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.Designer.vb

@@ -84,6 +84,7 @@ Partial Class usrcntlVollmacht_MDM_EU
         Me.CheckedListBox1 = New System.Windows.Forms.CheckedListBox()
         Me.txt_GF_nachname = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txt_GF_vorname = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.cbxRMC = New System.Windows.Forms.CheckBox()
         CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
@@ -465,7 +466,7 @@ Partial Class usrcntlVollmacht_MDM_EU
         Me.txt_GF_Adresse._WaehrungZeichen = False
         Me.txt_GF_Adresse.ForeColor = System.Drawing.Color.Black
         Me.txt_GF_Adresse.Location = New System.Drawing.Point(254, 254)
-        Me.txt_GF_Adresse.MaxLength = 10
+        Me.txt_GF_Adresse.MaxLength = 255
         Me.txt_GF_Adresse.MaxLineLength = -1
         Me.txt_GF_Adresse.MaxLines_Warning = ""
         Me.txt_GF_Adresse.MaxLines_Warning_Label = Nothing
@@ -1033,12 +1034,23 @@ Partial Class usrcntlVollmacht_MDM_EU
         Me.txt_GF_vorname.Size = New System.Drawing.Size(163, 20)
         Me.txt_GF_vorname.TabIndex = 146
         '
+        'cbxRMC
+        '
+        Me.cbxRMC.AutoSize = True
+        Me.cbxRMC.Location = New System.Drawing.Point(5, 46)
+        Me.cbxRMC.Name = "cbxRMC"
+        Me.cbxRMC.Size = New System.Drawing.Size(50, 17)
+        Me.cbxRMC.TabIndex = 147
+        Me.cbxRMC.Text = "RMC"
+        Me.cbxRMC.UseVisualStyleBackColor = True
+        '
         'usrcntlVollmacht_MDM_EU
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.WhiteSmoke
         Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Controls.Add(Me.cbxRMC)
         Me.Controls.Add(Me.CheckedListBox1)
         Me.Controls.Add(Me.cbx_GF_Geburtsland)
         Me.Controls.Add(Me.Label21)
@@ -1170,4 +1182,5 @@ Partial Class usrcntlVollmacht_MDM_EU
     Friend WithEvents CheckedListBox1 As CheckedListBox
     Friend WithEvents txt_GF_nachname As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents txt_GF_vorname As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents cbxRMC As CheckBox
 End Class

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.vb

@@ -52,6 +52,12 @@ Public Class usrcntlVollmacht_MDM_EU
         Dim KUNDE_ERW As New VERAG_PROG_ALLGEMEIN.cKundenErweitert(KdNR)
         Dim KK_List As New VERAG_PROG_ALLGEMEIN.cKundenKontakteList(KdNR)
 
+        If IsNumeric(KdNR) AndAlso (KdNR >= 150000 And KdNR <= 159999) Then
+            cbxRMC.Checked = True
+        Else
+            cbxRMC.Checked = False
+        End If
+
         Dim GF As cKundenKontakte = KK_List.LIST.Find(Function(c) c.kkd_kkaId = 13 And c.kkd_KundenNr = KdNR)
         If GF IsNot Nothing Then
             txt_GF_nachname.Text = IIf(GF.kkd_AnsprechpartnerNachname <> "", GF.kkd_AnsprechpartnerNachname & " ", "")

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.Designer.vb

@@ -455,7 +455,7 @@ Partial Class usrcntlVollmacht_MDM_NICHT_EU
         Me.txt_GF_Adresse._WaehrungZeichen = False
         Me.txt_GF_Adresse.ForeColor = System.Drawing.Color.Black
         Me.txt_GF_Adresse.Location = New System.Drawing.Point(254, 240)
-        Me.txt_GF_Adresse.MaxLength = 10
+        Me.txt_GF_Adresse.MaxLength = 255
         Me.txt_GF_Adresse.MaxLineLength = -1
         Me.txt_GF_Adresse.MaxLines_Warning = ""
         Me.txt_GF_Adresse.MaxLines_Warning_Label = Nothing

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.vb

@@ -114,6 +114,9 @@ Public Class usrcntlVollmacht_MDM_NICHT_EU
 
     Private Sub usrcntlVollmacht_DE_Load(sender As Object, e As EventArgs) Handles Me.Load
         initControlsHandler()
+
+
+
         cboLand.Items.Clear()
         cboLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
         cboLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Austria", "AT"))
@@ -168,12 +171,26 @@ Public Class usrcntlVollmacht_MDM_NICHT_EU
     End Sub
 
     Private Sub cboLand_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboLand.SelectedIndexChanged
-        If cboLand._value = "NL" Or cboLand._value = "HR" Then
+        Dim privatfirma As Boolean = False
-            cbxPrivatfirma.Visible = True
+        Select Case cboLand._value
 
-        Else
+            Case "NL"
+                privatfirma = True
+            Case "HR"
+                privatfirma = True
+            Case Else
+                privatfirma = False
+
+        End Select
+
+        If Not privatfirma Then
             cbxPrivatfirma.Visible = False
             cbxPrivatfirma.Checked = False
+        Else
+            cbxPrivatfirma.Visible = True
         End If
+
+
+
     End Sub
 End Class

SDL/Formulare/KDFormulare/frmFormulare.vb

@@ -1778,7 +1778,7 @@ Public Class FormularManagerNEU
 
                         Case "ceo_birthdate" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_Geb.Text))
                         Case "ceo" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_nachname.Text & usrCntl.txt_GF_vorname.Text))
-                        Case "ceo_address" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.txt_GF_Adresse.Text <> "", usrCntl.txt_GF_Adresse.Text & ", ", "") & usrCntl.cbx_GF_Land._value & "-" & usrCntl.txt_GF_PLZ.Text & IIf(usrCntl.txt_GF_Ort.Text <> "", ", " & usrCntl.txt_GF_Ort.Text, "")))
+                        Case "ceo_address" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(usrCntl.txt_GF_Adresse.Text <> "", usrCntl.txt_GF_Adresse.Text & ", ", "") & usrCntl.cbx_GF_Land._value & "-" & usrCntl.txt_GF_PLZ.Text & " " & usrCntl.txt_GF_Ort.Text))
                         Case "ceo_birthplace" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_Geburtsort.Text))
                         Case "ceo_birthcountry" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.cbx_GF_Geburtsland.Text))
                         Case "ceo_passportvaliduntil" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, usrCntl.txt_GF_Passgueltigbis.Text))
@@ -1819,7 +1819,7 @@ Public Class FormularManagerNEU
                 Else
 
                     Select Case item.Text.ToLower().Trim()
-                        Case "Tagesdatum" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(IsDate(usrCntl.datDatum.Text) AndAlso usrCntl.cbxPrintDate.Checked, usrCntl.datDatum.Text, "")))
+                        Case "tagesdatum" : listItem2.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(item.Text, IIf(IsDate(usrCntl.datDatum.Text) AndAlso usrCntl.cbxPrintDate.Checked, usrCntl.datDatum.Text, "")))
                     End Select
 
                 End If
@@ -1864,21 +1864,30 @@ Public Class FormularManagerNEU
                         Case "name4" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
                         Case "name5" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
 
-                        Case "address" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text & " " & usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text
+
+
+                        Case "address" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txtAdresse1.Text <> "", usrCntl.txtAdresse1.Text & ", ", "") & usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text '
+                        Case "address1" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txtAdresse1.Text <> "", usrCntl.txtAdresse1.Text & ", ", "") & usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text '
+                        Case "address2" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txtAdresse1.Text <> "", usrCntl.txtAdresse1.Text & ", ", "") & usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text '
 
                         Case "zipcode" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse2.Text
                         Case "zipcode1" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse2.Text
+                        Case "zipcode2" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse2.Text
 
                         Case "lpo" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text
 
                         Case "country" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbxLandKz._value
                         Case "country1" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbxLandKz._value
+                        Case "country2" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbxLandKz._value
 
                         Case "place" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse3.Text
                         Case "place1" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse3.Text
+                        Case "place2" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse3.Text
 
                         Case "street" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text
                         Case "street1" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text
+                        Case "street2" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text
+
                         Case "strasse" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text
                         Case "surname_firstname" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txt_GF_vorname.Text <> "", usrCntl.txt_GF_vorname.Text & " ", " ") & IIf(usrCntl.txt_GF_nachname.Text <> "", usrCntl.txt_GF_nachname.Text, "")
                         Case "firstname_surname" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txt_GF_vorname.Text <> "", usrCntl.txt_GF_vorname.Text & " ", " ") & IIf(usrCntl.txt_GF_nachname.Text <> "", usrCntl.txt_GF_nachname.Text, "")
@@ -1890,6 +1899,7 @@ Public Class FormularManagerNEU
 
                         Case "taxno" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtSteuerNr.Text
                         Case "taxno1" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtSteuerNr.Text
+                        Case "taxno2" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtSteuerNr.Text
 
                         Case "function" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txt_GF_nachname.Text <> "", functionCEO, "")
 
@@ -1919,15 +1929,19 @@ Public Class FormularManagerNEU
 
                         Case "c_street" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Straße
                         Case "c_street1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Straße
+                        Case "c_street2" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Straße
 
                         Case "c_zipcode" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Ort
                         Case "c_zipcode1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Ort
+                        Case "c_zipcode2" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Ort
 
                         Case "c_vatno" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_UID
                         Case "c_vatno1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_UID
+                        Case "c_vatno2" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_UID
 
                         Case "c_phone" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Telefon & " " & FIRMA.Firma_Telefax
                         Case "c_phone1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Telefon & " " & FIRMA.Firma_Telefax
+                        Case "c_phone2" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Telefon & " " & FIRMA.Firma_Telefax
 
                         Case "c_mailcontact" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtEmailzurueck.Text
                         Case "c_bank" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bankverbindung1
@@ -2009,6 +2023,8 @@ Public Class FormularManagerNEU
             Dim odoc As Microsoft.Office.Interop.Word.Document = Nothing
             Dim oWord As New Microsoft.Office.Interop.Word.Application
             Dim FIRMA As New VERAG_PROG_ALLGEMEIN.cFirmen(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA_ID)
+            Dim FIRMA_DE As New VERAG_PROG_ALLGEMEIN.cFirmen(2)
+            Dim isKundeDE = IIf(usrCntl.cbxLandKz._value = "DE" Or usrCntl.cbxLandKz._value = "D", True, False)
 
             Dim docBez As String = ""
 
@@ -2032,7 +2048,7 @@ Public Class FormularManagerNEU
                     Case "name" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
                     Case "name_1" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
                     Case "name_2" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
-                    Case "address" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text & " " & usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text
+                    Case "address" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txtAdresse1.Text <> "", usrCntl.txtAdresse1.Text & ", ", "") & usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text
                     Case "zipcode" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse2.Text
                     Case "country" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbxLandKz._value
                     Case "place" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse3.Text
@@ -2051,34 +2067,56 @@ Public Class FormularManagerNEU
                     Case "ceo_zipcode" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_PLZ.Text
                     Case "ceo_birthdate" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Geb.Text
                     Case "ceo_street" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Adresse.Text
-                    Case "ceo_address" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Adresse.Text & " " & usrCntl.cbx_GF_Land._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text
+                    Case "ceo_address" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txt_GF_Adresse.Text <> "", usrCntl.txt_GF_Adresse.Text & ", ", "") & " " & usrCntl.cbx_GF_Land._value & "-" & usrCntl.txt_GF_PLZ.Text & " " & usrCntl.txt_GF_Ort.Text
                     Case "ceo_birthplace" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Geburtsort.Text
                     Case "ceo_birthcountry" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbx_GF_Geburtsland._value
                     Case "ceo_passportvaliduntil" : odoc.FormFields(fieldName).Range.Text = usrCntl.txt_GF_Passgueltigbis.Text
 
-                    Case "c_name" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
+                    Case "c_name" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Bez, FIRMA_DE.Firma_Bez)
-                    Case "c_name1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
+                    Case "c_name1" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Bez, FIRMA_DE.Firma_Bez)
-                    Case "c_name2" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
+                    Case "c_name2" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Bez, FIRMA_DE.Firma_Bez)
-                    Case "c_name3" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
+                    Case "c_name3" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Bez, FIRMA_DE.Firma_Bez)
-                    Case "c_name4" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
+                    Case "c_name4" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Bez, FIRMA_DE.Firma_Bez)
-                    Case "c_name5" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
+                    Case "c_name5" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Bez, FIRMA_DE.Firma_Bez)
-                    Case "c_name6" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
+                    Case "c_name6" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Bez, FIRMA_DE.Firma_Bez)
-                    Case "c_name7" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
+                    Case "c_name7" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Bez, FIRMA_DE.Firma_Bez)
-                    Case "c_address" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Straße & " " & FIRMA.Firma_Ort
+                    Case "c_address" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Straße & " " & FIRMA.Firma_Ort, FIRMA_DE.Firma_Straße & " " & FIRMA_DE.Firma_Ort)
-                    Case "c_street" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Straße
+                    Case "c_street" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Straße, FIRMA_DE.Firma_Straße)
-                    Case "c_zipcode" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Ort
+                    Case "c_zipcode" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Ort, FIRMA_DE.Firma_Ort)
-                    Case "c_vatno" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_UID
+                    Case "c_vatno" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_UID, FIRMA_DE.Firma_UID)
                     Case "c_phone" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Telefon & " " & FIRMA.Firma_Telefax
                     Case "c_mailcontact" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtEmailzurueck.Text
-                    Case "c_bank" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bankverbindung1
+                    Case "c_bank" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_Bankverbindung1, FIRMA_DE.Firma_Bankverbindung1)
-                    Case "c_iban" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_IBAN1.Replace("IBAN:", "")
+                    Case "c_iban" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_IBAN1.Replace("IBAN:", ""), FIRMA_DE.Firma_IBAN1.Replace("IBAN:", ""))
-                    Case "c_bic" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_BIC1.Replace("BIC:", "")
+                    Case "c_bic" : odoc.FormFields(fieldName).Range.Text = IIf(Not isKundeDE, FIRMA.Firma_BIC1.Replace("BIC:", ""), FIRMA_DE.Firma_BIC1.Replace("BIC:", ""))
                     Case "place_date" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtOrt.Text & ", " & IIf(IsDate(usrCntl.datDatum.Text), usrCntl.datDatum.Text, "")
 
                 End Select
 
             Next
 
+            For Each s As Microsoft.Office.Interop.Word.Section In odoc.Sections
+                For Each header As Microsoft.Office.Interop.Word.HeaderFooter In s.Headers
+                    For Each img_word As Microsoft.Office.Interop.Word.Shape In header.Shapes
+
+                        If img_word.AlternativeText.ToLower.Contains("rmc-logo") Then
+                            img_word.Visible = usrCntl.cbxRMC.Checked
+                        End If
+
+                        If img_word.AlternativeText.ToLower.Contains("verag360-logo") Then
+                            '\\developer.verag.ost.dmn\F\Grafik\VERAG\LOGOs\VERIMEX360.jpg
+                            img_word.Visible = Not isKundeDE
+                        End If
+
+                        If img_word.AlternativeText.ToLower.Contains("veraggmbh-logo") Then
+                            '\\developer.verag.ost.dmn\F\Grafik\VERAG\LOGOs\VERAG GmbH\Verag-Spedition-GMBH-Logo.png
+                            img_word.Visible = isKundeDE
+                        End If
+
+                    Next
+                Next
+            Next
+
 
             odoc.Save() : odoc.Activate()
 

SDL/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.3.1.5")>
+<Assembly: AssemblyVersion("1.3.1.6")>
-<Assembly: AssemblyFileVersion("1.3.1.5")>
+<Assembly: AssemblyFileVersion("1.3.1.6")>

SDL/Speditionsbuch/Nacherfassung/rptSpeditionsberichtKdSpez.vb

@@ -3,7 +3,6 @@ Imports GrapeCity.ActiveReports.Document
 
 Public Class rptSpeditionsberichtKdSpez
 
-    Private Sub GroupHeader3_Format(sender As Object, e As EventArgs) Handles GroupHeader3.Format
 
-    End Sub
+
 End Class

SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb

@@ -1249,6 +1249,8 @@ Public Class usrCntlSpeditionsBuchSuche
 
             Dim rpt As New rptSpeditionsberichtKdSpez
 
+            rpt.PageSettings.PaperKind = GrapeCity.ActiveReports.Printing.PaperKind.A4
+
             Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
                 Case "IMEX" : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Label28.Text = "IMEX Customs Service GmbH"
                 Case "ATILLA" : rpt.picVERAG.Image = My.Resources.Atilla : rpt.Label28.Text = "ATILLA Spedition"

SDL/buchhaltung/rptMahnung.Designer.vb

@@ -1197,7 +1197,7 @@ Partial Public Class rptMahnung
         Me.lblReBetrag.Padding = New GrapeCity.ActiveReports.PaddingEx(0, 0, 2, 0)
         Me.lblReBetrag.Style = "color: Black; font-size: 9pt; font-weight: bold; text-align: right; text-justify:" &
     " auto; ddo-char-set: 1"
-        Me.lblReBetrag.Text = "Belegnr."
+        Me.lblReBetrag.Text = "Betrag"
         Me.lblReBetrag.Top = 0.7909449!
         Me.lblReBetrag.Width = 0.6889764!
         '

SDL/buchhaltung/usrCntlBH.vb

@@ -94,7 +94,7 @@ Public Class usrCntlBH
         Me.Cursor = Cursors.Default
 
         Catch ex As Exception
-            MsgBox(ex.Message & ex.StackTrace)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
     End Sub
 
@@ -223,6 +223,7 @@ Public Class usrCntlBH
         sqlStr &= "SELECT * FROM ("
         sqlStr &= " SELECT        Ordnungsbegriff, AdressenNr as KdNr, Adressen.LandKz, "
         If cbxDeckungsstoppAnzeigen.Checked Then sqlStr &= " (SELECT TOP 1 ISNULL([kde_Versicherung_DeckungsstoppDatum],'')  FROM [tblKundenErweitert]  where kde_Versicherung_Deckungsstopp=1 and kde_KundenNr=AdressenNr) AS DS, "
+        sqlStr &= " (SELECT TOP 1 ISNULL(kde_txtVersicherungNichtVersicherbar,'')  FROM [tblKundenErweitert]  where  kde_KundenNr=AdressenNr) AS nichtVersicherbar, "
         If True Then sqlStr &= " isnull((SELECT TOP 1 [kde_Versicherung_GemeldeterBetrag] FROM [tblKundenErweitert]  where kde_KundenNr=AdressenNr),0) AS GemeldeterBetrag, "
         sqlStr &= "     (SELECT SUM(Saldo) FROM dbo.[Offene_Posten_DVO] WHERE (KundenNr = AdressenNr )) AS LfdSaldo, "
         sqlStr &= "     (SELECT        MIN(Datum) AS Expr1"
@@ -450,7 +451,7 @@ Public Class usrCntlBH
             print.Show()
 
         Catch ex As Exception
-            MsgBox(ex.Message)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
         Me.Cursor = Cursors.Default
     End Sub
@@ -634,7 +635,7 @@ Public Class usrCntlBH
                                                     OP.SAVE()
 
                                                 Catch ex As Exception
-                                                    MsgBox("KdNr: " & kdnr & vbNewLine & ex.Message & ex.StackTrace)
+                                                    VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
                                                 End Try
 
 
@@ -653,7 +654,7 @@ Public Class usrCntlBH
                                     'For Each currentField In currentRow
                                     'Next
                                 Catch ex As Exception
-                                    MsgBox(kdnr_tmp & "  " & ex.Message & ex.StackTrace)
+                                    VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
                                 End Try
                             End While
                             Label30.Text = (cnt + 1) & " / " & LineCount
@@ -666,7 +667,7 @@ Public Class usrCntlBH
             End If
 
         Catch ex As Exception
-            MsgBox(ex.Message & ex.StackTrace)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         Finally
 
         End Try

SDL/frmEssensbestellungen.vb

@@ -631,7 +631,7 @@ Public Class frmEssensbestellungen
         End If
 
 
-        cbxGebauede.Text = currentEssen.eb_gebaeude
+        cbxGebauede._value = currentEssen.eb_gebaeude
         txtAnmerkung.Text = currentEssen.eb_anmerkung
 
 

SDL/kunden/frmKundenblatt.Designer.vb

@@ -2241,7 +2241,6 @@ Partial Class frmKundenblatt
         '
         Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM"
-        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8
         Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4)
         Me.cntxtCntxtMDM.Text = "cntxtMDM"
         '

SDL/kunden/usrcntlKundeBearbeitenFull.vb

@@ -836,7 +836,9 @@ Public Class usrcntlKundeBearbeitenFull
     Private Sub loadControls()
         cboAbf_Waehrung.fillWithSQL("SELECT [Währungscode],[Land] FROM Währungstabelle ORDER BY Währungscode",  , "FMZOLL", False)
 
-        cbxKapitalWaehrung.Items.AddRange(cboAbf_Waehrung.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())
+        cbxKapitalWaehrung.fillWithSQL("SELECT fw_iso3,  fw_land FROM [VERAG].[dbo].[tblWahrungtabelleNEU] order by fw_land ",  , "FMZOLL", False)
+
+        'cbxKapitalWaehrung.Items.AddRange(cboAbf_Waehrung.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())
 
         cboAbf_Steuerschluessel.fillWithSQL("SELECT [Steuerschlüssel], isnull(cast(cast( [Steuersatz %]*100 as decimal(2))as varchar(5)) + '% - ' +AuswahlSteuerbezeichnung,'') as Bezeichnung FROM [Steuertabelle] ORDER BY Steuerschlüssel", False, "FMZOLL", True)
 
@@ -872,7 +874,6 @@ Public Class usrcntlKundeBearbeitenFull
                 cboFiliale.changeItem("5601")
             Case "AMBAR"
                 cboFiliale.changeItem("5701")
-                cboFiliale.changeItem("5701")
             Case "ATILLA"
                 cboFiliale.changeItem("4801")
             Case Else

SDL/mdm/frmMDMDatenverarbetiung.Designer.vb

@@ -25,6 +25,9 @@ Partial Class frmMDMDatenverarbetiung
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMDMDatenverarbetiung))
         Me.pnl = New System.Windows.Forms.Panel()
+        Me.Panel5 = New System.Windows.Forms.Panel()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.DateTimePicker2 = New System.Windows.Forms.DateTimePicker()
         Me.PictureBox5 = New System.Windows.Forms.PictureBox()
         Me.cbxBelegeerstellt = New System.Windows.Forms.CheckBox()
         Me.cbxASFINAGAbgerechnet = New System.Windows.Forms.CheckBox()
@@ -75,10 +78,8 @@ Partial Class frmMDMDatenverarbetiung
         Me.txtPruefsummeBrutto = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtPruefsummeNetto = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtAnzahl = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.Panel5 = New System.Windows.Forms.Panel()
-        Me.Label5 = New System.Windows.Forms.Label()
-        Me.DateTimePicker2 = New System.Windows.Forms.DateTimePicker()
         Me.pnl.SuspendLayout()
+        Me.Panel5.SuspendLayout()
         CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel4.SuspendLayout()
         Me.FlowLayoutPanel.SuspendLayout()
@@ -89,7 +90,6 @@ Partial Class frmMDMDatenverarbetiung
         Me.Panel3.SuspendLayout()
         Me.Panel2.SuspendLayout()
         CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.Panel5.SuspendLayout()
         Me.SuspendLayout()
         '
         'pnl
@@ -111,6 +111,33 @@ Partial Class frmMDMDatenverarbetiung
         Me.pnl.Size = New System.Drawing.Size(1163, 100)
         Me.pnl.TabIndex = 1
         '
+        'Panel5
+        '
+        Me.Panel5.Controls.Add(Me.Label5)
+        Me.Panel5.Controls.Add(Me.DateTimePicker2)
+        Me.Panel5.Location = New System.Drawing.Point(3, 67)
+        Me.Panel5.Name = "Panel5"
+        Me.Panel5.Size = New System.Drawing.Size(264, 33)
+        Me.Panel5.TabIndex = 29
+        Me.Panel5.Visible = False
+        '
+        'Label5
+        '
+        Me.Label5.AutoSize = True
+        Me.Label5.Location = New System.Drawing.Point(11, 12)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(113, 13)
+        Me.Label5.TabIndex = 23
+        Me.Label5.Text = "Rechnungsdaten von:"
+        '
+        'DateTimePicker2
+        '
+        Me.DateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
+        Me.DateTimePicker2.Location = New System.Drawing.Point(143, 6)
+        Me.DateTimePicker2.Name = "DateTimePicker2"
+        Me.DateTimePicker2.Size = New System.Drawing.Size(103, 20)
+        Me.DateTimePicker2.TabIndex = 22
+        '
         'PictureBox5
         '
         Me.PictureBox5.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen
@@ -712,33 +739,6 @@ Partial Class frmMDMDatenverarbetiung
         Me.txtAnzahl.TabIndex = 35
         Me.txtAnzahl.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
         '
-        'Panel5
-        '
-        Me.Panel5.Controls.Add(Me.Label5)
-        Me.Panel5.Controls.Add(Me.DateTimePicker2)
-        Me.Panel5.Location = New System.Drawing.Point(3, 67)
-        Me.Panel5.Name = "Panel5"
-        Me.Panel5.Size = New System.Drawing.Size(264, 33)
-        Me.Panel5.TabIndex = 29
-        Me.Panel5.Visible = False
-        '
-        'Label5
-        '
-        Me.Label5.AutoSize = True
-        Me.Label5.Location = New System.Drawing.Point(11, 12)
-        Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(113, 13)
-        Me.Label5.TabIndex = 23
-        Me.Label5.Text = "Rechnungsdaten von:"
-        '
-        'DateTimePicker2
-        '
-        Me.DateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
-        Me.DateTimePicker2.Location = New System.Drawing.Point(143, 6)
-        Me.DateTimePicker2.Name = "DateTimePicker2"
-        Me.DateTimePicker2.Size = New System.Drawing.Size(103, 20)
-        Me.DateTimePicker2.TabIndex = 22
-        '
         'frmMDMDatenverarbetiung
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -754,6 +754,8 @@ Partial Class frmMDMDatenverarbetiung
         Me.Text = "Datenverarbeitung"
         Me.pnl.ResumeLayout(False)
         Me.pnl.PerformLayout()
+        Me.Panel5.ResumeLayout(False)
+        Me.Panel5.PerformLayout()
         CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit()
         Me.Panel4.ResumeLayout(False)
         Me.Panel4.PerformLayout()
@@ -767,8 +769,6 @@ Partial Class frmMDMDatenverarbetiung
         Me.Panel2.ResumeLayout(False)
         Me.Panel2.PerformLayout()
         CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.Panel5.ResumeLayout(False)
-        Me.Panel5.PerformLayout()
         Me.ResumeLayout(False)
 
     End Sub

SDL/mdm/frmMDMDatenverarbetiung.vb

@@ -1,12 +1,6 @@
 Imports System.Data.OleDb
 Imports System.DirectoryServices.ActiveDirectory
 Imports System.IO
-Imports Chilkat
-Imports com.sun.jdi
-Imports com.sun.net.httpserver.Authenticator
-Imports DAKOSY_Worker.NichtAbschliessendeFestsetzung
-Imports sun.nio.cs.ext
-Imports VERAG_PROG_ALLGEMEIN
 
 Public Class frmMDMDatenverarbetiung
 
@@ -15,7 +9,7 @@ Public Class frmMDMDatenverarbetiung
     ' Dim ProduktCode_NOT_IN = "SELECT plp_ProductCode FROM [tblPLOSE_Produktbeschreibung] WHERE  [plp_einarbeiten]=0 "
     Dim ProduktCode_NOT_IN = "'9020'"
     Dim datum As Date = Nothing
-    Dim test As Boolean = True
+    Dim test As Boolean = False
 
     Private Sub frmPloseDatenverarbetiung_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Me.Top = 0
@@ -23,6 +17,8 @@ Public Class frmMDMDatenverarbetiung
 
         VERAG_PROG_ALLGEMEIN.cProgramFunctions.SetDoubleBuffered(MyDatagridview1)
 
+        test = cbxTestdaten.Checked
+
     End Sub
 
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
@@ -88,7 +84,14 @@ Public Class frmMDMDatenverarbetiung
     End Sub
 
     Private Sub btnREerstellen_Click_1(sender As Object, e As EventArgs) Handles btnREerstellen.Click
+
         Dim errorTmp = False
+
+        If test Then
+
+            If Not vbYes = MsgBox("Aktuell ist der Testlauf aktiviert, wirklich fortfahren?", vbYesNoCancel) Then Exit Sub
+
+        End If
         Select Case LIEFERANT
             Case "PLOSE"
                 If genRGAtt_PLOSE() Then
@@ -102,7 +105,6 @@ Public Class frmMDMDatenverarbetiung
                         setFakturiert(LIEFERANT)
                     End If
                 End If
-
             Case "IDS"
                 MsgBox("Nicht verfügbar!")
             Case "MSE"
@@ -111,7 +113,6 @@ Public Class frmMDMDatenverarbetiung
                         setFakturiert(LIEFERANT)
                     End If
                 End If
-
             Case "ASFINAG"
                 Dim abrechnungsDatum As DateTime = Now()
                 If datum = Nothing Then
@@ -124,7 +125,6 @@ Public Class frmMDMDatenverarbetiung
                     MautD_Befuellen(inputKdNr)
                 End If
                 initDgv_ASFINAG(cbxASFINAGAbgerechnet.Checked, cbxBelegeerstellt.Checked)
-
         End Select
     End Sub
 
@@ -133,7 +133,6 @@ Public Class frmMDMDatenverarbetiung
     Sub genSummenbericht_PLOSE()
         Dim displayFilter = False
         Dim sqlstr As String = ""
-
         sqlstr &= " SELECT 	  count(*) Anzahl	,plose_ProduktCode"
         sqlstr &= ",max(plose_Produktbeschreibung) as plose_Produktbeschreibung"
         sqlstr &= ",sum(plose_Menge) as plose_Menge"
@@ -902,7 +901,7 @@ Public Class frmMDMDatenverarbetiung
 
         cbxASFINAGAbgerechnet.Visible = False
         cbxBelegeerstellt.Visible = False
-        cbxTestdaten.Visible = False
+        cbxTestdaten.Visible = VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", Me.FindForm)
         pnlAsfinag.Visible = False
         Panel4.Visible = False
         Panel5.Visible = False
@@ -922,7 +921,6 @@ Public Class frmMDMDatenverarbetiung
                 cbxASFINAGAbgerechnet.Visible = True
                 cbxBelegeerstellt.Visible = True
                 If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", Me.FindForm) Then
-                    'cbxTestdaten.Visible = True
                 End If
                 pnlAsfinag.Visible = True
                 Exit Sub
@@ -1170,7 +1168,7 @@ Public Class frmMDMDatenverarbetiung
                 dt_CSV_selected.Constraints.Clear()
 
 
-                Dim fn As String = dir & "\" & csv.Item("Customer ID") & "_Maut_MSE.csv"
+                Dim fn As String = dir & "\" & csv.Item("Customer Nr") & "_Maut_MSE.csv"
                 Dim outFile As System.IO.StreamWriter = My.Computer.FileSystem.OpenTextFileWriter(fn, False)
                 Dim clmns As String = ""
                 For i = 0 To dt_CSV_selected.Columns.Count - 1
@@ -1229,10 +1227,10 @@ Public Class frmMDMDatenverarbetiung
                 For Each f In Directory.GetFiles(dirAnhang)
                     File.Delete(f)
                 Next
+            Else
+                Directory.CreateDirectory(dirAnhang)
             End If
 
-            If Not Directory.Exists(dirAnhang) Then Directory.CreateDirectory(dirAnhang)
-
             For Each f In Directory.GetFiles(dir)
                 File.Copy(f, dirAnhang & (New FileInfo(f)).Name)
             Next
@@ -1240,7 +1238,6 @@ Public Class frmMDMDatenverarbetiung
             'IN FMZOLL / DB MautD einfügen --> Mautbericht
             'genPLOSEInsertMautD(dat_Sum_Von.Value.ToShortDateString, dat_Sum_Bis.Value.ToShortDateString)
 
-
             pbPloseAnh_Proz.Value = 100
             txtPloseAnh_Einarbeitung.Text = dt_Main.Rows.Count & " / " & dt_Main.Rows.Count
             lblPloseAnh_Proz.Text = "100.00 %"
@@ -2629,6 +2626,7 @@ Public Class frmMDMDatenverarbetiung
 
     Function gen_SPEDBUCH_ByKdNr(KdNr As String, ByRef SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, Lieferant As String, Optional PLOSEKundenNr As String = "", Optional von As Date = Nothing, Optional bis As Date = Nothing)
         Try
+            If KdNr = "" Then Return False
 
             Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(KdNr)
             SPEDBUCH = New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch
@@ -2830,6 +2828,8 @@ Public Class frmMDMDatenverarbetiung
     Function gen_RECHNUNG_BySPEDBUCH(KdNr As String, SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, Lieferant As String, Optional PLOSEKundenNr As String = "", Optional von As Date = Nothing, Optional bis As Date = Nothing)
         Try
 
+            If KdNr = "" Then Return False
+
             Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(SPEDBUCH.VermittlerKundenNr)
             Dim KD As New VERAG_PROG_ALLGEMEIN.cKunde(SPEDBUCH.VermittlerKundenNr)
             Dim RG As New VERAG_PROG_ALLGEMEIN.cRechnungsausgang
@@ -3633,6 +3633,11 @@ Public Class frmMDMDatenverarbetiung
     End Sub
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+
+        If test Then
+            If Not vbYes = MsgBox("Aktuell ist der Testlauf aktiviert, wirklich fortfahren?", vbYesNoCancel) Then Exit Sub
+        End If
+
         If vbYes = MsgBox("Möchten Sie den Vorgang wirklich manuell ausgeführen (wird bei Rechnungserstellung automatisch ausgeführt)", vbYesNoCancel) Then
             MautD_Befuellen()
         End If
@@ -3678,6 +3683,11 @@ Public Class frmMDMDatenverarbetiung
     End Sub
 
     Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
+
+        If test Then
+            If Not vbYes = MsgBox("Aktuell ist der Testlauf aktiviert, wirklich fortfahren?", vbYesNoCancel) Then Exit Sub
+        End If
+
         If vbYes = MsgBox("Möchten Sie den Vorgang wirklich manuell ausgeführen (wird bei Rechnungserstellung automatisch ausgeführt)", vbYesNoCancel) Then
             Select Case LIEFERANT
                 Case "PLOSE" : setFakturiert(LIEFERANT)
@@ -3818,7 +3828,7 @@ Public Class frmMDMDatenverarbetiung
 
 
 
-                cbxASFINAGAbgerechnet.Checked = True
+            cbxASFINAGAbgerechnet.Checked = True
             'initDgv_ASFINAG(Not cbxASFINAGNichtAbgerechnet.Checked)
         End If
 
@@ -3897,5 +3907,7 @@ Public Class frmMDMDatenverarbetiung
         Process.Start(webAddress)
     End Sub
 
-
+    Private Sub cbxTestdaten_CheckedChanged(sender As Object, e As EventArgs) Handles cbxTestdaten.CheckedChanged
+        test = cbxTestdaten.Checked
+    End Sub
 End Class

VERAG_PROG_ALLGEMEIN/Classes/cFremdwaehrungskurse.vb

@@ -117,3 +117,93 @@ Public Class cFremdwaehrungskurse
 
 
 End Class
+
+
+Public Class cWaehrungskurseNEU
+
+
+    Property fw_id As String
+    Property fw_iso2 As String
+    Property fw_iso3 As String
+    Property fw_land As String
+    Property fw_kurswert As Double
+
+
+    Dim SQL As New SQL
+
+    Sub New()
+
+    End Sub
+
+
+    Public Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+        Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fw_id", fw_id))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fw_iso2", fw_iso2))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fw_iso3", fw_iso3))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fw_land", fw_land))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fw_kurswert", fw_kurswert))
+
+        Return list
+    End Function
+
+
+
+
+    Public Function SAVE() As Boolean
+        Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+
+
+        Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblWahrungtabelleNEU WITH(updlock,serializable) WHERE fw_iso2=@fw_iso2 AND fw_land=@fw_land) " &
+                       " BEGIN " & getUpdateCmd() & " END " &
+                       " Else " &
+                       " BEGIN " & getInsertCmd() & " END " &
+                       " commit tran "
+
+
+        Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list)
+    End Function
+
+
+
+    Public Function getUpdateCmd() As String
+        Try
+            Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+
+            Dim str As String = ""
+            For Each i In list
+                If Not i.isPrimaryParam Then
+                    str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+                End If
+            Next
+            str = str.Substring(0, str.Length - 1) 'wg. ','
+            Return (" UPDATE [tblWahrungtabelleNEU] SET " & str & " WHERE fw_iso2=@fw_iso2 AND fw_land=@fw_land")
+
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+        Return ""
+    End Function
+
+
+    Public Function getInsertCmd() As String
+        Try
+            Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+            Dim str As String = ""
+            Dim values As String = ""
+            For Each i In list
+                If Not i.isPrimaryParam Then
+                    str &= "[" & i.Text & "],"
+                    values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+                End If
+            Next
+            str = str.Substring(0, str.Length - 1) 'wg. ','
+            values = values.Substring(0, values.Length - 1) 'wg. ','
+            Return (" INSERT INTO tblWahrungtabelleNEU  (" & str & ") VALUES(" & values & ")  ")
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+        Return ""
+    End Function
+
+End Class

VERAG_PROG_ALLGEMEIN/Classes/cGesamtsicherheitsPositionen.vb

@@ -18,6 +18,9 @@ Public Class cGesamtsicherheitsPositionen
     Property gsp_erstellungsdatum As DateTime
     Property gsp_isPosRundungsdiff As Boolean
 
+    Property gsp_zuletztgeandert As Object = Nothing
+    Property gsp_systemuser As Object = Nothing
+
     Property gsp_datum As Object = Nothing
 
     Public hasEntry = False
@@ -51,6 +54,8 @@ Public Class cGesamtsicherheitsPositionen
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_erstellungsdatum", gsp_erstellungsdatum))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_datum", gsp_datum))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_isPosRundungsdiff", gsp_isPosRundungsdiff))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_systemuser", gsp_systemuser))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_zuletztgeandert", gsp_zuletztgeandert))
 
 
         Return list

VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb

@@ -1557,7 +1557,6 @@ Public Class cFormularManager
                 End If
             End If
 
-
             'If Not VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense() Then MsgBox("Fehler beim Laden der SPIRE-Lizenz")
 
             Using webClient As New Net.WebClient()

VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb

@@ -1,11 +1,5 @@
 Imports System.Drawing
-Imports System.IO
-Imports System.Reflection
-Imports System.Security.Policy
-Imports System.Threading
-Imports System.Web.UI.WebControls.WebParts
 Imports System.Windows.Forms
-Imports VERAG_PROG_ALLGEMEIN.cMessenger
 
 Public Class frmMessenger
     Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL

VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb

@@ -1,11 +1,8 @@
 
 Imports System.Drawing
-Imports System.Globalization
-Imports System.Reflection
 Imports System.Text
 Imports System.Threading
 Imports System.Windows.Forms
-Imports DocumentFormat.OpenXml.Drawing.Diagrams
 
 Public Class frmUeberstundenauszahlen
     Dim refresh As Boolean = False

VERAG_PROG_ALLGEMEIN/Schnittstellen/MIC/cMICInterface.vb

@@ -33,8 +33,6 @@ Public Class cMICInterface
 
             Return False 'TEST!
 
-
-
             Return True
         Catch ex As Exception
             MsgBox(ex.Message & ex.StackTrace)

VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb

@@ -1,9 +1,6 @@
 Imports System.Data.SqlClient
-Imports System.EnterpriseServices
-Imports System.IO
 Imports System.Net
 Imports System.Reflection
-Imports DocumentFormat.OpenXml.InkML
 
 Public Class cMSEAPI
 
@@ -1016,19 +1013,18 @@ Public Class cMSEAPI
                     '\\datenarchiv\Datenarchiv\MDM_SCHNITTSTELLEN\ECHTSYSTEM\Nachrichtendaten_ZIEL\MSE
 
                     If r("url") <> "" AndAlso r("name") <> "" AndAlso r("name").contains("VAT") Then 'only VAT-Invoices
-                        Dim inv As New cMSEInvoices(r("name"), r("inv.invoice_id"))
+                        Dim inv As New cMSEInvoices(r("name"), r("invoice_id"))
-                        If Not inv.imported Then 'verhindert unnötige Downloads
+                        If IsDBNull(inv.daId) Then 'verhindert unnötige Downloads
                             Dim filepath = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURLStream(r("url"), r("name"), PDFRECHNUNGENPFAD, False)
                             If filepath <> "" AndAlso uploadToDs Then
                                 Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "MSE", Now.Year, Now.ToString("yyyyMMdd"), r("name"))
                                 DS.uploadDataToDATENSERVER(filepath & "\" & r("name"),,,,,, True)
-                                SQL.doSQL("Update [tblMSEInvoices] SET [daId]='" & DS.da_id & "', imported = 1 where [name] = '" & r("name") & "'", "FMZOLL")
+                                SQL.doSQL("Update [tblMSEInvoices] SET [daId]='" & DS.da_id & "' where [name] = '" & r("name") & "'", "FMZOLL")
                             End If
 
                         End If
                     End If
 
-
                 Next
 
                 dt = dt.DefaultView.ToTable()
@@ -1041,7 +1037,6 @@ Public Class cMSEAPI
     End Function
 
 
-
     Public Sub saveTransactions(num As Integer, dt As DataTable, transactions As Chilkat.JsonArray, receiver As Integer, Optional ignorePurchaseDate As Boolean = False, Optional onlyBilledTransactions As Boolean = True)
 
         Dim j As Integer = 0

VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb

@@ -246,7 +246,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
             wb.Worksheets(0).Tables.FirstOrDefault().ShowAutoFilter = ShowAutoFilter
 
             If rangeAsWaehrung IsNot Nothing Then
-                For Each r As IXLRangeAddress In rangeAsWaehrung
+                For Each r As String In rangeAsWaehrung
                     Try
                         wb.Worksheets(0).Range(r).Style.NumberFormat.SetFormat("###,###,##0.00 €")
                     Catch ex As Exception

VERAG_PROG_ALLGEMEIN/cSicherheiten.vb

@@ -25,6 +25,8 @@ Public Class cSicherheiten
     Property gs_avisoId As Integer
     Property gs_isRundungsdiff As Boolean
     Property gs_ReferenzAenderung As Boolean
+    Property gs_zuletztgeandert As Object = Nothing
+    Property gs_systemuser As Object = Nothing
 
     Public hasEntry = False
 
@@ -69,6 +71,8 @@ Public Class cSicherheiten
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_avisoId", gs_avisoId))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_isRundungsdiff", gs_isRundungsdiff))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_ReferenzAenderung", gs_ReferenzAenderung))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_zuletztgeandert", gs_zuletztgeandert))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_systemuser", gs_systemuser))
 
         Return list
     End Function