edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

Browse Source
This commit is contained in:
d.breimaier
2025-02-04 17:04:22 +01:00
parent 2ec5ebc44c dc9966ac79
commit 113884f27a
6 changed files with 140 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.vb
View File

@@ -91,17 +91,17 @@ Public Class usrCntlATLAS_EXGestellung
'MRN Prüfung:
For Each l In rtbMRN.Lines
If l.Trim <> "" Then
If l.Length >= 18 And dblcheck.Contains(l) Then
If l.Trim.Length >= 18 And dblcheck.Contains(l.Trim) Then
MsgBox("Doppelte MRN !: " & l)
Me.Cursor = Cursors.Default
Exit Sub
End If
If Not IsValidMRN(l) Then
If Not IsValidMRN(l.Trim) Then
MsgBox("Ungültige MRN (Format): " & l)
Me.Cursor = Cursors.Default
Exit Sub
End If
dblcheck &= l
dblcheck &= l.Trim
End If
Next
@@ -111,7 +111,7 @@ Public Class usrCntlATLAS_EXGestellung
For Each l In rtbMRN.Lines
If l.Trim <> "" Then
If Not sendEXP_MRN(l, sbAbgangZollstelle._value, cnt, exg_list) Then
If Not sendEXP_MRN(l.Trim, sbAbgangZollstelle._value, cnt, exg_list) Then
MsgBox("Sendefehler bei " & l)
err = True
End If

112
SDL/kunden/usrCntlKundenuebersicht.Designer.vb generated
View File

@@ -74,10 +74,10 @@ Partial Class usrCntlKundenuebersicht
Me.Label13 = New System.Windows.Forms.Label()
Me.grpAbfertigung = New System.Windows.Forms.GroupBox()
Me.Panel9 = New System.Windows.Forms.Panel()
Me.txtVerzolltBei = New System.Windows.Forms.TextBox()
Me.Label3 = New System.Windows.Forms.Label()
Me.Label15 = New System.Windows.Forms.Label()
Me.txtVerzolltBeiExport = New System.Windows.Forms.TextBox()
Me.txtVerzolltBei = New System.Windows.Forms.TextBox()
Me.rtbInfo = New System.Windows.Forms.RichTextBox()
Me.txtNeutralisierung = New System.Windows.Forms.TextBox()
Me.lblNeutralisierung = New System.Windows.Forms.Label()
@@ -86,6 +86,7 @@ Partial Class usrCntlKundenuebersicht
Me.txtVorauskasse = New System.Windows.Forms.TextBox()
Me.lblAviso = New System.Windows.Forms.TextBox()
Me.Label2 = New System.Windows.Forms.Label()
Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten()
Me.lblAbfertigungsverbot = New System.Windows.Forms.Label()
Me.Label45 = New System.Windows.Forms.Label()
Me.pnlVERAGSnspr = New System.Windows.Forms.Panel()
@@ -157,6 +158,7 @@ Partial Class usrCntlKundenuebersicht
Me.PictureBox3 = New System.Windows.Forms.PictureBox()
Me.PictureBox5 = New System.Windows.Forms.PictureBox()
Me.tbKontaktSpez = New System.Windows.Forms.TabPage()
Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte()
Me.Label38 = New System.Windows.Forms.Label()
Me.txtDebitorennr = New System.Windows.Forms.TextBox()
Me.lblFwlFiskal = New System.Windows.Forms.LinkLabel()
@@ -167,7 +169,6 @@ Partial Class usrCntlKundenuebersicht
Me.lblStrasse = New System.Windows.Forms.TextBox()
Me.lblFirmenname2 = New System.Windows.Forms.TextBox()
Me.lblTESTSystem = New System.Windows.Forms.Label()
Me.lblAdressZusatz = New System.Windows.Forms.TextBox()
Me.grpSonstiges = New System.Windows.Forms.GroupBox()
Me.Button14 = New System.Windows.Forms.Button()
Me.Button13 = New System.Windows.Forms.Button()
@@ -204,6 +205,7 @@ Partial Class usrCntlKundenuebersicht
Me.Button8 = New System.Windows.Forms.Button()
Me.Button9 = New System.Windows.Forms.Button()
Me.tbAvisoMail = New System.Windows.Forms.TabPage()
Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung()
Me.tbKdSpez = New System.Windows.Forms.TabPage()
Me.Label14 = New System.Windows.Forms.Label()
Me.Label43 = New System.Windows.Forms.Label()
@@ -260,9 +262,6 @@ Partial Class usrCntlKundenuebersicht
Me.btnOP = New System.Windows.Forms.Button()
Me.ContextMenuStrip5 = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.ToolStripMenuItem12 = New System.Windows.Forms.ToolStripMenuItem()
Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten()
Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte()
Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung()
Me.cntxtAddVM.SuspendLayout()
Me.tbWeitereKundenDetails.SuspendLayout()
Me.tbOfferten.SuspendLayout()
@@ -899,6 +898,19 @@ Partial Class usrCntlKundenuebersicht
Me.Panel9.Size = New System.Drawing.Size(356, 24)
Me.Panel9.TabIndex = 46
'
'txtVerzolltBei
'
Me.txtVerzolltBei.BackColor = System.Drawing.Color.WhiteSmoke
Me.txtVerzolltBei.BorderStyle = System.Windows.Forms.BorderStyle.None
Me.txtVerzolltBei.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtVerzolltBei.ForeColor = System.Drawing.Color.Black
Me.txtVerzolltBei.Location = New System.Drawing.Point(62, 4)
Me.txtVerzolltBei.Name = "txtVerzolltBei"
Me.txtVerzolltBei.ReadOnly = True
Me.txtVerzolltBei.Size = New System.Drawing.Size(155, 13)
Me.txtVerzolltBei.TabIndex = 16
Me.txtVerzolltBei.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
'
'Label3
'
Me.Label3.AutoSize = True
@@ -930,19 +942,6 @@ Partial Class usrCntlKundenuebersicht
Me.txtVerzolltBeiExport.TabIndex = 44
Me.txtVerzolltBeiExport.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
'
'txtVerzolltBei
'
Me.txtVerzolltBei.BackColor = System.Drawing.Color.WhiteSmoke
Me.txtVerzolltBei.BorderStyle = System.Windows.Forms.BorderStyle.None
Me.txtVerzolltBei.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtVerzolltBei.ForeColor = System.Drawing.Color.Black
Me.txtVerzolltBei.Location = New System.Drawing.Point(62, 4)
Me.txtVerzolltBei.Name = "txtVerzolltBei"
Me.txtVerzolltBei.ReadOnly = True
Me.txtVerzolltBei.Size = New System.Drawing.Size(155, 13)
Me.txtVerzolltBei.TabIndex = 16
Me.txtVerzolltBei.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
'
'rtbInfo
'
Me.rtbInfo.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -1037,6 +1036,17 @@ Partial Class usrCntlKundenuebersicht
Me.Label2.Text = "Aviso:"
Me.Label2.Visible = False
'
'UsrCntlKundenBesonderheiten1
'
Me.UsrCntlKundenBesonderheiten1.AutoScroll = True
Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White
Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.UsrCntlKundenBesonderheiten1.Location = New System.Drawing.Point(7, 32)
Me.UsrCntlKundenBesonderheiten1.Name = "UsrCntlKundenBesonderheiten1"
Me.UsrCntlKundenBesonderheiten1.Size = New System.Drawing.Size(107, 52)
Me.UsrCntlKundenBesonderheiten1.TabIndex = 6
Me.UsrCntlKundenBesonderheiten1.Visible = False
'
'lblAbfertigungsverbot
'
Me.lblAbfertigungsverbot.BackColor = System.Drawing.Color.Red
@@ -1970,7 +1980,6 @@ Partial Class usrCntlKundenuebersicht
Me.grpAdresse.Controls.Add(Me.lblStrasse)
Me.grpAdresse.Controls.Add(Me.lblFirmenname2)
Me.grpAdresse.Controls.Add(Me.lblTESTSystem)
Me.grpAdresse.Controls.Add(Me.lblAdressZusatz)
Me.grpAdresse.Location = New System.Drawing.Point(3, 17)
Me.grpAdresse.Name = "grpAdresse"
Me.grpAdresse.Size = New System.Drawing.Size(499, 348)
@@ -2187,6 +2196,14 @@ Partial Class usrCntlKundenuebersicht
Me.tbKontaktSpez.Text = "Spezifisch"
Me.tbKontaktSpez.UseVisualStyleBackColor = True
'
'ucKundenKontakte
'
Me.ucKundenKontakte.Dock = System.Windows.Forms.DockStyle.Fill
Me.ucKundenKontakte.Location = New System.Drawing.Point(3, 3)
Me.ucKundenKontakte.Name = "ucKundenKontakte"
Me.ucKundenKontakte.Size = New System.Drawing.Size(473, 158)
Me.ucKundenKontakte.TabIndex = 0
'
'Label38
'
Me.Label38.AutoSize = True
@@ -2273,10 +2290,11 @@ Partial Class usrCntlKundenuebersicht
Me.lblStrasse.BackColor = System.Drawing.Color.White
Me.lblStrasse.BorderStyle = System.Windows.Forms.BorderStyle.None
Me.lblStrasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.lblStrasse.Location = New System.Drawing.Point(6, 91)
Me.lblStrasse.Location = New System.Drawing.Point(6, 70)
Me.lblStrasse.Multiline = True
Me.lblStrasse.Name = "lblStrasse"
Me.lblStrasse.ReadOnly = True
Me.lblStrasse.Size = New System.Drawing.Size(491, 19)
Me.lblStrasse.Size = New System.Drawing.Size(491, 43)
Me.lblStrasse.TabIndex = 5
Me.lblStrasse.Text = "Strasse"
'
@@ -2303,18 +2321,6 @@ Partial Class usrCntlKundenuebersicht
Me.lblTESTSystem.TabIndex = 4
Me.lblTESTSystem.Text = "! TESTSYSTEM !"
'
'lblAdressZusatz
'
Me.lblAdressZusatz.BackColor = System.Drawing.Color.White
Me.lblAdressZusatz.BorderStyle = System.Windows.Forms.BorderStyle.None
Me.lblAdressZusatz.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.lblAdressZusatz.Location = New System.Drawing.Point(6, 62)
Me.lblAdressZusatz.Name = "lblAdressZusatz"
Me.lblAdressZusatz.ReadOnly = True
Me.lblAdressZusatz.Size = New System.Drawing.Size(353, 19)
Me.lblAdressZusatz.TabIndex = 11
Me.lblAdressZusatz.Text = "Zusatz"
'
'grpSonstiges
'
Me.grpSonstiges.BackColor = System.Drawing.Color.White
@@ -2837,6 +2843,16 @@ Partial Class usrCntlKundenuebersicht
Me.tbAvisoMail.Text = "Aviso E-Mails"
Me.tbAvisoMail.UseVisualStyleBackColor = True
'
'UsrCntlKundenAvisoMailBenachrichtigung1
'
Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True
Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White
Me.UsrCntlKundenAvisoMailBenachrichtigung1.Dock = System.Windows.Forms.DockStyle.Fill
Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(3, 3)
Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1"
Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(473, 158)
Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 0
'
'tbKdSpez
'
Me.tbKdSpez.Controls.Add(Me.Label14)
@@ -3408,35 +3424,6 @@ Partial Class usrCntlKundenuebersicht
Me.ToolStripMenuItem12.Size = New System.Drawing.Size(150, 30)
Me.ToolStripMenuItem12.Text = "Schnelldruck"
'
'UsrCntlKundenBesonderheiten1
'
Me.UsrCntlKundenBesonderheiten1.AutoScroll = True
Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White
Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.UsrCntlKundenBesonderheiten1.Location = New System.Drawing.Point(7, 32)
Me.UsrCntlKundenBesonderheiten1.Name = "UsrCntlKundenBesonderheiten1"
Me.UsrCntlKundenBesonderheiten1.Size = New System.Drawing.Size(107, 52)
Me.UsrCntlKundenBesonderheiten1.TabIndex = 6
Me.UsrCntlKundenBesonderheiten1.Visible = False
'
'ucKundenKontakte
'
Me.ucKundenKontakte.Dock = System.Windows.Forms.DockStyle.Fill
Me.ucKundenKontakte.Location = New System.Drawing.Point(3, 3)
Me.ucKundenKontakte.Name = "ucKundenKontakte"
Me.ucKundenKontakte.Size = New System.Drawing.Size(473, 158)
Me.ucKundenKontakte.TabIndex = 0
'
'UsrCntlKundenAvisoMailBenachrichtigung1
'
Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True
Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White
Me.UsrCntlKundenAvisoMailBenachrichtigung1.Dock = System.Windows.Forms.DockStyle.Fill
Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(3, 3)
Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1"
Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(473, 158)
Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 0
'
'usrCntlKundenuebersicht
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -3741,7 +3728,6 @@ Partial Class usrCntlKundenuebersicht
Friend WithEvents btnCreditsafe As Button
Friend WithEvents FlatButton2 As VERAG_PROG_ALLGEMEIN.FlatButton
Friend WithEvents SessionService1 As VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.session.sessionService
Friend WithEvents lblAdressZusatz As TextBox
Friend WithEvents picVertrag As PictureBox
Friend WithEvents PictureBox6 As PictureBox
Friend WithEvents txtOVK As VERAG_PROG_ALLGEMEIN.MyTextBox

10
SDL/kunden/usrCntlKundenuebersicht.vb
View File

@@ -408,9 +408,15 @@ Public Class usrCntlKundenuebersicht
lblFirmenname1.Text = checkNullStr(ADRESSE.Name_1)
lblFirmenname2.Text = checkNullStr(ADRESSE.Name_2)
lblAdressZusatz.Text = checkNullStr(KUNDE_ERW.kde_AdressZusatz)
Dim zusatz As String = checkNullStr(KUNDE_ERW.kde_AdressZusatz)
Dim strasse As String = checkNullStr(ADRESSE.Straße)
lblStrasse.Text = checkNullStr(ADRESSE.Straße)
lblStrasse.Text = checkNullStr(KUNDE_ERW.kde_AdressZusatz) & checkNullStr(ADRESSE.Straße)
If zusatz <> "" Then
lblStrasse.Text = zusatz & vbCrLf & strasse
Else
lblStrasse.Text = vbCrLf & strasse
End If
lblLandPlzOrt.Text = checkNullStr(ADRESSE.LandKz) & " - " & checkNullStr(ADRESSE.PLZ) & " - " & checkNullStr(ADRESSE.Ort)
lblPostfach.Text = checkNullStr(ADRESSE.PLZPF) & " - " & checkNullStr(ADRESSE.Postfach)