div. Änderungen

SDL/Fakturierung/usrCntlFaktAbrechnung.vb

@@ -1885,8 +1885,10 @@ Public Class usrCntlFaktAbrechnung
                     If FIRMA.Firma_ID = 19 AndAlso SPEDBUCH.ErfassungsNr <> "" AndAlso SPEDBUCH.ErfassungsNr > 0 AndAlso (SPEDBUCH.Abfertigungsart = 114 Or SPEDBUCH.Abfertigungsart = 115 Or SPEDBUCH.Abfertigungsart = 10) Then
 
                         Dim func As New cMDMFunctionsAllgemein()
-                        Dim dt = SQL.loadDgvBySql("SELECT UStVPo_daId, UStVPo_ID,UStVPo_SchnittstellenNr, UStVPo_ReNr, UStVPo_ReDat FROM tblUStVPositionen where UStVAn_ID='" & SPEDBUCH.ErfassungsNr & "' AND UStVPo_SchnittstellenNr <> 1 order by UStVPo_ID", "FMZOLL")
+                        Dim dt = SQL.loadDgvBySql("SELECT UStVPo_daId, UStVPo_ID,UStVPo_SchnittstellenNr, UStVPo_ReNr, UStVPo_ReDat FROM tblUStVPositionen where UStVAn_ID='" & SPEDBUCH.ErfassungsNr & "' AND UStVPo_SchnittstellenNr <> 1 " & IIf(isVZ, " And UStVPo_VZ = 1 And UStVPo_VZ_RKID Is null", "") & " order by  UStVPo_ID", "FMZOLL")
                         Dim USTV As New cUSTVAntrag(SPEDBUCH.ErfassungsNr)
+                        Dim Antrag_LandKz = ""
+                        If USTV.UStVAn_ID > 0 Then Antrag_LandKz = SQL.DLookup("LandKz", "[Länderverzeichnis für die Außenhandelsstatistik]", "Landnr='" & USTV.UStVAn_LandNr & "'", "FMZOLL")
 
                         'soll immer alle POS bekommen! laut Lidya! 28.04.2025 - aber nicht im Excel-Format sondern als PDF-Batinic 15.05.2025
                         Dim dtPOSList As New DataTable
@@ -1977,42 +1979,37 @@ Public Class usrCntlFaktAbrechnung
                         If dt IsNot Nothing Then
                             For Each r In dt.Rows
 
+                                'WARUM NOCHMAL not null??? -> weil laut lydia erst ab 2025 (und ab diesem Datum wird die daid in der USTVA_POS befüllt) die Dokumente digital mitgeschickt werden, vorher noch alles per POST!!!!!!!!!!!!!!!!!!
                                 If Not IsDBNull(r("UStVPo_daId")) Then
 
                                     If RECHNUNG.ANHAENGE IsNot Nothing AndAlso Not RECHNUNG.ANHAENGE.Exists(Function(c) c.dsId = r("UStVPo_daId")) Then 'wenn der Anhang schon existiert!
 
-                                        If USTV.UStVAn_ID > 0 Then
+                                        Dim DAID As String = ""
-                                            Dim Antrag_LandKz = SQL.DLookup("LandKz", "[Länderverzeichnis für die Außenhandelsstatistik]", "Landnr='" & USTV.UStVAn_LandNr & "'", "FMZOLL")
+                                        DAID = func.getPDF(r("UStVPo_SchnittstellenNr"), r("UStVPo_ReNr"), r("UStVPo_ReDat"), r("UStVPo_daId"), False, True, Antrag_LandKz, USTV, New cFakturierung, True)
 
-                                            Dim DAID As String = ""
+                                        Dim nameLief As String = ""
-                                            DAID = func.getPDF(r("UStVPo_SchnittstellenNr"), r("UStVPo_ReNr"), r("UStVPo_ReDat"), r("UStVPo_daId"), False, True, Antrag_LandKz, USTV, New cFakturierung, True)
 
-                                            Dim nameLief As String = ""
+                                        Select Case r("UStVPo_SchnittstellenNr")
+                                            Case 1 : nameLief = "VERAG-" 'Verag360
+                                            Case 2, 8, 12 : nameLief = "IDS-"
+                                            Case 3 : nameLief = "IT-"
+                                            Case 4, 9 : nameLief = "MSE-"
+                                            Case 5, 10 : nameLief = "UTA-"
+                                            Case 6, 11 : nameLief = "PLOSE-"
+                                            Case 7 : nameLief = "RMC-"
+                                        End Select
 
-                                            Select Case r("UStVPo_SchnittstellenNr")
+                                        nameLief &= "RE"
-                                                Case 1 : nameLief = "VERAG-" 'Verag360
-                                                Case 2, 8, 12 : nameLief = "IDS-"
-                                                Case 3 : nameLief = "IT-"
-                                                Case 4, 9 : nameLief = "MSE-"
-                                                Case 5, 10 : nameLief = "UTA-"
-                                                Case 6, 11 : nameLief = "PLOSE-"
-                                                Case 7 : nameLief = "RMC-"
-                                            End Select
-
-                                            nameLief &= "RE"
-
-                                            If DAID <> "" AndAlso IsNumeric(DAID) Then
-                                                Dim daidno As Integer = CInt(DAID)
-                                                Dim ds As New cDATENSERVER(daidno)
-                                                .Rows.Add(-1, nameLief, ds.da_name, ds.da_id, -1)
-                                            End If
 
+                                        If DAID <> "" AndAlso IsNumeric(DAID) Then
+                                            Dim daidno As Integer = CInt(DAID)
+                                            Dim ds As New cDATENSERVER(daidno)
+                                            .Rows.Add(-1, nameLief, ds.da_name, ds.da_id, -1)
                                         End If
+
                                     End If
-
                                 End If
 
-
                             Next
                         End If
                     End If

SDL/kunden/frmKundenblatt.Designer.vb

@@ -198,6 +198,7 @@ Partial Class frmKundenblatt
         Me.tbUSTVAntrage = New System.Windows.Forms.TabPage()
         Me.UsrCntlUSTV = New SDL.usrCntlUSTV()
         Me.tbFIBU = New System.Windows.Forms.TabPage()
+        Me.txtZinsbelastungNew = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.btn_FIBU_speichern = New System.Windows.Forms.Button()
         Me.lblZNB_verrechnet = New System.Windows.Forms.Label()
         Me.lblZNB_offen = New System.Windows.Forms.Label()
@@ -206,7 +207,6 @@ Partial Class frmKundenblatt
         Me.dgvZinsnachberechnung = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Label15 = New System.Windows.Forms.Label()
         Me.Label14 = New System.Windows.Forms.Label()
-        Me.txtZinsbelastung = New System.Windows.Forms.TextBox()
         Me.Label12 = New System.Windows.Forms.Label()
         Me.rtbGespreachsbericht = New System.Windows.Forms.RichTextBox()
         Me.Label9 = New System.Windows.Forms.Label()
@@ -374,7 +374,7 @@ Partial Class frmKundenblatt
         Me.tbcntrMain.Margin = New System.Windows.Forms.Padding(0)
         Me.tbcntrMain.Name = "tbcntrMain"
         Me.tbcntrMain.SelectedIndex = 0
-        Me.tbcntrMain.Size = New System.Drawing.Size(1652, 957)
+        Me.tbcntrMain.Size = New System.Drawing.Size(1652, 974)
         Me.tbcntrMain.TabIndex = 3
         '
         'tbAllgemein
@@ -415,7 +415,7 @@ Partial Class frmKundenblatt
         Me.tbAllgemein.Margin = New System.Windows.Forms.Padding(0)
         Me.tbAllgemein.Name = "tbAllgemein"
         Me.tbAllgemein.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbAllgemein.Size = New System.Drawing.Size(1644, 928)
+        Me.tbAllgemein.Size = New System.Drawing.Size(1644, 945)
         Me.tbAllgemein.TabIndex = 0
         Me.tbAllgemein.Text = "Allgemein"
         '
@@ -496,7 +496,7 @@ Partial Class frmKundenblatt
         Me.TabControl1.Location = New System.Drawing.Point(8, 582)
         Me.TabControl1.Name = "TabControl1"
         Me.TabControl1.SelectedIndex = 0
-        Me.TabControl1.Size = New System.Drawing.Size(718, 340)
+        Me.TabControl1.Size = New System.Drawing.Size(718, 357)
         Me.TabControl1.TabIndex = 186
         '
         'TabPage1
@@ -508,7 +508,7 @@ Partial Class frmKundenblatt
         Me.TabPage1.Location = New System.Drawing.Point(4, 22)
         Me.TabPage1.Name = "TabPage1"
         Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage1.Size = New System.Drawing.Size(710, 314)
+        Me.TabPage1.Size = New System.Drawing.Size(710, 331)
         Me.TabPage1.TabIndex = 0
         Me.TabPage1.Text = "Offene Posten"
         Me.TabPage1.UseVisualStyleBackColor = True
@@ -567,7 +567,7 @@ Partial Class frmKundenblatt
         Me.dgvOffenePosten.RowHeadersDefaultCellStyle = DataGridViewCellStyle4
         Me.dgvOffenePosten.RowHeadersVisible = False
         Me.dgvOffenePosten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvOffenePosten.Size = New System.Drawing.Size(707, 282)
+        Me.dgvOffenePosten.Size = New System.Drawing.Size(707, 299)
         Me.dgvOffenePosten.TabIndex = 175
         '
         'Label10
@@ -645,7 +645,7 @@ Partial Class frmKundenblatt
         Me.dgvUmsaetze.RowHeadersDefaultCellStyle = DataGridViewCellStyle8
         Me.dgvUmsaetze.RowHeadersVisible = False
         Me.dgvUmsaetze.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 292)
+        Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 309)
         Me.dgvUmsaetze.TabIndex = 182
         '
         'Label13
@@ -749,7 +749,7 @@ Partial Class frmKundenblatt
         Me.dgvUmsatzNachLeistngsNr.RowHeadersDefaultCellStyle = DataGridViewCellStyle12
         Me.dgvUmsatzNachLeistngsNr.RowHeadersVisible = False
         Me.dgvUmsatzNachLeistngsNr.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 291)
+        Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 308)
         Me.dgvUmsatzNachLeistngsNr.TabIndex = 183
         '
         'lblAdressenzusatz
@@ -1110,7 +1110,7 @@ Partial Class frmKundenblatt
         Me.dgvSperrliste.Name = "dgvSperrliste"
         Me.dgvSperrliste.ReadOnly = True
         Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle15
-        Me.dgvSperrliste.Size = New System.Drawing.Size(446, 884)
+        Me.dgvSperrliste.Size = New System.Drawing.Size(446, 901)
         Me.dgvSperrliste.TabIndex = 23
         '
         'PictureBox2
@@ -2433,6 +2433,7 @@ Partial Class frmKundenblatt
         '
         'tbFIBU
         '
+        Me.tbFIBU.Controls.Add(Me.txtZinsbelastungNew)
         Me.tbFIBU.Controls.Add(Me.btn_FIBU_speichern)
         Me.tbFIBU.Controls.Add(Me.lblZNB_verrechnet)
         Me.tbFIBU.Controls.Add(Me.lblZNB_offen)
@@ -2441,18 +2442,41 @@ Partial Class frmKundenblatt
         Me.tbFIBU.Controls.Add(Me.dgvZinsnachberechnung)
         Me.tbFIBU.Controls.Add(Me.Label15)
         Me.tbFIBU.Controls.Add(Me.Label14)
-        Me.tbFIBU.Controls.Add(Me.txtZinsbelastung)
         Me.tbFIBU.Controls.Add(Me.Label12)
         Me.tbFIBU.Controls.Add(Me.rtbGespreachsbericht)
         Me.tbFIBU.Controls.Add(Me.Label9)
         Me.tbFIBU.Controls.Add(Me.txtFIBUKuerzel)
         Me.tbFIBU.Location = New System.Drawing.Point(4, 25)
         Me.tbFIBU.Name = "tbFIBU"
-        Me.tbFIBU.Size = New System.Drawing.Size(1644, 928)
+        Me.tbFIBU.Size = New System.Drawing.Size(1644, 945)
         Me.tbFIBU.TabIndex = 13
         Me.tbFIBU.Text = "FIBU"
         Me.tbFIBU.UseVisualStyleBackColor = True
         '
+        'txtZinsbelastungNew
+        '
+        Me.txtZinsbelastungNew._DateTimeOnly = False
+        Me.txtZinsbelastungNew._numbersOnly = True
+        Me.txtZinsbelastungNew._numbersOnlyKommastellen = "2"
+        Me.txtZinsbelastungNew._numbersOnlyTrennzeichen = True
+        Me.txtZinsbelastungNew._Prozent = False
+        Me.txtZinsbelastungNew._ShortDateNew = False
+        Me.txtZinsbelastungNew._ShortDateOnly = False
+        Me.txtZinsbelastungNew._TimeOnly = False
+        Me.txtZinsbelastungNew._TimeOnly_Seconds = False
+        Me.txtZinsbelastungNew._value = ""
+        Me.txtZinsbelastungNew._Waehrung = False
+        Me.txtZinsbelastungNew._WaehrungZeichen = False
+        Me.txtZinsbelastungNew.ForeColor = System.Drawing.Color.Black
+        Me.txtZinsbelastungNew.Location = New System.Drawing.Point(835, 15)
+        Me.txtZinsbelastungNew.MaxLength = 6
+        Me.txtZinsbelastungNew.MaxLineLength = -1
+        Me.txtZinsbelastungNew.MaxLines_Warning = ""
+        Me.txtZinsbelastungNew.MaxLines_Warning_Label = Nothing
+        Me.txtZinsbelastungNew.Name = "txtZinsbelastungNew"
+        Me.txtZinsbelastungNew.Size = New System.Drawing.Size(52, 20)
+        Me.txtZinsbelastungNew.TabIndex = 30
+        '
         'btn_FIBU_speichern
         '
         Me.btn_FIBU_speichern.Location = New System.Drawing.Point(1468, 9)
@@ -2536,18 +2560,9 @@ Partial Class frmKundenblatt
         Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Label14.Location = New System.Drawing.Point(685, 18)
         Me.Label14.Name = "Label14"
-        Me.Label14.Size = New System.Drawing.Size(124, 13)
+        Me.Label14.Size = New System.Drawing.Size(149, 13)
         Me.Label14.TabIndex = 21
-        Me.Label14.Text = "Zinssatz (Zinsbelastung):"
+        Me.Label14.Text = "Zinssatz (Zinsbelastung, in %):"
-        '
-        'txtZinsbelastung
-        '
-        Me.txtZinsbelastung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtZinsbelastung.Location = New System.Drawing.Point(959, 11)
-        Me.txtZinsbelastung.MaxLength = 50
-        Me.txtZinsbelastung.Name = "txtZinsbelastung"
-        Me.txtZinsbelastung.Size = New System.Drawing.Size(53, 20)
-        Me.txtZinsbelastung.TabIndex = 20
         '
         'Label12
         '
@@ -3006,7 +3021,7 @@ Partial Class frmKundenblatt
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.AutoScroll = True
         Me.BackColor = System.Drawing.Color.White
-        Me.ClientSize = New System.Drawing.Size(1651, 1086)
+        Me.ClientSize = New System.Drawing.Size(1651, 1103)
         Me.Controls.Add(Me.lblAbfVerb)
         Me.Controls.Add(Me.btnAbfVerb)
         Me.Controls.Add(Me.tbcntrMain)
@@ -3287,7 +3302,6 @@ Partial Class frmKundenblatt
     Friend WithEvents Label12 As Label
     Friend WithEvents rtbGespreachsbericht As RichTextBox
     Friend WithEvents Label14 As Label
-    Friend WithEvents txtZinsbelastung As TextBox
     Friend WithEvents Label15 As Label
     Friend WithEvents lblZNB_verrechnet As Label
     Friend WithEvents lblZNB_offen As Label
@@ -3296,4 +3310,5 @@ Partial Class frmKundenblatt
     Friend WithEvents dgvZinsnachberechnung As VERAG_PROG_ALLGEMEIN.MyDatagridview
     Friend WithEvents btnBestelldateiErzeugen As Button
     Friend WithEvents btn_FIBU_speichern As Button
+    Friend WithEvents txtZinsbelastungNew As VERAG_PROG_ALLGEMEIN.MyTextBox
 End Class

SDL/kunden/frmKundenblatt.vb

@@ -465,7 +465,7 @@ Public Class frmKundenblatt
             If kdNr > 0 Then
                 rtbGespreachsbericht.Text = checkNullStr(KUNDE.Gesprächsbericht)
                 txtFIBUKuerzel.Text = checkNullStr(KUNDE_ERW.kde_BezFIBU)
-                txtZinsbelastung.Text = checkNullStr(KUNDE_ERW.kde_zinssatz)
+                txtZinsbelastungNew.Text = checkNullStr(KUNDE_ERW.kde_zinssatz)
 
                 initZNB()
 
@@ -2607,11 +2607,15 @@ Public Class frmKundenblatt
     Private Sub btn_FIBU_speichern_Click(sender As Object, e As EventArgs) Handles btn_FIBU_speichern.Click
         KUNDE_ERW.kde_BezFIBU = checkNullStr(txtFIBUKuerzel.Text)
 
-        If txtZinsbelastung.Text <> "" Then
+        If Not String.IsNullOrWhiteSpace(txtZinsbelastungNew.Text) Then
-            If txtZinsbelastung.Text.Contains(",") Then
+            Dim zinssatzText As String = txtZinsbelastungNew.Text.Replace(",", ".")
-                txtZinsbelastung.Text = txtZinsbelastung.ToString.Replace(",", ".")
+            Dim zinssatzValue As Decimal
-            Else
+
-                KUNDE_ERW.kde_zinssatz = checkNullStr(txtZinsbelastung.Text)
+            If Decimal.TryParse(zinssatzText, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, zinssatzValue) Then
+                If zinssatzValue <= 999.99D AndAlso zinssatzValue >= -999.99D Then
+                    KUNDE_ERW.kde_zinssatz = zinssatzValue
+                End If
+
             End If
         Else
             KUNDE_ERW.kde_zinssatz = Nothing
@@ -2619,10 +2623,15 @@ Public Class frmKundenblatt
 
         KUNDE_ERW.SAVE()
 
-        If KUNDE.Gesprächsbericht <> "" AndAlso checkNullStr(rtbGespreachsbericht.Text) = "" OrElse KUNDE.Gesprächsbericht = "" AndAlso checkNullStr(rtbGespreachsbericht.Text) <> "" Then
+        If Not (KUNDE.Gesprächsbericht <> "" AndAlso checkNullStr(rtbGespreachsbericht.Text) = "") Then
-            KUNDE.Gesprächsbericht = checkNullStr(rtbGespreachsbericht.Text)
+            If KUNDE.Gesprächsbericht = "" AndAlso checkNullStr(rtbGespreachsbericht.Text) <> "" Or KUNDE.Gesprächsbericht <> checkNullStr(rtbGespreachsbericht.Text) Then
-            KUNDE.SAVE()
+                KUNDE.Gesprächsbericht = checkNullStr(rtbGespreachsbericht.Text)
+                KUNDE.SAVE()
+            End If
+        Else
+            MsgBox("Feld Gesprächstbericht darf nicht leer sein")
         End If
+
     End Sub
 
     Private Sub dgvZinsnachberechnung_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvZinsnachberechnung.CellDoubleClick

VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb

@@ -828,8 +828,7 @@ Public Class cMDMFunctionsAllgemein
             Case 10 : da_id = SQL.getValueTxtBySql("SELECT TOP(1) [daId] FROM [tblUTAImportNew] where Rechnungsdatum='" & reDat & "' and Abrechnungsnummer='" & reNr & "' and Lieferland_ISO2='" & Antrag_LandKz & "' AND daId is not null", "FMZOLL",,, -1)
             Case 7 : da_id = SQL.getValueTxtBySql("SELECT TOP(1) [rmc_daId] FROM [tblRMCImport] where rmc_reDatum='" & reDat & "' and rmc_reNr='" & reNr & "' and rmc_landKZ='" & Antrag_LandKz & "' AND [rmc_daId] is not null", "FMZOLL",,, -1)
             Case 8 : da_id = SQL.getValueTxtBySql("SELECT TOP(1) tblIDSInvoicesNew.daId FROM [tblIDSTransactionsNew] INNER JOIN tbl_IDS_Länder ON tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode LEFT JOIN tblIDSInvoicesNew on tblIDSInvoicesNew.CustomerCode = tblIDSTransactionsNew.CustomerCode and tblIDSInvoicesNew.Invoicenumber = Paymentsummarynumber where tblIDSTransactionsNew.[YearMonthDay] ='" & reDat & "' AND ISNULL(tblIDSTransactionsNew.[OBONumber], ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber])) ='" & reNr & "' and tbl_IDS_Länder.Lieferland_ISO2='" & Antrag_LandKz & "' AND tblIDSInvoicesNew.daId  is not null", "FMZOLL",,, -1)
-            Case 12
+            Case 12 : da_id = SQL.getValueTxtBySql("SELECT TOP(1) tblIDSInvoicesNewSplittedByCountry.daId FROM [tblIDSInvoicesNewSplittedByCountry]  where tblIDSInvoicesNewSplittedByCountry.[YearMonthDay] ='" & reDat & "' AND tblIDSInvoicesNewSplittedByCountry.Invoicenumber ='" & reNr.ToString.Replace("/", "") & "' and tblIDSInvoicesNewSplittedByCountry.Country='" & Antrag_LandKz & "' AND tblIDSInvoicesNewSplittedByCountry.daId  is not null", "FMZOLL",,, -1)
-                da_id = SQL.getValueTxtBySql("SELECT TOP(1) tblIDSInvoicesNewSplittedByCountry.daId FROM [tblIDSInvoicesNewSplittedByCountry]  where tblIDSInvoicesNewSplittedByCountry.[YearMonthDay] ='" & reDat & "' AND tblIDSInvoicesNewSplittedByCountry.Invoicenumber ='" & reNr.ToString.Replace("/", "") & "' and tblIDSInvoicesNewSplittedByCountry.Country='" & Antrag_LandKz & "' AND tblIDSInvoicesNewSplittedByCountry.daId  is not null", "FMZOLL",,, -1)
         End Select
 
         Return da_id