Fakt abw. ZZ

2026-05-11 10:49:36 +02:00
parent 01b3a35a33
commit 0f71347c3b
2 changed files with 38 additions and 23 deletions
--- a/SDL/Fakturierung/cFakturierung.vb
+++ b/SDL/Fakturierung/cFakturierung.vb
@@ -3,8 +3,9 @@ Imports System.Globalization
 Imports System.IO
 Imports System.Net
 Imports System.Web.UI.WebControls.Expressions
+Imports com.sun.source.tree
 Imports iText.Kernel.Pdf
-Imports itextsharp.text.pdf
+Imports iTextSharp.text.pdf
 Imports Microsoft.Office.Interop
 Imports s2industries.ZUGFeRD
 Imports VERAG_PROG_ALLGEMEIN
@@ -343,13 +344,27 @@ Public Class cFakturierung
                            End Select
                        Else
                            If checkIfKreditaufwendungen(RECHNUNG) Then
-                                Select Case RECHNUNG.RechnungSprache
+
+                                Dim ZZKdZahlungszielVL = SQL.DLookup("kde_abweichendesZZVL", "tblKundenErweitert", "kde_KundenNr=" & RECHNUNG.RechnungsKundenNr, "FMZOLL", 10)
+                                If ZZKdZahlungszielVL IsNot Nothing AndAlso IsNumeric(ZZKdZahlungszielVL) Then
+                                    Select Case RECHNUNG.RechnungSprache
                                    'Case "EN" : strZahlbar = "Payable within " & ZZTage & " days less pos. 750; due net from " & ZZTage & " days."
                                    'Case Else : strZahlbar = "Zahlbar innerhalb " & ZZTage & " Tagen abzüglich Pos. 750; ab " & ZZTage & " Tagen netto fällig."
-                                    Case "EN" : strZahlbar = "Terms of Payment: " & ZZTage & " days from invoice date; Pos. 750 is deductible within the payment term."
-                                    Case "RO" : strZahlbar = "Payment term: " & ZZTage & " days from invoice date; Pos. 750 is deductible within the payment term."
-                                    Case Else : strZahlbar = "Zahlungsziel: " & ZZTage & " Tage ab Rechnungsdatum; Pos. 750 ist innerhalb des Zahlungsziels abzugfähig."
-                                End Select
+                                        Case "EN" : strZahlbar = "Terms of Payment: " & ZZTage & " days from invoice date; Pos. 750 is deductible within " & ZZKdZahlungszielVL & " days."
+                                        Case "RO" : strZahlbar = "Payment term: " & ZZTage & " days from invoice date; Pos. 750 is deductible within " & ZZKdZahlungszielVL & " days."
+                                        Case Else : strZahlbar = "Zahlungsziel: " & ZZTage & " Tage ab Rechnungsdatum; Pos. 750 ist innerhalb von " & ZZKdZahlungszielVL & " Tagen abzugfähig."
+                                    End Select
+                                Else
+                                    Select Case RECHNUNG.RechnungSprache
+                                    'Case "EN" : strZahlbar = "Payable within " & ZZTage & " days less pos. 750; due net from " & ZZTage & " days."
+                                    'Case Else : strZahlbar = "Zahlbar innerhalb " & ZZTage & " Tagen abzüglich Pos. 750; ab " & ZZTage & " Tagen netto fällig."
+                                        Case "EN" : strZahlbar = "Terms of Payment: " & ZZTage & " days from invoice date; Pos. 750 is deductible within the payment term."
+                                        Case "RO" : strZahlbar = "Payment term: " & ZZTage & " days from invoice date; Pos. 750 is deductible within the payment term."
+                                        Case Else : strZahlbar = "Zahlungsziel: " & ZZTage & " Tage ab Rechnungsdatum; Pos. 750 ist innerhalb des Zahlungsziels abzugfähig."
+                                    End Select
+
+                                End If
+
                            Else
                                'Zahlungsziel allgemein.
                                Select Case RECHNUNG.RechnungSprache
--- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb
@@ -1371,7 +1371,7 @@ Partial Class usrcntlKundeBearbeitenFull
        'Label117
        '
        Me.Label117.AutoSize = True
-        Me.Label117.Location = New System.Drawing.Point(191, 94)
+        Me.Label117.Location = New System.Drawing.Point(191, 99)
        Me.Label117.Name = "Label117"
        Me.Label117.Size = New System.Drawing.Size(30, 13)
        Me.Label117.TabIndex = 52
@@ -1681,11 +1681,11 @@ Partial Class usrcntlKundeBearbeitenFull
        'Label101
        '
        Me.Label101.AutoSize = True
-        Me.Label101.Location = New System.Drawing.Point(12, 116)
+        Me.Label101.Location = New System.Drawing.Point(191, 50)
        Me.Label101.Name = "Label101"
-        Me.Label101.Size = New System.Drawing.Size(50, 13)
+        Me.Label101.Size = New System.Drawing.Size(95, 13)
        Me.Label101.TabIndex = 42
-        Me.Label101.Text = "abw. ZZ:"
+        Me.Label101.Text = "abw. Zahlungsziel:"
        '
        'cbxSndDatenAusSTB
        '
@@ -1835,7 +1835,7 @@ Partial Class usrcntlKundeBearbeitenFull
        'Label47
        '
        Me.Label47.AutoSize = True
-        Me.Label47.Location = New System.Drawing.Point(191, 72)
+        Me.Label47.Location = New System.Drawing.Point(191, 77)
        Me.Label47.Name = "Label47"
        Me.Label47.Size = New System.Drawing.Size(30, 13)
        Me.Label47.TabIndex = 15
@@ -1844,7 +1844,7 @@ Partial Class usrcntlKundeBearbeitenFull
        'Label46
        '
        Me.Label46.AutoSize = True
-        Me.Label46.Location = New System.Drawing.Point(12, 72)
+        Me.Label46.Location = New System.Drawing.Point(12, 77)
        Me.Label46.Name = "Label46"
        Me.Label46.Size = New System.Drawing.Size(69, 13)
        Me.Label46.TabIndex = 10
@@ -1853,7 +1853,7 @@ Partial Class usrcntlKundeBearbeitenFull
        'Label45
        '
        Me.Label45.AutoSize = True
-        Me.Label45.Location = New System.Drawing.Point(12, 50)
+        Me.Label45.Location = New System.Drawing.Point(12, 51)
        Me.Label45.Name = "Label45"
        Me.Label45.Size = New System.Drawing.Size(108, 13)
        Me.Label45.TabIndex = 5
@@ -1882,7 +1882,7 @@ Partial Class usrcntlKundeBearbeitenFull
        'Label44
        '
        Me.Label44.AutoSize = True
-        Me.Label44.Location = New System.Drawing.Point(12, 92)
+        Me.Label44.Location = New System.Drawing.Point(12, 97)
        Me.Label44.Name = "Label44"
        Me.Label44.Size = New System.Drawing.Size(88, 13)
        Me.Label44.TabIndex = 0
@@ -1901,7 +1901,7 @@ Partial Class usrcntlKundeBearbeitenFull
        '
        Me.cbxAbf_SvsRvs.AutoSize = True
        Me.cbxAbf_SvsRvs.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxAbf_SvsRvs.Location = New System.Drawing.Point(289, 113)
+        Me.cbxAbf_SvsRvs.Location = New System.Drawing.Point(289, 118)
        Me.cbxAbf_SvsRvs.Name = "cbxAbf_SvsRvs"
        Me.cbxAbf_SvsRvs.Size = New System.Drawing.Size(74, 17)
        Me.cbxAbf_SvsRvs.TabIndex = 12
@@ -1912,7 +1912,7 @@ Partial Class usrcntlKundeBearbeitenFull
        '
        Me.cbxAbf_Rabattstaffel.AutoSize = True
        Me.cbxAbf_Rabattstaffel.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxAbf_Rabattstaffel.Location = New System.Drawing.Point(289, 91)
+        Me.cbxAbf_Rabattstaffel.Location = New System.Drawing.Point(289, 96)
        Me.cbxAbf_Rabattstaffel.Name = "cbxAbf_Rabattstaffel"
        Me.cbxAbf_Rabattstaffel.Size = New System.Drawing.Size(86, 17)
        Me.cbxAbf_Rabattstaffel.TabIndex = 7
@@ -1923,7 +1923,7 @@ Partial Class usrcntlKundeBearbeitenFull
        '
        Me.cbxAbf_Vorkasse.AutoSize = True
        Me.cbxAbf_Vorkasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxAbf_Vorkasse.Location = New System.Drawing.Point(289, 69)
+        Me.cbxAbf_Vorkasse.Location = New System.Drawing.Point(289, 74)
        Me.cbxAbf_Vorkasse.Name = "cbxAbf_Vorkasse"
        Me.cbxAbf_Vorkasse.Size = New System.Drawing.Size(70, 17)
        Me.cbxAbf_Vorkasse.TabIndex = 2
@@ -1975,7 +1975,7 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.txtAbf_Vorlageprovision_Mindestbetrag._Waehrung = True
        Me.txtAbf_Vorlageprovision_Mindestbetrag._WaehrungZeichen = True
        Me.txtAbf_Vorlageprovision_Mindestbetrag.ForeColor = System.Drawing.Color.Red
-        Me.txtAbf_Vorlageprovision_Mindestbetrag.Location = New System.Drawing.Point(222, 90)
+        Me.txtAbf_Vorlageprovision_Mindestbetrag.Location = New System.Drawing.Point(222, 95)
        Me.txtAbf_Vorlageprovision_Mindestbetrag.MaxLength = 50
        Me.txtAbf_Vorlageprovision_Mindestbetrag.MaxLineLength = -1
        Me.txtAbf_Vorlageprovision_Mindestbetrag.MaxLines_Warning = ""
@@ -2041,7 +2041,7 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.txtAbwZZVL._Waehrung = False
        Me.txtAbwZZVL._WaehrungZeichen = True
        Me.txtAbwZZVL.ForeColor = System.Drawing.Color.Red
-        Me.txtAbwZZVL.Location = New System.Drawing.Point(125, 113)
+        Me.txtAbwZZVL.Location = New System.Drawing.Point(289, 47)
        Me.txtAbwZZVL.MaxLength = 10
        Me.txtAbwZZVL.MaxLineLength = -1
        Me.txtAbwZZVL.MaxLines_Warning = ""
@@ -2312,7 +2312,7 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.txtAbf_BankspesenMindestbetrag._Waehrung = True
        Me.txtAbf_BankspesenMindestbetrag._WaehrungZeichen = True
        Me.txtAbf_BankspesenMindestbetrag.ForeColor = System.Drawing.Color.Red
-        Me.txtAbf_BankspesenMindestbetrag.Location = New System.Drawing.Point(222, 65)
+        Me.txtAbf_BankspesenMindestbetrag.Location = New System.Drawing.Point(222, 70)
        Me.txtAbf_BankspesenMindestbetrag.MaxLength = 50
        Me.txtAbf_BankspesenMindestbetrag.MaxLineLength = -1
        Me.txtAbf_BankspesenMindestbetrag.MaxLines_Warning = ""
@@ -2337,7 +2337,7 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.txtAbf_Bankspesen._Waehrung = False
        Me.txtAbf_Bankspesen._WaehrungZeichen = True
        Me.txtAbf_Bankspesen.ForeColor = System.Drawing.Color.Black
-        Me.txtAbf_Bankspesen.Location = New System.Drawing.Point(125, 69)
+        Me.txtAbf_Bankspesen.Location = New System.Drawing.Point(125, 74)
        Me.txtAbf_Bankspesen.MaxLength = 10
        Me.txtAbf_Bankspesen.MaxLineLength = -1
        Me.txtAbf_Bankspesen.MaxLines_Warning = ""
@@ -2363,7 +2363,7 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.txtAbf_Kreditaufwendungen._Waehrung = False
        Me.txtAbf_Kreditaufwendungen._WaehrungZeichen = True
        Me.txtAbf_Kreditaufwendungen.ForeColor = System.Drawing.Color.Black
-        Me.txtAbf_Kreditaufwendungen.Location = New System.Drawing.Point(125, 47)
+        Me.txtAbf_Kreditaufwendungen.Location = New System.Drawing.Point(125, 48)
        Me.txtAbf_Kreditaufwendungen.MaxLength = 10
        Me.txtAbf_Kreditaufwendungen.MaxLineLength = -1
        Me.txtAbf_Kreditaufwendungen.MaxLines_Warning = ""
@@ -2389,7 +2389,7 @@ Partial Class usrcntlKundeBearbeitenFull
        Me.txtAbf_Vorlageprovision._Waehrung = False
        Me.txtAbf_Vorlageprovision._WaehrungZeichen = True
        Me.txtAbf_Vorlageprovision.ForeColor = System.Drawing.Color.Black
-        Me.txtAbf_Vorlageprovision.Location = New System.Drawing.Point(125, 91)
+        Me.txtAbf_Vorlageprovision.Location = New System.Drawing.Point(125, 96)
        Me.txtAbf_Vorlageprovision.MaxLength = 10
        Me.txtAbf_Vorlageprovision.MaxLineLength = -1
        Me.txtAbf_Vorlageprovision.MaxLines_Warning = ""