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:
Andreas Luxbauer
2025-03-14 09:15:32 +01:00
parent 33b814d995 7ff2b4d34f
commit 414e105b9e
3 changed files with 43 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb generated
View File

@@ -64,26 +64,23 @@ Partial Class ustCntlUSTV_ErstattungPosition
Me.tbcntr = New System.Windows.Forms.TabControl() Me.tbcntr = New System.Windows.Forms.TabControl()
Me.tabDok = New System.Windows.Forms.TabPage() Me.tabDok = New System.Windows.Forms.TabPage()
Me.scanSonstiges = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.scanSonstiges = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
Me.tabVollmachten = New System.Windows.Forms.TabPage()
Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
Me.tabFABest = New System.Windows.Forms.TabPage()
Me.scanUSTVFABest = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
Me.Panel4 = New System.Windows.Forms.Panel() Me.Panel4 = New System.Windows.Forms.Panel()
Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabControl1 = New System.Windows.Forms.TabControl()
Me.TabPage1 = New System.Windows.Forms.TabPage() Me.TabPage1 = New System.Windows.Forms.TabPage()
Me.UsrcntlPDFScanList1 = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.UsrcntlPDFScanList1 = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
Me.scanLieferschein = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() Me.scanLieferschein = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
Me.tabVZ = New System.Windows.Forms.TabPage()
Me.Panel2.SuspendLayout() Me.Panel2.SuspendLayout()
Me.pnl.SuspendLayout() Me.pnl.SuspendLayout()
Me.Panel1.SuspendLayout() Me.Panel1.SuspendLayout()
Me.Panel3.SuspendLayout() Me.Panel3.SuspendLayout()
Me.tbcntr.SuspendLayout() Me.tbcntr.SuspendLayout()
Me.tabDok.SuspendLayout() Me.tabDok.SuspendLayout()
Me.tabVollmachten.SuspendLayout()
Me.tabFABest.SuspendLayout()
Me.Panel4.SuspendLayout() Me.Panel4.SuspendLayout()
Me.TabControl1.SuspendLayout() Me.TabControl1.SuspendLayout()
Me.TabPage1.SuspendLayout() Me.TabPage1.SuspendLayout()
Me.tabVZ.SuspendLayout()
Me.SuspendLayout() Me.SuspendLayout()
' '
'Label8 'Label8
@@ -659,8 +656,7 @@ Partial Class ustCntlUSTV_ErstattungPosition
'tbcntr 'tbcntr
' '
Me.tbcntr.Controls.Add(Me.tabDok) Me.tbcntr.Controls.Add(Me.tabDok)
Me.tbcntr.Controls.Add(Me.tabVollmachten) Me.tbcntr.Controls.Add(Me.tabVZ)
Me.tbcntr.Controls.Add(Me.tabFABest)
Me.tbcntr.Dock = System.Windows.Forms.DockStyle.Fill Me.tbcntr.Dock = System.Windows.Forms.DockStyle.Fill
Me.tbcntr.Location = New System.Drawing.Point(0, 16) Me.tbcntr.Location = New System.Drawing.Point(0, 16)
Me.tbcntr.Name = "tbcntr" Me.tbcntr.Name = "tbcntr"
@@ -676,7 +672,7 @@ Partial Class ustCntlUSTV_ErstattungPosition
Me.tabDok.Padding = New System.Windows.Forms.Padding(3) Me.tabDok.Padding = New System.Windows.Forms.Padding(3)
Me.tabDok.Size = New System.Drawing.Size(256, 193) Me.tabDok.Size = New System.Drawing.Size(256, 193)
Me.tabDok.TabIndex = 1 Me.tabDok.TabIndex = 1
Me.tabDok.Text = "Bescheide" Me.tabDok.Text = "Bescheide/Anträge"
Me.tabDok.UseVisualStyleBackColor = True Me.tabDok.UseVisualStyleBackColor = True
' '
'scanSonstiges 'scanSonstiges
@@ -700,69 +696,6 @@ Partial Class ustCntlUSTV_ErstattungPosition
Me.scanSonstiges.Size = New System.Drawing.Size(250, 187) Me.scanSonstiges.Size = New System.Drawing.Size(250, 187)
Me.scanSonstiges.TabIndex = 0 Me.scanSonstiges.TabIndex = 0
' '
'tabVollmachten
'
Me.tabVollmachten.Controls.Add(Me.scanUSTVVollmachten)
Me.tabVollmachten.Location = New System.Drawing.Point(4, 22)
Me.tabVollmachten.Name = "tabVollmachten"
Me.tabVollmachten.Padding = New System.Windows.Forms.Padding(3)
Me.tabVollmachten.Size = New System.Drawing.Size(256, 193)
Me.tabVollmachten.TabIndex = 2
Me.tabVollmachten.Text = "Vollmachten"
Me.tabVollmachten.UseVisualStyleBackColor = True
'
'scanUSTVVollmachten
'
Me.scanUSTVVollmachten._DATENSERVER_KATEGORIE = "DOKUMENTE"
Me.scanUSTVVollmachten._DATENSERVER_ORDNER = "MDM"
Me.scanUSTVVollmachten._DATENSERVER_UOrdner1 = ""
Me.scanUSTVVollmachten._DATENSERVER_UOrdner2 = ""
Me.scanUSTVVollmachten._DATENSERVER_UOrdner3 = ""
Me.scanUSTVVollmachten._OPEN_ORIGINAL = False
Me.scanUSTVVollmachten._TYPE = "PDF"
Me.scanUSTVVollmachten.AllowDrop = True
Me.scanUSTVVollmachten.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
Me.scanUSTVVollmachten.BackColor = System.Drawing.Color.White
Me.scanUSTVVollmachten.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.scanUSTVVollmachten.Cursor = System.Windows.Forms.Cursors.Hand
Me.scanUSTVVollmachten.Dock = System.Windows.Forms.DockStyle.Fill
Me.scanUSTVVollmachten.Location = New System.Drawing.Point(3, 3)
Me.scanUSTVVollmachten.Margin = New System.Windows.Forms.Padding(0)
Me.scanUSTVVollmachten.Name = "scanUSTVVollmachten"
Me.scanUSTVVollmachten.Size = New System.Drawing.Size(250, 187)
Me.scanUSTVVollmachten.TabIndex = 1
'
'tabFABest
'
Me.tabFABest.Controls.Add(Me.scanUSTVFABest)
Me.tabFABest.Location = New System.Drawing.Point(4, 22)
Me.tabFABest.Name = "tabFABest"
Me.tabFABest.Size = New System.Drawing.Size(256, 193)
Me.tabFABest.TabIndex = 3
Me.tabFABest.Text = "FA_Bestätigung"
Me.tabFABest.UseVisualStyleBackColor = True
'
'scanUSTVFABest
'
Me.scanUSTVFABest._DATENSERVER_KATEGORIE = "DOKUMENTE"
Me.scanUSTVFABest._DATENSERVER_ORDNER = "MDM"
Me.scanUSTVFABest._DATENSERVER_UOrdner1 = ""
Me.scanUSTVFABest._DATENSERVER_UOrdner2 = ""
Me.scanUSTVFABest._DATENSERVER_UOrdner3 = ""
Me.scanUSTVFABest._OPEN_ORIGINAL = False
Me.scanUSTVFABest._TYPE = "PDF"
Me.scanUSTVFABest.AllowDrop = True
Me.scanUSTVFABest.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
Me.scanUSTVFABest.BackColor = System.Drawing.Color.White
Me.scanUSTVFABest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.scanUSTVFABest.Cursor = System.Windows.Forms.Cursors.Hand
Me.scanUSTVFABest.Dock = System.Windows.Forms.DockStyle.Fill
Me.scanUSTVFABest.Location = New System.Drawing.Point(0, 0)
Me.scanUSTVFABest.Margin = New System.Windows.Forms.Padding(0)
Me.scanUSTVFABest.Name = "scanUSTVFABest"
Me.scanUSTVFABest.Size = New System.Drawing.Size(256, 193)
Me.scanUSTVFABest.TabIndex = 1
'
'Panel4 'Panel4
' '
Me.Panel4.Controls.Add(Me.TabControl1) Me.Panel4.Controls.Add(Me.TabControl1)
@@ -834,6 +767,38 @@ Partial Class ustCntlUSTV_ErstattungPosition
Me.scanLieferschein.TabIndex = 2 Me.scanLieferschein.TabIndex = 2
Me.scanLieferschein.Visible = False Me.scanLieferschein.Visible = False
' '
'scanUSTVVollmachten
'
Me.scanUSTVVollmachten._DATENSERVER_KATEGORIE = "DOKUMENTE"
Me.scanUSTVVollmachten._DATENSERVER_ORDNER = "MDM"
Me.scanUSTVVollmachten._DATENSERVER_UOrdner1 = ""
Me.scanUSTVVollmachten._DATENSERVER_UOrdner2 = ""
Me.scanUSTVVollmachten._DATENSERVER_UOrdner3 = ""
Me.scanUSTVVollmachten._OPEN_ORIGINAL = False
Me.scanUSTVVollmachten._TYPE = "PDF"
Me.scanUSTVVollmachten.AllowDrop = True
Me.scanUSTVVollmachten.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
Me.scanUSTVVollmachten.BackColor = System.Drawing.Color.White
Me.scanUSTVVollmachten.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.scanUSTVVollmachten.Cursor = System.Windows.Forms.Cursors.Hand
Me.scanUSTVVollmachten.Dock = System.Windows.Forms.DockStyle.Fill
Me.scanUSTVVollmachten.Location = New System.Drawing.Point(3, 3)
Me.scanUSTVVollmachten.Margin = New System.Windows.Forms.Padding(0)
Me.scanUSTVVollmachten.Name = "scanUSTVVollmachten"
Me.scanUSTVVollmachten.Size = New System.Drawing.Size(250, 187)
Me.scanUSTVVollmachten.TabIndex = 1
'
'tabVZ
'
Me.tabVZ.Controls.Add(Me.scanUSTVVollmachten)
Me.tabVZ.Location = New System.Drawing.Point(4, 22)
Me.tabVZ.Name = "tabVZ"
Me.tabVZ.Padding = New System.Windows.Forms.Padding(3)
Me.tabVZ.Size = New System.Drawing.Size(256, 193)
Me.tabVZ.TabIndex = 2
Me.tabVZ.Text = "Vorauszahlungen"
Me.tabVZ.UseVisualStyleBackColor = True
'
'ustCntlUSTV_ErstattungPosition 'ustCntlUSTV_ErstattungPosition
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -851,11 +816,10 @@ Partial Class ustCntlUSTV_ErstattungPosition
Me.Panel3.ResumeLayout(False) Me.Panel3.ResumeLayout(False)
Me.tbcntr.ResumeLayout(False) Me.tbcntr.ResumeLayout(False)
Me.tabDok.ResumeLayout(False) Me.tabDok.ResumeLayout(False)
Me.tabVollmachten.ResumeLayout(False)
Me.tabFABest.ResumeLayout(False)
Me.Panel4.ResumeLayout(False) Me.Panel4.ResumeLayout(False)
Me.TabControl1.ResumeLayout(False) Me.TabControl1.ResumeLayout(False)
Me.TabPage1.ResumeLayout(False) Me.TabPage1.ResumeLayout(False)
Me.tabVZ.ResumeLayout(False)
Me.ResumeLayout(False) Me.ResumeLayout(False)
End Sub End Sub
@@ -900,13 +864,11 @@ Partial Class ustCntlUSTV_ErstattungPosition
Friend WithEvents tbcntr As TabControl Friend WithEvents tbcntr As TabControl
Friend WithEvents tabDok As TabPage Friend WithEvents tabDok As TabPage
Friend WithEvents scanSonstiges As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList Friend WithEvents scanSonstiges As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList
Friend WithEvents tabVollmachten As TabPage
Friend WithEvents scanUSTVVollmachten As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList
Friend WithEvents tabFABest As TabPage
Friend WithEvents scanUSTVFABest As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList
Friend WithEvents Panel4 As Panel Friend WithEvents Panel4 As Panel
Friend WithEvents TabControl1 As TabControl Friend WithEvents TabControl1 As TabControl
Friend WithEvents TabPage1 As TabPage Friend WithEvents TabPage1 As TabPage
Friend WithEvents UsrcntlPDFScanList1 As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList Friend WithEvents UsrcntlPDFScanList1 As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList
Friend WithEvents scanLieferschein As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan Friend WithEvents scanLieferschein As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan
Friend WithEvents tabVZ As TabPage
Friend WithEvents scanUSTVVollmachten As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList
End Class End Class

2
SDL/kunden/usrCntlOfferte.vb
View File

@@ -895,7 +895,7 @@ Public Class usrCntlOfferte
Dim currentRow As Integer = 13 Dim currentRow As Integer = 13
Dim DatumDerZollabf As String = SQL.getValueTxtBySql("select top(1) isnull([Geändert am],[Eingegeben am]) as Datum FROM [VERAG].[dbo].[Offertenpositionen] where KundenNr = 704150 and OffertenNr in (38, 1) and LeistungsNr in (340, 324, 348, 440) order by Preis desc", "FMZOLL") Dim DatumDerZollabf As String = SQL.getValueTxtBySql("select top(1) isnull([Geändert am],[Eingegeben am]) as Datum FROM [VERAG].[dbo].[Offertenpositionen] where KundenNr = " & kdNr & " and OffertenNr in (38, 1) and LeistungsNr in (340, 324, 348, 440) order by Preis desc", "FMZOLL")
For Each row In dtKostenkalk.Rows For Each row In dtKostenkalk.Rows
Blatt.Range("A" & currentRow).Value = row("LeistungsBez") Blatt.Range("A" & currentRow).Value = row("LeistungsBez")

2
VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb
View File

@@ -240,6 +240,7 @@ Public Class cUTA
Property daId As Object Property daId As Object
Property charged As Boolean = False Property charged As Boolean = False
Property chargedDatetime As Object = Nothing Property chargedDatetime As Object = Nothing
Property daIdgesetztDatum As Object = Nothing
Public hasEntry = False Public hasEntry = False
@@ -345,6 +346,7 @@ Public Class cUTA
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("daId", daId)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("daId", daId))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("charged", charged)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("charged", charged))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chargedDatetime", chargedDatetime)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chargedDatetime", chargedDatetime))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("daIdgesetztDatum", daIdgesetztDatum))
Return list Return list
End Function End Function