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

SDL/Fakturierung/frmFaktSammelRgDrucken.vb

@@ -59,7 +59,7 @@ Public Class frmFaktSammelRgDrucken
             Dim whereAbfArt = ""
             If cboAbfertigungsart._value <> "" Then whereAbfArt = " AND (SELECT Abfertigungsart FROM Speditionsbuch WHERE Speditionsbuch.FilialenNr=Rechnungsausgang.FilialenNr and Speditionsbuch.AbfertigungsNr=Rechnungsausgang.AbfertigungsNr and Speditionsbuch.UnterNr=Rechnungsausgang.SpeditionsbuchUnterNr)='" & cboAbfertigungsart._value & "'  "
 
-            Dim sqlStr = " SELECT Rechnungsausgang.RechnungsKundenNr, max(Rechnungsausgang.[RechnungsName 1]) as [RechnungsName 1]," & If(Sammelrechung = 7, "AvisoId", "0") & " as AvisoId,max(Rechnungsausgang.[RechnungsLandKz]) as [RechnungsLandKz] , count(*) as Anzahl" & If(Sammelrechung = 7, ",max([LKW Kennzeichen]) as LKW", "") & " 
+            Dim sqlStr = " SELECT Rechnungsausgang.RechnungsKundenNr, max(Rechnungsausgang.[RechnungsName 1]) as [RechnungsName 1]," & If(Sammelrechung = 7, "AvisoId", "0") & " as AvisoId,max(Rechnungsausgang.[RechnungsLandKz]) as [RechnungsLandKz] , count(*) as Anzahl, SUM(Rechnungsausgang.SteuerfreierGesamtbetrag + Rechnungsausgang.SteuerpflichtigerGesamtbetrag) AS Summe" & If(Sammelrechung = 7, ",max([LKW Kennzeichen]) as LKW", "") & " 
                             ,(SELECT CASE WHEN Rechnungsdruck =0 THEN 'POST' WHEN Rechnungsdruck=1 THEN 'FAX' WHEN Rechnungsdruck=2 THEN 'E-MAIL' ELSE '-' END FROM Adressen WHERE AdressenNr=Rechnungsausgang.RechnungsKundenNr ) as Rechnungsdruck 
                              FROM Rechnungsausgang  
 	                         WHERE Rechnungsausgang.Status IN (0,2) And Rechnungsausgang.Firma_ID = '" & cboFirma._value & "' And Rechnungsausgang.Sammelrechnung = '" & Sammelrechung & "' And CONVERT(DATE,Rechnungsausgang.Abfertigungsdatum,104) <= '" & txtZeitraumBis._value & "'
@@ -74,6 +74,9 @@ Public Class frmFaktSammelRgDrucken
             .Columns("RechnungsKundenNr").Width = 120
             .Columns("RechnungsKundenNr").HeaderText = "KundenNr"
             .Columns("RechnungsName 1").HeaderText = "Firma"
+            .Columns("Summe").HeaderText = "Summe"
+            .Columns("Summe").DefaultCellStyle.Format = "#,##0.00 €"
+            .Columns("Summe").Width = 80
             .Columns("RechnungsLandKz").Visible = False
             .Columns("Anzahl").Width = 42
             .Columns("Rechnungsdruck").Width = 80
@@ -81,7 +84,7 @@ Public Class frmFaktSammelRgDrucken
             .Columns("Rechnungsdruck").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
             .Columns("Anzahl").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
             .Columns(2).Visible = False
-            If .Columns.Count = 7 Then
+            If .Columns.Count = 8 Then
                 .Columns("LKW").Width = 80
             End If
 

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/usrcntlVerzollungspreise.Designer.vb

@@ -46,6 +46,8 @@ Partial Class usrcntlVerzollungspreise
         Me.ZLeistung = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.ZPreis = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.cbxZollpflichtigeAbfertigung = New System.Windows.Forms.CheckBox()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.MyComboBoxSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.dgvZusatzleistung, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -190,10 +192,12 @@ Partial Class usrcntlVerzollungspreise
         Me.txtZahlunsziel._DateTimeOnly = False
         Me.txtZahlunsziel._numbersOnly = True
         Me.txtZahlunsziel._numbersOnlyKommastellen = ""
+        Me.txtZahlunsziel._numbersOnlyTrennzeichen = True
         Me.txtZahlunsziel._Prozent = False
         Me.txtZahlunsziel._ShortDateNew = False
         Me.txtZahlunsziel._ShortDateOnly = False
         Me.txtZahlunsziel._TimeOnly = False
+        Me.txtZahlunsziel._TimeOnly_Seconds = False
         Me.txtZahlunsziel._value = "10"
         Me.txtZahlunsziel._Waehrung = False
         Me.txtZahlunsziel._WaehrungZeichen = True
@@ -284,12 +288,35 @@ Partial Class usrcntlVerzollungspreise
         Me.cbxZollpflichtigeAbfertigung.Text = "Zollpflichtige Abfertigung"
         Me.cbxZollpflichtigeAbfertigung.UseVisualStyleBackColor = True
         '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label1.Location = New System.Drawing.Point(8, 92)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(58, 13)
+        Me.Label1.TabIndex = 38
+        Me.Label1.Text = "Sprache:"
+        '
+        'MyComboBoxSprache
+        '
+        Me.MyComboBoxSprache._allowedValuesFreiText = Nothing
+        Me.MyComboBoxSprache._allowFreiText = False
+        Me.MyComboBoxSprache._value = ""
+        Me.MyComboBoxSprache.FormattingEnabled = True
+        Me.MyComboBoxSprache.Location = New System.Drawing.Point(72, 89)
+        Me.MyComboBoxSprache.Name = "MyComboBoxSprache"
+        Me.MyComboBoxSprache.Size = New System.Drawing.Size(144, 21)
+        Me.MyComboBoxSprache.TabIndex = 39
+        '
         'usrcntlVerzollungspreise
         '
         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.MyComboBoxSprache)
+        Me.Controls.Add(Me.Label1)
         Me.Controls.Add(Me.cbxZollpflichtigeAbfertigung)
         Me.Controls.Add(Me.dgvZusatzleistung)
         Me.Controls.Add(Me.cboFirma)
@@ -339,4 +366,6 @@ Partial Class usrcntlVerzollungspreise
     Friend WithEvents ZLeistung As System.Windows.Forms.DataGridViewTextBoxColumn
     Friend WithEvents ZPreis As System.Windows.Forms.DataGridViewTextBoxColumn
     Friend WithEvents cbxZollpflichtigeAbfertigung As CheckBox
+    Friend WithEvents Label1 As Label
+    Friend WithEvents MyComboBoxSprache As VERAG_PROG_ALLGEMEIN.MyComboBox
 End Class

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

@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class usrcntlVollmacht_DE
     Inherits System.Windows.Forms.UserControl
 
     'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
     Protected Overrides Sub Dispose(ByVal disposing As Boolean)
         Try
             If disposing AndAlso components IsNot Nothing Then
@@ -20,7 +20,7 @@ Partial Class usrcntlVollmacht_DE
     'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
     'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.lbl = New System.Windows.Forms.Label()
         Me.Label1 = New System.Windows.Forms.Label()
@@ -53,6 +53,7 @@ Partial Class usrcntlVollmacht_DE
         Me.cboSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.cbxEinmaligeVollmachtCarnetATA = New System.Windows.Forms.CheckBox()
         Me.txtEinmalig_CarnetATA = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.cbxVollmachtmitBefristung = New System.Windows.Forms.CheckBox()
         CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
@@ -140,7 +141,7 @@ Partial Class usrcntlVollmacht_DE
         '
         'btn
         '
-        Me.btn.BackgroundImage = Global.SDL.My.Resources.search
+        Me.btn.BackgroundImage = Global.SDL.My.Resources.Resources.search
         Me.btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btn.Location = New System.Drawing.Point(937, 34)
@@ -163,12 +164,15 @@ Partial Class usrcntlVollmacht_DE
         Me.txtAnsprechpartner._DateTimeOnly = False
         Me.txtAnsprechpartner._numbersOnly = False
         Me.txtAnsprechpartner._numbersOnlyKommastellen = ""
+        Me.txtAnsprechpartner._numbersOnlyTrennzeichen = True
         Me.txtAnsprechpartner._Prozent = False
         Me.txtAnsprechpartner._ShortDateNew = False
         Me.txtAnsprechpartner._ShortDateOnly = False
         Me.txtAnsprechpartner._TimeOnly = False
+        Me.txtAnsprechpartner._TimeOnly_Seconds = False
         Me.txtAnsprechpartner._value = Nothing
         Me.txtAnsprechpartner._Waehrung = False
+        Me.txtAnsprechpartner._WaehrungZeichen = True
         Me.txtAnsprechpartner.ForeColor = System.Drawing.Color.Black
         Me.txtAnsprechpartner.Location = New System.Drawing.Point(653, 9)
         Me.txtAnsprechpartner.MaxLineLength = -1
@@ -183,12 +187,15 @@ Partial Class usrcntlVollmacht_DE
         Me.txtEinmalig_RgDat._DateTimeOnly = False
         Me.txtEinmalig_RgDat._numbersOnly = False
         Me.txtEinmalig_RgDat._numbersOnlyKommastellen = ""
+        Me.txtEinmalig_RgDat._numbersOnlyTrennzeichen = True
         Me.txtEinmalig_RgDat._Prozent = False
         Me.txtEinmalig_RgDat._ShortDateNew = False
         Me.txtEinmalig_RgDat._ShortDateOnly = False
         Me.txtEinmalig_RgDat._TimeOnly = False
+        Me.txtEinmalig_RgDat._TimeOnly_Seconds = False
         Me.txtEinmalig_RgDat._value = Nothing
         Me.txtEinmalig_RgDat._Waehrung = False
+        Me.txtEinmalig_RgDat._WaehrungZeichen = True
         Me.txtEinmalig_RgDat.Enabled = False
         Me.txtEinmalig_RgDat.ForeColor = System.Drawing.Color.Black
         Me.txtEinmalig_RgDat.Location = New System.Drawing.Point(653, 162)
@@ -204,12 +211,15 @@ Partial Class usrcntlVollmacht_DE
         Me.txtEinmalig_RgNr._DateTimeOnly = False
         Me.txtEinmalig_RgNr._numbersOnly = False
         Me.txtEinmalig_RgNr._numbersOnlyKommastellen = ""
+        Me.txtEinmalig_RgNr._numbersOnlyTrennzeichen = True
         Me.txtEinmalig_RgNr._Prozent = False
         Me.txtEinmalig_RgNr._ShortDateNew = False
         Me.txtEinmalig_RgNr._ShortDateOnly = False
         Me.txtEinmalig_RgNr._TimeOnly = False
+        Me.txtEinmalig_RgNr._TimeOnly_Seconds = False
         Me.txtEinmalig_RgNr._value = Nothing
         Me.txtEinmalig_RgNr._Waehrung = False
+        Me.txtEinmalig_RgNr._WaehrungZeichen = True
         Me.txtEinmalig_RgNr.Enabled = False
         Me.txtEinmalig_RgNr.ForeColor = System.Drawing.Color.Black
         Me.txtEinmalig_RgNr.Location = New System.Drawing.Point(363, 162)
@@ -225,12 +235,15 @@ Partial Class usrcntlVollmacht_DE
         Me.txtEmail._DateTimeOnly = False
         Me.txtEmail._numbersOnly = False
         Me.txtEmail._numbersOnlyKommastellen = ""
+        Me.txtEmail._numbersOnlyTrennzeichen = True
         Me.txtEmail._Prozent = False
         Me.txtEmail._ShortDateNew = False
         Me.txtEmail._ShortDateOnly = False
         Me.txtEmail._TimeOnly = False
+        Me.txtEmail._TimeOnly_Seconds = False
         Me.txtEmail._value = Nothing
         Me.txtEmail._Waehrung = False
+        Me.txtEmail._WaehrungZeichen = True
         Me.txtEmail.ForeColor = System.Drawing.Color.Black
         Me.txtEmail.Location = New System.Drawing.Point(254, 136)
         Me.txtEmail.MaxLineLength = -1
@@ -245,12 +258,15 @@ Partial Class usrcntlVollmacht_DE
         Me.txtFax._DateTimeOnly = False
         Me.txtFax._numbersOnly = False
         Me.txtFax._numbersOnlyKommastellen = ""
+        Me.txtFax._numbersOnlyTrennzeichen = True
         Me.txtFax._Prozent = False
         Me.txtFax._ShortDateNew = False
         Me.txtFax._ShortDateOnly = False
         Me.txtFax._TimeOnly = False
+        Me.txtFax._TimeOnly_Seconds = False
         Me.txtFax._value = Nothing
         Me.txtFax._Waehrung = False
+        Me.txtFax._WaehrungZeichen = True
         Me.txtFax.ForeColor = System.Drawing.Color.Black
         Me.txtFax.Location = New System.Drawing.Point(653, 117)
         Me.txtFax.MaxLineLength = -1
@@ -265,12 +281,15 @@ Partial Class usrcntlVollmacht_DE
         Me.txtTel._DateTimeOnly = False
         Me.txtTel._numbersOnly = False
         Me.txtTel._numbersOnlyKommastellen = ""
+        Me.txtTel._numbersOnlyTrennzeichen = True
         Me.txtTel._Prozent = False
         Me.txtTel._ShortDateNew = False
         Me.txtTel._ShortDateOnly = False
         Me.txtTel._TimeOnly = False
+        Me.txtTel._TimeOnly_Seconds = False
         Me.txtTel._value = Nothing
         Me.txtTel._Waehrung = False
+        Me.txtTel._WaehrungZeichen = True
         Me.txtTel.ForeColor = System.Drawing.Color.Black
         Me.txtTel.Location = New System.Drawing.Point(254, 117)
         Me.txtTel.MaxLineLength = -1
@@ -285,12 +304,15 @@ Partial Class usrcntlVollmacht_DE
         Me.txtEori._DateTimeOnly = False
         Me.txtEori._numbersOnly = False
         Me.txtEori._numbersOnlyKommastellen = ""
+        Me.txtEori._numbersOnlyTrennzeichen = True
         Me.txtEori._Prozent = False
         Me.txtEori._ShortDateNew = False
         Me.txtEori._ShortDateOnly = False
         Me.txtEori._TimeOnly = False
+        Me.txtEori._TimeOnly_Seconds = False
         Me.txtEori._value = Nothing
         Me.txtEori._Waehrung = False
+        Me.txtEori._WaehrungZeichen = True
         Me.txtEori.ForeColor = System.Drawing.Color.Black
         Me.txtEori.Location = New System.Drawing.Point(653, 98)
         Me.txtEori.MaxLineLength = -1
@@ -305,12 +327,15 @@ Partial Class usrcntlVollmacht_DE
         Me.txtUid._DateTimeOnly = False
         Me.txtUid._numbersOnly = False
         Me.txtUid._numbersOnlyKommastellen = ""
+        Me.txtUid._numbersOnlyTrennzeichen = True
         Me.txtUid._Prozent = False
         Me.txtUid._ShortDateNew = False
         Me.txtUid._ShortDateOnly = False
         Me.txtUid._TimeOnly = False
+        Me.txtUid._TimeOnly_Seconds = False
         Me.txtUid._value = Nothing
         Me.txtUid._Waehrung = False
+        Me.txtUid._WaehrungZeichen = True
         Me.txtUid.ForeColor = System.Drawing.Color.Black
         Me.txtUid.Location = New System.Drawing.Point(254, 98)
         Me.txtUid.MaxLineLength = -1
@@ -325,12 +350,15 @@ Partial Class usrcntlVollmacht_DE
         Me.txtAdresse2._DateTimeOnly = False
         Me.txtAdresse2._numbersOnly = False
         Me.txtAdresse2._numbersOnlyKommastellen = ""
+        Me.txtAdresse2._numbersOnlyTrennzeichen = True
         Me.txtAdresse2._Prozent = False
         Me.txtAdresse2._ShortDateNew = False
         Me.txtAdresse2._ShortDateOnly = False
         Me.txtAdresse2._TimeOnly = False
+        Me.txtAdresse2._TimeOnly_Seconds = False
         Me.txtAdresse2._value = Nothing
         Me.txtAdresse2._Waehrung = False
+        Me.txtAdresse2._WaehrungZeichen = True
         Me.txtAdresse2.ForeColor = System.Drawing.Color.Black
         Me.txtAdresse2.Location = New System.Drawing.Point(254, 72)
         Me.txtAdresse2.MaxLineLength = -1
@@ -345,12 +373,15 @@ Partial Class usrcntlVollmacht_DE
         Me.txtAdresse1._DateTimeOnly = False
         Me.txtAdresse1._numbersOnly = False
         Me.txtAdresse1._numbersOnlyKommastellen = ""
+        Me.txtAdresse1._numbersOnlyTrennzeichen = True
         Me.txtAdresse1._Prozent = False
         Me.txtAdresse1._ShortDateNew = False
         Me.txtAdresse1._ShortDateOnly = False
         Me.txtAdresse1._TimeOnly = False
+        Me.txtAdresse1._TimeOnly_Seconds = False
         Me.txtAdresse1._value = Nothing
         Me.txtAdresse1._Waehrung = False
+        Me.txtAdresse1._WaehrungZeichen = True
         Me.txtAdresse1.ForeColor = System.Drawing.Color.Black
         Me.txtAdresse1.Location = New System.Drawing.Point(254, 53)
         Me.txtAdresse1.MaxLineLength = -1
@@ -365,12 +396,15 @@ Partial Class usrcntlVollmacht_DE
         Me.txtFirma._DateTimeOnly = False
         Me.txtFirma._numbersOnly = False
         Me.txtFirma._numbersOnlyKommastellen = ""
+        Me.txtFirma._numbersOnlyTrennzeichen = True
         Me.txtFirma._Prozent = False
         Me.txtFirma._ShortDateNew = False
         Me.txtFirma._ShortDateOnly = False
         Me.txtFirma._TimeOnly = False
+        Me.txtFirma._TimeOnly_Seconds = False
         Me.txtFirma._value = Nothing
         Me.txtFirma._Waehrung = False
+        Me.txtFirma._WaehrungZeichen = True
         Me.txtFirma.ForeColor = System.Drawing.Color.Black
         Me.txtFirma.Location = New System.Drawing.Point(254, 34)
         Me.txtFirma.MaxLineLength = -1
@@ -382,7 +416,7 @@ Partial Class usrcntlVollmacht_DE
         '
         'pic
         '
-        Me.pic.BackgroundImage = Global.SDL.My.Resources.pdf
+        Me.pic.BackgroundImage = Global.SDL.My.Resources.Resources.pdf
         Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
         Me.pic.Cursor = System.Windows.Forms.Cursors.Hand
         Me.pic.Location = New System.Drawing.Point(5, 5)
@@ -404,7 +438,7 @@ Partial Class usrcntlVollmacht_DE
         'btnDown
         '
         Me.btnDown.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnDown.BackgroundImage = Global.SDL.My.Resources.pfeil_unten
+        Me.btnDown.BackgroundImage = Global.SDL.My.Resources.Resources.pfeil_unten
         Me.btnDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.btnDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnDown.Location = New System.Drawing.Point(976, 42)
@@ -416,7 +450,7 @@ Partial Class usrcntlVollmacht_DE
         'btnUp
         '
         Me.btnUp.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnUp.BackgroundImage = Global.SDL.My.Resources.pfeil_oben
+        Me.btnUp.BackgroundImage = Global.SDL.My.Resources.Resources.pfeil_oben
         Me.btnUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.btnUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnUp.Location = New System.Drawing.Point(976, 22)
@@ -428,7 +462,7 @@ Partial Class usrcntlVollmacht_DE
         'btnDel
         '
         Me.btnDel.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnDel.BackgroundImage = Global.SDL.My.Resources.del
+        Me.btnDel.BackgroundImage = Global.SDL.My.Resources.Resources.del
         Me.btnDel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.btnDel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnDel.Location = New System.Drawing.Point(976, -1)
@@ -472,12 +506,15 @@ Partial Class usrcntlVollmacht_DE
         Me.txtEinmalig_CarnetATA._DateTimeOnly = False
         Me.txtEinmalig_CarnetATA._numbersOnly = False
         Me.txtEinmalig_CarnetATA._numbersOnlyKommastellen = ""
+        Me.txtEinmalig_CarnetATA._numbersOnlyTrennzeichen = True
         Me.txtEinmalig_CarnetATA._Prozent = False
         Me.txtEinmalig_CarnetATA._ShortDateNew = False
         Me.txtEinmalig_CarnetATA._ShortDateOnly = False
         Me.txtEinmalig_CarnetATA._TimeOnly = False
+        Me.txtEinmalig_CarnetATA._TimeOnly_Seconds = False
         Me.txtEinmalig_CarnetATA._value = Nothing
         Me.txtEinmalig_CarnetATA._Waehrung = False
+        Me.txtEinmalig_CarnetATA._WaehrungZeichen = True
         Me.txtEinmalig_CarnetATA.Enabled = False
         Me.txtEinmalig_CarnetATA.ForeColor = System.Drawing.Color.Black
         Me.txtEinmalig_CarnetATA.Location = New System.Drawing.Point(390, 181)
@@ -488,12 +525,23 @@ Partial Class usrcntlVollmacht_DE
         Me.txtEinmalig_CarnetATA.Size = New System.Drawing.Size(174, 20)
         Me.txtEinmalig_CarnetATA.TabIndex = 34
         '
+        'cbxVollmachtmitBefristung
+        '
+        Me.cbxVollmachtmitBefristung.AutoSize = True
+        Me.cbxVollmachtmitBefristung.Location = New System.Drawing.Point(590, 183)
+        Me.cbxVollmachtmitBefristung.Name = "cbxVollmachtmitBefristung"
+        Me.cbxVollmachtmitBefristung.Size = New System.Drawing.Size(141, 17)
+        Me.cbxVollmachtmitBefristung.TabIndex = 38
+        Me.cbxVollmachtmitBefristung.Text = "Vollmacht mit Befristung:"
+        Me.cbxVollmachtmitBefristung.UseVisualStyleBackColor = True
+        '
         'usrcntlVollmacht_DE
         '
         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.cbxVollmachtmitBefristung)
         Me.Controls.Add(Me.txtEinmalig_CarnetATA)
         Me.Controls.Add(Me.cbxEinmaligeVollmachtCarnetATA)
         Me.Controls.Add(Me.Label12)
@@ -563,5 +611,5 @@ Partial Class usrcntlVollmacht_DE
     Friend WithEvents cboSprache As VERAG_PROG_ALLGEMEIN.MyComboBox
     Friend WithEvents cbxEinmaligeVollmachtCarnetATA As System.Windows.Forms.CheckBox
     Friend WithEvents txtEinmalig_CarnetATA As VERAG_PROG_ALLGEMEIN.MyTextBox
-
+    Friend WithEvents cbxVollmachtmitBefristung As CheckBox
 End Class

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_DE.vb

@@ -92,4 +92,5 @@
     Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles cbxEinmaligeVollmachtCarnetATA.CheckedChanged
         txtEinmalig_CarnetATA.Enabled = sender.checked
     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/FormulareBaukasten/usrcntlVorauskasse.vb

@@ -210,22 +210,24 @@ Public Class usrcntlVorauskasse
 
         If CDate(Now.ToShortDateString) >= CDate("01.07.2020") And CDate(Now.ToShortDateString) <= CDate("31.12.2020") Then
 
-            txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("0%", "0"))
+            txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "0,0"))
+            txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("0%", "0,0"))
             'txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("5%", "0,05"))
             'txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("16%", "0,16"))
             txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("7%", "0,07"))
             txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("19%", "0,19"))
             txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("20%", "0,20"))
-            txtEustProzent.changeItem("0,19")
+            ' txtEustProzent.changeItem("0,19")
             ' txtEustProzent.changeItem("0,16")
         Else
 
+            txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "0,0"))
             txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("0%", "0"))
             txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("7%", "0,07"))
             txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("10%", "0,10"))
             txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("19%", "0,19"))
             txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("20%", "0,20"))
-            txtEustProzent.changeItem("0,19")
+            ' txtEustProzent.changeItem("0,19")
         End If
 
         cboFirma.Items.Clear()
@@ -425,22 +427,23 @@ Public Class usrcntlVorauskasse
             'Select Case FIRMA_TMP.Firma_LandKz
             lblWaehrung.Text = "EUR"
             Select Case cboFirma._value
-                Case "11",
+                Case "11"
-                    txtEustProzent.changeItem("0,20")
+                    'txtEustProzent.changeItem("0,20")
+                    txtEustProzent.changeItem("0,0")
                 Case "26"
-                    txtEustProzent.changeItem("0,20")
+                    txtEustProzent.changeItem("0,0")
                     lblWaehrung.Text = "GBP"
                 Case "24"
                     cboSprache.Visible = True
                     Label17.Visible = True
-                    txtEustProzent.changeItem("0,19")
+                    txtEustProzent.changeItem("0,0")
                 Case Else
                     'If CDate(Now.ToShortDateString) >= CDate("01.07.2020") And CDate(Now.ToShortDateString) <= CDate("20.12.2020") Then
                     '    txtEustProzent.changeItem("0,16")
                     'Else
                     '    txtEustProzent.changeItem("0,19")
                     'End If
-                    txtEustProzent.changeItem("0,19")
+                    txtEustProzent.changeItem("0,0")
             End Select
         End If
         initBerechnung()
@@ -451,27 +454,39 @@ Public Class usrcntlVorauskasse
     End Sub
 
     Private Sub btnSaveFD_Click(sender As Object, e As EventArgs) Handles btnSaveFD.Click
-        If txtVorlage.Text = "" Then MsgBox("Bitte ein Vorlagenbezeichnung eingeben!") : Exit Sub
+        If checkEustProzent() Then
-        Dim FV As cFormularVorlagen
+            If txtVorlage.Text = "" Then MsgBox("Bitte ein Vorlagenbezeichnung eingeben!") : Exit Sub
-        If FV_ID > -1 Then
+            Dim FV As cFormularVorlagen
-            If MsgBox("Möchten Sie die Vorlage überschreiben?", vbYesNoCancel) <> MsgBoxResult.Yes Then Exit Sub
+            If FV_ID > -1 Then
-            FV = New cFormularVorlagen(FV_ID)
+                If MsgBox("Möchten Sie die Vorlage überschreiben?", vbYesNoCancel) <> MsgBoxResult.Yes Then Exit Sub
-        Else
+                FV = New cFormularVorlagen(FV_ID)
-            FV = New cFormularVorlagen
+            Else
-            FV.tblform_art = Me.GetType.ToString
+                FV = New cFormularVorlagen
-            FV.tblform_begriff = txtVorlage.Text
+                FV.tblform_art = Me.GetType.ToString
-        End If
+                FV.tblform_begriff = txtVorlage.Text
-        FV.tblform_KundenNr = If(KdNR > 0, KdNR, Nothing)
+            End If
-        FV.tblform_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
+            FV.tblform_KundenNr = If(KdNR > 0, KdNR, Nothing)
-        FV.tblform_letzeAenderung = Now
+            FV.tblform_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
+            FV.tblform_letzeAenderung = Now
 
-        If FV.SAVE() Then
+            If FV.SAVE() Then
-            getValues(FV)
+                getValues(FV)
-            If FV.SAVE_VALUES() Then initControlsSave(FV)
+                If FV.SAVE_VALUES() Then initControlsSave(FV)
+            End If
         End If
-
     End Sub
 
+    Public Function checkEustProzent() As Boolean
+        If txtEustProzent.Text = "" Then
+            txtEustProzent.Focus()
+            txtEustProzent.BackColor = Color.LightCoral
+            MsgBox("EUST-Wert erforderlich. Erstellen ist nicht möglich.", vbCritical, "Fehler")
+            Return False
+        Else
+            txtEustProzent.BackColor = SystemColors.Window
+            Return True
+        End If
+    End Function
 
     Sub getValues(ByVal FV As cFormularVorlagen)
         FV.VALUES.Clear()
@@ -582,10 +597,13 @@ Public Class usrcntlVorauskasse
     End Sub
 
     Private Sub btnStandardPreiseLaden_Click(sender As Object, e As EventArgs) Handles btnStandardPreiseLaden.Click
-        If FormularManagerNEU.saveVorauskasse(Me) Then
+        If checkEustProzent() Then
-            lblCRsaved.Text = "(gespeichert)"
+            If FormularManagerNEU.saveVorauskasse(Me) Then
-            lblCRsaved.ForeColor = Color.Green
+                lblCRsaved.Text = "(gespeichert)"
+                lblCRsaved.ForeColor = Color.Green
+            End If
         End If
+
     End Sub
 
     Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click

SDL/Formulare/KDFormulare/frmFormulare.vb

@@ -616,6 +616,10 @@ Public Class frmFormulare
                                                  End If
                                              End Sub
                         MyFlowLayoutPanel1.Controls.Add(c)
+
+                        Dim sprachen() As String = {"DE", "EN"}
+                        c.MyComboBoxSprache.Items.Clear()
+                        c.MyComboBoxSprache.Items.AddRange(sprachen)
                     End If
                 Case FormularManagerArten.Boniteatsauskunft
                     Dim c As New usrcntlCreditreformBoniAuskunft
@@ -1573,6 +1577,8 @@ Public Class FormularManagerNEU
             listTowrite = addEinmaligeVM(listTowrite, 0, top + 220, usrCntl.cboSprache._value, usrCntl.txtEinmalig_RgNr.Text, usrCntl.txtEinmalig_RgDat.Text)
         ElseIf usrCntl.cbxEinmaligeVollmachtCarnetATA.Checked Then
             listTowrite = addEinmaligeVMCarnetATA(listTowrite, 0, top + 220, usrCntl.cboSprache._value, usrCntl.txtEinmalig_CarnetATA.Text, "")
+        ElseIf usrCntl.cbxVollmachtmitBefristung.Checked Then
+            listTowrite = addBebfristung(listTowrite, 0, 235, usrCntl.cboSprache._value, "", "")
         End If
 
 
@@ -1772,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))
@@ -1813,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
@@ -1858,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, "")
@@ -1884,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, "")
 
@@ -1913,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
@@ -2003,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 = ""
 
@@ -2026,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
@@ -2045,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()
 
@@ -4331,17 +4375,21 @@ Public Class FormularManagerNEU
 
 
 
+        If usrCntl.checkEustProzent Then
+            saveVorauskasse(usrCntl)
+        Else
+            Exit Function
+        End If
+
         If usrCntl.cbxLKWWartet.Checked Then
             listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("!!! LKW wartet !!!", 141, 12, 60, 15, "boldRed", 20, , itextsharp.text.Element.ALIGN_LEFT))
         End If
 
         If usrCntl.cbxBeimErstellenSpeichern.Checked Then
             '   If vbYes = MsgBox("Möchten Sie die Bonitätsauskunft in den Kundendaten speichern?", vbYesNoCancel) Then
-            saveVorauskasse(usrCntl)
-            'End If
         End If
 
-        Dim destPath = ""
+            Dim destPath = ""
         If usrCntl.cboFirma._value = "26" Then 'VERAG-UNISPED LTD
             destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "VERAG-UNISPED", "", "Importaviso_VK", listTowrite)
         Else
@@ -6410,6 +6458,18 @@ Public Class FormularManagerNEU
         Return listTowrite
     End Function
 
+    Shared Function addBebfristung(listTowrite As List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues), left As Integer, top As Integer, language As String, DateAtr As String, XXXX As String, Optional small As Boolean = False) As List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
+        Select Case language
+            Case "EN"
+                listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("Power of attorney valid until: ____________", left + 15, top, 180, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+            Case Else
+                listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("Vollmacht gültig bis: ____________", left + 15, top, 180, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+
+        End Select
+        Return listTowrite
+    End Function
+
+
 
     Public Shared Function MergePdfFiles(ByVal fileNames As List(Of String), ByVal targetPdf As String) As Boolean
         Dim merged As Boolean = True

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/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

@@ -41,7 +41,7 @@ Public Class frmEssensbestellungen
 
         cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Frontoffice", "Frontoffice"))
         'cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Backoffice", "Backoffice"))
-        cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verag VERR", "Verag Verrechnung"))
+        cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verag VERR", "Verag VERR"))
         cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Maut", "Maut"))
         cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Suben West", "Suben West"))
         cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
@@ -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

@@ -428,6 +428,7 @@ Public Class usrcntlKundeBearbeitenFull
                         cboKundenkreis.changeItem("3000000-3099990")
                         KUNDE.Zahlungsziel = 0
                         ADRESSE.Rechnungsdruck = 2
+                        KUNDE.Vorkasse = True
                     Case "ATILLA"
                         cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  100000-199999: ATILLA", "100000-199999"))
                         cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  900000-999999: Sonstige", "900000-999999"))
@@ -835,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)
 

SDL/mdm/frmMDMDatenverarbetiung.vb

@@ -1168,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
@@ -1227,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
@@ -1238,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 %"

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/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

@@ -58,7 +58,7 @@ Public Class cMSEAPI
 
             ' Set the timestamp defining an expiration time (end time) for the token
             ' to be now + 1 hour (3600 seconds)
-            success = claims.AddIntAt(-1, "exp", curDateTime + 3600)
+            success = claims.AddIntAt(-1, "exp", curDateTime + 1000)
 
             jwt.AutoCompact = True
 
@@ -1014,18 +1014,17 @@ Public Class cMSEAPI
 
                     If r("url") <> "" AndAlso r("name") <> "" AndAlso r("name").contains("VAT") Then 'only VAT-Invoices
                         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()
@@ -1038,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