diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 9e2036ff..f7b24f66 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -5237,9 +5237,12 @@ Public Class cFakturierung rpt.DataSource = dt + Dim Gesamt_RG_Betrag As Double = CDbl(dt.Compute("SUM(SteuerpflichtigerGesamtbetrag)", "")) + CDbl(dt.Compute("SUM(SteuerfreierGesamtbetrag)", "")) + Dim BelegartenKz = If(Gesamt_RG_Betrag < 0, "AG", "AR") + Select Case Row("RechnungSprache") Case "EN" - Select Case Row("BelegartenKz") + Select Case BelegartenKz Case "AR" rpt.lblUeberschriftRG_GS.Text = IIf(Not isMDMRechnungsdruck, "Attatchment to INVOICE", "INVOICE") rpt.lblSummeUeberschrift.Text = "Invoice Amount:" @@ -5252,7 +5255,7 @@ Public Class cFakturierung rpt.lblRgDatumUeberschrift.Text = "Credit Note Date:" End Select Case Else - Select Case Row("BelegartenKz") + Select Case BelegartenKz Case "AR" rpt.lblUeberschriftRG_GS.Text = IIf(Not isMDMRechnungsdruck, "Anlage zur Sammelrechnung", "Rechnung") Case "AG" diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb b/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb index 2f770343..64fa3dbf 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb @@ -62,6 +62,8 @@ Partial Class frmBU_Mahnlauf Me.Button2 = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button() Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cboBetreuer = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.lblBetreuer = New System.Windows.Forms.Label() Me.Panel1.SuspendLayout() Me.pnlTop.SuspendLayout() Me.Panel2.SuspendLayout() @@ -71,6 +73,8 @@ Partial Class frmBU_Mahnlauf ' 'Panel1 ' + Me.Panel1.Controls.Add(Me.lblBetreuer) + Me.Panel1.Controls.Add(Me.cboBetreuer) Me.Panel1.Controls.Add(Me.cbxKontotyp) Me.Panel1.Controls.Add(Me.txtZahlEingaenge) Me.Panel1.Controls.Add(Me.cbxZahlungseingaenge) @@ -88,7 +92,7 @@ Partial Class frmBU_Mahnlauf Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top Me.Panel1.Location = New System.Drawing.Point(0, 0) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1427, 127) + Me.Panel1.Size = New System.Drawing.Size(1514, 132) Me.Panel1.TabIndex = 0 ' 'cbxKontotyp @@ -98,7 +102,7 @@ Partial Class frmBU_Mahnlauf Me.cbxKontotyp._value = "" Me.cbxKontotyp.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.cbxKontotyp.FormattingEnabled = True - Me.cbxKontotyp.Location = New System.Drawing.Point(529, 96) + Me.cbxKontotyp.Location = New System.Drawing.Point(544, 96) Me.cbxKontotyp.Name = "cbxKontotyp" Me.cbxKontotyp.Size = New System.Drawing.Size(97, 21) Me.cbxKontotyp.TabIndex = 48 @@ -120,7 +124,7 @@ Partial Class frmBU_Mahnlauf Me.txtZahlEingaenge._WaehrungZeichen = False Me.txtZahlEingaenge.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.txtZahlEingaenge.ForeColor = System.Drawing.Color.Black - Me.txtZahlEingaenge.Location = New System.Drawing.Point(675, 78) + Me.txtZahlEingaenge.Location = New System.Drawing.Point(690, 78) Me.txtZahlEingaenge.MaxLength = 10 Me.txtZahlEingaenge.MaxLineLength = -1 Me.txtZahlEingaenge.MaxLines_Warning = "" @@ -135,7 +139,7 @@ Partial Class frmBU_Mahnlauf ' Me.cbxZahlungseingaenge.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.cbxZahlungseingaenge.AutoSize = True - Me.cbxZahlungseingaenge.Location = New System.Drawing.Point(529, 80) + Me.cbxZahlungseingaenge.Location = New System.Drawing.Point(544, 80) Me.cbxZahlungseingaenge.Name = "cbxZahlungseingaenge" Me.cbxZahlungseingaenge.Size = New System.Drawing.Size(140, 17) Me.cbxZahlungseingaenge.TabIndex = 39 @@ -148,7 +152,7 @@ Partial Class frmBU_Mahnlauf Me.cbxNurFaellig.AutoSize = True Me.cbxNurFaellig.Checked = True Me.cbxNurFaellig.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxNurFaellig.Location = New System.Drawing.Point(529, 56) + Me.cbxNurFaellig.Location = New System.Drawing.Point(544, 56) Me.cbxNurFaellig.Name = "cbxNurFaellig" Me.cbxNurFaellig.Size = New System.Drawing.Size(94, 17) Me.cbxNurFaellig.TabIndex = 38 @@ -219,7 +223,7 @@ Partial Class frmBU_Mahnlauf Me.btnSuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnSuche.Image = Global.SDL.My.Resources.Resources.search Me.btnSuche.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSuche.Location = New System.Drawing.Point(1232, 56) + Me.btnSuche.Location = New System.Drawing.Point(1319, 56) Me.btnSuche.Name = "btnSuche" Me.btnSuche.Size = New System.Drawing.Size(162, 52) Me.btnSuche.TabIndex = 29 @@ -287,7 +291,7 @@ Partial Class frmBU_Mahnlauf Me.pnlTop.Dock = System.Windows.Forms.DockStyle.Top Me.pnlTop.Location = New System.Drawing.Point(0, 0) Me.pnlTop.Name = "pnlTop" - Me.pnlTop.Size = New System.Drawing.Size(1427, 48) + Me.pnlTop.Size = New System.Drawing.Size(1514, 48) Me.pnlTop.TabIndex = 4 ' 'Label4 @@ -305,9 +309,9 @@ Partial Class frmBU_Mahnlauf ' Me.Panel2.Controls.Add(Me.MyDatagridview1) Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill - Me.Panel2.Location = New System.Drawing.Point(0, 127) + Me.Panel2.Location = New System.Drawing.Point(0, 132) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(1427, 562) + Me.Panel2.Size = New System.Drawing.Size(1514, 557) Me.Panel2.TabIndex = 1 ' 'MyDatagridview1 @@ -323,7 +327,7 @@ Partial Class frmBU_Mahnlauf Me.MyDatagridview1.ReadOnly = True Me.MyDatagridview1.RowHeadersVisible = False Me.MyDatagridview1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.MyDatagridview1.Size = New System.Drawing.Size(1427, 562) + Me.MyDatagridview1.Size = New System.Drawing.Size(1514, 557) Me.MyDatagridview1.TabIndex = 0 ' 'Panel3 @@ -350,14 +354,14 @@ Partial Class frmBU_Mahnlauf Me.Panel3.Dock = System.Windows.Forms.DockStyle.Bottom Me.Panel3.Location = New System.Drawing.Point(0, 689) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(1427, 166) + Me.Panel3.Size = New System.Drawing.Size(1514, 166) Me.Panel3.TabIndex = 1 ' 'Label9 ' Me.Label9.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(1109, 144) + Me.Label9.Location = New System.Drawing.Point(1196, 144) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(234, 13) Me.Label9.TabIndex = 50 @@ -367,7 +371,7 @@ Partial Class frmBU_Mahnlauf ' Me.cbxMahnsperre.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.cbxMahnsperre.AutoSize = True - Me.cbxMahnsperre.Location = New System.Drawing.Point(1337, 11) + Me.cbxMahnsperre.Location = New System.Drawing.Point(1424, 11) Me.cbxMahnsperre.Name = "cbxMahnsperre" Me.cbxMahnsperre.Size = New System.Drawing.Size(86, 17) Me.cbxMahnsperre.TabIndex = 49 @@ -380,7 +384,7 @@ Partial Class frmBU_Mahnlauf Me.btnMail_Intern.BackgroundImage = Global.SDL.My.Resources.Resources.email_big1 Me.btnMail_Intern.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.btnMail_Intern.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnMail_Intern.Location = New System.Drawing.Point(1353, 83) + Me.btnMail_Intern.Location = New System.Drawing.Point(1440, 83) Me.btnMail_Intern.Name = "btnMail_Intern" Me.btnMail_Intern.Size = New System.Drawing.Size(41, 34) Me.btnMail_Intern.TabIndex = 48 @@ -419,7 +423,7 @@ Partial Class frmBU_Mahnlauf Me.cbxMahnstufeErh.AutoSize = True Me.cbxMahnstufeErh.Checked = True Me.cbxMahnstufeErh.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxMahnstufeErh.Location = New System.Drawing.Point(1216, 11) + Me.cbxMahnstufeErh.Location = New System.Drawing.Point(1303, 11) Me.cbxMahnstufeErh.Name = "cbxMahnstufeErh" Me.cbxMahnstufeErh.Size = New System.Drawing.Size(118, 17) Me.cbxMahnstufeErh.TabIndex = 44 @@ -430,7 +434,7 @@ Partial Class frmBU_Mahnlauf ' Me.Label8.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(1109, 121) + Me.Label8.Location = New System.Drawing.Point(1196, 121) Me.Label8.Name = "Label8" Me.Label8.Size = New System.Drawing.Size(81, 13) Me.Label8.TabIndex = 42 @@ -442,7 +446,7 @@ Partial Class frmBU_Mahnlauf Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button6.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button6.Location = New System.Drawing.Point(1112, 81) + Me.Button6.Location = New System.Drawing.Point(1199, 81) Me.Button6.Name = "Button6" Me.Button6.Size = New System.Drawing.Size(222, 38) Me.Button6.TabIndex = 40 @@ -455,7 +459,7 @@ Partial Class frmBU_Mahnlauf Me.btnExcel.BackgroundImage = Global.SDL.My.Resources.Resources.Excel_logo Me.btnExcel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center Me.btnExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnExcel.Location = New System.Drawing.Point(1353, 30) + Me.btnExcel.Location = New System.Drawing.Point(1440, 30) Me.btnExcel.Name = "btnExcel" Me.btnExcel.Size = New System.Drawing.Size(41, 34) Me.btnExcel.TabIndex = 39 @@ -514,7 +518,7 @@ Partial Class frmBU_Mahnlauf ' Me.CheckBox1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.CheckBox1.AutoSize = True - Me.CheckBox1.Location = New System.Drawing.Point(628, 113) + Me.CheckBox1.Location = New System.Drawing.Point(715, 113) Me.CheckBox1.Name = "CheckBox1" Me.CheckBox1.Size = New System.Drawing.Size(147, 17) Me.CheckBox1.TabIndex = 33 @@ -527,7 +531,7 @@ Partial Class frmBU_Mahnlauf Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label3.Location = New System.Drawing.Point(1109, 14) + Me.Label3.Location = New System.Drawing.Point(1196, 14) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(101, 13) Me.Label3.TabIndex = 30 @@ -552,7 +556,7 @@ Partial Class frmBU_Mahnlauf Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button2.Image = Global.SDL.My.Resources.Resources.mahn Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button2.Location = New System.Drawing.Point(1112, 30) + Me.Button2.Location = New System.Drawing.Point(1199, 30) Me.Button2.Name = "Button2" Me.Button2.Size = New System.Drawing.Size(222, 45) Me.Button2.TabIndex = 31 @@ -588,7 +592,7 @@ Partial Class frmBU_Mahnlauf Me.MyTextBox2._WaehrungZeichen = False Me.MyTextBox2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.MyTextBox2.ForeColor = System.Drawing.Color.Black - Me.MyTextBox2.Location = New System.Drawing.Point(1196, 118) + Me.MyTextBox2.Location = New System.Drawing.Point(1283, 118) Me.MyTextBox2.MaxLength = 10 Me.MyTextBox2.MaxLineLength = -1 Me.MyTextBox2.MaxLines_Warning = "" @@ -598,12 +602,34 @@ Partial Class frmBU_Mahnlauf Me.MyTextBox2.TabIndex = 39 Me.MyTextBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' + 'cboBetreuer + ' + Me.cboBetreuer._allowedValuesFreiText = Nothing + Me.cboBetreuer._allowFreiText = False + Me.cboBetreuer._value = "" + Me.cboBetreuer.FormattingEnabled = True + Me.cboBetreuer.Location = New System.Drawing.Point(410, 111) + Me.cboBetreuer.Name = "cboBetreuer" + Me.cboBetreuer.Size = New System.Drawing.Size(97, 21) + Me.cboBetreuer.TabIndex = 49 + Me.cboBetreuer.Visible = False + ' + 'lblBetreuer + ' + Me.lblBetreuer.AutoSize = True + Me.lblBetreuer.Location = New System.Drawing.Point(329, 114) + Me.lblBetreuer.Name = "lblBetreuer" + Me.lblBetreuer.Size = New System.Drawing.Size(50, 13) + Me.lblBetreuer.TabIndex = 50 + Me.lblBetreuer.Text = "Betreuer:" + Me.lblBetreuer.Visible = False + ' 'frmBU_Mahnlauf ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(1427, 855) + Me.ClientSize = New System.Drawing.Size(1514, 855) Me.Controls.Add(Me.Panel2) Me.Controls.Add(Me.Panel3) Me.Controls.Add(Me.Panel1) @@ -661,4 +687,6 @@ Partial Class frmBU_Mahnlauf Friend WithEvents cbxKontotyp As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents cbxMahnsperre As CheckBox Friend WithEvents Label9 As Label + Friend WithEvents lblBetreuer As Label + Friend WithEvents cboBetreuer As VERAG_PROG_ALLGEMEIN.MyComboBox End Class diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index 883ccc41..0d3d2a7a 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -60,16 +60,18 @@ Public Class frmBU_Mahnlauf when max(si_mahnstufe) >= 5 Then 'gesperrt' else '-' End as Sperre " & If(cbxNurFaellig.Checked, "", ",SUM(CASE WHEN op.d_netto(1) ", "") & " " & If(KdNr > 0, " AND i_personenkonto ='" & KdNr & "'", "") & " + " & If(cboBetreuer.Text <> "", " AND kde_betreuer ='" & cboBetreuer.Text & "'", "") & " " & If(KdTxt <> "", " AND KTO.c_name LIKE '" & KdTxt.Replace("*", "%") & "'", "") & " - group by i_personenkonto ,KTO.c_name,KTO.c_landid,KTO.c_ort,KTO.c_plz,[tblKundenKontakt].kkd_Email, Kunden.Abfertigungsverbot, isnull(si_mahnung,0) + group by i_personenkonto ,KTO.c_name,KTO.c_landid,KTO.c_ort,KTO.c_plz,[tblKundenKontakt].kkd_Email, Kunden.Abfertigungsverbot, isnull(si_mahnung,0), isnull([tblKundenErweitert].kde_betreuer,'') HAVING sum(eur_bruttobetrag+eur_zahlung)>'" & MyTextBox1._value & "' " & If(MyComboBox1._value > 0, " and max(si_mahnstufe)>='" & MyComboBox1._value & "'", "") & " ORDER BY KTO.c_name" @@ -226,6 +228,9 @@ Public Class frmBU_Mahnlauf 'cbxKontotyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sachkonten", "KO")) cbxKontotyp.changeItem("Alle") + cboBetreuer.Items.Clear() + cboBetreuer.fillWithSQL("select mit_id, mit_nname FROM [ADMIN].[dbo].[tblMitarbeiter] where tblMitarbeiter.mit_Funktion = 'VK' and mit_gekuendigt = 0 and mit_abteilung = 'MDM'", False, "ADMIN", True) + MyTextBox2._value = Now.ToShortDateString End Sub @@ -1501,10 +1506,14 @@ Public Class frmBU_Mahnlauf Private Sub cboFirma_SelectedValueChanged(sender As Object, e As EventArgs) Handles cboFirma.SelectedValueChanged If cboFirma._value <> "" AndAlso cboFirma._value = 19 Then cbxZahlungseingaenge.Visible = True + cboBetreuer.Visible = True + lblBetreuer.Visible = True Else cbxZahlungseingaenge.Visible = False cbxZahlungseingaenge.Checked = False + cboBetreuer.Visible = False + lblBetreuer.Visible = False End If End Sub diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index 1591163c..79afbe6e 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -58,6 +58,10 @@ Partial Class frmKundenblatt Me.Panel4 = New System.Windows.Forms.Panel() Me.tbcntrMain = New System.Windows.Forms.TabControl() Me.tbAllgemein = New System.Windows.Forms.TabPage() + Me.txtRisiko = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label20 = New System.Windows.Forms.Label() + Me.txt3470Betrag = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label21 = New System.Windows.Forms.Label() Me.GroupBox5 = New System.Windows.Forms.GroupBox() Me.lblStat_Lkws = New System.Windows.Forms.Label() Me.dgvLeistungen = New System.Windows.Forms.DataGridView() @@ -248,17 +252,13 @@ 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.txtRisiko = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label20 = New System.Windows.Forms.Label() - Me.txt3470Betrag = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label21 = New System.Windows.Forms.Label() + Me.txtKundeninfo = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() Me.usrcntlKarten = New SDL.usrCntlKartenDaten() Me.UsrCntlLKW1 = New SDL.usrCntlLKW() Me.UsrCntlKundenlogin1 = New SDL.usrCntlKundenlogin() Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() Me.UsrCntlUSTV = New SDL.usrCntlUSTV() - Me.Button8 = New System.Windows.Forms.Button() Me.pnlInfo.SuspendLayout() Me.tbFirmendaten.SuspendLayout() Me.Panel4.SuspendLayout() @@ -385,7 +385,7 @@ Partial Class frmKundenblatt 'tbAllgemein ' Me.tbAllgemein.BackColor = System.Drawing.Color.White - Me.tbAllgemein.Controls.Add(Me.Button8) + Me.tbAllgemein.Controls.Add(Me.txtKundeninfo) Me.tbAllgemein.Controls.Add(Me.txtRisiko) Me.tbAllgemein.Controls.Add(Me.Label20) Me.tbAllgemein.Controls.Add(Me.txt3470Betrag) @@ -434,6 +434,76 @@ Partial Class frmKundenblatt Me.tbAllgemein.TabIndex = 0 Me.tbAllgemein.Text = "Allgemein" ' + 'txtRisiko + ' + Me.txtRisiko._DateTimeOnly = False + Me.txtRisiko._numbersOnly = False + Me.txtRisiko._numbersOnlyKommastellen = "" + Me.txtRisiko._numbersOnlyTrennzeichen = True + Me.txtRisiko._Prozent = False + Me.txtRisiko._ShortDateNew = False + Me.txtRisiko._ShortDateOnly = False + Me.txtRisiko._TimeOnly = False + Me.txtRisiko._TimeOnly_Seconds = False + Me.txtRisiko._value = "" + Me.txtRisiko._Waehrung = True + Me.txtRisiko._WaehrungZeichen = True + Me.txtRisiko.BackColor = System.Drawing.Color.IndianRed + Me.txtRisiko.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtRisiko.ForeColor = System.Drawing.Color.Black + Me.txtRisiko.Location = New System.Drawing.Point(614, 450) + Me.txtRisiko.MaxLineLength = -1 + Me.txtRisiko.MaxLines_Warning = "" + Me.txtRisiko.MaxLines_Warning_Label = Nothing + Me.txtRisiko.Name = "txtRisiko" + Me.txtRisiko.ReadOnly = True + Me.txtRisiko.Size = New System.Drawing.Size(103, 20) + Me.txtRisiko.TabIndex = 200 + ' + 'Label20 + ' + Me.Label20.AutoSize = True + Me.Label20.Location = New System.Drawing.Point(563, 453) + Me.Label20.Name = "Label20" + Me.Label20.Size = New System.Drawing.Size(36, 13) + Me.Label20.TabIndex = 199 + Me.Label20.Text = "Risiko" + ' + 'txt3470Betrag + ' + Me.txt3470Betrag._DateTimeOnly = False + Me.txt3470Betrag._numbersOnly = False + Me.txt3470Betrag._numbersOnlyKommastellen = "" + Me.txt3470Betrag._numbersOnlyTrennzeichen = True + Me.txt3470Betrag._Prozent = False + Me.txt3470Betrag._ShortDateNew = False + Me.txt3470Betrag._ShortDateOnly = False + Me.txt3470Betrag._TimeOnly = False + Me.txt3470Betrag._TimeOnly_Seconds = False + Me.txt3470Betrag._value = "" + Me.txt3470Betrag._Waehrung = True + Me.txt3470Betrag._WaehrungZeichen = True + Me.txt3470Betrag.BackColor = System.Drawing.Color.LightGreen + Me.txt3470Betrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txt3470Betrag.ForeColor = System.Drawing.Color.Black + Me.txt3470Betrag.Location = New System.Drawing.Point(614, 429) + Me.txt3470Betrag.MaxLineLength = -1 + Me.txt3470Betrag.MaxLines_Warning = "" + Me.txt3470Betrag.MaxLines_Warning_Label = Nothing + Me.txt3470Betrag.Name = "txt3470Betrag" + Me.txt3470Betrag.ReadOnly = True + Me.txt3470Betrag.Size = New System.Drawing.Size(103, 20) + Me.txt3470Betrag.TabIndex = 198 + ' + 'Label21 + ' + Me.Label21.AutoSize = True + Me.Label21.Location = New System.Drawing.Point(563, 436) + Me.Label21.Name = "Label21" + Me.Label21.Size = New System.Drawing.Size(31, 13) + Me.Label21.TabIndex = 197 + Me.Label21.Text = "3470" + ' 'GroupBox5 ' Me.GroupBox5.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ @@ -514,12 +584,13 @@ Partial Class frmKundenblatt Me.lblAnsprechp.BackColor = System.Drawing.Color.White Me.lblAnsprechp.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblAnsprechp.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAnsprechp.Location = New System.Drawing.Point(5, 212) + Me.lblAnsprechp.Location = New System.Drawing.Point(1298, 187) Me.lblAnsprechp.Name = "lblAnsprechp" Me.lblAnsprechp.ReadOnly = True - Me.lblAnsprechp.Size = New System.Drawing.Size(431, 19) + Me.lblAnsprechp.Size = New System.Drawing.Size(196, 19) Me.lblAnsprechp.TabIndex = 196 Me.lblAnsprechp.Text = "Kontakt" + Me.lblAnsprechp.Visible = False ' 'txtEmailRE2 ' @@ -527,12 +598,13 @@ Partial Class frmKundenblatt 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.Location = New System.Drawing.Point(1333, 385) Me.txtEmailRE2.Name = "txtEmailRE2" Me.txtEmailRE2.ReadOnly = True - Me.txtEmailRE2.Size = New System.Drawing.Size(384, 19) + Me.txtEmailRE2.Size = New System.Drawing.Size(149, 19) Me.txtEmailRE2.TabIndex = 195 Me.txtEmailRE2.Text = "email-Rechnung" + Me.txtEmailRE2.Visible = False ' 'txtEmailRE ' @@ -540,12 +612,13 @@ Partial Class frmKundenblatt Me.txtEmailRE.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtEmailRE.Cursor = System.Windows.Forms.Cursors.Hand Me.txtEmailRE.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtEmailRE.Location = New System.Drawing.Point(38, 385) + Me.txtEmailRE.Location = New System.Drawing.Point(1331, 360) Me.txtEmailRE.Name = "txtEmailRE" Me.txtEmailRE.ReadOnly = True - Me.txtEmailRE.Size = New System.Drawing.Size(384, 19) + Me.txtEmailRE.Size = New System.Drawing.Size(149, 19) Me.txtEmailRE.TabIndex = 194 Me.txtEmailRE.Text = "email-Rechnung" + Me.txtEmailRE.Visible = False ' 'TextBox1 ' @@ -553,23 +626,25 @@ Partial Class frmKundenblatt Me.TextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None Me.TextBox1.Cursor = System.Windows.Forms.Cursors.Hand Me.TextBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.TextBox1.Location = New System.Drawing.Point(36, 360) + Me.TextBox1.Location = New System.Drawing.Point(1329, 335) Me.TextBox1.Name = "TextBox1" Me.TextBox1.ReadOnly = True - Me.TextBox1.Size = New System.Drawing.Size(384, 19) + Me.TextBox1.Size = New System.Drawing.Size(149, 19) Me.TextBox1.TabIndex = 193 Me.TextBox1.Text = "Rechnungen an:" + Me.TextBox1.Visible = False ' 'PictureBox8 ' Me.PictureBox8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None Me.PictureBox8.Image = Global.SDL.My.Resources.Resources.email - Me.PictureBox8.Location = New System.Drawing.Point(8, 360) + Me.PictureBox8.Location = New System.Drawing.Point(1301, 335) Me.PictureBox8.Name = "PictureBox8" Me.PictureBox8.Size = New System.Drawing.Size(22, 18) Me.PictureBox8.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom Me.PictureBox8.TabIndex = 192 Me.PictureBox8.TabStop = False + Me.PictureBox8.Visible = False ' 'FlatButton6 ' @@ -579,7 +654,7 @@ Partial Class frmKundenblatt Me.FlatButton6.FlatAppearance.BorderSize = 0 Me.FlatButton6.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.FlatButton6.ForeColor = System.Drawing.Color.Black - Me.FlatButton6.Location = New System.Drawing.Point(702, 410) + Me.FlatButton6.Location = New System.Drawing.Point(542, 437) Me.FlatButton6.Name = "FlatButton6" Me.FlatButton6.Size = New System.Drawing.Size(15, 12) Me.FlatButton6.TabIndex = 191 @@ -592,7 +667,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(430, 6) + Me.picLogo.Location = New System.Drawing.Point(509, 6) Me.picLogo.Name = "picLogo" Me.picLogo.Size = New System.Drawing.Size(145, 58) Me.picLogo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom @@ -617,7 +692,7 @@ Partial Class frmKundenblatt Me.lblBonitaet.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblBonitaet.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblBonitaet.ForeColor = System.Drawing.Color.Black - Me.lblBonitaet.Location = New System.Drawing.Point(642, 409) + Me.lblBonitaet.Location = New System.Drawing.Point(482, 436) Me.lblBonitaet.MaxLineLength = -1 Me.lblBonitaet.MaxLines_Warning = "" Me.lblBonitaet.MaxLines_Warning_Label = Nothing @@ -631,7 +706,7 @@ Partial Class frmKundenblatt ' Me.Label39.AutoSize = True Me.Label39.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label39.Location = New System.Drawing.Point(585, 409) + Me.Label39.Location = New System.Drawing.Point(425, 436) Me.Label39.Name = "Label39" Me.Label39.Size = New System.Drawing.Size(43, 13) Me.Label39.TabIndex = 188 @@ -645,7 +720,7 @@ Partial Class frmKundenblatt Me.btnBonitaetBearbeiten.FlatAppearance.BorderSize = 0 Me.btnBonitaetBearbeiten.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnBonitaetBearbeiten.ForeColor = System.Drawing.Color.Black - Me.btnBonitaetBearbeiten.Location = New System.Drawing.Point(562, 409) + Me.btnBonitaetBearbeiten.Location = New System.Drawing.Point(402, 436) Me.btnBonitaetBearbeiten.Name = "btnBonitaetBearbeiten" Me.btnBonitaetBearbeiten.Size = New System.Drawing.Size(15, 12) Me.btnBonitaetBearbeiten.TabIndex = 187 @@ -923,12 +998,13 @@ Partial Class frmKundenblatt Me.lblAdressenzusatz.BackColor = System.Drawing.Color.White Me.lblAdressenzusatz.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblAdressenzusatz.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAdressenzusatz.Location = New System.Drawing.Point(3, 126) + Me.lblAdressenzusatz.Location = New System.Drawing.Point(1296, 101) Me.lblAdressenzusatz.Name = "lblAdressenzusatz" Me.lblAdressenzusatz.ReadOnly = True - Me.lblAdressenzusatz.Size = New System.Drawing.Size(419, 19) + Me.lblAdressenzusatz.Size = New System.Drawing.Size(184, 19) Me.lblAdressenzusatz.TabIndex = 181 Me.lblAdressenzusatz.Text = "Zusatz" + Me.lblAdressenzusatz.Visible = False ' 'Label11 ' @@ -1018,12 +1094,13 @@ Partial Class frmKundenblatt Me.lblEmail2.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblEmail2.Cursor = System.Windows.Forms.Cursors.Hand Me.lblEmail2.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblEmail2.Location = New System.Drawing.Point(38, 338) + Me.lblEmail2.Location = New System.Drawing.Point(1331, 313) Me.lblEmail2.Name = "lblEmail2" Me.lblEmail2.ReadOnly = True - Me.lblEmail2.Size = New System.Drawing.Size(384, 19) + Me.lblEmail2.Size = New System.Drawing.Size(149, 19) Me.lblEmail2.TabIndex = 19 Me.lblEmail2.Text = "email2" + Me.lblEmail2.Visible = False ' 'lblEmail ' @@ -1031,142 +1108,154 @@ Partial Class frmKundenblatt Me.lblEmail.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblEmail.Cursor = System.Windows.Forms.Cursors.Hand Me.lblEmail.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblEmail.Location = New System.Drawing.Point(38, 315) + Me.lblEmail.Location = New System.Drawing.Point(1331, 290) Me.lblEmail.Name = "lblEmail" Me.lblEmail.ReadOnly = True - Me.lblEmail.Size = New System.Drawing.Size(384, 19) + Me.lblEmail.Size = New System.Drawing.Size(149, 19) Me.lblEmail.TabIndex = 14 Me.lblEmail.Text = "email" + Me.lblEmail.Visible = False ' 'lblMobil ' Me.lblMobil.BackColor = System.Drawing.Color.White Me.lblMobil.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblMobil.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblMobil.Location = New System.Drawing.Point(38, 284) + Me.lblMobil.Location = New System.Drawing.Point(1331, 259) Me.lblMobil.Name = "lblMobil" Me.lblMobil.ReadOnly = True - Me.lblMobil.Size = New System.Drawing.Size(384, 19) + Me.lblMobil.Size = New System.Drawing.Size(149, 19) Me.lblMobil.TabIndex = 11 Me.lblMobil.Text = "mobil" + Me.lblMobil.Visible = False ' 'lblFax ' Me.lblFax.BackColor = System.Drawing.Color.White Me.lblFax.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblFax.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblFax.Location = New System.Drawing.Point(38, 261) + Me.lblFax.Location = New System.Drawing.Point(1331, 236) Me.lblFax.Name = "lblFax" Me.lblFax.ReadOnly = True - Me.lblFax.Size = New System.Drawing.Size(384, 19) + Me.lblFax.Size = New System.Drawing.Size(149, 19) Me.lblFax.TabIndex = 10 Me.lblFax.Text = "fax" + Me.lblFax.Visible = False ' 'lblTel ' Me.lblTel.BackColor = System.Drawing.Color.White Me.lblTel.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblTel.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblTel.Location = New System.Drawing.Point(38, 237) + Me.lblTel.Location = New System.Drawing.Point(1331, 212) Me.lblTel.Name = "lblTel" Me.lblTel.ReadOnly = True - Me.lblTel.Size = New System.Drawing.Size(384, 19) + Me.lblTel.Size = New System.Drawing.Size(149, 19) Me.lblTel.TabIndex = 9 Me.lblTel.Text = "tel" + Me.lblTel.Visible = False ' 'lblUid ' Me.lblUid.BackColor = System.Drawing.Color.White Me.lblUid.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblUid.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblUid.Location = New System.Drawing.Point(5, 191) + Me.lblUid.Location = New System.Drawing.Point(1298, 166) Me.lblUid.Name = "lblUid" Me.lblUid.ReadOnly = True - Me.lblUid.Size = New System.Drawing.Size(419, 19) + Me.lblUid.Size = New System.Drawing.Size(184, 19) Me.lblUid.TabIndex = 8 Me.lblUid.Text = "Uid" + Me.lblUid.Visible = False ' 'lblPostfach ' Me.lblPostfach.BackColor = System.Drawing.Color.White Me.lblPostfach.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblPostfach.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblPostfach.Location = New System.Drawing.Point(3, 170) + Me.lblPostfach.Location = New System.Drawing.Point(1296, 145) Me.lblPostfach.Name = "lblPostfach" Me.lblPostfach.ReadOnly = True - Me.lblPostfach.Size = New System.Drawing.Size(419, 19) + Me.lblPostfach.Size = New System.Drawing.Size(184, 19) Me.lblPostfach.TabIndex = 7 Me.lblPostfach.Text = "Postfach" + Me.lblPostfach.Visible = False ' 'lblLandPlzOrt ' Me.lblLandPlzOrt.BackColor = System.Drawing.Color.White Me.lblLandPlzOrt.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblLandPlzOrt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblLandPlzOrt.Location = New System.Drawing.Point(3, 149) + Me.lblLandPlzOrt.Location = New System.Drawing.Point(1296, 124) Me.lblLandPlzOrt.Name = "lblLandPlzOrt" Me.lblLandPlzOrt.ReadOnly = True - Me.lblLandPlzOrt.Size = New System.Drawing.Size(419, 19) + Me.lblLandPlzOrt.Size = New System.Drawing.Size(184, 19) Me.lblLandPlzOrt.TabIndex = 6 Me.lblLandPlzOrt.Text = "Land - Plz Ort" + Me.lblLandPlzOrt.Visible = False ' 'lblStrasse ' Me.lblStrasse.BackColor = System.Drawing.Color.White Me.lblStrasse.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblStrasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblStrasse.Location = New System.Drawing.Point(3, 104) + Me.lblStrasse.Location = New System.Drawing.Point(1296, 79) Me.lblStrasse.Name = "lblStrasse" Me.lblStrasse.ReadOnly = True - Me.lblStrasse.Size = New System.Drawing.Size(419, 19) + Me.lblStrasse.Size = New System.Drawing.Size(184, 19) Me.lblStrasse.TabIndex = 5 Me.lblStrasse.Text = "Strasse" + Me.lblStrasse.Visible = False ' 'lblFirmenname2 ' Me.lblFirmenname2.BackColor = System.Drawing.Color.White Me.lblFirmenname2.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblFirmenname2.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblFirmenname2.Location = New System.Drawing.Point(3, 83) + Me.lblFirmenname2.Location = New System.Drawing.Point(1296, 58) Me.lblFirmenname2.Name = "lblFirmenname2" Me.lblFirmenname2.ReadOnly = True - Me.lblFirmenname2.Size = New System.Drawing.Size(419, 19) + Me.lblFirmenname2.Size = New System.Drawing.Size(184, 19) Me.lblFirmenname2.TabIndex = 4 Me.lblFirmenname2.Text = "Name2" + Me.lblFirmenname2.Visible = False ' 'lblFirmenname1 ' Me.lblFirmenname1.BackColor = System.Drawing.Color.White Me.lblFirmenname1.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblFirmenname1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblFirmenname1.Location = New System.Drawing.Point(3, 62) + Me.lblFirmenname1.Location = New System.Drawing.Point(1296, 37) Me.lblFirmenname1.Name = "lblFirmenname1" Me.lblFirmenname1.ReadOnly = True - Me.lblFirmenname1.Size = New System.Drawing.Size(419, 19) + Me.lblFirmenname1.Size = New System.Drawing.Size(184, 19) Me.lblFirmenname1.TabIndex = 3 Me.lblFirmenname1.Text = "Name1" + Me.lblFirmenname1.Visible = False ' 'PictureBox4 ' Me.PictureBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None Me.PictureBox4.Image = Global.SDL.My.Resources.Resources.email - Me.PictureBox4.Location = New System.Drawing.Point(6, 315) + Me.PictureBox4.Location = New System.Drawing.Point(1299, 290) Me.PictureBox4.Name = "PictureBox4" Me.PictureBox4.Size = New System.Drawing.Size(22, 18) Me.PictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom Me.PictureBox4.TabIndex = 157 Me.PictureBox4.TabStop = False + Me.PictureBox4.Visible = False ' 'PictureBox3 ' Me.PictureBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None Me.PictureBox3.Image = Global.SDL.My.Resources.Resources.handy - Me.PictureBox3.Location = New System.Drawing.Point(3, 285) + Me.PictureBox3.Location = New System.Drawing.Point(1296, 260) Me.PictureBox3.Name = "PictureBox3" Me.PictureBox3.Size = New System.Drawing.Size(25, 18) Me.PictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom Me.PictureBox3.TabIndex = 149 Me.PictureBox3.TabStop = False + Me.PictureBox3.Visible = False ' 'dgvSperrliste ' @@ -1201,7 +1290,7 @@ Partial Class frmKundenblatt ' Me.PictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None Me.PictureBox2.Image = Global.SDL.My.Resources.Resources.fax - Me.PictureBox2.Location = New System.Drawing.Point(3, 261) + Me.PictureBox2.Location = New System.Drawing.Point(1214, 254) Me.PictureBox2.Name = "PictureBox2" Me.PictureBox2.Size = New System.Drawing.Size(25, 18) Me.PictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom @@ -1212,7 +1301,7 @@ Partial Class frmKundenblatt ' Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None Me.PictureBox1.Image = Global.SDL.My.Resources.Resources.telefon - Me.PictureBox1.Location = New System.Drawing.Point(3, 237) + Me.PictureBox1.Location = New System.Drawing.Point(1214, 230) Me.PictureBox1.Name = "PictureBox1" Me.PictureBox1.Size = New System.Drawing.Size(25, 18) Me.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom @@ -3070,75 +3159,32 @@ Partial Class frmKundenblatt Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22) Me.tbiVERAGCard.Text = "VERAG Card" ' - 'txtRisiko + 'txtKundeninfo ' - Me.txtRisiko._DateTimeOnly = False - Me.txtRisiko._numbersOnly = False - Me.txtRisiko._numbersOnlyKommastellen = "" - Me.txtRisiko._numbersOnlyTrennzeichen = True - Me.txtRisiko._Prozent = False - Me.txtRisiko._ShortDateNew = False - Me.txtRisiko._ShortDateOnly = False - Me.txtRisiko._TimeOnly = False - Me.txtRisiko._TimeOnly_Seconds = False - Me.txtRisiko._value = "" - Me.txtRisiko._Waehrung = True - Me.txtRisiko._WaehrungZeichen = True - Me.txtRisiko.BackColor = System.Drawing.Color.IndianRed - Me.txtRisiko.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtRisiko.ForeColor = System.Drawing.Color.Black - Me.txtRisiko.Location = New System.Drawing.Point(614, 450) - Me.txtRisiko.MaxLineLength = -1 - Me.txtRisiko.MaxLines_Warning = "" - Me.txtRisiko.MaxLines_Warning_Label = Nothing - Me.txtRisiko.Name = "txtRisiko" - Me.txtRisiko.ReadOnly = True - Me.txtRisiko.Size = New System.Drawing.Size(103, 20) - Me.txtRisiko.TabIndex = 200 - ' - 'Label20 - ' - Me.Label20.AutoSize = True - Me.Label20.Location = New System.Drawing.Point(563, 453) - Me.Label20.Name = "Label20" - Me.Label20.Size = New System.Drawing.Size(36, 13) - Me.Label20.TabIndex = 199 - Me.Label20.Text = "Risiko" - ' - 'txt3470Betrag - ' - Me.txt3470Betrag._DateTimeOnly = False - Me.txt3470Betrag._numbersOnly = False - Me.txt3470Betrag._numbersOnlyKommastellen = "" - Me.txt3470Betrag._numbersOnlyTrennzeichen = True - Me.txt3470Betrag._Prozent = False - Me.txt3470Betrag._ShortDateNew = False - Me.txt3470Betrag._ShortDateOnly = False - Me.txt3470Betrag._TimeOnly = False - Me.txt3470Betrag._TimeOnly_Seconds = False - Me.txt3470Betrag._value = "" - Me.txt3470Betrag._Waehrung = True - Me.txt3470Betrag._WaehrungZeichen = True - Me.txt3470Betrag.BackColor = System.Drawing.Color.LightGreen - Me.txt3470Betrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txt3470Betrag.ForeColor = System.Drawing.Color.Black - Me.txt3470Betrag.Location = New System.Drawing.Point(614, 429) - Me.txt3470Betrag.MaxLineLength = -1 - Me.txt3470Betrag.MaxLines_Warning = "" - Me.txt3470Betrag.MaxLines_Warning_Label = Nothing - Me.txt3470Betrag.Name = "txt3470Betrag" - Me.txt3470Betrag.ReadOnly = True - Me.txt3470Betrag.Size = New System.Drawing.Size(103, 20) - Me.txt3470Betrag.TabIndex = 198 - ' - 'Label21 - ' - Me.Label21.AutoSize = True - Me.Label21.Location = New System.Drawing.Point(563, 436) - Me.Label21.Name = "Label21" - Me.Label21.Size = New System.Drawing.Size(31, 13) - Me.Label21.TabIndex = 197 - Me.Label21.Text = "3470" + Me.txtKundeninfo._DateTimeOnly = False + Me.txtKundeninfo._numbersOnly = False + Me.txtKundeninfo._numbersOnlyKommastellen = "" + Me.txtKundeninfo._numbersOnlyTrennzeichen = True + Me.txtKundeninfo._Prozent = False + Me.txtKundeninfo._ShortDateNew = False + Me.txtKundeninfo._ShortDateOnly = False + Me.txtKundeninfo._TimeOnly = False + Me.txtKundeninfo._TimeOnly_Seconds = False + Me.txtKundeninfo._value = "" + Me.txtKundeninfo._Waehrung = False + Me.txtKundeninfo._WaehrungZeichen = True + Me.txtKundeninfo.BackColor = System.Drawing.Color.White + Me.txtKundeninfo.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtKundeninfo.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtKundeninfo.ForeColor = System.Drawing.Color.Black + Me.txtKundeninfo.Location = New System.Drawing.Point(8, 65) + Me.txtKundeninfo.MaxLineLength = -1 + Me.txtKundeninfo.MaxLines_Warning = "" + Me.txtKundeninfo.MaxLines_Warning_Label = Nothing + Me.txtKundeninfo.Multiline = True + Me.txtKundeninfo.Name = "txtKundeninfo" + Me.txtKundeninfo.Size = New System.Drawing.Size(646, 364) + Me.txtKundeninfo.TabIndex = 202 ' 'UsrcntlKundeBearbeitenFull1 ' @@ -3198,20 +3244,6 @@ Partial Class frmKundenblatt Me.UsrCntlUSTV.Size = New System.Drawing.Size(1667, 964) Me.UsrCntlUSTV.TabIndex = 0 ' - 'Button8 - ' - Me.Button8.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Button8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button8.Location = New System.Drawing.Point(612, 325) - Me.Button8.Name = "Button8" - Me.Button8.Size = New System.Drawing.Size(62, 32) - Me.Button8.TabIndex = 201 - Me.Button8.Text = "Anschrift" - Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button8.UseVisualStyleBackColor = True - ' 'frmKundenblatt ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -3519,5 +3551,5 @@ Partial Class frmKundenblatt Friend WithEvents Label20 As Label Friend WithEvents txt3470Betrag As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label21 As Label - Friend WithEvents Button8 As Button + Friend WithEvents txtKundeninfo As VERAG_PROG_ALLGEMEIN.MyTextBox End Class diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index cad991bc..c104c4ac 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -806,7 +806,34 @@ Public Class frmKundenblatt 'Me.dataFirma.AcceptChanges() ' Me.dataFirma.Locale = System.Globalization.CultureInfo.InvariantCulture + + txtKundeninfo.ReadOnly = True + + txtKundeninfo.Text = "" + + + txtKundeninfo.AppendText(IIf(checkNullStr(ADRESSE.Name_1) <> "", checkNullStr(ADRESSE.Name_1) & vbNewLine, "")) + txtKundeninfo.AppendText(IIf(checkNullStr(ADRESSE.Name_2) <> "", checkNullStr(ADRESSE.Name_2) & vbNewLine, "")) + txtKundeninfo.AppendText(IIf(checkNullStr(ADRESSE.Straße) <> "", checkNullStr(ADRESSE.Straße) & vbNewLine, "")) + txtKundeninfo.AppendText(IIf(checkNullStr(KUNDE_ERW.kde_AdressZusatz) <> "", checkNullStr(KUNDE_ERW.kde_AdressZusatz) & vbNewLine, "")) + txtKundeninfo.AppendText(IIf(checkNullStr(ADRESSE.LandKz) <> "", checkNullStr(ADRESSE.LandKz) & " - " & checkNullStr(ADRESSE.PLZ) & " - " & checkNullStr(ADRESSE.Ort) & vbNewLine, "")) + txtKundeninfo.AppendText(IIf(checkNullStr(ADRESSE.PLZPF) <> "", checkNullStr(ADRESSE.PLZPF) & " - " & checkNullStr(ADRESSE.Postfach) & vbNewLine, "")) + + txtKundeninfo.AppendText(vbNewLine) + + txtKundeninfo.AppendText(IIf(checkNullStr(ADRESSE.Ansprechpartner) <> "", IIf(checkNullStr(ADRESSE.Anrede) <> "", ADRESSE.Anrede & " ", "") & ADRESSE.Ansprechpartner & vbNewLine, "")) + + txtKundeninfo.AppendText(vbNewLine) + + txtKundeninfo.AppendText(IIf(checkNullStr(ADRESSE.Telefon) <> "", "Tel.: " & ADRESSE.Telefon & vbNewLine, "")) + txtKundeninfo.AppendText(IIf(checkNullStr(ADRESSE.Telefax) <> "", "Fax: " & ADRESSE.Telefax & vbNewLine, "")) + txtKundeninfo.AppendText(IIf(checkNullStr(ADRESSE.Mobiltelefon) <> "", "Mobil: " & checkNullStr(ADRESSE.Mobiltelefon) & vbNewLine, "")) + txtKundeninfo.AppendText(IIf(checkNullStr(ADRESSE.E_Mail) <> "", "E-Mail: " & ADRESSE.E_Mail & IIf(checkNullStr(ADRESSE.E_Mail2) <> "", " " & ADRESSE.E_Mail2, "") & vbNewLine, "")) + lblKurzname.Text = checkNullStr(ADRESSE.Ordnungsbegriff) + + + '----------- EV DEAKTIVIEREN------------------------ lblFirmenname1.Text = checkNullStr(ADRESSE.Name_1) lblFirmenname2.Text = checkNullStr(ADRESSE.Name_2) lblStrasse.Text = checkNullStr(ADRESSE.Straße) @@ -817,21 +844,27 @@ Public Class frmKundenblatt lblAnsprechp.Text = IIf(checkNullStr(ADRESSE.Anrede) <> "", ADRESSE.Anrede & " ", "") lblAnsprechp.Text &= IIf(checkNullStr(ADRESSE.Ansprechpartner) <> "", ADRESSE.Ansprechpartner, "") - lblTel.Text = checkNullStr(ADRESSE.Telefon) lblFax.Text = checkNullStr(ADRESSE.Telefax) lblMobil.Text = checkNullStr(ADRESSE.Mobiltelefon) lblEmail.Text = checkNullStr(ADRESSE.E_Mail) lblEmail2.Text = checkNullStr(ADRESSE.E_Mail2) + + Dim EmailRechnungen As String = "Rechnungen an: " txtEmailRE.Text = "-" txtEmailRE2.Text = "" If KUNDE_K_RE.hasEntry Then 'Rechnung an - txtEmailRE.Text = KUNDE_K_RE.kkd_Email - txtEmailRE2.Text &= KUNDE_K_RE.kkd_EmailCC + EmailRechnungen &= KUNDE_K_RE.kkd_Email + EmailRechnungen &= KUNDE_K_RE.kkd_EmailCC + Else + EmailRechnungen &= " - " End If + txtKundeninfo.AppendText(vbNewLine) + txtKundeninfo.AppendText(IIf(EmailRechnungen <> "", EmailRechnungen & vbNewLine, "")) + Dim ansprechpartnerText As String = "" If KUNDE_K_GF.hasEntry Then If lblAnsprechp.Text <> "" Then lblAnsprechp.Text &= " " @@ -841,23 +874,36 @@ Public Class frmKundenblatt lblAnsprechp.Text &= IIf(checkNullStr(KUNDE_K_GF.kkd_AnsprechpartnerNachname) <> "", KUNDE_K_GF.kkd_AnsprechpartnerNachname.ToString.ToUpper, "") lblAnsprechp.Text &= ")" + ansprechpartnerText = lblAnsprechp.Text + txtKundeninfo.AppendText(IIf(ansprechpartnerText <> "", ansprechpartnerText & vbNewLine, "")) End If - - lblUid.Text = "" + Dim UID As String = "" If checkNullStr(ADRESSE.UstIdGeprüft) <> "" Then - lblUid.Text = "UId: " & checkNullStr(ADRESSE.UstIdKz) & checkNullStr(ADRESSE.UstIdNr) + lblUid.Text = "UID: " & checkNullStr(ADRESSE.UstIdKz) & checkNullStr(ADRESSE.UstIdNr) + UID = "UID: " & checkNullStr(ADRESSE.UstIdKz) & checkNullStr(ADRESSE.UstIdNr) If checkNullStr(ADRESSE.UstIdGeprüft) <> "" Then lblUid.Text &= " , geprüft am: " & checkNullStr(ADRESSE.UstIdGeprüft) + UID &= " , geprüft am: " & checkNullStr(ADRESSE.UstIdGeprüft) + txtKundeninfo.AppendText(UID & vbNewLine) End If End If + Dim SteuerNr As String = "" If checkNullStr(ADRESSE.Steuernummer) <> "" Then If lblUid.Text <> "" Then lblUid.Text &= " / " lblUid.Text &= "St-Nr.: " & checkNullStr(ADRESSE.Steuernummer) + SteuerNr = "Steuer-Nr.: " & checkNullStr(ADRESSE.Steuernummer) + txtKundeninfo.AppendText(SteuerNr & vbNewLine) End If + If checkNullStr(KUNDE_ERW.kde_betreuer) <> "" Then + txtKundeninfo.AppendText(vbNewLine) + txtKundeninfo.AppendText("Betreuer: " & KUNDE_ERW.kde_betreuer & vbNewLine) + End If + + End If Catch ex As Exception @@ -2798,21 +2844,5 @@ Public Class frmKundenblatt End Sub - Private Sub lblEmail_TextChanged(sender As Object, e As MouseEventArgs) Handles lblEmail2.MouseUp, lblEmail.MouseUp - - End Sub - - Private Sub Button8_Click(sender As Object, e As EventArgs) Handles Button8.Click - - Dim allText As String = "" - - For Each ctrl As Control In tbAllgemein.Controls - If TypeOf ctrl Is TextBox AndAlso ctrl.Name.Contains("lbl") Then - allText &= DirectCast(ctrl, TextBox).Text & Environment.NewLine - End If - Next - If allText <> "" Then Clipboard.SetText(allText) - - End Sub End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index 1ce5d686..13a791d5 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -64,7 +64,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten() Me.tbcntrAbf = New System.Windows.Forms.TabControl() Me.TabPage4 = New System.Windows.Forms.TabPage() - Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel() Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung() Me.rtbLKWFreigabeSenden = New System.Windows.Forms.RichTextBox() Me.Label18 = New System.Windows.Forms.Label() @@ -425,6 +424,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboAuswahl = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.cbxBetreuer = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label116 = New System.Windows.Forms.Label() Me.tbcntrDetails.SuspendLayout() Me.tbAbfertigung.SuspendLayout() Me.tbcntrAbf.SuspendLayout() @@ -641,7 +642,6 @@ Partial Class usrcntlKundeBearbeitenFull ' 'TabPage4 ' - Me.TabPage4.Controls.Add(Me.FlowLayoutPanel1) Me.TabPage4.Controls.Add(Me.UsrCntlKundenAvisoMailBenachrichtigung1) Me.TabPage4.Controls.Add(Me.rtbLKWFreigabeSenden) Me.TabPage4.Controls.Add(Me.Label18) @@ -653,13 +653,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.TabPage4.Text = " Aviso / E-Mail Benachrichtigung" Me.TabPage4.UseVisualStyleBackColor = True ' - 'FlowLayoutPanel1 - ' - Me.FlowLayoutPanel1.Location = New System.Drawing.Point(249, 94) - Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1" - Me.FlowLayoutPanel1.Size = New System.Drawing.Size(200, 100) - Me.FlowLayoutPanel1.TabIndex = 7 - ' 'UsrCntlKundenAvisoMailBenachrichtigung1 ' Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True @@ -4730,6 +4723,8 @@ Partial Class usrcntlKundeBearbeitenFull ' 'GroupBox3 ' + Me.GroupBox3.Controls.Add(Me.Label116) + Me.GroupBox3.Controls.Add(Me.cbxBetreuer) Me.GroupBox3.Controls.Add(Me.cbxkeineMWSt) Me.GroupBox3.Controls.Add(Me.txtGruendungsDatum) Me.GroupBox3.Controls.Add(Me.Label33) @@ -5794,6 +5789,31 @@ Partial Class usrcntlKundeBearbeitenFull Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' + 'cbxBetreuer + ' + Me.cbxBetreuer._allowedValuesFreiText = Nothing + Me.cbxBetreuer._allowFreiText = False + Me.cbxBetreuer._value = "" + Me.cbxBetreuer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cbxBetreuer.DropDownWidth = 150 + Me.cbxBetreuer.FlatStyle = System.Windows.Forms.FlatStyle.System + Me.cbxBetreuer.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxBetreuer.FormattingEnabled = True + Me.cbxBetreuer.Location = New System.Drawing.Point(110, 182) + Me.cbxBetreuer.Name = "cbxBetreuer" + Me.cbxBetreuer.Size = New System.Drawing.Size(120, 21) + Me.cbxBetreuer.TabIndex = 137 + ' + 'Label116 + ' + Me.Label116.AutoSize = True + Me.Label116.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label116.Location = New System.Drawing.Point(11, 185) + Me.Label116.Name = "Label116" + Me.Label116.Size = New System.Drawing.Size(50, 13) + Me.Label116.TabIndex = 138 + Me.Label116.Text = "Betreuer:" + ' 'usrcntlKundeBearbeitenFull ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -6189,7 +6209,6 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents Button13 As Button Friend WithEvents cbxVerzolltBeiExport As CheckBox Friend WithEvents cboFremdspeditionExport As System.Windows.Forms.ComboBox - Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel Friend WithEvents Panel1 As Panel Friend WithEvents btnDatevExport As Button Friend WithEvents Label98 As Label @@ -6276,4 +6295,6 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents PictureBox7 As PictureBox Friend WithEvents lblIDS_Rabatte As Label Friend WithEvents txtSonst_weitereKdNrWOELFL As TextBox + Friend WithEvents Label116 As Label + Friend WithEvents cbxBetreuer As VERAG_PROG_ALLGEMEIN.MyComboBox End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index 6e881b92..f8e9e0ba 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -99,12 +99,14 @@ Public Class usrcntlKundeBearbeitenFull cbxErstattungsart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("2.Überweisung", 2)) cbxErstattungsart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("3.Bankverbindung", 3)) cbxErstattungsart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("4.Auf Sicherheit", 4)) + End If bntGOBOXUmstellung.Enabled = isVerag360 btnKKhinzufuegen.Enabled = isVerag360 Button9.Enabled = isVerag360 cbxkeineMWSt.Visible = isVerag360 + cbxBetreuer.Visible = isVerag360 cbxVorauszahlung.Visible = isVerag360 cbxAbf_Vorkasse.Visible = Not isVerag360 @@ -824,6 +826,8 @@ Public Class usrcntlKundeBearbeitenFull ADRESSE.MSEExportCSV = cbxSonst_CsvMSE.Checked ADRESSE.UTAExportCSV = cbxSonst_CsvUTA.Checked + KUNDE_ERW.kde_betreuer = isLeerNothing(cbxBetreuer.Text) + KUNDE.Steuerschlüssel = cboAbf_Steuerschluessel._value @@ -956,7 +960,6 @@ Public Class usrcntlKundeBearbeitenFull cboFiliale.changeItem("4803") End Select - cboAuswahl.Items.Clear() cboAuswahl.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AKTIV", "A")) cboAuswahl.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("INAKTIV", "I")) @@ -979,6 +982,11 @@ Public Class usrcntlKundeBearbeitenFull cboAbf_Sammelrechnung.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("6 - Maut/Diesel", "6")) cboAbf_Sammelrechnung.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("7 - LKW", "7")) + cbxBetreuer.Items.Clear() + cbxBetreuer.fillWithSQL("select mit_id, mit_nname FROM [ADMIN].[dbo].[tblMitarbeiter] where tblMitarbeiter.mit_Funktion = 'VK' and mit_gekuendigt = 0 and mit_abteilung = 'MDM'", False, "ADMIN", True) + + + End Sub Private Sub cboProvisionStaffelArt_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboProvisionStaffelArt.SelectedIndexChanged diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb index 40815b9d..a1164371 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb @@ -100,6 +100,7 @@ Public Class cKundenErweitert Property kde_Provisionsverguetung_ProzentDL As Object = Nothing Property kde_Provisionsverguetung_GSAnKdNr As Object = Nothing Property kde_zinssatz As Object = Nothing + Property kde_betreuer As Object = Nothing @@ -207,6 +208,7 @@ Public Class cKundenErweitert list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Provisionsverguetung_GSAnKdNr", kde_Provisionsverguetung_GSAnKdNr)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CSinsolventAm", kde_CSinsolventAm)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_zinssatz", kde_zinssatz)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_betreuer", kde_betreuer)) Return list End Function diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb index 6058c1e0..73300dd3 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb @@ -102,6 +102,7 @@ Public Class cMitarbeiter Property mit_Notfall_Handy As Object = Nothing Property mit_Notfall_Mail As Object = Nothing Property mit_SchalterID As Object = Nothing + Property mit_Funktion As Object = Nothing @@ -221,6 +222,7 @@ Public Class cMitarbeiter list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_Notfall_Handy", mit_Notfall_Handy)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_Notfall_Mail", mit_Notfall_Mail)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_SchalterID", mit_SchalterID)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_Funktion", mit_Funktion)) @@ -431,6 +433,7 @@ Public Class cMitarbeiter If Not dr.Item("mit_Notfall_Name") Is DBNull.Value Then Me.mit_Notfall_Name = dr.Item("mit_Notfall_Name") If Not dr.Item("mit_Notfall_Mail") Is DBNull.Value Then Me.mit_Notfall_Mail = dr.Item("mit_Notfall_Mail") If Not dr.Item("mit_SchalterID") Is DBNull.Value Then Me.mit_SchalterID = dr.Item("mit_SchalterID") + If Not dr.Item("mit_Funktion") Is DBNull.Value Then Me.mit_Funktion = dr.Item("mit_Funktion") Catch ex As Exception