fix atilla iban, datum, etc.

This commit is contained in:
2025-03-04 11:04:30 +01:00
parent a75a5bbcca
commit 969e522efc
4 changed files with 89 additions and 12 deletions

View File

@@ -816,7 +816,9 @@ Public Class cFakturierung
If Not hasEUSTZOLL(Rechnung) Then If Not hasEUSTZOLL(Rechnung) Then
rpt.txtBank1.Text = "Türkei:" & vbNewLine & "Garanti Bank Hadimköy" & vbNewLine & "EUR-IBAN: TR08 6 2000 5440 0009 0603 73" & vbNewLine & "Hesap Numarası: 544-9060373" 'falscher IBAN!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
'rpt.txtBank1.Text = "Türkei:" & vbNewLine & "Garanti Bank Hadimköy" & vbNewLine & "EUR-IBAN: TR08 6 2000 5440 0009 0603 73" & vbNewLine & "Hesap Numarası: 544-9060373"
rpt.txtBank1.Text = "Türkei:" & vbNewLine & "Garanti Bank Hadimköy" & vbNewLine & "EUR-IBAN: TR08 0006 2000 5440 0009 0603 73" & vbNewLine & "Hesap Numarası: 544-9060373"
End If End If
Else Else

View File

@@ -1033,21 +1033,18 @@ Public Class usrCntlUSTV
Else Else
Dim f As New frmDatumsabfrage("Bitte Prüfdatum eingeben", False) Dim f As New frmDatumsabfrage("Bitte Prüfdatum eingeben", False, True)
f.ShowDialog() f.ShowDialog()
If f.DialogResult = DialogResult.OK Then If f.DialogResult = DialogResult.OK Then
Dim pruefdatum As Date = CDate(f.Datum) Dim pruefdatum As Date = CDate(f.Datum)
Dim sqlQery = "Select A.AdressenNr, A.[E-Mail], A.[E-Mail2], A.LandKz, A.Ordnungsbegriff, L.LandKz, S.StNrFürRückerstattungUSt, S.StNrGültigkeitsdatum, CAST('" & pruefdatum & "' AS DATE) AS Prüfdatum, Dim sqlQery = "Select A.AdressenNr, A.[E-Mail], A.[E-Mail2], A.LandKz, A.Ordnungsbegriff, L.LandKz, S.StNrFürRückerstattungUSt, S.StNrGültigkeitsdatum, CAST('" & pruefdatum & "' AS DATE) AS Prüfdatum,
CASE CASE
WHEN S.StNrGültigkeitsdatum > CAST('" & pruefdatum & "' AS DATE) THEN 1 ELSE 0 WHEN S.StNrGültigkeitsdatum > CAST('" & pruefdatum & "' AS DATE) THEN 1 ELSE 0
END AS Gültig END AS Gültig
FROM [Länderverzeichnis für die Außenhandelsstatistik] L INNER JOIN (Adressen A INNER JOIN Währungstabelle W ON A.LandKz = W.LandKz INNER JOIN tblSteuernummern S ON A.AdressenNr = S.AdressenNr) ON L.LandNr = S.LandNr FROM [Länderverzeichnis für die Außenhandelsstatistik] L INNER JOIN (Adressen A INNER JOIN Währungstabelle W ON A.LandKz = W.LandKz INNER JOIN tblSteuernummern S ON A.AdressenNr = S.AdressenNr) ON L.LandNr = S.LandNr
WHERE S.StNrGültigkeitsdatum IS NOT NULL AND W.MitgliedslandEU = 0 " & sqlKunde WHERE S.StNrGültigkeitsdatum IS NOT NULL AND W.MitgliedslandEU = 0 " & IIf(sqlKunde <> "", sqlKunde, "") & IIf(f.cbxKunden.Checked, " AND A.AdressenNr between " & f.cboKundenkreis._value.Replace("-", " AND "), "")
Dim dtVorschau As DataTable = SQL.loadDgvBySql(sqlQery, "FMZOLL") Dim dtVorschau As DataTable = SQL.loadDgvBySql(sqlQery, "FMZOLL")

View File

@@ -24,18 +24,23 @@ Partial Class frmDatumsabfrage
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container() Me.components = New System.ComponentModel.Container()
Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
Me.pnlKunde = New System.Windows.Forms.Panel()
Me.cboKundenkreis = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.dtp_date = New System.Windows.Forms.DateTimePicker() Me.dtp_date = New System.Windows.Forms.DateTimePicker()
Me.btnClose = New System.Windows.Forms.Button() Me.btnClose = New System.Windows.Forms.Button()
Me.btn = New System.Windows.Forms.Button() Me.btn = New System.Windows.Forms.Button()
Me.lbl = New System.Windows.Forms.Label() Me.lbl = New System.Windows.Forms.Label()
Me.Label1 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label()
Me.cbxKunden = New System.Windows.Forms.CheckBox()
Me.MyPanel1.SuspendLayout() Me.MyPanel1.SuspendLayout()
Me.pnlKunde.SuspendLayout()
Me.SuspendLayout() Me.SuspendLayout()
' '
'MyPanel1 'MyPanel1
' '
Me.MyPanel1.BackColor = System.Drawing.Color.White Me.MyPanel1.BackColor = System.Drawing.Color.White
Me.MyPanel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.MyPanel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.MyPanel1.Controls.Add(Me.pnlKunde)
Me.MyPanel1.Controls.Add(Me.dtp_date) Me.MyPanel1.Controls.Add(Me.dtp_date)
Me.MyPanel1.Controls.Add(Me.btnClose) Me.MyPanel1.Controls.Add(Me.btnClose)
Me.MyPanel1.Controls.Add(Me.btn) Me.MyPanel1.Controls.Add(Me.btn)
@@ -44,13 +49,41 @@ Partial Class frmDatumsabfrage
Me.MyPanel1.Dock = System.Windows.Forms.DockStyle.Fill Me.MyPanel1.Dock = System.Windows.Forms.DockStyle.Fill
Me.MyPanel1.Location = New System.Drawing.Point(0, 0) Me.MyPanel1.Location = New System.Drawing.Point(0, 0)
Me.MyPanel1.Name = "MyPanel1" Me.MyPanel1.Name = "MyPanel1"
Me.MyPanel1.Size = New System.Drawing.Size(264, 77) Me.MyPanel1.Size = New System.Drawing.Size(264, 84)
Me.MyPanel1.TabIndex = 3 Me.MyPanel1.TabIndex = 3
' '
'pnlKunde
'
Me.pnlKunde.Controls.Add(Me.cbxKunden)
Me.pnlKunde.Controls.Add(Me.cboKundenkreis)
Me.pnlKunde.Location = New System.Drawing.Point(16, 47)
Me.pnlKunde.Name = "pnlKunde"
Me.pnlKunde.Size = New System.Drawing.Size(169, 32)
Me.pnlKunde.TabIndex = 26
Me.pnlKunde.Visible = False
'
'cboKundenkreis
'
Me.cboKundenkreis._allowedValuesFreiText = Nothing
Me.cboKundenkreis._allowFreiText = False
Me.cboKundenkreis._value = ""
Me.cboKundenkreis.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
Me.cboKundenkreis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cboKundenkreis.DropDownWidth = 400
Me.cboKundenkreis.Enabled = False
Me.cboKundenkreis.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.cboKundenkreis.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboKundenkreis.FormattingEnabled = True
Me.cboKundenkreis.Items.AddRange(New Object() {"", "100000-199999: XXXXXX", "200000-299999: XXXXXX", "300000-399999: XXXXXX", "400000-499999: XXXXXX", "500000-599999: XXXXXX", "600000-699999: XXXXXX", "700000-799999: XXXXXX", "800000-899999: XXXXXX", "900000-999999: XXXXXX"})
Me.cboKundenkreis.Location = New System.Drawing.Point(33, 1)
Me.cboKundenkreis.Name = "cboKundenkreis"
Me.cboKundenkreis.Size = New System.Drawing.Size(133, 28)
Me.cboKundenkreis.TabIndex = 4
'
'dtp_date 'dtp_date
' '
Me.dtp_date.Format = System.Windows.Forms.DateTimePickerFormat.[Short] Me.dtp_date.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
Me.dtp_date.Location = New System.Drawing.Point(16, 29) Me.dtp_date.Location = New System.Drawing.Point(16, 24)
Me.dtp_date.Name = "dtp_date" Me.dtp_date.Name = "dtp_date"
Me.dtp_date.Size = New System.Drawing.Size(100, 20) Me.dtp_date.Size = New System.Drawing.Size(100, 20)
Me.dtp_date.TabIndex = 25 Me.dtp_date.TabIndex = 25
@@ -87,7 +120,7 @@ Partial Class frmDatumsabfrage
'lbl 'lbl
' '
Me.lbl.AutoSize = True Me.lbl.AutoSize = True
Me.lbl.Location = New System.Drawing.Point(13, 8) Me.lbl.Location = New System.Drawing.Point(13, 5)
Me.lbl.Name = "lbl" Me.lbl.Name = "lbl"
Me.lbl.Size = New System.Drawing.Size(215, 13) Me.lbl.Size = New System.Drawing.Size(215, 13)
Me.lbl.TabIndex = 0 Me.lbl.TabIndex = 0
@@ -96,16 +129,25 @@ Partial Class frmDatumsabfrage
'Label1 'Label1
' '
Me.Label1.ForeColor = System.Drawing.Color.Red Me.Label1.ForeColor = System.Drawing.Color.Red
Me.Label1.Location = New System.Drawing.Point(13, 52) Me.Label1.Location = New System.Drawing.Point(122, 29)
Me.Label1.Name = "Label1" Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(159, 18) Me.Label1.Size = New System.Drawing.Size(132, 18)
Me.Label1.TabIndex = 6 Me.Label1.TabIndex = 6
' '
'cbxKunden
'
Me.cbxKunden.AutoSize = True
Me.cbxKunden.Location = New System.Drawing.Point(12, 9)
Me.cbxKunden.Name = "cbxKunden"
Me.cbxKunden.Size = New System.Drawing.Size(15, 14)
Me.cbxKunden.TabIndex = 5
Me.cbxKunden.UseVisualStyleBackColor = True
'
'frmDatumsabfrage 'frmDatumsabfrage
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(264, 77) Me.ClientSize = New System.Drawing.Size(264, 84)
Me.Controls.Add(Me.MyPanel1) Me.Controls.Add(Me.MyPanel1)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
Me.Name = "frmDatumsabfrage" Me.Name = "frmDatumsabfrage"
@@ -113,6 +155,8 @@ Partial Class frmDatumsabfrage
Me.Text = "frmDatumsabfrage" Me.Text = "frmDatumsabfrage"
Me.MyPanel1.ResumeLayout(False) Me.MyPanel1.ResumeLayout(False)
Me.MyPanel1.PerformLayout() Me.MyPanel1.PerformLayout()
Me.pnlKunde.ResumeLayout(False)
Me.pnlKunde.PerformLayout()
Me.ResumeLayout(False) Me.ResumeLayout(False)
End Sub End Sub
@@ -123,4 +167,7 @@ Partial Class frmDatumsabfrage
Friend WithEvents lbl As Label Friend WithEvents lbl As Label
Friend WithEvents Label1 As Label Friend WithEvents Label1 As Label
Friend WithEvents dtp_date As DateTimePicker Friend WithEvents dtp_date As DateTimePicker
Friend WithEvents pnlKunde As Panel
Friend WithEvents cboKundenkreis As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents cbxKunden As CheckBox
End Class End Class

View File

@@ -3,6 +3,7 @@ Imports VERAG_PROG_ALLGEMEIN
Public Class frmDatumsabfrage Public Class frmDatumsabfrage
Dim onlypastDate As Boolean = True Dim onlypastDate As Boolean = True
Dim panelKunde As Boolean = False
Sub New() Sub New()
@@ -20,6 +21,17 @@ Public Class frmDatumsabfrage
lbl.Text = title lbl.Text = title
End Sub End Sub
Sub New(title As String, _onlypastDate As Boolean, _mitKundengruppe As Boolean)
' Dieser Aufruf ist für den Designer erforderlich.
InitializeComponent()
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
onlypastDate = _onlypastDate
lbl.Text = title
panelKunde = _mitKundengruppe
End Sub
Public Datum As Date = CDate(Now.ToShortDateString) Public Datum As Date = CDate(Now.ToShortDateString)
Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
Label1.Text = "" Label1.Text = ""
@@ -46,6 +58,25 @@ Public Class frmDatumsabfrage
Private Sub frmDatumsabfrage(sender As Object, e As EventArgs) Handles Me.Load Private Sub frmDatumsabfrage(sender As Object, e As EventArgs) Handles Me.Load
dtp_date.Value = Now.ToShortDateString dtp_date.Value = Now.ToShortDateString
pnlKunde.Visible = panelKunde
If panelKunde Then
cboKundenkreis.Items.Clear()
cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 100000-199999: TR - KUNDEN", "100000-199999"))
cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 130000-139999: 360 TR - KUNDEN", "130000-139999"))
cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 150000-159999: 360 RMC - KUNDEN", "150000-159999"))
cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 140000-149999: 360 DURMAZ - KUNDEN", "140000-149999"))
cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 160000-169999: AT - KUNDEN", "160000-169999"))
cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 200000-299999: RO - KUNDEN", "200000-299999"))
cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 300000-302999: BG - KUNDEN", "300000-302999"))
cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 303000-303999: DE - KUNDEN", "303000-303999"))
cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 400000-499999: YU - KUNDEN", "400000-499999"))
End If
End Sub End Sub
Private Sub cbxKunden_CheckedChanged(sender As Object, e As EventArgs) Handles cbxKunden.CheckedChanged
cboKundenkreis.Enabled = cbxKunden.Checked
End Sub
End Class End Class