diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index a20baa7c..235e5ef4 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -3145,37 +3145,44 @@ Nächste_Textzeile_lesen: If keyData = Keys.F1 Then Button7.PerformClick() + Return True End If If keyData = Keys.F2 Then Button1.PerformClick() + Return True End If If keyData = Keys.F3 AndAlso cboSammelrechnung._value = 0 Then btn.PerformClick() + Return True End If If keyData = (Keys.Control Or Keys.P) Then Button4.PerformClick() + Return True End If If keyData = (Keys.Control Or Keys.S) Then - saveMe() + Return True End If If (keyData = (Keys.Control Or Keys.Add)) Or (keyData = (Keys.Control Or Keys.Return)) Then btnNeueUnterNR.PerformClick() + Return True End If If keyData = Keys.PageDown Then If saveMe() Then btnNext.PerformClick() + Return True End If End If If keyData = Keys.PageUp Then If saveMe() Then btnPrev.PerformClick() + Return True End If End If @@ -3282,7 +3289,11 @@ Nächste_Textzeile_lesen: Private Sub btnNeueUnterNR_Click(sender As Object, e As EventArgs) Handles btnNeueUnterNR.Click - If saveMe() Then newRECHNUNG() + If saveMe() Then + newRECHNUNG() + End If + + End Sub Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click diff --git a/SDL/kunden/frmKundenKontakteDetails.vb b/SDL/kunden/frmKundenKontakteDetails.vb index 0d553812..3eff7026 100644 --- a/SDL/kunden/frmKundenKontakteDetails.vb +++ b/SDL/kunden/frmKundenKontakteDetails.vb @@ -73,7 +73,7 @@ txtGeburtsort.Text = If(KD_KONTAKT.kkd_Geburtsort, "") If Not IsDBNull(KD_KONTAKT.kkd_Land) Then cbxLand.changeItem(KD_KONTAKT.kkd_Land) - If Not IsDBNull(KD_KONTAKT.kkd_Geburtsland) Then cbxLand.changeItem(KD_KONTAKT.kkd_Geburtsland) + If Not IsDBNull(KD_KONTAKT.kkd_Geburtsland) Then cbxGeburtsland.changeItem(KD_KONTAKT.kkd_Geburtsland) End Sub diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index 5ecdeae3..ee6dadad 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -45,6 +45,7 @@ Partial Class frmKundenblatt Me.txtInfotext = New System.Windows.Forms.Label() Me.tbFirmendaten = New System.Windows.Forms.TabPage() Me.Panel4 = New System.Windows.Forms.Panel() + Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() Me.tbcntrMain = New System.Windows.Forms.TabControl() Me.tbAllgemein = New System.Windows.Forms.TabPage() Me.lblAdressenzusatz = New System.Windows.Forms.TextBox() @@ -128,8 +129,10 @@ Partial Class frmKundenblatt Me.lblLetzterSA_SDL = New System.Windows.Forms.Label() Me.rtbVermerke = New System.Windows.Forms.RichTextBox() Me.tbSDLKarten = New System.Windows.Forms.TabPage() + Me.usrcntlKarten = New SDL.usrCntlKartenDaten() Me.tbLKW = New System.Windows.Forms.TabPage() Me.pnlLKWRight = New System.Windows.Forms.Panel() + Me.UsrCntlLKW1 = New SDL.usrCntlLKW() Me.pnlLKW = New System.Windows.Forms.Panel() Me.dgvLKW = New System.Windows.Forms.DataGridView() Me.pnlLKWBottom = New System.Windows.Forms.Panel() @@ -160,6 +163,7 @@ Partial Class frmKundenblatt Me.scanVertragVeragKd = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() 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() @@ -170,6 +174,7 @@ Partial Class frmKundenblatt 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() @@ -195,11 +200,6 @@ Partial Class frmKundenblatt Me.tbiKartenverwaltung = New System.Windows.Forms.ToolStripMenuItem() Me.tbiLKW = New System.Windows.Forms.ToolStripMenuItem() Me.tbiVERAGCard = New System.Windows.Forms.ToolStripMenuItem() - Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() - Me.usrcntlKarten = New SDL.usrCntlKartenDaten() - Me.UsrCntlLKW1 = New SDL.usrCntlLKW() - Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() - Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.pnlInfo.SuspendLayout() Me.tbFirmendaten.SuspendLayout() Me.Panel4.SuspendLayout() @@ -289,6 +289,16 @@ Partial Class frmKundenblatt Me.Panel4.Size = New System.Drawing.Size(1624, 1027) Me.Panel4.TabIndex = 0 ' + 'UsrcntlKundeBearbeitenFull1 + ' + Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White + Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill + 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, 1027) + Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 + ' 'tbcntrMain ' Me.tbcntrMain.Appearance = System.Windows.Forms.TabAppearance.FlatButtons @@ -1440,11 +1450,21 @@ Partial Class frmKundenblatt Me.tbSDLKarten.Location = New System.Drawing.Point(4, 22) Me.tbSDLKarten.Name = "tbSDLKarten" Me.tbSDLKarten.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDLKarten.Size = New System.Drawing.Size(1616, 1001) + Me.tbSDLKarten.Size = New System.Drawing.Size(178, 39) Me.tbSDLKarten.TabIndex = 7 Me.tbSDLKarten.Text = "SDL-Kartenverwaltung" Me.tbSDLKarten.UseVisualStyleBackColor = True ' + 'usrcntlKarten + ' + Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default + Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill + Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) + Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.usrcntlKarten.Name = "usrcntlKarten" + Me.usrcntlKarten.Size = New System.Drawing.Size(172, 33) + Me.usrcntlKarten.TabIndex = 0 + ' 'tbLKW ' Me.tbLKW.Controls.Add(Me.pnlLKWRight) @@ -1452,7 +1472,7 @@ Partial Class frmKundenblatt Me.tbLKW.Location = New System.Drawing.Point(4, 22) Me.tbLKW.Name = "tbLKW" Me.tbLKW.Padding = New System.Windows.Forms.Padding(3) - Me.tbLKW.Size = New System.Drawing.Size(1616, 1001) + Me.tbLKW.Size = New System.Drawing.Size(178, 39) Me.tbLKW.TabIndex = 4 Me.tbLKW.Text = "LKWs" Me.tbLKW.UseVisualStyleBackColor = True @@ -1464,9 +1484,22 @@ Partial Class frmKundenblatt Me.pnlLKWRight.Location = New System.Drawing.Point(309, 3) Me.pnlLKWRight.Name = "pnlLKWRight" Me.pnlLKWRight.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0) - Me.pnlLKWRight.Size = New System.Drawing.Size(1304, 995) + Me.pnlLKWRight.Size = New System.Drawing.Size(0, 33) Me.pnlLKWRight.TabIndex = 2 ' + 'UsrCntlLKW1 + ' + Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White + Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0) + Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) + Me.UsrCntlLKW1.Name = "UsrCntlLKW1" + Me.UsrCntlLKW1.Size = New System.Drawing.Size(0, 33) + Me.UsrCntlLKW1.TabIndex = 0 + ' 'pnlLKW ' Me.pnlLKW.Controls.Add(Me.dgvLKW) @@ -1475,7 +1508,7 @@ Partial Class frmKundenblatt Me.pnlLKW.Dock = System.Windows.Forms.DockStyle.Left Me.pnlLKW.Location = New System.Drawing.Point(3, 3) Me.pnlLKW.Name = "pnlLKW" - Me.pnlLKW.Size = New System.Drawing.Size(306, 995) + Me.pnlLKW.Size = New System.Drawing.Size(306, 33) Me.pnlLKW.TabIndex = 3 ' 'dgvLKW @@ -1516,7 +1549,7 @@ Partial Class frmKundenblatt Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle17 Me.dgvLKW.RowHeadersVisible = False Me.dgvLKW.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvLKW.Size = New System.Drawing.Size(306, 821) + Me.dgvLKW.Size = New System.Drawing.Size(306, 0) Me.dgvLKW.TabIndex = 2 ' 'pnlLKWBottom @@ -1528,7 +1561,7 @@ Partial Class frmKundenblatt Me.pnlLKWBottom.Controls.Add(Me.Button13) Me.pnlLKWBottom.Controls.Add(Me.lblErgebnisse) Me.pnlLKWBottom.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlLKWBottom.Location = New System.Drawing.Point(0, 883) + Me.pnlLKWBottom.Location = New System.Drawing.Point(0, -79) Me.pnlLKWBottom.Name = "pnlLKWBottom" Me.pnlLKWBottom.Size = New System.Drawing.Size(306, 112) Me.pnlLKWBottom.TabIndex = 3 @@ -1669,7 +1702,7 @@ Partial Class frmKundenblatt Me.tbVERAGCard.Location = New System.Drawing.Point(4, 22) Me.tbVERAGCard.Name = "tbVERAGCard" Me.tbVERAGCard.Padding = New System.Windows.Forms.Padding(3) - Me.tbVERAGCard.Size = New System.Drawing.Size(1616, 1001) + Me.tbVERAGCard.Size = New System.Drawing.Size(178, 39) Me.tbVERAGCard.TabIndex = 6 Me.tbVERAGCard.Text = "VERAG Card" Me.tbVERAGCard.UseVisualStyleBackColor = True @@ -1681,7 +1714,7 @@ Partial Class frmKundenblatt Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel3.Location = New System.Drawing.Point(3, 3) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(1610, 995) + Me.Panel3.Size = New System.Drawing.Size(172, 33) Me.Panel3.TabIndex = 0 ' 'tbDokumente @@ -1699,7 +1732,7 @@ Partial Class frmKundenblatt Me.tbDokumente.Controls.Add(Me.scanVertragVeragKd) Me.tbDokumente.Location = New System.Drawing.Point(4, 22) Me.tbDokumente.Name = "tbDokumente" - Me.tbDokumente.Size = New System.Drawing.Size(1616, 1001) + Me.tbDokumente.Size = New System.Drawing.Size(178, 39) Me.tbDokumente.TabIndex = 8 Me.tbDokumente.Text = "Dokumente" Me.tbDokumente.UseVisualStyleBackColor = True @@ -1897,7 +1930,7 @@ Partial Class frmKundenblatt Me.tbBesuchsberichte.Location = New System.Drawing.Point(4, 22) Me.tbBesuchsberichte.Name = "tbBesuchsberichte" Me.tbBesuchsberichte.Padding = New System.Windows.Forms.Padding(3) - Me.tbBesuchsberichte.Size = New System.Drawing.Size(1616, 1001) + Me.tbBesuchsberichte.Size = New System.Drawing.Size(178, 39) Me.tbBesuchsberichte.TabIndex = 9 Me.tbBesuchsberichte.Text = "Besuchsberichte" Me.tbBesuchsberichte.UseVisualStyleBackColor = True @@ -1913,6 +1946,16 @@ Partial Class frmKundenblatt Me.tbOfferte.Text = "Offerte" Me.tbOfferte.UseVisualStyleBackColor = True ' + 'UsrCntlOfferte1 + ' + Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White + Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill + 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, 1033) + Me.UsrCntlOfferte1.TabIndex = 0 + ' 'tbUSTV ' Me.tbUSTV.Controls.Add(Me.tbcntrUSTV) @@ -2043,11 +2086,19 @@ Partial Class frmKundenblatt 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, 1007) + Me.tbUSTVAntrage.Size = New System.Drawing.Size(184, 45) 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(178, 39) + Me.UsrCntlUSTV.TabIndex = 0 + ' 'cntxtExcel ' Me.cntxtExcel.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -2190,7 +2241,7 @@ 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" ' @@ -2324,57 +2375,6 @@ Partial Class frmKundenblatt Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22) Me.tbiVERAGCard.Text = "VERAG Card" ' - 'UsrcntlKundeBearbeitenFull1 - ' - Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White - Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill - 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, 1027) - Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 - ' - 'usrcntlKarten - ' - Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default - Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill - Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) - Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.usrcntlKarten.Name = "usrcntlKarten" - Me.usrcntlKarten.Size = New System.Drawing.Size(1610, 995) - Me.usrcntlKarten.TabIndex = 0 - ' - 'UsrCntlLKW1 - ' - Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White - Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0) - Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) - Me.UsrCntlLKW1.Name = "UsrCntlLKW1" - Me.UsrCntlLKW1.Size = New System.Drawing.Size(1200, 995) - Me.UsrCntlLKW1.TabIndex = 0 - ' - 'UsrCntlOfferte1 - ' - Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White - Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill - 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, 1033) - Me.UsrCntlOfferte1.TabIndex = 0 - ' - '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, 1001) - Me.UsrCntlUSTV.TabIndex = 0 - ' 'frmKundenblatt ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SDL/kunden/usrCntlKundenKontakte.Designer.vb b/SDL/kunden/usrCntlKundenKontakte.Designer.vb index 85844197..24dccfbf 100644 --- a/SDL/kunden/usrCntlKundenKontakte.Designer.vb +++ b/SDL/kunden/usrCntlKundenKontakte.Designer.vb @@ -23,9 +23,9 @@ Partial Class usrCntlKundenKontakte Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.dgvAufschub = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.KdKontaktId = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.Art = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -48,24 +48,24 @@ Partial Class usrCntlKundenKontakte Me.dgvAufschub.AllowUserToResizeColumns = False Me.dgvAufschub.AllowUserToResizeRows = False Me.dgvAufschub.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 Me.dgvAufschub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvAufschub.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.KdKontaktId, Me.Art, Me.HZA, Me.EORI, Me.NL, Me.KontoNr}) - DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle3 Me.dgvAufschub.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvAufschub.Location = New System.Drawing.Point(0, 0) Me.dgvAufschub.MultiSelect = False @@ -93,8 +93,8 @@ Partial Class usrCntlKundenKontakte ' 'HZA ' - DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - Me.HZA.DefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + Me.HZA.DefaultCellStyle = DataGridViewCellStyle2 Me.HZA.HeaderText = "Tel" Me.HZA.Name = "HZA" Me.HZA.ReadOnly = True @@ -140,13 +140,13 @@ Partial Class usrCntlKundenKontakte ' Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LöschenToolStripMenuItem}) Me.ContextMenuStrip1.Name = "ContextMenuStrip1" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(181, 48) + Me.ContextMenuStrip1.Size = New System.Drawing.Size(116, 26) ' 'LöschenToolStripMenuItem ' Me.LöschenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.del_small Me.LöschenToolStripMenuItem.Name = "LöschenToolStripMenuItem" - Me.LöschenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.LöschenToolStripMenuItem.Size = New System.Drawing.Size(115, 22) Me.LöschenToolStripMenuItem.Text = "löschen" ' 'usrCntlKundenKontakte diff --git a/SDL/kunden/usrCntlKundenKontakte.vb b/SDL/kunden/usrCntlKundenKontakte.vb index bbdfe56d..84c6840f 100644 --- a/SDL/kunden/usrCntlKundenKontakte.vb +++ b/SDL/kunden/usrCntlKundenKontakte.vb @@ -100,4 +100,6 @@ Public Class usrCntlKundenKontakte Dim delKey As New KeyEventArgs(Keys.Delete) dgvAufschub_KeyDown(sender, delKey) End Sub + + End Class diff --git a/SDL/seriendruck/usrCntlSeriendruck.vb b/SDL/seriendruck/usrCntlSeriendruck.vb index ebd575fb..f39e1bfe 100644 --- a/SDL/seriendruck/usrCntlSeriendruck.vb +++ b/SDL/seriendruck/usrCntlSeriendruck.vb @@ -139,9 +139,10 @@ Public Class usrCntlSeriendruck End Sub Private Sub txtErstattungAbfNr_KeyDown(sender As Object, e As KeyEventArgs) Handles txtErstattungAbfNr_neu.KeyDown, txtErstattungAbfNrFiliale.KeyDown, txtErstattungAbfUnterNr.KeyDown, cbxErstSprache.KeyDown, txtErstattungAbfNr_neu.KeyDown, txtErstattungAbfNrFiliale_neu.KeyDown, txtErstattungAbfUnterNr_neu.KeyDown - If e.KeyCode = Keys.Enter Then + If e.KeyCode = Keys.Enter AndAlso e.Handled = False Then withPrint = cbxSofortDruck.Checked btnWord.PerformClick() + e.Handled = True End If End Sub diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb index 27149f0d..b090b78c 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb @@ -86,7 +86,7 @@ Public Class cMDMFunctionsAllgemein End Try End Function - Shared Function UStVAKunden_SummenNeuBerechnen(Optional KundenNr As Integer = 0) As Boolean + Shared Function UStVAKunden_SummenNeuBerechnen(Optional KundenNr As Integer = 0, Optional saveValues As Boolean = True, Optional dt As DataTable = Nothing) As Boolean Try Dim sumChangedPLOSEOK As Boolean = True @@ -99,7 +99,7 @@ Public Class cMDMFunctionsAllgemein Else sqlWhere = "in (SELECT DISTINCT tblSteuernummern.AdressenNr AS UStVAn_KuNr FROM tblSteuernummern - where AdressenNr is not null)" + where AdressenNr is not null) " End If 'alle Kunden, die eine SteuerNr hinterlegt haben inkl. deren hinterlegte Summen! @@ -107,7 +107,7 @@ Public Class cMDMFunctionsAllgemein FROM Kunden left JOIN [tblKundenErweitert] on [kde_KundenNr] = Kunden.KundenNr WHERE Kunden.KundenNr " & sqlWhere & - "order by Kunden.KundenNr" + " order by Kunden.KundenNr" Dim dtKunden As DataTable = sql.loadDgvBySql(sqlKunden, "FMZOLL") @@ -137,21 +137,21 @@ Public Class cMDMFunctionsAllgemein Dim dtKundenSummen As DataTable = sql.loadDgvBySql(sqlSummeBilden, "FMZOLL") - Dim curUStV_SummeVorschaubetragEUR As Double - Dim curUStV_SummeVorschaubetragEUR_VERAG As Double - Dim curUStV_SummeVorschaubetragEUR_IDS As Double - Dim curUStV_SummeVorschaubetragEUR_IT As Double - Dim curUStV_SummeVorschaubetragEUR_MSE As Double - Dim curUStV_SummeVorschaubetragEUR_UTA As Double - Dim curUStV_SummeVorschaubetragEUR_PLOSE As Double + Dim curUStV_SummeVorschaubetragEUR As Double = 0 + Dim curUStV_SummeVorschaubetragEUR_VERAG As Double = 0 + Dim curUStV_SummeVorschaubetragEUR_IDS As Double = 0 + Dim curUStV_SummeVorschaubetragEUR_IT As Double = 0 + Dim curUStV_SummeVorschaubetragEUR_MSE As Double = 0 + Dim curUStV_SummeVorschaubetragEUR_UTA As Double = 0 + Dim curUStV_SummeVorschaubetragEUR_PLOSE As Double = 0 - Dim curUStV_SummeUmsatzsteuerbetragEUR As Double - Dim curUStV_SummeErstattungsbetragEUR As Double - Dim curUStV_Summe3470BetragEUR As Double - Dim curUStV_SummeVZBetragEUR As Double + Dim curUStV_SummeUmsatzsteuerbetragEUR As Double = 0 + Dim curUStV_SummeErstattungsbetragEUR As Double = 0 + Dim curUStV_Summe3470BetragEUR As Double = 0 + Dim curUStV_SummeVZBetragEUR As Double = 0 Dim invoiceDate = If(Date.Now > New Date(Date.Now.Year, 6, 30), New Date(Date.Now.Year, 1, 1), New Date(Date.Now.Year - 1, 1, 1)) - 'Neuberechnung der Vorschausummen (also alle noch nicht verrechneten Transaktionen) + 'Neuberechnung der Vorschausummen (also alle noch nicht verrechneten Transaktionen , die aber schon eingelesen wurden) curUStV_SummeVorschaubetragEUR_VERAG = UStVKunden_Summen_lesen_Vorschau_VERAG(r.Item("KundenNr"), invoiceDate) curUStV_SummeVorschaubetragEUR_IDS = UStVKunden_Summen_lesen_Vorschau_IDS(r.Item("KundenNr"), invoiceDate) curUStV_SummeVorschaubetragEUR_IT = UStVKunden_Summen_lesen_Vorschau_IT(r.Item("KundenNr"), invoiceDate) @@ -204,7 +204,7 @@ Public Class cMDMFunctionsAllgemein End If - If sumChanged Then + If sumChanged And saveValues Then 'updateSummen sumChangedOK = sql.doSQL("Update Kunden set Kunden.UStV_SummeUmsatzsteuerbetragEUR = " & curUStV_SummeUmsatzsteuerbetragEUR.ToString.Replace(",", ".") & ", Kunden.UStV_SummeErstattungsbetragEUR = " & curUStV_SummeErstattungsbetragEUR.ToString.Replace(",", ".") & ", @@ -220,7 +220,7 @@ Public Class cMDMFunctionsAllgemein " WHERE Kunden.KundenNr = " & r.Item("KundenNr"), "FMZOLL") End If - If sumChangedPLOSE Then + If sumChangedPLOSE And saveValues Then If IsDBNull(r.Item("UStV_SummeVorschaubetragEUR_PLOSE")) Then Dim kndErw As New cKundenErweitert(r.Item("KundenNr")) kndErw.kde_UStV_SummeVorschaubetragEUR_PLOSE = curUStV_SummeVorschaubetragEUR_PLOSE @@ -231,6 +231,37 @@ Public Class cMDMFunctionsAllgemein End If End If + If KundenNr > 0 AndAlso dt IsNot Nothing Then + + dt.Columns.Add("KundenNr", GetType(String)) + dt.Columns.Add("VorschaubetragEUR", GetType(Double)) + dt.Columns.Add("VorschaubetragEUR_VERAG", GetType(Double)) + dt.Columns.Add("VorschaubetragEUR_IDS", GetType(Double)) + dt.Columns.Add("VorschaubetragEUR_IT", GetType(Double)) + dt.Columns.Add("VorschaubetragEUR_MSE", GetType(Double)) + dt.Columns.Add("VorschaubetragEUR_UTA", GetType(Double)) + dt.Columns.Add("VorschaubetragEUR_PLOSE", GetType(Double)) + dt.Columns.Add("UmsatzsteuerbetragEUR", GetType(Double)) + dt.Columns.Add("ErstattungsbetragEUR", GetType(Double)) + dt.Columns.Add("3470BetragEUR", GetType(Double)) + dt.Columns.Add("VZBetragEUR", GetType(Double)) + + Dim ro As DataRow = dt.NewRow + ro("KundenNr") = KundenNr + ro("VorschaubetragEUR") = curUStV_SummeVorschaubetragEUR + ro("VorschaubetragEUR_VERAG") = curUStV_SummeVorschaubetragEUR_VERAG + ro("VorschaubetragEUR_IDS") = curUStV_SummeVorschaubetragEUR_IDS + ro("VorschaubetragEUR_IT") = curUStV_SummeVorschaubetragEUR_IT + ro("VorschaubetragEUR_MSE") = curUStV_SummeVorschaubetragEUR_MSE + ro("VorschaubetragEUR_UTA") = curUStV_SummeVorschaubetragEUR_UTA + ro("VorschaubetragEUR_PLOSE") = curUStV_SummeVorschaubetragEUR_PLOSE + ro("UmsatzsteuerbetragEUR") = curUStV_SummeUmsatzsteuerbetragEUR + ro("ErstattungsbetragEUR") = curUStV_SummeErstattungsbetragEUR + ro("3470BetragEUR") = curUStV_Summe3470BetragEUR + ro("VZBetragEUR") = curUStV_SummeVZBetragEUR + dt.Rows.Add(ro) + End If + Next End If diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb index 842fc318..20dd7603 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb @@ -1,19 +1,14 @@ Imports System.Data.SqlClient -Imports System.IO -Imports iTextSharp.text.pdf -Imports System.Drawing.Printing -Imports Ghostscript.NET.Processor -Imports System.Runtime.InteropServices -Imports System.Windows.Forms Imports System.Drawing -Imports Spire.Pdf.Print -Imports Spire.Pdf -Imports Spire.Pdf.HtmlConverter -Imports System.Threading +Imports System.Drawing.Printing +Imports System.IO Imports System.Net - Imports System.Text.RegularExpressions -Imports System.Runtime.DesignerServices +Imports System.Windows.Forms +Imports iTextSharp.text.pdf +Imports Spire.Pdf +Imports Spire.Pdf.Print + Public Class cDATENSERVER @@ -2272,6 +2267,28 @@ Public Class DATENVERVER_OPTIONS Return "" End Function + Public Shared Function getFileExtensionFromBase64String(base64 As String) As String + + Dim list As List(Of KeyValuePair(Of String, String)) = New List(Of KeyValuePair(Of String, String)) + list.Add(New KeyValuePair(Of String, String)("JVBERi0", "pdf")) + list.Add(New KeyValuePair(Of String, String)("R0lGODdh", "gif")) + list.Add(New KeyValuePair(Of String, String)("iVBORw0KGgo", "png")) + list.Add(New KeyValuePair(Of String, String)("TU0AK", "tiff")) + list.Add(New KeyValuePair(Of String, String)("UEs", "gif")) + list.Add(New KeyValuePair(Of String, String)("PK", "zip")) + + For Each type In list + If base64.Contains(type.Key) Then + Return type.Value + End If + Next + + Return "unknown" + + + + End Function + End Class