diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/subRptLaufzettelZollDE_Vorpapier.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/subRptLaufzettelZollDE_Vorpapier.Designer.vb index 76b65291..96d7cd76 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/subRptLaufzettelZollDE_Vorpapier.Designer.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/subRptLaufzettelZollDE_Vorpapier.Designer.vb @@ -20,17 +20,17 @@ Partial Public Class subRptLaufzettelZollDE_Vorpapier Me.txtATAMRN = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.txtNr = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.picBarcodeMRN = New GrapeCity.ActiveReports.SectionReportModel.Picture() + Me.TextBox1 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.ReportHeader1 = New GrapeCity.ActiveReports.SectionReportModel.ReportHeader() Me.Shape4 = New GrapeCity.ActiveReports.SectionReportModel.Shape() Me.TextBox8 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() - Me.ReportFooter1 = New GrapeCity.ActiveReports.SectionReportModel.ReportFooter() - Me.TextBox1 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.TextBox2 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.ReportFooter1 = New GrapeCity.ActiveReports.SectionReportModel.ReportFooter() CType(Me.txtATAMRN, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtNr, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picBarcodeMRN, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextBox8, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextBox1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextBox8, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextBox2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me, System.ComponentModel.ISupportInitialize).BeginInit() ' @@ -87,6 +87,18 @@ Partial Public Class subRptLaufzettelZollDE_Vorpapier Me.picBarcodeMRN.Visible = False Me.picBarcodeMRN.Width = 3.102756! ' + 'TextBox1 + ' + Me.TextBox1.CanGrow = False + Me.TextBox1.Height = 0.2094488! + Me.TextBox1.Left = 3.955118! + Me.TextBox1.Name = "TextBox1" + Me.TextBox1.Style = "font-size: 10pt; font-weight: bold; text-align: right; vertical-align: middle; dd" & + "o-char-set: 1" + Me.TextBox1.Text = Nothing + Me.TextBox1.Top = 0.03543307! + Me.TextBox1.Width = 3.050787! + ' 'ReportHeader1 ' Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Shape4, Me.TextBox8, Me.TextBox2}) @@ -114,22 +126,6 @@ Partial Public Class subRptLaufzettelZollDE_Vorpapier Me.TextBox8.Top = 0.1035433! Me.TextBox8.Width = 1.130709! ' - 'ReportFooter1 - ' - Me.ReportFooter1.Height = 0.08333333! - Me.ReportFooter1.Name = "ReportFooter1" - ' - 'TextBox1 - ' - Me.TextBox1.CanGrow = False - Me.TextBox1.Height = 0.2094488! - Me.TextBox1.Left = 3.955118! - Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Style = "font-size: 12pt; font-weight: bold; text-align: right; vertical-align: middle; dd" & - "o-char-set: 1" - Me.TextBox1.Top = 0.03543307! - Me.TextBox1.Width = 3.050787! - ' 'TextBox2 ' Me.TextBox2.Height = 0.1460631! @@ -141,6 +137,11 @@ Partial Public Class subRptLaufzettelZollDE_Vorpapier Me.TextBox2.Top = 0.1035433! Me.TextBox2.Width = 1.130709! ' + 'ReportFooter1 + ' + Me.ReportFooter1.Height = 0.08333333! + Me.ReportFooter1.Name = "ReportFooter1" + ' 'subRptLaufzettelZollDE_Vorpapier ' Me.PageSettings.PaperHeight = 11.0! @@ -158,8 +159,8 @@ Partial Public Class subRptLaufzettelZollDE_Vorpapier CType(Me.txtATAMRN, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtNr, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.picBarcodeMRN, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextBox8, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextBox1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextBox8, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextBox2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/subRptLaufzettelZollDE_Vorpapier.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/subRptLaufzettelZollDE_Vorpapier.vb index 4493749e..2e1cf6f9 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/subRptLaufzettelZollDE_Vorpapier.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/subRptLaufzettelZollDE_Vorpapier.vb @@ -33,9 +33,20 @@ Public Class subRptLaufzettelZollDE_Vorpapier End If If ATAMRN <> "" Then - Dim ATB = SQL.DLookup("tblSnd_ATB_Nr", "tblSendungen", "'" & ATAMRN & "' IN (tblSnd_Vorpapier,tblSnd_Vorpapier2,tblSnd_Vorpapier3) and tblSnd_Abfertigungsart_ID=44", "AVISO", "") + ' Dim ATB = SQL.DLookup("tblSnd_ATB_Nr", "tblSendungen", "'" & ATAMRN.Trim & "' IN (tblSnd_Vorpapier,tblSnd_Vorpapier2,tblSnd_Vorpapier3) and tblSnd_Abfertigungsart_ID=44", "AVISO", "") + Dim ATB = SQL.DLookup("tblSnd_ATB_Nr", "tblSendungen", " tblSnd_ATB_T1= '" & ATAMRN.Trim & "' and tblSnd_Abfertigungsart_ID=44", "AVISO", "") + If ATB <> "" Then TextBox1.Text = ATB + + 'Überschreiben mit ATB-Barcode + Dim barcodeATB As Image = Code128Rendering.MakeBarcodeImage(ATB, 1, True, 20) + picBarcodeMRN.Image = barcodeATB + picBarcodeMRN.Visible = True + picBarcodeMRN.Location = New PointF(picBarcodeMRN.Location.X - 0.5, picBarcodeMRN.Location.Y) + + ATAMRN = "(" & ATAMRN & ")" + txtATAMRN.Font = New Font(txtATAMRN.Font.FontFamily, 10, FontStyle.Regular) ' kleiner schreiben End If End If Catch ex As Exception diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 38fbb09b..210c68af 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index cba1a247..9fb961d5 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -186,12 +186,13 @@ Public Class frmMDM_USTVAntrag End Sub Private Sub Button14_Click(sender As Object, e As EventArgs) Handles Button14.Click - loadUSTVFrom_PLOSE() + loadUSTVFrom_PLOSE(UStVAn_ID, Antrag_LandKz, cbxArchivierteEintracheNochmalsEinarbetien.Checked) init() End Sub - Function alreadyExists(USTVAn_KuNr As Integer, UStVAn_LandNr As String, USTV_POS As VERAG_PROG_ALLGEMEIN.cUStVPositionen) As Boolean + Shared Function alreadyExists(USTVAn_KuNr As Integer, UStVAn_LandNr As String, USTV_POS As VERAG_PROG_ALLGEMEIN.cUStVPositionen) As Boolean + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim cnt = SQL.getValueTxtBySql(" SELECT count(*) FROM [tblUStVAntrag] inner join [tblUStVPositionen] on tblUStVAntrag.UStVAn_ID= [tblUStVPositionen].UStVAn_ID WHERE USTVAn_KuNr='" & USTVAn_KuNr & "' AND UStVPo_SchnittstellenNr='" & USTV_POS.UStVPo_SchnittstellenNr & "' AND UStVPo_ReNr = '" & USTV_POS.UStVPo_ReNr & "' AND UStVPo_ReDat='" & USTV_POS.UStVPo_ReDat & "' AND UStVAn_LandNr='" & UStVAn_LandNr & "' ", "FMZOLL") Return (cnt > 0) @@ -208,11 +209,11 @@ Public Class frmMDM_USTVAntrag Return False End Function - Function loadUSTVFrom_PLOSE() As Boolean + Shared Function loadUSTVFrom_PLOSE(UStVAn_ID, Antrag_LandKz, ArchivierteEintracheNochmalsEinarbetien) As Boolean Try Dim bytSchnittstellenNr = 6 'glaube noch frei? Dim USTV_ANTRAG As New VERAG_PROG_ALLGEMEIN.cUSTVAntrag(UStVAn_ID) - Dim GET_Antraege = MDM_Worker.cPLOSE.GET_Antraege(USTV_ANTRAG.UStVAn_ReDatVon, USTV_ANTRAG.UStVAn_ReDatBis, USTV_ANTRAG.UStVAn_KuNr, Antrag_LandKz, cbxArchivierteEintracheNochmalsEinarbetien.Checked) + Dim GET_Antraege = MDM_Worker.cPLOSE.GET_Antraege(USTV_ANTRAG.UStVAn_ReDatVon, USTV_ANTRAG.UStVAn_ReDatBis, USTV_ANTRAG.UStVAn_KuNr, Antrag_LandKz, ArchivierteEintracheNochmalsEinarbetien) If GET_Antraege IsNot Nothing Then @@ -267,7 +268,7 @@ Public Class frmMDM_USTVAntrag If UStVPo_ID > 0 Then Dim ANTR_POS As New VERAG_PROG_ALLGEMEIN.cUStVPositionen(USTV_ANTRAG.UStVAn_ID, UStVPo_ID) UstCntlUSTV_AntragPosition1.Enabled = True - UstCntlUSTV_AntragPosition1.setValues(ANTR_POS, Antrag_LandKz) + UstCntlUSTV_AntragPosition1.setValues(USTV_ANTRAG.UStVAn_KuNr, ANTR_POS, Antrag_LandKz) Else UstCntlUSTV_AntragPosition1.reset() UstCntlUSTV_AntragPosition1.Enabled = False diff --git a/SDL/USTV/usrCntlUSTV.Designer.vb b/SDL/USTV/usrCntlUSTV.Designer.vb index 0dd44400..0166da30 100644 --- a/SDL/USTV/usrCntlUSTV.Designer.vb +++ b/SDL/USTV/usrCntlUSTV.Designer.vb @@ -23,7 +23,7 @@ Partial Class usrCntlUSTV Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnlFilter = New System.Windows.Forms.Panel() Me.dgvUSTV = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Label1 = New System.Windows.Forms.Label() @@ -38,8 +38,9 @@ Partial Class usrCntlUSTV Me.FlatButton2 = New System.Windows.Forms.Button() Me.Panel2 = New System.Windows.Forms.Panel() Me.Panel3 = New System.Windows.Forms.Panel() - Me.Button8 = New System.Windows.Forms.Button() + Me.btnPLOSEAlle = New System.Windows.Forms.Button() Me.Button5 = New System.Windows.Forms.Button() + Me.Button8 = New System.Windows.Forms.Button() CType(Me.dgvUSTV, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.Panel2.SuspendLayout() @@ -61,8 +62,8 @@ Partial Class usrCntlUSTV Me.dgvUSTV.AKTUALISIERUNGS_INTERVALL = -1 Me.dgvUSTV.AllowUserToAddRows = False Me.dgvUSTV.AllowUserToDeleteRows = False - DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUSTV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUSTV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 Me.dgvUSTV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUSTV.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvUSTV.Location = New System.Drawing.Point(0, 84) @@ -140,6 +141,7 @@ Partial Class usrCntlUSTV Me.KdSearchBox1._displayWoelflKd = False Me.KdSearchBox1._hideIfListEmpty = True Me.KdSearchBox1._loadKdData = False + Me.KdSearchBox1._searchName1 = True Me.KdSearchBox1._UseFIRMA = "" Me.KdSearchBox1._ValueKdAndName = True Me.KdSearchBox1.dgvpos = "LEFT" @@ -226,6 +228,7 @@ Partial Class usrCntlUSTV 'Panel3 ' Me.Panel3.AutoSize = True + Me.Panel3.Controls.Add(Me.btnPLOSEAlle) Me.Panel3.Controls.Add(Me.Button5) Me.Panel3.Controls.Add(Me.Button8) Me.Panel3.Controls.Add(Me.Button1) @@ -237,19 +240,20 @@ Partial Class usrCntlUSTV Me.Panel3.Size = New System.Drawing.Size(1072, 66) Me.Panel3.TabIndex = 0 ' - 'Button8 + 'btnPLOSEAlle ' - Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button8.Image = Global.SDL.My.Resources.Resources.statistik_small - Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button8.Location = New System.Drawing.Point(213, 7) - Me.Button8.Margin = New System.Windows.Forms.Padding(0) - Me.Button8.Name = "Button8" - Me.Button8.Size = New System.Drawing.Size(145, 41) - Me.Button8.TabIndex = 6 - Me.Button8.Text = "Eingereichte Anträge" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "mit Differenzbetrag" - Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button8.UseVisualStyleBackColor = True + Me.btnPLOSEAlle.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnPLOSEAlle.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) + Me.btnPLOSEAlle.ForeColor = System.Drawing.Color.Black + Me.btnPLOSEAlle.Image = Global.SDL.My.Resources.Resources.plus + Me.btnPLOSEAlle.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnPLOSEAlle.Location = New System.Drawing.Point(367, 8) + Me.btnPLOSEAlle.Name = "btnPLOSEAlle" + Me.btnPLOSEAlle.Size = New System.Drawing.Size(172, 40) + Me.btnPLOSEAlle.TabIndex = 24 + Me.btnPLOSEAlle.Text = "PLOSE für offene " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Anträge übernehmen" + Me.btnPLOSEAlle.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnPLOSEAlle.UseVisualStyleBackColor = True ' 'Button5 ' @@ -265,6 +269,20 @@ Partial Class usrCntlUSTV Me.Button5.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button5.UseVisualStyleBackColor = True ' + 'Button8 + ' + Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button8.Image = Global.SDL.My.Resources.Resources.statistik_small + Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button8.Location = New System.Drawing.Point(213, 7) + Me.Button8.Margin = New System.Windows.Forms.Padding(0) + Me.Button8.Name = "Button8" + Me.Button8.Size = New System.Drawing.Size(145, 41) + Me.Button8.TabIndex = 6 + Me.Button8.Text = "Eingereichte Anträge" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "mit Differenzbetrag" + Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button8.UseVisualStyleBackColor = True + ' 'usrCntlUSTV ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -299,4 +317,5 @@ Partial Class usrCntlUSTV Friend WithEvents Button8 As Button Friend WithEvents cboJahrBis As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Button5 As Button + Friend WithEvents btnPLOSEAlle As Button End Class diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index b9f6b0bd..136c1037 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -6,14 +6,22 @@ Public Class usrCntlUSTV Dim kundenSQL As New kundenSQL - Dim SQL As New SQL + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim FUNC As New cProgramFunctions Dim aktbtn As String = "" Dim dgvInitWait As Boolean = False + Public kdNr As Integer = -1 - - Sub init() + Sub init(Optional kdNr = -1) pnlFilter.AutoScroll = False + ' MsgBox(kdNr) + If kdNr > 0 Then + Me.kdNr = kdNr + KdSearchBox1.KdNr = kdNr + KdSearchBox1.Enabled = False + End If + + btnPLOSEAlle.Enabled = KdSearchBox1.KdNr > 0 With dgvUSTV .ClearSelection() @@ -114,6 +122,10 @@ Public Class usrCntlUSTV Private Sub usrCntlVERAGCard_Load(sender As Object, e As EventArgs) Handles MyBase.Load ' btnFilter.Left = Panel4.Width - btnFilter.Width KdSearchBox1.initKdBox(Me.FindForm) + If kdNr > 0 Then + KdSearchBox1.KdNr = kdNr + KdSearchBox1.Enabled = False + End If init() cboJahr.Items.Clear() cboJahr.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) @@ -194,4 +206,30 @@ Public Class usrCntlUSTV End If ' End If End Sub + + Private Sub btnPLOSEAlle_Click(sender As Object, e As EventArgs) Handles btnPLOSEAlle.Click + Try + Me.Cursor = Cursors.WaitCursor + If KdSearchBox1.KdNr <= 0 Then Exit Sub + If cboJahr._value = "" Then Exit Sub + If cboJahrBis._value = "" Then Exit Sub + + Dim cnt = SQL.getValueTxtBySql(" SELECT COUNT(*) FROM [tblUStVAntrag] where UStVAn_AntragEingereichtAm is null AND UStVAn_KuNr=" & KdSearchBox1.KdNr & " AND UStVAn_ReDatVon>='01.01." & cboJahr._value & "' AND UStVAn_ReDatBis<='31.12." & cboJahrBis._value & "'", "FMZOLL") + If cnt = 0 Then MsgBox("Keine einreichbaren Anträge gefunden!") : Exit Sub + + If vbYes = MsgBox("Es werden PLOSE Daten für " & cnt & " USTV-Anträge eingearbeitet. Möchten Sie fortfahren?", vbYesNoCancel) Then + For Each r As DataGridViewRow In dgvUSTV.Rows + If r.Cells("UStVAn_AntragEingereichtAm").Value Is DBNull.Value Then ' OrElse r.Cells("UStVAn_AntragEingereichtAm").Value = "" Then + 'Dim Antrag_LandKz = SQL.DLookup("LandKz", "[Länderverzeichnis für die Außenhandelsstatistik]", "Landnr='" & r.Cells("UStVAn_LandNr").Value & "'", "FMZOLL") + frmMDM_USTVAntrag.loadUSTVFrom_PLOSE(r.Cells("UStVAn_ID").Value, r.Cells("LandKz").Value, False) + End If + Next + End If + init() + MsgBox("Fertig!") + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + Me.Cursor = Cursors.Default + End Sub End Class diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb index a8cbac2b..e8924b94 100644 --- a/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb +++ b/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb @@ -24,9 +24,13 @@ Partial Class ustCntlUSTV_AntragPosition Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Me.scanLieferschein = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() - Me.TabPage2 = New System.Windows.Forms.TabPage() + Me.tabDok = New System.Windows.Forms.TabPage() Me.scanSonstiges = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.tbcntr = New System.Windows.Forms.TabControl() + 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.cbxAPI = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components) Me.Label8 = New System.Windows.Forms.Label() Me.txtRgDatum = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -37,7 +41,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.Label1 = New System.Windows.Forms.Label() Me.btnBildAuf = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button() - Me.txtLeistender = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtLeistungsbezeichnung = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label2 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() Me.Label6 = New System.Windows.Forms.Label() @@ -48,7 +52,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.Label12 = New System.Windows.Forms.Label() Me.txtUSTBetragEUR = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label13 = New System.Windows.Forms.Label() - Me.cboLeistungsbezeichnung = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboLeistungsgeber = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label4 = New System.Windows.Forms.Label() Me.Label5 = New System.Windows.Forms.Label() Me.lblAenderungsdatum = New System.Windows.Forms.Label() @@ -61,8 +65,10 @@ Partial Class ustCntlUSTV_AntragPosition Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.UsrcntlPDFScanList1 = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() - Me.TabPage2.SuspendLayout() + Me.tabDok.SuspendLayout() Me.tbcntr.SuspendLayout() + Me.tabVollmachten.SuspendLayout() + Me.tabFABest.SuspendLayout() Me.Panel2.SuspendLayout() Me.pnl.SuspendLayout() Me.Panel1.SuspendLayout() @@ -90,17 +96,18 @@ Partial Class ustCntlUSTV_AntragPosition Me.scanLieferschein.Name = "scanLieferschein" Me.scanLieferschein.Size = New System.Drawing.Size(111, 34) Me.scanLieferschein.TabIndex = 2 + Me.scanLieferschein.Visible = False ' - 'TabPage2 + 'tabDok ' - Me.TabPage2.Controls.Add(Me.scanSonstiges) - Me.TabPage2.Location = New System.Drawing.Point(4, 22) - Me.TabPage2.Name = "TabPage2" - Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(256, 170) - Me.TabPage2.TabIndex = 1 - Me.TabPage2.Text = "Dokumente" - Me.TabPage2.UseVisualStyleBackColor = True + Me.tabDok.Controls.Add(Me.scanSonstiges) + Me.tabDok.Location = New System.Drawing.Point(4, 22) + Me.tabDok.Name = "tabDok" + Me.tabDok.Padding = New System.Windows.Forms.Padding(3) + Me.tabDok.Size = New System.Drawing.Size(256, 197) + Me.tabDok.TabIndex = 1 + Me.tabDok.Text = "Dokumente" + Me.tabDok.UseVisualStyleBackColor = True ' 'scanSonstiges ' @@ -119,19 +126,82 @@ Partial Class ustCntlUSTV_AntragPosition Me.scanSonstiges.Location = New System.Drawing.Point(3, 3) Me.scanSonstiges.Margin = New System.Windows.Forms.Padding(0) Me.scanSonstiges.Name = "scanSonstiges" - Me.scanSonstiges.Size = New System.Drawing.Size(250, 164) + Me.scanSonstiges.Size = New System.Drawing.Size(250, 191) Me.scanSonstiges.TabIndex = 0 ' 'tbcntr ' - Me.tbcntr.Controls.Add(Me.TabPage2) + Me.tbcntr.Controls.Add(Me.tabDok) + Me.tbcntr.Controls.Add(Me.tabVollmachten) + Me.tbcntr.Controls.Add(Me.tabFABest) Me.tbcntr.Dock = System.Windows.Forms.DockStyle.Fill - Me.tbcntr.Location = New System.Drawing.Point(0, 43) + Me.tbcntr.Location = New System.Drawing.Point(0, 16) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 - Me.tbcntr.Size = New System.Drawing.Size(264, 196) + Me.tbcntr.Size = New System.Drawing.Size(264, 223) Me.tbcntr.TabIndex = 3 ' + '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, 197) + 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.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, 191) + 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, 197) + 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.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, 197) + Me.scanUSTVFABest.TabIndex = 1 + ' 'cbxAPI ' Me.cbxAPI._date = Nothing @@ -241,9 +311,9 @@ Partial Class ustCntlUSTV_AntragPosition Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label1.Location = New System.Drawing.Point(442, 14) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(59, 13) + Me.Label1.Size = New System.Drawing.Size(55, 13) Me.Label1.TabIndex = 1 - Me.Label1.Text = "Leistung:" + Me.Label1.Text = "Leistung" ' 'btnBildAuf ' @@ -271,28 +341,28 @@ Partial Class ustCntlUSTV_AntragPosition Me.Button1.TextAlign = System.Drawing.ContentAlignment.TopCenter Me.Button1.UseVisualStyleBackColor = True ' - 'txtLeistender + 'txtLeistungsbezeichnung ' - Me.txtLeistender._DateTimeOnly = False - Me.txtLeistender._numbersOnly = False - Me.txtLeistender._numbersOnlyKommastellen = "" - Me.txtLeistender._numbersOnlyTrennzeichen = True - Me.txtLeistender._Prozent = False - Me.txtLeistender._ShortDateNew = False - Me.txtLeistender._ShortDateOnly = False - Me.txtLeistender._TimeOnly = False - Me.txtLeistender._TimeOnly_Seconds = False - Me.txtLeistender._value = Nothing - Me.txtLeistender._Waehrung = False - Me.txtLeistender._WaehrungZeichen = True - Me.txtLeistender.Location = New System.Drawing.Point(634, 49) - Me.txtLeistender.MaxLength = 22 - Me.txtLeistender.MaxLineLength = -1 - Me.txtLeistender.MaxLines_Warning = "" - Me.txtLeistender.MaxLines_Warning_Label = Nothing - Me.txtLeistender.Name = "txtLeistender" - Me.txtLeistender.Size = New System.Drawing.Size(279, 20) - Me.txtLeistender.TabIndex = 9 + Me.txtLeistungsbezeichnung._DateTimeOnly = False + Me.txtLeistungsbezeichnung._numbersOnly = False + Me.txtLeistungsbezeichnung._numbersOnlyKommastellen = "" + Me.txtLeistungsbezeichnung._numbersOnlyTrennzeichen = True + Me.txtLeistungsbezeichnung._Prozent = False + Me.txtLeistungsbezeichnung._ShortDateNew = False + Me.txtLeistungsbezeichnung._ShortDateOnly = False + Me.txtLeistungsbezeichnung._TimeOnly = False + Me.txtLeistungsbezeichnung._TimeOnly_Seconds = False + Me.txtLeistungsbezeichnung._value = Nothing + Me.txtLeistungsbezeichnung._Waehrung = False + Me.txtLeistungsbezeichnung._WaehrungZeichen = True + Me.txtLeistungsbezeichnung.Location = New System.Drawing.Point(445, 49) + Me.txtLeistungsbezeichnung.MaxLength = 22 + Me.txtLeistungsbezeichnung.MaxLineLength = -1 + Me.txtLeistungsbezeichnung.MaxLines_Warning = "" + Me.txtLeistungsbezeichnung.MaxLines_Warning_Label = Nothing + Me.txtLeistungsbezeichnung.Name = "txtLeistungsbezeichnung" + Me.txtLeistungsbezeichnung.Size = New System.Drawing.Size(182, 20) + Me.txtLeistungsbezeichnung.TabIndex = 9 ' 'Label2 ' @@ -300,9 +370,9 @@ Partial Class ustCntlUSTV_AntragPosition Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) Me.Label2.Location = New System.Drawing.Point(442, 31) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(134, 15) + Me.Label2.Size = New System.Drawing.Size(139, 15) Me.Label2.TabIndex = 4 - Me.Label2.Text = "Leistungsbezeichnung:" + Me.Label2.Text = "Leistungs-Bezeichnung:" ' 'Label3 ' @@ -310,9 +380,9 @@ Partial Class ustCntlUSTV_AntragPosition Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) Me.Label3.Location = New System.Drawing.Point(630, 31) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(82, 15) + Me.Label3.Size = New System.Drawing.Size(101, 15) Me.Label3.TabIndex = 5 - Me.Label3.Text = "Leistungeber:" + Me.Label3.Text = "Leistungs-Geber:" ' 'Label6 ' @@ -436,16 +506,16 @@ Partial Class ustCntlUSTV_AntragPosition Me.Label13.TabIndex = 13 Me.Label13.Text = "USt-Betrag EUR" ' - 'cboLeistungsbezeichnung + 'cboLeistungsgeber ' - Me.cboLeistungsbezeichnung._allowedValuesFreiText = Nothing - Me.cboLeistungsbezeichnung._allowFreiText = False - Me.cboLeistungsbezeichnung._value = "" - Me.cboLeistungsbezeichnung.FormattingEnabled = True - Me.cboLeistungsbezeichnung.Location = New System.Drawing.Point(445, 49) - Me.cboLeistungsbezeichnung.Name = "cboLeistungsbezeichnung" - Me.cboLeistungsbezeichnung.Size = New System.Drawing.Size(183, 21) - Me.cboLeistungsbezeichnung.TabIndex = 8 + Me.cboLeistungsgeber._allowedValuesFreiText = Nothing + Me.cboLeistungsgeber._allowFreiText = False + Me.cboLeistungsgeber._value = "" + Me.cboLeistungsgeber.FormattingEnabled = True + Me.cboLeistungsgeber.Location = New System.Drawing.Point(633, 49) + Me.cboLeistungsgeber.Name = "cboLeistungsgeber" + Me.cboLeistungsgeber.Size = New System.Drawing.Size(280, 21) + Me.cboLeistungsgeber.TabIndex = 8 ' 'Label4 ' @@ -514,8 +584,8 @@ Partial Class ustCntlUSTV_AntragPosition Me.pnl.Controls.Add(Me.Label4) Me.pnl.Controls.Add(Me.cbxAPI) Me.pnl.Controls.Add(Me.Label1) - Me.pnl.Controls.Add(Me.cboLeistungsbezeichnung) - Me.pnl.Controls.Add(Me.txtLeistender) + Me.pnl.Controls.Add(Me.cboLeistungsgeber) + Me.pnl.Controls.Add(Me.txtLeistungsbezeichnung) Me.pnl.Controls.Add(Me.txtUSTBetragEUR) Me.pnl.Controls.Add(Me.Label2) Me.pnl.Controls.Add(Me.Label13) @@ -558,7 +628,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.Panel4.Dock = System.Windows.Forms.DockStyle.Top Me.Panel4.Location = New System.Drawing.Point(0, 0) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(264, 43) + Me.Panel4.Size = New System.Drawing.Size(264, 16) Me.Panel4.TabIndex = 26 ' 'TabControl1 @@ -611,8 +681,10 @@ Partial Class ustCntlUSTV_AntragPosition Me.Controls.Add(Me.Panel2) Me.Name = "ustCntlUSTV_AntragPosition" Me.Size = New System.Drawing.Size(1300, 269) - Me.TabPage2.ResumeLayout(False) + Me.tabDok.ResumeLayout(False) Me.tbcntr.ResumeLayout(False) + Me.tabVollmachten.ResumeLayout(False) + Me.tabFABest.ResumeLayout(False) Me.Panel2.ResumeLayout(False) Me.Panel2.PerformLayout() Me.pnl.ResumeLayout(False) @@ -626,7 +698,7 @@ Partial Class ustCntlUSTV_AntragPosition End Sub Friend WithEvents scanLieferschein As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan - Friend WithEvents TabPage2 As TabPage + Friend WithEvents tabDok As TabPage Friend WithEvents scanSonstiges As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList Friend WithEvents tbcntr As TabControl Friend WithEvents cbxAPI As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue @@ -639,7 +711,7 @@ Partial Class ustCntlUSTV_AntragPosition Friend WithEvents Label1 As Label Friend WithEvents btnBildAuf As Button Friend WithEvents Button1 As Button - Friend WithEvents txtLeistender As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtLeistungsbezeichnung As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label2 As Label Friend WithEvents Label3 As Label Friend WithEvents Label6 As Label @@ -650,7 +722,7 @@ Partial Class ustCntlUSTV_AntragPosition Friend WithEvents Label12 As Label Friend WithEvents txtUSTBetragEUR As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label13 As Label - Friend WithEvents cboLeistungsbezeichnung As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents cboLeistungsgeber As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Label4 As Label Friend WithEvents Label5 As Label Friend WithEvents lblAenderungsdatum As Label @@ -663,4 +735,8 @@ Partial Class ustCntlUSTV_AntragPosition Friend WithEvents TabControl1 As TabControl Friend WithEvents TabPage1 As TabPage Friend WithEvents UsrcntlPDFScanList1 As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList + Friend WithEvents tabVollmachten As TabPage + Friend WithEvents tabFABest As TabPage + Friend WithEvents scanUSTVVollmachten As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList + Friend WithEvents scanUSTVFABest As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList End Class diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.vb index 687e82d7..10b1897f 100644 --- a/SDL/USTV/ustCntlUSTV_AntragPosition.vb +++ b/SDL/USTV/ustCntlUSTV_AntragPosition.vb @@ -2,6 +2,7 @@ Public UStV_POS As VERAG_PROG_ALLGEMEIN.cUStVPositionen = Nothing Dim sql As New VERAG_PROG_ALLGEMEIN.SQL Dim Antrag_LandKz = "" + Dim kdnr = "" Public Event EV_PREV() Public Event EV_NEXT() @@ -20,18 +21,19 @@ txtRgNr._value = "" End Sub - Sub setValues(UStV_POS As VERAG_PROG_ALLGEMEIN.cUStVPositionen, Antrag_LandKz As String) + Sub setValues(kdnr As Integer, UStV_POS As VERAG_PROG_ALLGEMEIN.cUStVPositionen, Antrag_LandKz As String) gridAktiv = False Me.Antrag_LandKz = Antrag_LandKz Me.UStV_POS = UStV_POS + Me.kdnr = kdnr cbxAPI.Checked = If(UStV_POS.UStVPo_Schnittstelle, False) cboSchnittstellennr.changeItem(If(UStV_POS.UStVPo_SchnittstellenNr, "")) txtRgDatum._value = If(UStV_POS.UStVPo_ReDat, "") txtRgNr._value = If(UStV_POS.UStVPo_ReNr, "") lblSachbearbeiter.Text = If(UStV_POS.UStVPo_Sachbearbeiter, "") If UStV_POS.UStVPo_Zeitstempel IsNot Nothing Then lblAenderungsdatum.Text = CDate(UStV_POS.UStVPo_Zeitstempel).ToString("dd.MM.yyyy HH:mm") - txtLeistender.Text = If(UStV_POS.UStVPo_Leistender, "") - cboLeistungsbezeichnung.Text = If(UStV_POS.UStVPo_Leistungsbezeichnung, "") + cboLeistungsgeber.Text = If(UStV_POS.UStVPo_Leistender, "") + txtLeistungsbezeichnung.Text = If(UStV_POS.UStVPo_Leistungsbezeichnung, "") txtUSTBetrag.Text = If(UStV_POS.UStVPo_USteuerbetrag, "") txtUmrechnungskurs.Text = If(UStV_POS.UStVPo_Umrechnungskurs, "") txtUSTBetragEUR.Text = If(UStV_POS.UStVPo_USteuerbetragEUR, "") @@ -42,6 +44,8 @@ End Select scanSonstiges.INIT_daId(da_id) + scanUSTVFABest.INIT(kdnr, "KUNDENDATEN", "FA_Bestaetigungen") + scanUSTVVollmachten.INIT(kdnr, "KUNDENDATEN", "USTV_Vollmachten") gridAktiv = True End Sub @@ -51,6 +55,9 @@ 'UStV_POS. UStV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME UStV_POS.UStVPo_Zeitstempel = Now + + + 'TO DO!!!!! End Sub Private Sub ustCntlUSTV_AntragPosition_KeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles Me.PreviewKeyDown @@ -78,8 +85,8 @@ Return UStV_POS.save End Function - Private Sub txtBestellung_TextChanged(sender As Object, e As EventArgs) Handles txtRgDatum.PropertyChanged, txtRgNr.TextChanged, cboLeistungsbezeichnung.SelectedIndexChanged, - txtLeistender.TextChanged, txtUSTBetrag.TextChanged, txtUSTBetrag.TextChanged, txtUSTBetragEUR.TextChanged ', cbxAPI.CheckedChanged, cboSchnittstellennr.SelectedIndexChanged + Private Sub txtBestellung_TextChanged(sender As Object, e As EventArgs) Handles txtRgDatum.PropertyChanged, txtRgNr.TextChanged, cboLeistungsgeber.SelectedIndexChanged, + txtLeistungsbezeichnung.TextChanged, txtUSTBetrag.TextChanged, txtUSTBetrag.TextChanged, txtUSTBetragEUR.TextChanged ', cbxAPI.CheckedChanged, cboSchnittstellennr.SelectedIndexChanged If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Leistungen_bearbeiten", Me.FindForm) Then Exit Sub @@ -99,7 +106,4 @@ - Private Sub ustCntlUSTV_AntragPosition_Load(sender As Object, e As EventArgs) Handles Me.Load - - End Sub End Class diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index 5aa5785a..1327c63b 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -152,6 +152,15 @@ Partial Class frmKundenblatt Me.tbBesuchsberichte = New System.Windows.Forms.TabPage() Me.tbOfferte = New System.Windows.Forms.TabPage() Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() + Me.tbUSTV = New System.Windows.Forms.TabPage() + Me.tbcntrUSTV = New System.Windows.Forms.TabControl() + Me.tbUSTVDokumente = New System.Windows.Forms.TabPage() + Me.Label27 = New System.Windows.Forms.Label() + Me.Label37 = New System.Windows.Forms.Label() + Me.scanUSTVFABest = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() + Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() + Me.tbUSTVAntrage = New System.Windows.Forms.TabPage() + Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem() @@ -167,6 +176,7 @@ Partial Class frmKundenblatt Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem() Me.cntxtCntxtMDM = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.ToolStripMenuItem8 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem7 = New System.Windows.Forms.ToolStripMenuItem() Me.pnl = New System.Windows.Forms.Panel() @@ -212,6 +222,10 @@ Partial Class frmKundenblatt Me.tbVERAGCard.SuspendLayout() Me.tbDokumente.SuspendLayout() Me.tbOfferte.SuspendLayout() + Me.tbUSTV.SuspendLayout() + Me.tbcntrUSTV.SuspendLayout() + Me.tbUSTVDokumente.SuspendLayout() + Me.tbUSTVAntrage.SuspendLayout() Me.cntxtExcel.SuspendLayout() Me.ContextMenuStrip2.SuspendLayout() Me.ContextMenuStrip3.SuspendLayout() @@ -247,7 +261,7 @@ Partial Class frmKundenblatt Me.tbFirmendaten.Location = New System.Drawing.Point(4, 25) Me.tbFirmendaten.Name = "tbFirmendaten" Me.tbFirmendaten.Padding = New System.Windows.Forms.Padding(3) - Me.tbFirmendaten.Size = New System.Drawing.Size(1630, 727) + Me.tbFirmendaten.Size = New System.Drawing.Size(1630, 744) Me.tbFirmendaten.TabIndex = 3 Me.tbFirmendaten.Text = "Firmendaten" ' @@ -257,7 +271,7 @@ Partial Class frmKundenblatt Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(3, 3) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(1624, 721) + Me.Panel4.Size = New System.Drawing.Size(1624, 738) Me.Panel4.TabIndex = 0 ' 'UsrcntlKundeBearbeitenFull1 @@ -267,7 +281,7 @@ Partial Class frmKundenblatt Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" - Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1624, 721) + Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1624, 738) Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 ' 'tbcntrMain @@ -278,13 +292,14 @@ Partial Class frmKundenblatt Me.tbcntrMain.Controls.Add(Me.tbZoll) Me.tbcntrMain.Controls.Add(Me.tbMdm) Me.tbcntrMain.Controls.Add(Me.tbOfferte) + Me.tbcntrMain.Controls.Add(Me.tbUSTV) Me.tbcntrMain.Dock = System.Windows.Forms.DockStyle.Fill Me.tbcntrMain.ItemSize = New System.Drawing.Size(76, 0) Me.tbcntrMain.Location = New System.Drawing.Point(0, 112) Me.tbcntrMain.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMain.Name = "tbcntrMain" Me.tbcntrMain.SelectedIndex = 0 - Me.tbcntrMain.Size = New System.Drawing.Size(1638, 756) + Me.tbcntrMain.Size = New System.Drawing.Size(1638, 790) Me.tbcntrMain.TabIndex = 3 ' 'tbAllgemein @@ -317,7 +332,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(1630, 727) + Me.tbAllgemein.Size = New System.Drawing.Size(1630, 761) Me.tbAllgemein.TabIndex = 0 Me.tbAllgemein.Text = "Allgemein" ' @@ -652,7 +667,7 @@ Partial Class frmKundenblatt DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle6 - Me.dgvSperrliste.Size = New System.Drawing.Size(835, 617) + Me.dgvSperrliste.Size = New System.Drawing.Size(835, 651) Me.dgvSperrliste.TabIndex = 23 ' 'PictureBox2 @@ -706,7 +721,7 @@ Partial Class frmKundenblatt Me.tbZoll.Location = New System.Drawing.Point(4, 25) Me.tbZoll.Name = "tbZoll" Me.tbZoll.Padding = New System.Windows.Forms.Padding(3) - Me.tbZoll.Size = New System.Drawing.Size(1630, 727) + Me.tbZoll.Size = New System.Drawing.Size(1630, 744) Me.tbZoll.TabIndex = 9 Me.tbZoll.Text = "ZOLL" Me.tbZoll.UseVisualStyleBackColor = True @@ -718,7 +733,7 @@ Partial Class frmKundenblatt Me.tbcntrZOLL.Location = New System.Drawing.Point(3, 3) Me.tbcntrZOLL.Name = "tbcntrZOLL" Me.tbcntrZOLL.SelectedIndex = 0 - Me.tbcntrZOLL.Size = New System.Drawing.Size(1624, 721) + Me.tbcntrZOLL.Size = New System.Drawing.Size(1624, 738) Me.tbcntrZOLL.TabIndex = 0 ' 'tabZoll_Artikel @@ -726,7 +741,7 @@ Partial Class frmKundenblatt Me.tabZoll_Artikel.Location = New System.Drawing.Point(4, 22) Me.tabZoll_Artikel.Name = "tabZoll_Artikel" Me.tabZoll_Artikel.Padding = New System.Windows.Forms.Padding(3) - Me.tabZoll_Artikel.Size = New System.Drawing.Size(1616, 695) + Me.tabZoll_Artikel.Size = New System.Drawing.Size(1616, 712) Me.tabZoll_Artikel.TabIndex = 1 Me.tabZoll_Artikel.Text = "Artikel" Me.tabZoll_Artikel.UseVisualStyleBackColor = True @@ -737,7 +752,7 @@ Partial Class frmKundenblatt Me.tbMdm.Location = New System.Drawing.Point(4, 25) Me.tbMdm.Name = "tbMdm" Me.tbMdm.Padding = New System.Windows.Forms.Padding(3) - Me.tbMdm.Size = New System.Drawing.Size(1630, 727) + Me.tbMdm.Size = New System.Drawing.Size(1630, 744) Me.tbMdm.TabIndex = 10 Me.tbMdm.Text = "MDM" Me.tbMdm.UseVisualStyleBackColor = True @@ -755,7 +770,7 @@ Partial Class frmKundenblatt Me.tbcntrMDM.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMDM.Name = "tbcntrMDM" Me.tbcntrMDM.SelectedIndex = 0 - Me.tbcntrMDM.Size = New System.Drawing.Size(1624, 721) + Me.tbcntrMDM.Size = New System.Drawing.Size(1624, 738) Me.tbcntrMDM.TabIndex = 0 ' 'tbSDL @@ -767,7 +782,7 @@ Partial Class frmKundenblatt Me.tbSDL.Margin = New System.Windows.Forms.Padding(0) Me.tbSDL.Name = "tbSDL" Me.tbSDL.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDL.Size = New System.Drawing.Size(1616, 695) + Me.tbSDL.Size = New System.Drawing.Size(1616, 712) Me.tbSDL.TabIndex = 5 Me.tbSDL.Text = "SDL-Leistungen" Me.tbSDL.UseVisualStyleBackColor = True @@ -809,7 +824,7 @@ Partial Class frmKundenblatt DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle10 Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1610, 499) + Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1610, 516) Me.dgvSDLLeistungenFull.TabIndex = 5 ' 'Panel6 @@ -913,7 +928,7 @@ Partial Class frmKundenblatt Me.Panel5.Controls.Add(Me.lblLetzterSA_SDL) Me.Panel5.Controls.Add(Me.rtbVermerke) Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel5.Location = New System.Drawing.Point(3, 549) + Me.Panel5.Location = New System.Drawing.Point(3, 566) Me.Panel5.Name = "Panel5" Me.Panel5.Size = New System.Drawing.Size(1610, 143) Me.Panel5.TabIndex = 177 @@ -1777,7 +1792,7 @@ Partial Class frmKundenblatt Me.tbOfferte.Location = New System.Drawing.Point(4, 25) Me.tbOfferte.Margin = New System.Windows.Forms.Padding(2) Me.tbOfferte.Name = "tbOfferte" - Me.tbOfferte.Size = New System.Drawing.Size(1630, 727) + Me.tbOfferte.Size = New System.Drawing.Size(1630, 744) Me.tbOfferte.TabIndex = 11 Me.tbOfferte.Text = "Offerte" Me.tbOfferte.UseVisualStyleBackColor = True @@ -1789,9 +1804,121 @@ Partial Class frmKundenblatt Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" - Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1630, 727) + Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1630, 744) Me.UsrCntlOfferte1.TabIndex = 0 ' + 'tbUSTV + ' + Me.tbUSTV.Controls.Add(Me.tbcntrUSTV) + Me.tbUSTV.Location = New System.Drawing.Point(4, 25) + Me.tbUSTV.Name = "tbUSTV" + Me.tbUSTV.Size = New System.Drawing.Size(1630, 761) + Me.tbUSTV.TabIndex = 12 + Me.tbUSTV.Text = "USTV" + Me.tbUSTV.UseVisualStyleBackColor = True + ' + 'tbcntrUSTV + ' + Me.tbcntrUSTV.Controls.Add(Me.tbUSTVDokumente) + Me.tbcntrUSTV.Controls.Add(Me.tbUSTVAntrage) + Me.tbcntrUSTV.Dock = System.Windows.Forms.DockStyle.Fill + Me.tbcntrUSTV.Location = New System.Drawing.Point(0, 0) + Me.tbcntrUSTV.Margin = New System.Windows.Forms.Padding(0) + Me.tbcntrUSTV.Name = "tbcntrUSTV" + Me.tbcntrUSTV.SelectedIndex = 0 + Me.tbcntrUSTV.Size = New System.Drawing.Size(1630, 761) + Me.tbcntrUSTV.TabIndex = 1 + ' + 'tbUSTVDokumente + ' + Me.tbUSTVDokumente.Controls.Add(Me.Label27) + Me.tbUSTVDokumente.Controls.Add(Me.Label37) + Me.tbUSTVDokumente.Controls.Add(Me.scanUSTVFABest) + Me.tbUSTVDokumente.Controls.Add(Me.scanUSTVVollmachten) + Me.tbUSTVDokumente.Location = New System.Drawing.Point(4, 22) + Me.tbUSTVDokumente.Name = "tbUSTVDokumente" + Me.tbUSTVDokumente.Size = New System.Drawing.Size(1622, 735) + Me.tbUSTVDokumente.TabIndex = 8 + Me.tbUSTVDokumente.Text = "Dokumente" + Me.tbUSTVDokumente.UseVisualStyleBackColor = True + ' + 'Label27 + ' + Me.Label27.AutoSize = True + Me.Label27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label27.Location = New System.Drawing.Point(311, 17) + Me.Label27.Name = "Label27" + Me.Label27.Size = New System.Drawing.Size(153, 13) + Me.Label27.TabIndex = 6 + Me.Label27.Text = "Finanzamt-Bestätigungen:" + ' + 'Label37 + ' + Me.Label37.AutoSize = True + Me.Label37.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label37.Location = New System.Drawing.Point(14, 17) + Me.Label37.Name = "Label37" + Me.Label37.Size = New System.Drawing.Size(113, 13) + Me.Label37.TabIndex = 2 + Me.Label37.Text = "USTV Vollmachten" + ' + '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.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.Default + Me.scanUSTVFABest.Location = New System.Drawing.Point(311, 36) + Me.scanUSTVFABest.Margin = New System.Windows.Forms.Padding(0) + Me.scanUSTVFABest.Name = "scanUSTVFABest" + Me.scanUSTVFABest.Size = New System.Drawing.Size(285, 505) + Me.scanUSTVFABest.TabIndex = 5 + ' + '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.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.Default + Me.scanUSTVVollmachten.Location = New System.Drawing.Point(14, 36) + Me.scanUSTVVollmachten.Margin = New System.Windows.Forms.Padding(0) + Me.scanUSTVVollmachten.Name = "scanUSTVVollmachten" + Me.scanUSTVVollmachten.Size = New System.Drawing.Size(285, 505) + Me.scanUSTVVollmachten.TabIndex = 1 + ' + 'tbUSTVAntrage + ' + Me.tbUSTVAntrage.Controls.Add(Me.UsrCntlUSTV) + Me.tbUSTVAntrage.Location = New System.Drawing.Point(4, 22) + Me.tbUSTVAntrage.Name = "tbUSTVAntrage" + Me.tbUSTVAntrage.Padding = New System.Windows.Forms.Padding(3) + Me.tbUSTVAntrage.Size = New System.Drawing.Size(1622, 735) + Me.tbUSTVAntrage.TabIndex = 9 + Me.tbUSTVAntrage.Text = "USTV-Anträge" + Me.tbUSTVAntrage.UseVisualStyleBackColor = True + ' + 'UsrCntlUSTV + ' + Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlUSTV.Name = "UsrCntlUSTV" + Me.UsrCntlUSTV.Size = New System.Drawing.Size(1616, 729) + Me.UsrCntlUSTV.TabIndex = 0 + ' 'cntxtExcel ' Me.cntxtExcel.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -1877,7 +2004,7 @@ Partial Class frmKundenblatt Me.mne.Dock = System.Windows.Forms.DockStyle.Bottom Me.mne.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.mne.ImageScalingSize = New System.Drawing.Size(25, 25) - Me.mne.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AllgemeinToolStripMenuItem, Me.ToolStripMenuItem2, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.ToolStripMenuItem7}) + Me.mne.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AllgemeinToolStripMenuItem, Me.ToolStripMenuItem2, Me.ToolStripMenuItem4, Me.ToolStripMenuItem8, Me.ToolStripMenuItem5, Me.ToolStripMenuItem7}) Me.mne.Location = New System.Drawing.Point(0, 31) Me.mne.Name = "mne" Me.mne.Padding = New System.Windows.Forms.Padding(5, 0, 0, 0) @@ -1934,10 +2061,27 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" - Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4 + Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8 Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' + 'ToolStripMenuItem8 + ' + Me.ToolStripMenuItem8.AutoSize = False + Me.ToolStripMenuItem8.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.ToolStripMenuItem8.DropDown = Me.cntxtCntxtMDM + Me.ToolStripMenuItem8.ForeColor = System.Drawing.Color.White + Me.ToolStripMenuItem8.Image = Global.SDL.My.Resources.Resources.logo_mdm + Me.ToolStripMenuItem8.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.ToolStripMenuItem8.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None + Me.ToolStripMenuItem8.MergeIndex = 10 + Me.ToolStripMenuItem8.Name = "ToolStripMenuItem8" + Me.ToolStripMenuItem8.Padding = New System.Windows.Forms.Padding(10, 0, 10, 0) + Me.ToolStripMenuItem8.Size = New System.Drawing.Size(94, 60) + Me.ToolStripMenuItem8.Text = "USTV" + Me.ToolStripMenuItem8.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.ToolStripMenuItem8.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText + ' 'ToolStripMenuItem5 ' Me.ToolStripMenuItem5.AutoSize = False @@ -2057,7 +2201,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(1180, 885) + Me.ClientSize = New System.Drawing.Size(1180, 919) Me.Controls.Add(Me.lblAbfVerb) Me.Controls.Add(Me.btnAbfVerb) Me.Controls.Add(Me.tbcntrMain) @@ -2117,6 +2261,11 @@ Partial Class frmKundenblatt Me.tbDokumente.ResumeLayout(False) Me.tbDokumente.PerformLayout() Me.tbOfferte.ResumeLayout(False) + Me.tbUSTV.ResumeLayout(False) + Me.tbcntrUSTV.ResumeLayout(False) + Me.tbUSTVDokumente.ResumeLayout(False) + Me.tbUSTVDokumente.PerformLayout() + Me.tbUSTVAntrage.ResumeLayout(False) Me.cntxtExcel.ResumeLayout(False) Me.ContextMenuStrip2.ResumeLayout(False) Me.ContextMenuStrip3.ResumeLayout(False) @@ -2266,4 +2415,14 @@ Partial Class frmKundenblatt Friend WithEvents Label7 As Label Friend WithEvents scanUebernahmebestätigungen As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList Friend WithEvents tbBesuchsberichte As TabPage + Friend WithEvents tbUSTV As TabPage + Friend WithEvents ToolStripMenuItem8 As ToolStripMenuItem + Friend WithEvents tbcntrUSTV As TabControl + Friend WithEvents tbUSTVDokumente As TabPage + Friend WithEvents Label27 As Label + Friend WithEvents Label37 As Label + Friend WithEvents scanUSTVFABest As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList + Friend WithEvents scanUSTVVollmachten As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList + Friend WithEvents tbUSTVAntrage As TabPage + Friend WithEvents UsrCntlUSTV As usrCntlUSTV End Class diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index fff6fa99..47a93fa3 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -40,6 +40,17 @@ Public Class frmKundenblatt Private WithEvents timShow As New Timer With {.Interval = 10} Private WithEvents timHide As New Timer With {.Interval = 10} + Sub New() + + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + Me.DoubleBuffered = True + SetStyle(ControlStyles.OptimizedDoubleBuffer Or ControlStyles.UserPaint Or ControlStyles.AllPaintingInWmPaint Or ControlStyles.ResizeRedraw, True) + UpdateStyles() + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + + End Sub Private Sub frmKundenblatt_BackColorChanged(sender As Object, e As EventArgs) Handles pnl.BackColorChanged 'lblFirma.BackColor = sender.BackColor ' pnl.BackColor = sender.BackColor @@ -219,7 +230,7 @@ Public Class frmKundenblatt End If ' lblFirma.Text = KUNDE.Kurzname End Sub - Private Sub TabControl1_TabIndexChanged(sender As Object, e As EventArgs) Handles tbcntrMain.SelectedIndexChanged, tbcntrMDM.SelectedIndexChanged + Private Sub TabControl1_TabIndexChanged(sender As Object, e As EventArgs) Handles tbcntrMain.SelectedIndexChanged, tbcntrMDM.SelectedIndexChanged, tbcntrUSTV.SelectedIndexChanged ' tbcntrMDM.SuspendLayout() ' If kdNr <= 0 Then changeTab(0, AllgemeinToolStripMenuItem) : Exit Sub If kdNr <= 0 Then changeTab(1, ToolStripMenuItem2) : Exit Sub @@ -246,9 +257,19 @@ Public Class frmKundenblatt scanUebernahmebestätigungen.INIT(kdNr, "KUNDENDATEN", "Übernahmebestätigungen") Case "tbBesuchsberichte" : initTABBesuchsberichte() End Select + Case "tbUSTV" + Select Case tbcntrUSTV.SelectedTab.Name + Case "tbUSTVDokumente" + scanUSTVFABest.INIT(kdNr, "KUNDENDATEN", "FA_Bestaetigungen") + scanUSTVVollmachten.INIT(kdNr, "KUNDENDATEN", "USTV_Vollmachten") + + + Case "tbUSTVAntrage" : initTABUSTVAntraege() + + End Select Case "tbZoll" : initTZOLL() Case "tbOfferte" : UsrCntlOfferte1.init(kdNr) - + End Select End If 'tbcntrMDM.ResumeLayout() @@ -341,6 +362,13 @@ Public Class frmKundenblatt usrcntlKarten.init() End Sub + + Sub initTABUSTVAntraege() + ' UsrCntlUSTV.kdNr_filter = True + ' MsgBox("kdNr: " & kdNr) + UsrCntlUSTV.init(kdNr) + End Sub + Private Sub initTZOLL() If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("ZOLL_Hauptmenue", Me) = 0 Then If tbcntrZOLL.SelectedIndex = 0 Then @@ -1704,6 +1732,9 @@ Public Class frmKundenblatt f.ShowDialog(Me) End Sub + Private Sub ToolStripMenuItem8_Click_1(sender As Object, e As EventArgs) Handles ToolStripMenuItem8.Click + changeTab(5, sender, 1) + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb b/VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb index 58412cbb..70ce1c9e 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb @@ -115,6 +115,7 @@ Public Class cSendungen Property tblSnd_Firma As Object = Nothing Property tblSnd_Cluster As Object = Nothing + Property tblSnd_ATBFakturieren As Object = Nothing Public saveSachbearbeiter As Boolean = False @@ -435,6 +436,7 @@ Public Class cSendungen Me.tblSnd_AbfertigungTRAnzahlPos = SQL.checkNullIntegerZero(dr.Item("tblSnd_AbfertigungTRAnzahlPos")) Me.tblSnd_Firma = SQL.checkNullReturnValue(dr.Item("tblSnd_Firma"), Nothing) Me.tblSnd_Cluster = SQL.checkNullReturnValue(dr.Item("tblSnd_Cluster"), Nothing) + Me.tblSnd_ATBFakturieren = SQL.checkNullReturnValue(dr.Item("tblSnd_ATBFakturieren"), Nothing) End If @@ -664,6 +666,7 @@ Public Class cSendungen list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_AbfertigungTRAnzahlPos", tblSnd_AbfertigungTRAnzahlPos)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Firma", tblSnd_Firma)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Cluster", tblSnd_Cluster)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_ATBFakturieren", tblSnd_ATBFakturieren)) 'End If Return list diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb index 5d1e86b9..9ac3dc13 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb @@ -24,6 +24,7 @@ Partial Class frmMessenger 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() @@ -38,11 +39,11 @@ Partial Class frmMessenger Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMessenger)) Me.SplitContainer = New System.Windows.Forms.SplitContainer() Me.SplitContainer2 = New System.Windows.Forms.SplitContainer() - Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel6 = New System.Windows.Forms.Panel() Me.lblLKWChat_MsgCntInaktiv = New System.Windows.Forms.Label() Me.cbxInaktiveChats = New System.Windows.Forms.CheckBox() - Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel5 = New System.Windows.Forms.Panel() Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.PictureBox2 = New System.Windows.Forms.PictureBox() @@ -63,7 +64,7 @@ Partial Class frmMessenger Me.btnNeu = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() - Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel() + Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components) Me.UsrCntlMessenger_ChatElement1 = New VERAG_PROG_ALLGEMEIN.usrCntlMessenger_ChatElement() Me.Panel3 = New System.Windows.Forms.Panel() Me.btnTeilnehmer = New System.Windows.Forms.Button() @@ -91,9 +92,9 @@ Partial Class frmMessenger Me.btnSendAtt = New System.Windows.Forms.Button() Me.btnSenden = New System.Windows.Forms.Button() Me.rtbChatMessage = New System.Windows.Forms.RichTextBox() - Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer() - Me.Timer_REFRESH = New System.Windows.Forms.Timer() - Me.cntxt = New System.Windows.Forms.ContextMenuStrip() + Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer(Me.components) + Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components) + Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ChatDeaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.toolChatReminder = New System.Windows.Forms.ToolStripMenuItem() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -992,6 +993,7 @@ Partial Class frmMessenger Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(912, 922) Me.Controls.Add(Me.SplitContainer) + Me.DoubleBuffered = True Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.Name = "frmMessenger" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb index b5c0635b..255cba08 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb @@ -1,5 +1,6 @@ Imports System.Drawing Imports System.IO +Imports System.Reflection Imports System.Threading Imports System.Web.UI.WebControls.WebParts Imports System.Windows.Forms @@ -27,10 +28,17 @@ Public Class frmMessenger InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + Me.DoubleBuffered = True + SetStyle(ControlStyles.OptimizedDoubleBuffer Or ControlStyles.UserPaint Or ControlStyles.AllPaintingInWmPaint Or ControlStyles.ResizeRedraw, True) + UpdateStyles() End Sub + Public Sub SetDoubleBuffered([Control] As Control) + [Control].GetType().InvokeMember("DoubleBuffered", BindingFlags.SetProperty Or +BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object() {True}) + End Sub Sub initEMOJI_PATH() @@ -82,7 +90,7 @@ Public Class frmMessenger Private Sub frmMessenger_Load(sender As Object, e As EventArgs) Handles Me.Load initEMOJI_PATH() - + SetDoubleBuffered(MyFlowLayoutPanel1) rtbChatMessage.AllowDrop = True MSG_LISTENDER.START() TimerNEW_MESSAGE.Enabled = True diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb index fd8b5d31..9ce66413 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb @@ -309,7 +309,7 @@ Public Class frmUeberstundenauszahlen picDel.Visible = False For Each c As Control In Panel1.Controls - If TypeOf c Is TextBox Then + If TypeOf c Is Windows.Forms.TextBox Then c.Text = "0" End If Next