merge

2024-10-10 14:41:18 +02:00
parent 8ce76ed4f6 f9003db09d
commit bda299a576
27 changed files with 463 additions and 232 deletions
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.Designer.vb
+++ b/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 btnPreise As Button
+    Friend WithEvents speziell As DataGridViewTextBoxColumn
 End Class
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.resx
+++ b/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">
-    <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">
+  <metadata name="speziell.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">
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrCntlQualitaetskontrolle.vb
+++ b/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.Rows.Count > 0 Then dgvGebuehren.Rows.Clear()
+            If dgvGebuehren IsNot Nothing AndAlso 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
-
-                If r IsNot Nothing And IsNumeric(r.Cells(4).Value) AndAlso r.Cells(4).Value >= 1000 Then
-                    posVorhanden = True
-
-                    If r.Cells(5).Value <> "" Then
-                        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
+            For Each r In tableResultGroup.Rows
+                If Not IsDBNull(r("gewicht")) AndAlso IsNumeric(r("gewicht")) AndAlso Not IsDBNull(r("spez/allg")) Then
+                    If r("spez/allg") = "spez." Then
+                        sumNormenSpez += CDbl(r("gewicht"))
+                    ElseIf r("spez/allg").ToString.Contains("allg") Then
+                        sumNormenAllg += CDbl(r("gewicht"))
                    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
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.Designer.vb
+++ b/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
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_EU.vb
+++ b/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 & " ", "")
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.Designer.vb
+++ b/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
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_MDM_NICHT_EU.vb
+++ b/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
-            cbxPrivatfirma.Visible = True
+        Dim privatfirma As Boolean = False
+        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
--- a/SDL/Formulare/KDFormulare/frmFormulare.vb
+++ b/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_name1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
-                    Case "c_name2" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
-                    Case "c_name3" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
-                    Case "c_name4" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
-                    Case "c_name5" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
-                    Case "c_name6" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
-                    Case "c_name7" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez
-                    Case "c_address" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Straße & " " & FIRMA.Firma_Ort
-                    Case "c_street" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Straße
-                    Case "c_zipcode" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Ort
-                    Case "c_vatno" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_UID
+                    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 = IIf(Not isKundeDE, FIRMA.Firma_Bez, FIRMA_DE.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 = IIf(Not isKundeDE, FIRMA.Firma_Bez, FIRMA_DE.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 = IIf(Not isKundeDE, FIRMA.Firma_Bez, FIRMA_DE.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 = IIf(Not isKundeDE, FIRMA.Firma_Bez, FIRMA_DE.Firma_Bez)
+                    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 = IIf(Not isKundeDE, FIRMA.Firma_Straße, FIRMA_DE.Firma_Straße)
+                    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 = 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_iban" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_IBAN1.Replace("IBAN:", "")
-                    Case "c_bic" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_BIC1.Replace("BIC:", "")
+                    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 = IIf(Not isKundeDE, FIRMA.Firma_IBAN1.Replace("IBAN:", ""), FIRMA_DE.Firma_IBAN1.Replace("IBAN:", ""))
+                    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()