From bcb15f1086d1d84b2d1091e8a0b13b0d92b60c06 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 30 Oct 2025 15:53:23 +0100 Subject: [PATCH] Zinsnachberechnung, KundeBearbeiten --- .../rptRechnungDruck_MDM.Designer.vb | 2 +- ...agenDruck_Zinsennachberechnung.Designer.vb | 19 ++++- ...ngMDM_AnlagenDruck_Zinsennachberechnung.vb | 24 +++++- SDL/kunden/frmKundenblatt.Designer.vb | 85 +++++++++++-------- SDL/kunden/frmKundenblatt.vb | 10 ++- SDL/kunden/usrcntlKundeBearbeitenFull.vb | 4 +- 6 files changed, 99 insertions(+), 45 deletions(-) diff --git a/SDL/Fakturierung/rptRechnungDruck_MDM.Designer.vb b/SDL/Fakturierung/rptRechnungDruck_MDM.Designer.vb index 73c30ff0..b8ed7623 100644 --- a/SDL/Fakturierung/rptRechnungDruck_MDM.Designer.vb +++ b/SDL/Fakturierung/rptRechnungDruck_MDM.Designer.vb @@ -1264,7 +1264,7 @@ Partial Public Class rptRechnungDruck_MDM Me.lbl_onlyZR_ZahlungsDatUeberschrift.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) Me.lbl_onlyZR_ZahlungsDatUeberschrift.Style = "font-size: 8pt; font-weight: bold; text-align: left; text-justify: auto; ddo-char" & "-set: 1" - Me.lbl_onlyZR_ZahlungsDatUeberschrift.Text = "Zahlungsdatum" + Me.lbl_onlyZR_ZahlungsDatUeberschrift.Text = "Zahlung" Me.lbl_onlyZR_ZahlungsDatUeberschrift.Top = 0.8112674! Me.lbl_onlyZR_ZahlungsDatUeberschrift.Visible = False Me.lbl_onlyZR_ZahlungsDatUeberschrift.Width = 0.9661421! diff --git a/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.Designer.vb b/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.Designer.vb index e20ad4f1..17eb644a 100644 --- a/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.Designer.vb +++ b/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.Designer.vb @@ -39,6 +39,7 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung Me.Label1 = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.GroupFooter4 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter() Me.Line18 = New GrapeCity.ActiveReports.SectionReportModel.Line() + Me.txt_Anmerkung = New GrapeCity.ActiveReports.SectionReportModel.TextBox() CType(Me.txtREnr, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtReDat, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtZE, System.ComponentModel.ISupportInitialize).BeginInit() @@ -55,6 +56,7 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung CType(Me.lblZinsen, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblVZ, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txt_Anmerkung, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me, System.ComponentModel.ISupportInitialize).BeginInit() ' 'PageHeader @@ -65,7 +67,7 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung 'Detail ' Me.Detail.CanGrow = False - Me.Detail.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.txtREnr, Me.txtReDat, Me.txtZE, Me.txtReBetrag, Me.txtTage, Me.txtZinsen, Me.txtVZ, Me.txtFaellig}) + Me.Detail.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.txt_Anmerkung, Me.txtREnr, Me.txtReDat, Me.txtZE, Me.txtReBetrag, Me.txtTage, Me.txtZinsen, Me.txtVZ, Me.txtFaellig}) Me.Detail.Height = 0.1755249! Me.Detail.KeepTogether = True Me.Detail.Name = "Detail" @@ -303,6 +305,19 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung Me.Line18.Y1 = 0.09375003! Me.Line18.Y2 = 0.0937008! ' + 'txt_Anmerkung + ' + Me.txt_Anmerkung.Height = 0.1338583! + Me.txt_Anmerkung.Left = 1.788977! + Me.txt_Anmerkung.Name = "txt_Anmerkung" + Me.txt_Anmerkung.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) + Me.txt_Anmerkung.Style = "color: #202020; font-size: 6.75pt; font-style: italic; text-align: center; ddo-ch" & + "ar-set: 0" + Me.txt_Anmerkung.Text = "-" + Me.txt_Anmerkung.Top = 0.02083332! + Me.txt_Anmerkung.Visible = False + Me.txt_Anmerkung.Width = 3.713779! + ' 'rptRechnungMDM_AnlagenDruck_Zinsennachberechnung ' Me.MasterReport = False @@ -340,6 +355,7 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung CType(Me.lblZinsen, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblVZ, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txt_Anmerkung, System.ComponentModel.ISupportInitialize).EndInit() CType(Me, System.ComponentModel.ISupportInitialize).EndInit() End Sub @@ -363,4 +379,5 @@ Partial Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung Private WithEvents lblVZ As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents txtFaellig As GrapeCity.ActiveReports.SectionReportModel.TextBox Private WithEvents Label1 As GrapeCity.ActiveReports.SectionReportModel.Label + Public WithEvents txt_Anmerkung As GrapeCity.ActiveReports.SectionReportModel.TextBox End Class diff --git a/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.vb b/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.vb index 0f514eae..8c609e5b 100644 --- a/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.vb +++ b/SDL/Fakturierung/rptRechnungMDM_AnlagenDruck_Zinsennachberechnung.vb @@ -35,12 +35,29 @@ Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung txtZinsen.Text = "" txtVZ.Text = "" txtFaellig.Text = "" + txt_Anmerkung.Text = "" If Me.Fields.Item("clmnReNr") IsNot Nothing AndAlso Me.Fields.Item("clmnReNr").Value IsNot Nothing Then txtREnr.Text &= Me.Fields.Item("clmnReNr").Value.ToString If Me.Fields.Item("clmnReDatum") IsNot Nothing AndAlso Me.Fields.Item("clmnReDatum").Value IsNot Nothing AndAlso IsDate(Me.Fields.Item("clmnReDatum").Value) Then txtReDat.Text &= CDate(Me.Fields.Item("clmnReDatum").Value).ToShortDateString If Me.Fields.Item("clmnReBetrag") IsNot Nothing AndAlso Me.Fields.Item("clmnReBetrag").Value IsNot Nothing AndAlso IsNumeric(Me.Fields.Item("clmnReBetrag").Value) AndAlso CDbl(Me.Fields.Item("clmnReBetrag").Value) <> 0 Then txtReBetrag.Text &= CDbl(Me.Fields.Item("clmnReBetrag").Value).ToString("N2") If Me.Fields.Item("clmnFaellig") IsNot Nothing AndAlso Me.Fields.Item("clmnFaellig").Value IsNot Nothing AndAlso IsDate(Me.Fields.Item("clmnFaellig").Value) Then txtFaellig.Text &= CDate(Me.Fields.Item("clmnFaellig").Value).ToShortDateString - If Me.Fields.Item("clmnZE") IsNot Nothing AndAlso Me.Fields.Item("clmnZE").Value IsNot Nothing AndAlso IsDate(Me.Fields.Item("clmnZE").Value) Then txtZE.Text &= CDate(Me.Fields.Item("clmnZE").Value).ToShortDateString + If Me.Fields.Item("clmnZE") IsNot Nothing AndAlso Me.Fields.Item("clmnZE").Value IsNot Nothing Then + If IsDate(Me.Fields.Item("clmnZE").Value) Then + txtZE.Text &= CDate(Me.Fields.Item("clmnZE").Value).ToShortDateString + txt_Anmerkung.Visible = False + txtZE.Visible = True + txtFaellig.Visible = True + txtTage.Visible = True + txtReBetrag.Visible = True + Else + txt_Anmerkung.Text &= Me.Fields.Item("clmnZE").Value + txt_Anmerkung.Visible = True + txtZE.Visible = False + txtFaellig.Visible = False + txtTage.Visible = False + txtReBetrag.Visible = False + End If + End If If Me.Fields.Item("clmnTage") IsNot Nothing AndAlso Me.Fields.Item("clmnTage").Value IsNot Nothing Then txtTage.Text &= Me.Fields.Item("clmnTage").Value.ToString If Me.Fields.Item("clmnZinsen") IsNot Nothing AndAlso Me.Fields.Item("clmnZinsen").Value IsNot Nothing AndAlso IsNumeric(Me.Fields.Item("clmnZinsen").Value) AndAlso CDbl(Me.Fields.Item("clmnZinsen").Value) <> 0 Then txtZinsen.Text &= CDbl(Me.Fields.Item("clmnZinsen").Value).ToString("N2") If Me.Fields.Item("clmnVZ") IsNot Nothing AndAlso Me.Fields.Item("clmnVZ").Value IsNot Nothing AndAlso IsNumeric(Me.Fields.Item("clmnVZ").Value) Then txtVZ.Text &= Me.Fields.Item("clmnVZ").Value.ToString() & " %" @@ -67,9 +84,10 @@ Public Class rptRechnungMDM_AnlagenDruck_Zinsennachberechnung If RECHNUNG.POSITIONEN.Any() Then - If Anzahl > 0 AndAlso LeistungsText.Contains("Zinsnachbelastung") AndAlso LeistungsText.Contains("Rabatt") AndAlso Betrag <> 0 Then + If Anzahl > 0 AndAlso Betrag < 0 Then - dt.Rows.Add("0", "Rabatt", RECHNUNG.Abfertigungsdatum.ToShortDateString, LeistungsText, "", "", "", Betrag.ToString, "", "") + + dt.Rows.Add("0", "Rabatt", RECHNUNG.Abfertigungsdatum.ToShortDateString, "", "", LeistungsText.ToString, "", Betrag.ToString, "", "") 'dt.Rows.Add(rg.Item("clmnID"), rg.Item("clmnReNr"), rg.Item("clmnReDatum"), rg.Item("clmnAbfNr"), rg.Item("clmnReBetrag"), rg.Item("clmnZE"), rg.Item("clmnTage"), rg.Item("clmnZinsen"), rg.Item("clmnVZ"), rg.Item("clmnFaellig")) Else diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index fa72f190..f415d6c1 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -249,6 +249,7 @@ 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.txtEmailRE2 = New System.Windows.Forms.TextBox() Me.pnlInfo.SuspendLayout() Me.tbFirmendaten.SuspendLayout() Me.Panel4.SuspendLayout() @@ -338,7 +339,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(1644, 945) + Me.tbFirmendaten.Size = New System.Drawing.Size(1644, 962) Me.tbFirmendaten.TabIndex = 3 Me.tbFirmendaten.Text = "Firmendaten" ' @@ -348,7 +349,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(1638, 939) + Me.Panel4.Size = New System.Drawing.Size(1638, 956) Me.Panel4.TabIndex = 0 ' 'UsrcntlKundeBearbeitenFull1 @@ -358,7 +359,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(1638, 939) + Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1638, 956) Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 ' 'tbcntrMain @@ -384,6 +385,7 @@ Partial Class frmKundenblatt 'tbAllgemein ' Me.tbAllgemein.BackColor = System.Drawing.Color.White + Me.tbAllgemein.Controls.Add(Me.txtEmailRE2) Me.tbAllgemein.Controls.Add(Me.txtEmailRE) Me.tbAllgemein.Controls.Add(Me.TextBox1) Me.tbAllgemein.Controls.Add(Me.PictureBox8) @@ -644,7 +646,7 @@ Partial Class frmKundenblatt 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(710, 439) + Me.TabPage2.Size = New System.Drawing.Size(710, 456) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Umsatzbericht" Me.TabPage2.UseVisualStyleBackColor = True @@ -689,7 +691,7 @@ Partial Class frmKundenblatt Me.dgvUmsaetze.RowHeadersDefaultCellStyle = DataGridViewCellStyle8 Me.dgvUmsaetze.RowHeadersVisible = False Me.dgvUmsaetze.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 434) + Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 451) Me.dgvUmsaetze.TabIndex = 182 ' 'Label13 @@ -737,7 +739,7 @@ Partial Class frmKundenblatt Me.TabPage3.Controls.Add(Me.dgvUmsatzNachLeistngsNr) Me.TabPage3.Location = New System.Drawing.Point(4, 22) Me.TabPage3.Name = "TabPage3" - Me.TabPage3.Size = New System.Drawing.Size(710, 439) + Me.TabPage3.Size = New System.Drawing.Size(710, 456) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Umsatz nach LeistungsNr" Me.TabPage3.UseVisualStyleBackColor = True @@ -793,7 +795,7 @@ Partial Class frmKundenblatt Me.dgvUmsatzNachLeistngsNr.RowHeadersDefaultCellStyle = DataGridViewCellStyle12 Me.dgvUmsatzNachLeistngsNr.RowHeadersVisible = False Me.dgvUmsatzNachLeistngsNr.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 433) + Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 450) Me.dgvUmsatzNachLeistngsNr.TabIndex = 183 ' 'lblAdressenzusatz @@ -880,7 +882,7 @@ Partial Class frmKundenblatt Me.picLogo.Cursor = System.Windows.Forms.Cursors.Hand Me.picLogo.Image = Global.SDL.My.Resources.Resources.person_default Me.picLogo.ImageLocation = "" - Me.picLogo.Location = New System.Drawing.Point(788, 800) + Me.picLogo.Location = New System.Drawing.Point(788, 839) Me.picLogo.Name = "picLogo" Me.picLogo.Size = New System.Drawing.Size(287, 114) Me.picLogo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom @@ -889,11 +891,12 @@ Partial Class frmKundenblatt ' 'Button4 ' + Me.Button4.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.Button4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button4.Image = Global.SDL.My.Resources.Resources.statistik_small Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button4.Location = New System.Drawing.Point(1058, 740) + Me.Button4.Location = New System.Drawing.Point(1058, 792) Me.Button4.Name = "Button4" Me.Button4.Size = New System.Drawing.Size(136, 32) Me.Button4.TabIndex = 21 @@ -1048,14 +1051,14 @@ Partial Class frmKundenblatt ' 'GroupBox5 ' - Me.GroupBox5.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Me.GroupBox5.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.GroupBox5.Controls.Add(Me.lblStat_SdlLeistungen_Maut) Me.GroupBox5.Controls.Add(Me.lblStat_SdlLeistungen_Diesel) Me.GroupBox5.Controls.Add(Me.lblStat_SdlLeistungen) Me.GroupBox5.Controls.Add(Me.lblStat_Lkws) Me.GroupBox5.Controls.Add(Me.PictureBox5) - Me.GroupBox5.Location = New System.Drawing.Point(738, 793) + Me.GroupBox5.Location = New System.Drawing.Point(738, 832) Me.GroupBox5.Name = "GroupBox5" Me.GroupBox5.Size = New System.Drawing.Size(456, 121) Me.GroupBox5.TabIndex = 22 @@ -1067,10 +1070,10 @@ Partial Class frmKundenblatt ' Me.lblStat_SdlLeistungen_Maut.AutoSize = True Me.lblStat_SdlLeistungen_Maut.Cursor = System.Windows.Forms.Cursors.Hand - Me.lblStat_SdlLeistungen_Maut.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblStat_SdlLeistungen_Maut.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblStat_SdlLeistungen_Maut.Location = New System.Drawing.Point(12, 90) Me.lblStat_SdlLeistungen_Maut.Name = "lblStat_SdlLeistungen_Maut" - Me.lblStat_SdlLeistungen_Maut.Size = New System.Drawing.Size(32, 20) + Me.lblStat_SdlLeistungen_Maut.Size = New System.Drawing.Size(27, 16) Me.lblStat_SdlLeistungen_Maut.TabIndex = 3 Me.lblStat_SdlLeistungen_Maut.Text = "Sdl" ' @@ -1078,10 +1081,10 @@ Partial Class frmKundenblatt ' Me.lblStat_SdlLeistungen_Diesel.AutoSize = True Me.lblStat_SdlLeistungen_Diesel.Cursor = System.Windows.Forms.Cursors.Hand - Me.lblStat_SdlLeistungen_Diesel.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblStat_SdlLeistungen_Diesel.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblStat_SdlLeistungen_Diesel.Location = New System.Drawing.Point(12, 70) Me.lblStat_SdlLeistungen_Diesel.Name = "lblStat_SdlLeistungen_Diesel" - Me.lblStat_SdlLeistungen_Diesel.Size = New System.Drawing.Size(32, 20) + Me.lblStat_SdlLeistungen_Diesel.Size = New System.Drawing.Size(27, 16) Me.lblStat_SdlLeistungen_Diesel.TabIndex = 2 Me.lblStat_SdlLeistungen_Diesel.Text = "Sdl" ' @@ -1089,10 +1092,10 @@ Partial Class frmKundenblatt ' Me.lblStat_SdlLeistungen.AutoSize = True Me.lblStat_SdlLeistungen.Cursor = System.Windows.Forms.Cursors.Hand - Me.lblStat_SdlLeistungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblStat_SdlLeistungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblStat_SdlLeistungen.Location = New System.Drawing.Point(12, 50) Me.lblStat_SdlLeistungen.Name = "lblStat_SdlLeistungen" - Me.lblStat_SdlLeistungen.Size = New System.Drawing.Size(32, 20) + Me.lblStat_SdlLeistungen.Size = New System.Drawing.Size(27, 16) Me.lblStat_SdlLeistungen.TabIndex = 1 Me.lblStat_SdlLeistungen.Text = "Sdl" ' @@ -1100,10 +1103,10 @@ Partial Class frmKundenblatt ' Me.lblStat_Lkws.AutoSize = True Me.lblStat_Lkws.Cursor = System.Windows.Forms.Cursors.Hand - Me.lblStat_Lkws.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblStat_Lkws.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblStat_Lkws.Location = New System.Drawing.Point(12, 30) Me.lblStat_Lkws.Name = "lblStat_Lkws" - Me.lblStat_Lkws.Size = New System.Drawing.Size(37, 20) + Me.lblStat_Lkws.Size = New System.Drawing.Size(30, 16) Me.lblStat_Lkws.TabIndex = 0 Me.lblStat_Lkws.Text = "Lkw" ' @@ -1209,7 +1212,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(1644, 945) + Me.tbZoll.Size = New System.Drawing.Size(1644, 962) Me.tbZoll.TabIndex = 9 Me.tbZoll.Text = "ZOLL" Me.tbZoll.UseVisualStyleBackColor = True @@ -1221,7 +1224,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(1638, 939) + Me.tbcntrZOLL.Size = New System.Drawing.Size(1638, 956) Me.tbcntrZOLL.TabIndex = 0 ' 'tabZoll_Artikel @@ -1229,7 +1232,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(1630, 913) + Me.tabZoll_Artikel.Size = New System.Drawing.Size(1630, 930) Me.tabZoll_Artikel.TabIndex = 1 Me.tabZoll_Artikel.Text = "Artikel" Me.tabZoll_Artikel.UseVisualStyleBackColor = True @@ -1240,7 +1243,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(1644, 945) + Me.tbMdm.Size = New System.Drawing.Size(1644, 962) Me.tbMdm.TabIndex = 10 Me.tbMdm.Text = "MDM" Me.tbMdm.UseVisualStyleBackColor = True @@ -1259,7 +1262,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(1638, 939) + Me.tbcntrMDM.Size = New System.Drawing.Size(1638, 956) Me.tbcntrMDM.TabIndex = 0 ' 'tbSDL @@ -1271,7 +1274,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(1630, 913) + Me.tbSDL.Size = New System.Drawing.Size(1630, 930) Me.tbSDL.TabIndex = 5 Me.tbSDL.Text = "SDL-Leistungen" Me.tbSDL.UseVisualStyleBackColor = True @@ -1313,7 +1316,7 @@ Partial Class frmKundenblatt DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle21 Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1624, 717) + Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1624, 734) Me.dgvSDLLeistungenFull.TabIndex = 5 ' 'Panel6 @@ -1419,7 +1422,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, 767) + Me.Panel5.Location = New System.Drawing.Point(3, 784) Me.Panel5.Name = "Panel5" Me.Panel5.Size = New System.Drawing.Size(1624, 143) Me.Panel5.TabIndex = 177 @@ -2315,7 +2318,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(1644, 945) + Me.tbOfferte.Size = New System.Drawing.Size(1644, 962) Me.tbOfferte.TabIndex = 11 Me.tbOfferte.Text = "Offerte" Me.tbOfferte.UseVisualStyleBackColor = True @@ -2327,7 +2330,7 @@ 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(1644, 945) + Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1644, 962) Me.UsrCntlOfferte1.TabIndex = 0 ' 'tbUSTV @@ -2335,7 +2338,7 @@ Partial Class frmKundenblatt 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(1644, 945) + Me.tbUSTV.Size = New System.Drawing.Size(1644, 962) Me.tbUSTV.TabIndex = 12 Me.tbUSTV.Text = "USTV" Me.tbUSTV.UseVisualStyleBackColor = True @@ -2349,7 +2352,7 @@ Partial Class frmKundenblatt Me.tbcntrUSTV.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrUSTV.Name = "tbcntrUSTV" Me.tbcntrUSTV.SelectedIndex = 0 - Me.tbcntrUSTV.Size = New System.Drawing.Size(1644, 945) + Me.tbcntrUSTV.Size = New System.Drawing.Size(1644, 962) Me.tbcntrUSTV.TabIndex = 1 ' 'tbUSTVDokumente @@ -2362,7 +2365,7 @@ Partial Class frmKundenblatt 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(1636, 919) + Me.tbUSTVDokumente.Size = New System.Drawing.Size(1636, 936) Me.tbUSTVDokumente.TabIndex = 8 Me.tbUSTVDokumente.Text = "Dokumente" Me.tbUSTVDokumente.UseVisualStyleBackColor = True @@ -2493,7 +2496,7 @@ Partial Class frmKundenblatt Me.tbFIBU.Controls.Add(Me.txtFIBUKuerzel) Me.tbFIBU.Location = New System.Drawing.Point(4, 25) Me.tbFIBU.Name = "tbFIBU" - Me.tbFIBU.Size = New System.Drawing.Size(1644, 945) + Me.tbFIBU.Size = New System.Drawing.Size(1644, 962) Me.tbFIBU.TabIndex = 13 Me.tbFIBU.Text = "FIBU" Me.tbFIBU.UseVisualStyleBackColor = True @@ -2898,7 +2901,7 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" - Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8 + Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4 Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' @@ -3060,6 +3063,19 @@ Partial Class frmKundenblatt Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22) Me.tbiVERAGCard.Text = "VERAG Card" ' + 'txtEmailRE2 + ' + Me.txtEmailRE2.BackColor = System.Drawing.Color.White + Me.txtEmailRE2.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtEmailRE2.Cursor = System.Windows.Forms.Cursors.Hand + Me.txtEmailRE2.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtEmailRE2.Location = New System.Drawing.Point(40, 410) + Me.txtEmailRE2.Name = "txtEmailRE2" + Me.txtEmailRE2.ReadOnly = True + Me.txtEmailRE2.Size = New System.Drawing.Size(384, 19) + Me.txtEmailRE2.TabIndex = 195 + Me.txtEmailRE2.Text = "email-Rechnung" + ' 'frmKundenblatt ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -3360,4 +3376,5 @@ Partial Class frmKundenblatt Friend WithEvents txtEmailRE As TextBox Friend WithEvents TextBox1 As TextBox Friend WithEvents PictureBox8 As PictureBox + Friend WithEvents txtEmailRE2 As TextBox End Class diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index 00cbedd3..e69b6dfb 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -738,7 +738,7 @@ Public Class frmKundenblatt KUNDE = New VERAG_PROG_ALLGEMEIN.cKunde(kdNr) 'kundenSQL.getKundeByKdNr(kdNr) ADRESSE = New VERAG_PROG_ALLGEMEIN.cAdressen(kdNr) 'kundenSQL.getKundeByKdNr(kdNr) KUNDE_ERW = New VERAG_PROG_ALLGEMEIN.cKundenErweitert(kdNr) - KUNDE_K = New VERAG_PROG_ALLGEMEIN.cKundenKontakte(kdNr) + KUNDE_K = New VERAG_PROG_ALLGEMEIN.cKundenKontakte(8, kdNr) 'Me.dataAdapterFirma = Nothing ' Me.dataFirma.Clear() 'SDL! @@ -771,8 +771,10 @@ Public Class frmKundenblatt lblEmail2.Text = checkNullStr(ADRESSE.E_Mail2) txtEmailRE.Text = "-" - If KUNDE_K.kkd_kkaId = 8 Then 'Rechnung an - txtEmailRE.Text = KUNDE_K.kkd_Email & " " & KUNDE_K.kkd_EmailCC + txtEmailRE2.Text = "" + If KUNDE_K.hasEntry Then 'Rechnung an + txtEmailRE.Text = KUNDE_K.kkd_Email + txtEmailRE2.Text &= KUNDE_K.kkd_EmailCC End If @@ -2292,7 +2294,7 @@ Public Class frmKundenblatt Dim dt As DataTable = dtUmsatzNachLeistungsNr() If dt.Rows.Count > 0 Then - cProgramFunctions.genExcelFromDT_NEW(dt, {"C1:C" & (dt.Rows.Count + 1), "D1:D" & (dt.Rows.Count + 1), "E1:E" & (dt.Rows.Count + 1), "F1:F" & (dt.Rows.Count + 1), "G1:G" & (dt.Rows.Count + 1), "H1:H" & (dt.Rows.Count + 1), "I1:I" & (dt.Rows.Count + 1), "J1:J" & (dt.Rows.Count + 1), "K1:K" & (dt.Rows.Count + 1)}, False,,,) + cProgramFunctions.genExcelFromDT_NEW(dt, {"C1:C" & (dt.Rows.Count + 1), "D1:D" & (dt.Rows.Count + 1), "E1:E" & (dt.Rows.Count + 1), "F1:F" & (dt.Rows.Count + 1), "G1:G" & (dt.Rows.Count + 1), "H1:H" & (dt.Rows.Count + 1), "I1:I" & (dt.Rows.Count + 1), "J1:J" & (dt.Rows.Count + 1), "K1:K" & (dt.Rows.Count + 1)}, False) End If diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index 2859de34..b78addd4 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -2234,7 +2234,7 @@ Public Class usrcntlKundeBearbeitenFull Dim dt_IDS_Rabatte As DataTable = sql.loadDgvBySql("SELECT P.ProductDescription, C.OutletCountry, S.OutletName, RW.Rechenwert, Kz, RW.KategorieNr as KatNr FROM [VERAG].[dbo].[tbl_IDS_Rechenwerte] as RW left join [VERAG].[dbo].[tbl_IDS_Produkte] as P on P.ProductTypeCode = RW.ProductTypeCode left join [VERAG].[dbo].[tbl_IDS_Länder] as C on C.OutletCountryCode = RW.OutletCountryCode - left join [VERAG].[dbo].[tbl_IDS_Stationen] as S on S.[OutletCode] = RW.OutletCode where CustomerCode =" & KUNDE.KundenNr & " AND RW.Rechenwert <> 0 order by Kz", "FMZOLL") + left join [VERAG].[dbo].[tbl_IDS_Stationen] as S on S.[OutletCode] = RW.OutletCode where CustomerCode =" & KUNDE.KundenNr & " order by Kz", "FMZOLL") With dgvIDS_Rabatte @@ -2265,7 +2265,7 @@ Public Class usrcntlKundeBearbeitenFull Dim dt_IDS As DataTable = sql.loadDgvBySql("SELECT P.ProductDescription, C.OutletCountry, S.OutletName, RW.Rechenwert, Kz, RW.KategorieNr as KatNr FROM [VERAG].[dbo].[tbl_IDS_Rechenwerte] as RW left join [VERAG].[dbo].[tbl_IDS_Produkte] as P on P.ProductTypeCode = RW.ProductTypeCode left join [VERAG].[dbo].[tbl_IDS_Länder] as C on C.OutletCountryCode = RW.OutletCountryCode - left join [VERAG].[dbo].[tbl_IDS_Stationen] as S on S.[OutletCode] = RW.OutletCode where CustomerCode is null and RW.Rechenwert <> 0 order by KZ", "FMZOLL") + left join [VERAG].[dbo].[tbl_IDS_Stationen] as S on S.[OutletCode] = RW.OutletCode where CustomerCode is null order by KZ", "FMZOLL") With dgvIDS_Standard .DataSource = dt_IDS