diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index d0382294..33b164d6 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -1437,6 +1437,11 @@ Public Class cFakturierung rpt.lblRgNr.Text = If(Rechnung.RechnungsNr > 0, addYeartoRgNr(firma.Firma_ID, Rechnung.Buchungsjahr) & Rechnung.RechnungsNr, "Vorschau") rpt.lblRgDatum.Text = If(Rechnung.RechnungsDatum IsNot Nothing, CDate(Rechnung.RechnungsDatum).ToShortDateString, "VORSCHAU") + If Rechnung.Rechnungsart = "PROFORMA" Then + rpt.lblRgNr.Text = "PROFORMA" + rpt.lblRgDatum.Text = If(Rechnung.RechnungsDatum IsNot Nothing, CDate(Rechnung.RechnungsDatum).ToShortDateString, Now.ToShortDateString) + End If + 'rpt.lblKundenAuftragsnummer.Text = If(RECHNUNG.KdAuftragsNr, "") 'If rpt.lblKundenAuftragsnummer.Text = String.Empty Then rpt.lblKundenAuftragsnummerUeberschrift.Visible = False @@ -1748,7 +1753,7 @@ Public Class cFakturierung 'End If - If vorschau Then + If vorschau Or Rechnung.Rechnungsart = "PROFORMA" Then rpt.txtVermerk.Text = rpt.txtVermerk.Text.Replace("", Now.AddDays(10).ToShortDateString) @@ -3905,7 +3910,22 @@ Public Class cFakturierung End If + '------------------------------------------------------------------------------------------------------------------------------------- + '------PROFORMA----------------------------------------------------------------------------------------------------------------------- + '------------------------------------------------------------------------------------------------------------------------------------- + If RECHNUNG.Rechnungsart = "PROFORMA" Then + ' Rechnungsdaten im RK eintragen. + RECHNUNG.[Status] = 1 + RECHNUNG.RechnungsNr = Nothing + RECHNUNG.RechnungsDatum = Now + RECHNUNG.Buchungsjahr = cRKSV.getGJ(RechnungsDatum, RECHNUNG.Firma_ID) ' If(CDate(RECHNUNG.[RechnungsDatum]).Month = 1, CDate(RECHNUNG.[RechnungsDatum]).Year - 1, CDate(RECHNUNG.[RechnungsDatum]).Year) + Return RECHNUNG.SAVE + End If + '------------------------------------------------------------------------------------------------------------------------------------- + + If RECHNUNG.Sammelrechnung = 0 Then + ' Rechnungsdaten im RK eintragen. RECHNUNG.[Status] = 1 diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb index 93f21e5d..89fc6214 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb @@ -23,27 +23,27 @@ Partial Class usrCntlFaktAbrechnung Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle37 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle38 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle39 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle40 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle41 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle42 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlFaktAbrechnung)) Me.Label9 = New System.Windows.Forms.Label() Me.Label4 = New System.Windows.Forms.Label() @@ -924,36 +924,36 @@ Partial Class usrCntlFaktAbrechnung Me.dgvAnhaenge.AllowUserToResizeColumns = False Me.dgvAnhaenge.AllowUserToResizeRows = False Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvAnhaenge.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22 + 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.dgvAnhaenge.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.optAnhSel, Me.DataGridViewTextBoxColumn2, Me.clmnBezeichnung, Me.clmnDsId, Me.clmnAnhId}) - DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvAnhaenge.DefaultCellStyle = DataGridViewCellStyle25 + DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window + 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.ControlText + DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvAnhaenge.DefaultCellStyle = DataGridViewCellStyle4 Me.dgvAnhaenge.Location = New System.Drawing.Point(493, 911) Me.dgvAnhaenge.MultiSelect = False Me.dgvAnhaenge.Name = "dgvAnhaenge" Me.dgvAnhaenge.ReadOnly = True - DataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvAnhaenge.RowHeadersDefaultCellStyle = DataGridViewCellStyle26 + DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvAnhaenge.RowHeadersDefaultCellStyle = DataGridViewCellStyle5 Me.dgvAnhaenge.RowHeadersVisible = False Me.dgvAnhaenge.RowHeadersWidth = 62 Me.dgvAnhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect @@ -975,10 +975,10 @@ Partial Class usrCntlFaktAbrechnung ' 'DataGridViewTextBoxColumn2 ' - DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle23.Format = "N0" - DataGridViewCellStyle23.NullValue = Nothing - Me.DataGridViewTextBoxColumn2.DefaultCellStyle = DataGridViewCellStyle23 + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle2.Format = "N0" + DataGridViewCellStyle2.NullValue = Nothing + Me.DataGridViewTextBoxColumn2.DefaultCellStyle = DataGridViewCellStyle2 Me.DataGridViewTextBoxColumn2.HeaderText = "Art" Me.DataGridViewTextBoxColumn2.MinimumWidth = 8 Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" @@ -988,9 +988,9 @@ Partial Class usrCntlFaktAbrechnung 'clmnBezeichnung ' Me.clmnBezeichnung.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle24.Format = "c2" - Me.clmnBezeichnung.DefaultCellStyle = DataGridViewCellStyle24 + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.Format = "c2" + Me.clmnBezeichnung.DefaultCellStyle = DataGridViewCellStyle3 Me.clmnBezeichnung.FillWeight = 121.2598! Me.clmnBezeichnung.HeaderText = "Bezeichnung" Me.clmnBezeichnung.MinimumWidth = 8 @@ -2318,7 +2318,7 @@ Partial Class usrCntlFaktAbrechnung Me.txtKdAuftragsNr.BackColor = System.Drawing.Color.Yellow Me.txtKdAuftragsNr.ForeColor = System.Drawing.Color.Black Me.txtKdAuftragsNr.Location = New System.Drawing.Point(101, 123) - Me.txtKdAuftragsNr.MaxLength = 46 + Me.txtKdAuftragsNr.MaxLength = 35 Me.txtKdAuftragsNr.MaxLineLength = -1 Me.txtKdAuftragsNr.MaxLines_Warning = "" Me.txtKdAuftragsNr.MaxLines_Warning_Label = Nothing @@ -2995,35 +2995,35 @@ Partial Class usrCntlFaktAbrechnung Me.dgvRechnungenPositionen.AllowUserToResizeColumns = False Me.dgvRechnungenPositionen.AllowUserToResizeRows = False Me.dgvRechnungenPositionen.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvRechnungenPositionen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle27 + DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control + 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.WindowText + DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvRechnungenPositionen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6 Me.dgvRechnungenPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvRechnungenPositionen.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.Leistung, Me.Anzahl, Me.Preis, Me.SteuerpflichtigerBetrag, Me.SteuerfreierBetrag, Me.Aufschubkonto}) - DataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle32.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvRechnungenPositionen.DefaultCellStyle = DataGridViewCellStyle32 + DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvRechnungenPositionen.DefaultCellStyle = DataGridViewCellStyle11 Me.dgvRechnungenPositionen.Location = New System.Drawing.Point(10, 258) Me.dgvRechnungenPositionen.Name = "dgvRechnungenPositionen" Me.dgvRechnungenPositionen.ReadOnly = True - DataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle33.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvRechnungenPositionen.RowHeadersDefaultCellStyle = DataGridViewCellStyle33 + DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvRechnungenPositionen.RowHeadersDefaultCellStyle = DataGridViewCellStyle12 Me.dgvRechnungenPositionen.RowHeadersVisible = False Me.dgvRechnungenPositionen.RowHeadersWidth = 62 Me.dgvRechnungenPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect @@ -3041,10 +3041,10 @@ Partial Class usrCntlFaktAbrechnung ' 'Anzahl ' - DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle28.Format = "N0" - DataGridViewCellStyle28.NullValue = Nothing - Me.Anzahl.DefaultCellStyle = DataGridViewCellStyle28 + DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle7.Format = "N0" + DataGridViewCellStyle7.NullValue = Nothing + Me.Anzahl.DefaultCellStyle = DataGridViewCellStyle7 Me.Anzahl.HeaderText = "Anzahl" Me.Anzahl.MinimumWidth = 8 Me.Anzahl.Name = "Anzahl" @@ -3053,9 +3053,9 @@ Partial Class usrCntlFaktAbrechnung ' 'Preis ' - DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle29.Format = "c2" - Me.Preis.DefaultCellStyle = DataGridViewCellStyle29 + DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle8.Format = "c2" + Me.Preis.DefaultCellStyle = DataGridViewCellStyle8 Me.Preis.HeaderText = "Preis" Me.Preis.MinimumWidth = 8 Me.Preis.Name = "Preis" @@ -3064,9 +3064,9 @@ Partial Class usrCntlFaktAbrechnung ' 'SteuerpflichtigerBetrag ' - DataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle30.Format = "c2" - Me.SteuerpflichtigerBetrag.DefaultCellStyle = DataGridViewCellStyle30 + DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle9.Format = "c2" + Me.SteuerpflichtigerBetrag.DefaultCellStyle = DataGridViewCellStyle9 Me.SteuerpflichtigerBetrag.HeaderText = "Steuerpfl." Me.SteuerpflichtigerBetrag.MinimumWidth = 8 Me.SteuerpflichtigerBetrag.Name = "SteuerpflichtigerBetrag" @@ -3075,10 +3075,10 @@ Partial Class usrCntlFaktAbrechnung ' 'SteuerfreierBetrag ' - DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle31.Format = "C2" - DataGridViewCellStyle31.NullValue = Nothing - Me.SteuerfreierBetrag.DefaultCellStyle = DataGridViewCellStyle31 + DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle10.Format = "C2" + DataGridViewCellStyle10.NullValue = Nothing + Me.SteuerfreierBetrag.DefaultCellStyle = DataGridViewCellStyle10 Me.SteuerfreierBetrag.HeaderText = "Steuerfrei" Me.SteuerfreierBetrag.MinimumWidth = 8 Me.SteuerfreierBetrag.Name = "SteuerfreierBetrag" @@ -3101,41 +3101,41 @@ Partial Class usrCntlFaktAbrechnung Me.dgvOffertenSperrliste.AllowUserToResizeRows = False Me.dgvOffertenSperrliste.BackgroundColor = System.Drawing.Color.White Me.dgvOffertenSperrliste.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D - DataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvOffertenSperrliste.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle34 + DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvOffertenSperrliste.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle13 Me.dgvOffertenSperrliste.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvOffertenSperrliste.DefaultCellStyle = DataGridViewCellStyle35 + DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvOffertenSperrliste.DefaultCellStyle = DataGridViewCellStyle14 Me.dgvOffertenSperrliste.Location = New System.Drawing.Point(11, 29) Me.dgvOffertenSperrliste.MultiSelect = False Me.dgvOffertenSperrliste.Name = "dgvOffertenSperrliste" Me.dgvOffertenSperrliste.ReadOnly = True - DataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle36.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvOffertenSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle36 + DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvOffertenSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle15 Me.dgvOffertenSperrliste.RowHeadersVisible = False Me.dgvOffertenSperrliste.RowHeadersWidth = 62 - DataGridViewCellStyle37.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle37.SelectionBackColor = System.Drawing.Color.PapayaWhip - DataGridViewCellStyle37.SelectionForeColor = System.Drawing.Color.Black - Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle37 + DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle16.SelectionBackColor = System.Drawing.Color.PapayaWhip + DataGridViewCellStyle16.SelectionForeColor = System.Drawing.Color.Black + Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle16 Me.dgvOffertenSperrliste.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvOffertenSperrliste.Size = New System.Drawing.Size(204, 201) Me.dgvOffertenSperrliste.TabIndex = 2 @@ -3148,44 +3148,44 @@ Partial Class usrCntlFaktAbrechnung Me.dgvOfferteDetailsUebersicht.AllowUserToDeleteRows = False Me.dgvOfferteDetailsUebersicht.AllowUserToOrderColumns = True Me.dgvOfferteDetailsUebersicht.AllowUserToResizeRows = False - DataGridViewCellStyle38.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle38 + DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17 Me.dgvOfferteDetailsUebersicht.BackgroundColor = System.Drawing.Color.White Me.dgvOfferteDetailsUebersicht.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D - DataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle39.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle39.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle39.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle39.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle39.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvOfferteDetailsUebersicht.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle39 + DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvOfferteDetailsUebersicht.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle18 Me.dgvOfferteDetailsUebersicht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle40.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle40.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle40.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle40.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle40.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvOfferteDetailsUebersicht.DefaultCellStyle = DataGridViewCellStyle40 + DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvOfferteDetailsUebersicht.DefaultCellStyle = DataGridViewCellStyle19 Me.dgvOfferteDetailsUebersicht.Location = New System.Drawing.Point(220, 29) Me.dgvOfferteDetailsUebersicht.MultiSelect = False Me.dgvOfferteDetailsUebersicht.Name = "dgvOfferteDetailsUebersicht" - DataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle41.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvOfferteDetailsUebersicht.RowHeadersDefaultCellStyle = DataGridViewCellStyle41 + DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvOfferteDetailsUebersicht.RowHeadersDefaultCellStyle = DataGridViewCellStyle20 Me.dgvOfferteDetailsUebersicht.RowHeadersVisible = False Me.dgvOfferteDetailsUebersicht.RowHeadersWidth = 62 - DataGridViewCellStyle42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle42.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer)) - DataGridViewCellStyle42.SelectionForeColor = System.Drawing.Color.Black - Me.dgvOfferteDetailsUebersicht.RowsDefaultCellStyle = DataGridViewCellStyle42 + DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle21.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer)) + DataGridViewCellStyle21.SelectionForeColor = System.Drawing.Color.Black + Me.dgvOfferteDetailsUebersicht.RowsDefaultCellStyle = DataGridViewCellStyle21 Me.dgvOfferteDetailsUebersicht.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvOfferteDetailsUebersicht.Size = New System.Drawing.Size(601, 201) Me.dgvOfferteDetailsUebersicht.TabIndex = 3 diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index 0268e383..e157878e 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -1835,11 +1835,13 @@ Public Class usrCntlFaktAbrechnung Else cboRgArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Standard", "RG")) cboRgArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Unvollständig", "RU")) + cboRgArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("PROFORMA", "PROFORMA")) End If Else cboRgArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("RG-Kopf", "RK")) cboRgArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Standard", "RG")) cboRgArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Unvollständig", "RU")) + cboRgArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("PROFORMA", "PROFORMA")) End If cboRgArt.SelectedIndex = 0 @@ -2090,7 +2092,7 @@ Public Class usrCntlFaktAbrechnung RECHNUNG.Anlage_4 = "" - RECHNUNG.Anlage_5 = "" + RECHNUNG.Anlage_5 = "" Case Else @@ -3987,6 +3989,8 @@ Nächste_Textzeile_lesen: ' RECHNUNG.DruckDatumZeit Private Sub Button9_Click(sender As Object, e As EventArgs) Handles Button9.Click If Not checkUIDNR() Then Exit Sub + getValues() + If RECHNUNG.Rechnungsart = "PROFORMA" And RECHNUNG.Sammelrechnung <> "0" Then MsgBox("Proforma-Rechnung nur bei Einzelrechnung möglich!") : Exit Sub If RECHNUNG.Sammelrechnung <> "0" Then MsgBox("Nur bei Einzelrechnung möglich!") : Exit Sub If RECHNUNG.Status <> 0 OrElse vbYes = MsgBox("Möchten Sie das PDF erstellen?" & vbNewLine & "Es wird eine Rechnungsnummer vergeben, die Rechnung gilt somit als gedruckt und kann nicht mehr bearbeitet werden.", vbYesNoCancel) Then If RECHNUNG.Status <> 0 OrElse saveMe() Then @@ -4000,6 +4004,7 @@ Nächste_Textzeile_lesen: End Sub Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click + getValues() If RECHNUNG.Sammelrechnung <> "0" Then MsgBox("Nur bei Einzelrechnung möglich!") : Exit Sub If RECHNUNG.Status <> 0 OrElse vbYes = MsgBox("Möchten Sie die Rechnung drucken?" & vbNewLine & "Es wird eine Rechnungsnummer vergeben, die Rechnung kann nicht mehr bearbeitet werden.", vbYesNoCancel) Then If RECHNUNG.Status <> 0 OrElse saveMe() Then @@ -4047,6 +4052,7 @@ Nächste_Textzeile_lesen: Private Sub Button8_Click(sender As Object, e As EventArgs) Handles Button8.Click, Button16.Click If Not checkUIDNR() Then Exit Sub + getValues() If RECHNUNG.Sammelrechnung <> "0" Then MsgBox("Nur bei Einzelrechnung möglich!") : Exit Sub If RECHNUNG.Status <> 0 OrElse saveMe() Then ' Anhänge sichern, falls geändert diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index 7778ac86..eed51fa6 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -30,8 +30,8 @@ Public Class frmBU_Mahnlauf 'Dim sqlStr = "SELECT i_personenkonto Konto,KTO.c_name, KTO.c_landid Land,KTO.c_plz + ' ' + KTO.c_ort Ort,isnull(KTO.c_email,'') Email, count(*) Anzahl, sum(eur_bruttobetrag+eur_zahlung) Ausstand ,min(op.d_netto) Faelligkeit,max(si_mahnstufe) Mahnstufe, cast(MAX(d_mahnung)as date) Mahndatum Dim sqlStr = "SELECT i_personenkonto Konto,KTO.c_name, KTO.c_landid Land,KTO.c_plz + ' ' + KTO.c_ort Ort,/*isnull(KTO.c_email,'') Email, */ " & - "isnull(( SELECT TOP 1 [kkd_Email] FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[tblKundenKontakt] where kkd_kkaId=10 and kkd_KundenNr=i_personenkonto ) ,'') Email," & - " isnull(( SELECT TOP 1 Vorkasse FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].Kunden where KundenNr=i_personenkonto ) ,'') VK,KTO.c_zahlziel as Zahlungsziel, " & + "isnull(( SELECT TOP 1 [kkd_Email] FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".[VERAG].[dbo].[tblKundenKontakt] where kkd_kkaId=10 and kkd_KundenNr=i_personenkonto ) ,'') Email," & + " isnull(( SELECT TOP 1 Vorkasse FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".[VERAG].[dbo].Kunden where KundenNr=i_personenkonto ) ,'') VK,KTO.c_zahlziel as Zahlungsziel, " & "count(*) Anzahl, sum(eur_bruttobetrag+eur_zahlung) Ausstand ,min(op.d_netto) Faelligkeit,max(si_mahnstufe) Mahnstufe, cast(MAX(d_mahnung)as date) Mahndatum" & If(cbxNurFaellig.Checked, "", ",SUM(CASE WHEN op.d_netto(1) ", "") & " " & If(KdNr > 0, " AND i_personenkonto ='" & KdNr & "'", "") & " diff --git a/SDL/buchhaltung/usrCntlBH.vb b/SDL/buchhaltung/usrCntlBH.vb index 9e01afb2..70407466 100644 --- a/SDL/buchhaltung/usrCntlBH.vb +++ b/SDL/buchhaltung/usrCntlBH.vb @@ -870,8 +870,8 @@ Public Class usrCntlBH FROM op_debitor INNER JOIN fibu_konto ON (op_debitor.i_personenkonto = fibu_konto.i_konto) - inner join [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[Adressen] on [Adressen].AdressenNr = op_debitor.i_personenkonto - inner join [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[tblKundenErweitert] on kde_KundenNr = op_debitor.i_personenkonto + inner join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".[VERAG].[dbo].[Adressen] on [Adressen].AdressenNr = op_debitor.i_personenkonto + inner join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".[VERAG].[dbo].[tblKundenErweitert] on kde_KundenNr = op_debitor.i_personenkonto left join fibu_zahlziel on dbo.fibu_zahlziel.i_firm_refid = dbo.op_debitor.i_firm_refid and dbo.fibu_zahlziel.c_zahlziel = ISNULL(fibu_konto.c_zahlziel, '0/0/20') WHERE op_debitor.i_firm_refid = @MandantNr and fibu_konto.i_firm_refid = @MandantNr diff --git a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb index 2970c777..3b105ef7 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb @@ -23,19 +23,19 @@ Partial Class usrCntlKundenuebersicht Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlKundenuebersicht)) - Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.cntxtAddVM = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.btnExcel = New System.Windows.Forms.Button() @@ -100,7 +100,6 @@ Partial Class usrCntlKundenuebersicht Me.Button6 = New System.Windows.Forms.Button() Me.LinkLabel1 = New System.Windows.Forms.LinkLabel() Me.Label33 = New System.Windows.Forms.Label() - Me.txtUmsatzJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label29 = New System.Windows.Forms.Label() Me.cbxFiskalabfertigung = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) Me.lblFisk = New System.Windows.Forms.Label() @@ -134,6 +133,8 @@ Partial Class usrCntlKundenuebersicht Me.Label18 = New System.Windows.Forms.Label() Me.txtOPNichtFaellig = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Panel7 = New System.Windows.Forms.Panel() + Me.txtProforma = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label24 = New System.Windows.Forms.Label() Me.txtKdSicherheiten = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label23 = New System.Windows.Forms.Label() Me.txtOffenePosten2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -149,6 +150,7 @@ Partial Class usrCntlKundenuebersicht Me.txtZahlungsziel = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtVeranlKd = New System.Windows.Forms.TextBox() Me.lblVeranlKd = New System.Windows.Forms.Label() + Me.txtUmsatzJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblInsolvent = New System.Windows.Forms.Label() Me.grpAdresse = New System.Windows.Forms.GroupBox() Me.tbKontakt = New System.Windows.Forms.TabControl() @@ -440,8 +442,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvOfferteDetailsUebersicht.AllowUserToDeleteRows = False Me.dgvOfferteDetailsUebersicht.AllowUserToOrderColumns = True Me.dgvOfferteDetailsUebersicht.AllowUserToResizeRows = False - DataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvOfferteDetailsUebersicht.BackgroundColor = System.Drawing.Color.White Me.dgvOfferteDetailsUebersicht.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D Me.dgvOfferteDetailsUebersicht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize @@ -461,8 +463,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvOffertenSperrliste.AllowUserToDeleteRows = False Me.dgvOffertenSperrliste.AllowUserToOrderColumns = True Me.dgvOffertenSperrliste.AllowUserToResizeRows = False - DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffertenSperrliste.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffertenSperrliste.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.dgvOffertenSperrliste.BackgroundColor = System.Drawing.Color.White Me.dgvOffertenSperrliste.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D Me.dgvOffertenSperrliste.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize @@ -472,10 +474,10 @@ Partial Class usrCntlKundenuebersicht Me.dgvOffertenSperrliste.Name = "dgvOffertenSperrliste" Me.dgvOffertenSperrliste.ReadOnly = True Me.dgvOffertenSperrliste.RowHeadersVisible = False - DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle15.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer)) - DataGridViewCellStyle15.SelectionForeColor = System.Drawing.Color.Black - Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer)) + DataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.Black + Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle3 Me.dgvOffertenSperrliste.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvOffertenSperrliste.Size = New System.Drawing.Size(173, 257) Me.dgvOffertenSperrliste.TabIndex = 0 @@ -613,8 +615,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvOffenePosten.AllowUserToAddRows = False Me.dgvOffenePosten.AllowUserToDeleteRows = False Me.dgvOffenePosten.AllowUserToResizeRows = False - DataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4 Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvOffenePosten.Dock = System.Windows.Forms.DockStyle.Fill @@ -694,8 +696,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvUmsatzbericht.AllowUserToDeleteRows = False Me.dgvUmsatzbericht.AllowUserToOrderColumns = True Me.dgvUmsatzbericht.AllowUserToResizeRows = False - DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17 + DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5 Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUmsatzbericht.Dock = System.Windows.Forms.DockStyle.Fill @@ -758,8 +760,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvAnhaenge.AllowUserToAddRows = False Me.dgvAnhaenge.AllowUserToDeleteRows = False Me.dgvAnhaenge.AllowUserToResizeRows = False - DataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvAnhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18 + DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvAnhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6 Me.dgvAnhaenge.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize @@ -879,13 +881,11 @@ Partial Class usrCntlKundenuebersicht Me.grpAbfertigung.Controls.Add(Me.Button6) Me.grpAbfertigung.Controls.Add(Me.LinkLabel1) Me.grpAbfertigung.Controls.Add(Me.Label33) - Me.grpAbfertigung.Controls.Add(Me.txtUmsatzJahr) Me.grpAbfertigung.Controls.Add(Me.Label29) Me.grpAbfertigung.Controls.Add(Me.cbxFiskalabfertigung) Me.grpAbfertigung.Controls.Add(Me.lblFisk) Me.grpAbfertigung.Controls.Add(Me.txtAbf_ErsteAbfertigung) Me.grpAbfertigung.Controls.Add(Me.Label41) - Me.grpAbfertigung.Controls.Add(Me.rtbAbf_Besonderheiten) Me.grpAbfertigung.Controls.Add(Me.lblBesonderheiten) Me.grpAbfertigung.Controls.Add(Me.Panel4) Me.grpAbfertigung.Controls.Add(Me.Panel5) @@ -894,6 +894,8 @@ Partial Class usrCntlKundenuebersicht Me.grpAbfertigung.Controls.Add(Me.txtZahlungsziel) Me.grpAbfertigung.Controls.Add(Me.txtVeranlKd) Me.grpAbfertigung.Controls.Add(Me.lblVeranlKd) + Me.grpAbfertigung.Controls.Add(Me.txtUmsatzJahr) + Me.grpAbfertigung.Controls.Add(Me.rtbAbf_Besonderheiten) Me.grpAbfertigung.Cursor = System.Windows.Forms.Cursors.Default Me.grpAbfertigung.Location = New System.Drawing.Point(509, 3) Me.grpAbfertigung.Name = "grpAbfertigung" @@ -1055,6 +1057,9 @@ Partial Class usrCntlKundenuebersicht ' 'UsrCntlKundenBesonderheiten1 ' + Me.UsrCntlKundenBesonderheiten1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.UsrCntlKundenBesonderheiten1.AutoScroll = True Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle @@ -1278,45 +1283,17 @@ Partial Class usrCntlKundenuebersicht ' Me.Label33.AutoSize = True Me.Label33.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label33.Location = New System.Drawing.Point(243, 253) + Me.Label33.Location = New System.Drawing.Point(6, 340) Me.Label33.Name = "Label33" - Me.Label33.Size = New System.Drawing.Size(69, 13) + Me.Label33.Size = New System.Drawing.Size(74, 13) Me.Label33.TabIndex = 33 - Me.Label33.Text = "Zahlungsziel:" - ' - 'txtUmsatzJahr - ' - Me.txtUmsatzJahr._DateTimeOnly = False - Me.txtUmsatzJahr._numbersOnly = False - Me.txtUmsatzJahr._numbersOnlyKommastellen = "" - Me.txtUmsatzJahr._numbersOnlyTrennzeichen = True - Me.txtUmsatzJahr._Prozent = False - Me.txtUmsatzJahr._ShortDateNew = False - Me.txtUmsatzJahr._ShortDateOnly = False - Me.txtUmsatzJahr._TimeOnly = False - Me.txtUmsatzJahr._TimeOnly_Seconds = False - Me.txtUmsatzJahr._value = Nothing - Me.txtUmsatzJahr._Waehrung = False - Me.txtUmsatzJahr._WaehrungZeichen = True - Me.txtUmsatzJahr.BackColor = System.Drawing.Color.White - Me.txtUmsatzJahr.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.txtUmsatzJahr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtUmsatzJahr.ForeColor = System.Drawing.Color.Black - Me.txtUmsatzJahr.Location = New System.Drawing.Point(134, 253) - Me.txtUmsatzJahr.MaxLineLength = -1 - Me.txtUmsatzJahr.MaxLines_Warning = "" - Me.txtUmsatzJahr.MaxLines_Warning_Label = Nothing - Me.txtUmsatzJahr.Name = "txtUmsatzJahr" - Me.txtUmsatzJahr.ReadOnly = True - Me.txtUmsatzJahr.Size = New System.Drawing.Size(96, 13) - Me.txtUmsatzJahr.TabIndex = 32 - Me.txtUmsatzJahr.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + Me.Label33.Text = "Zahlungs-Ziel:" ' 'Label29 ' Me.Label29.AutoSize = True Me.Label29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label29.Location = New System.Drawing.Point(11, 253) + Me.Label29.Location = New System.Drawing.Point(6, 359) Me.Label29.Name = "Label29" Me.Label29.Size = New System.Drawing.Size(68, 13) Me.Label29.TabIndex = 31 @@ -1392,7 +1369,8 @@ Partial Class usrCntlKundenuebersicht ' 'rtbAbf_Besonderheiten ' - Me.rtbAbf_Besonderheiten.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Me.rtbAbf_Besonderheiten.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.rtbAbf_Besonderheiten.BackColor = System.Drawing.Color.White Me.rtbAbf_Besonderheiten.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle @@ -1685,15 +1663,15 @@ Partial Class usrCntlKundenuebersicht Me.Panel5.Controls.Add(Me.Label17) Me.Panel5.Controls.Add(Me.Label18) Me.Panel5.Controls.Add(Me.txtOPNichtFaellig) - Me.Panel5.Location = New System.Drawing.Point(7, 272) + Me.Panel5.Location = New System.Drawing.Point(7, 247) Me.Panel5.Name = "Panel5" - Me.Panel5.Size = New System.Drawing.Size(230, 107) + Me.Panel5.Size = New System.Drawing.Size(230, 89) Me.Panel5.TabIndex = 38 ' 'Panel6 ' Me.Panel6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.Panel6.Location = New System.Drawing.Point(7, 81) + Me.Panel6.Location = New System.Drawing.Point(7, 63) Me.Panel6.Name = "Panel6" Me.Panel6.Size = New System.Drawing.Size(210, 1) Me.Panel6.TabIndex = 42 @@ -1716,7 +1694,7 @@ Partial Class usrCntlKundenuebersicht Me.txtOPFaellig.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtOPFaellig.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtOPFaellig.ForeColor = System.Drawing.Color.Black - Me.txtOPFaellig.Location = New System.Drawing.Point(114, 23) + Me.txtOPFaellig.Location = New System.Drawing.Point(114, 5) Me.txtOPFaellig.MaxLineLength = -1 Me.txtOPFaellig.MaxLines_Warning = "" Me.txtOPFaellig.MaxLines_Warning_Label = Nothing @@ -1730,7 +1708,7 @@ Partial Class usrCntlKundenuebersicht ' Me.lblOffenePosten.AutoSize = True Me.lblOffenePosten.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblOffenePosten.Location = New System.Drawing.Point(3, 86) + Me.lblOffenePosten.Location = New System.Drawing.Point(3, 68) Me.lblOffenePosten.Name = "lblOffenePosten" Me.lblOffenePosten.Size = New System.Drawing.Size(64, 13) Me.lblOffenePosten.TabIndex = 27 @@ -1754,7 +1732,7 @@ Partial Class usrCntlKundenuebersicht Me.txtOffenePosten.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtOffenePosten.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtOffenePosten.ForeColor = System.Drawing.Color.Black - Me.txtOffenePosten.Location = New System.Drawing.Point(114, 85) + Me.txtOffenePosten.Location = New System.Drawing.Point(114, 67) Me.txtOffenePosten.MaxLineLength = -1 Me.txtOffenePosten.MaxLines_Warning = "" Me.txtOffenePosten.MaxLines_Warning_Label = Nothing @@ -1768,7 +1746,7 @@ Partial Class usrCntlKundenuebersicht ' Me.Label32.AutoSize = True Me.Label32.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label32.Location = New System.Drawing.Point(3, 23) + Me.Label32.Location = New System.Drawing.Point(3, 5) Me.Label32.Name = "Label32" Me.Label32.Size = New System.Drawing.Size(86, 13) Me.Label32.TabIndex = 29 @@ -1792,7 +1770,7 @@ Partial Class usrCntlKundenuebersicht Me.txtOPCredit.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtOPCredit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtOPCredit.ForeColor = System.Drawing.Color.Green - Me.txtOPCredit.Location = New System.Drawing.Point(114, 63) + Me.txtOPCredit.Location = New System.Drawing.Point(114, 46) Me.txtOPCredit.MaxLineLength = -1 Me.txtOPCredit.MaxLines_Warning = "" Me.txtOPCredit.MaxLines_Warning_Label = Nothing @@ -1806,7 +1784,7 @@ Partial Class usrCntlKundenuebersicht ' Me.Label17.AutoSize = True Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label17.Location = New System.Drawing.Point(3, 42) + Me.Label17.Location = New System.Drawing.Point(3, 26) Me.Label17.Name = "Label17" Me.Label17.Size = New System.Drawing.Size(112, 13) Me.Label17.TabIndex = 38 @@ -1816,7 +1794,7 @@ Partial Class usrCntlKundenuebersicht ' Me.Label18.AutoSize = True Me.Label18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label18.Location = New System.Drawing.Point(3, 63) + Me.Label18.Location = New System.Drawing.Point(3, 46) Me.Label18.Name = "Label18" Me.Label18.Size = New System.Drawing.Size(60, 13) Me.Label18.TabIndex = 40 @@ -1840,7 +1818,7 @@ Partial Class usrCntlKundenuebersicht Me.txtOPNichtFaellig.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtOPNichtFaellig.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtOPNichtFaellig.ForeColor = System.Drawing.Color.Black - Me.txtOPNichtFaellig.Location = New System.Drawing.Point(114, 42) + Me.txtOPNichtFaellig.Location = New System.Drawing.Point(114, 26) Me.txtOPNichtFaellig.MaxLineLength = -1 Me.txtOPNichtFaellig.MaxLines_Warning = "" Me.txtOPNichtFaellig.MaxLines_Warning_Label = Nothing @@ -1854,8 +1832,12 @@ Partial Class usrCntlKundenuebersicht ' Me.Panel7.BackColor = System.Drawing.Color.AntiqueWhite Me.Panel7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.Panel7.Controls.Add(Me.txtKdSicherheiten) + Me.Panel7.Controls.Add(Me.lblKreditlimit) + Me.Panel7.Controls.Add(Me.Label1) + Me.Panel7.Controls.Add(Me.txtProforma) Me.Panel7.Controls.Add(Me.Label23) + Me.Panel7.Controls.Add(Me.txtKdSicherheiten) + Me.Panel7.Controls.Add(Me.Label24) Me.Panel7.Controls.Add(Me.txtOffenePosten2) Me.Panel7.Controls.Add(Me.Label22) Me.Panel7.Controls.Add(Me.Panel10) @@ -1863,13 +1845,51 @@ Partial Class usrCntlKundenuebersicht Me.Panel7.Controls.Add(Me.txtRisiko) Me.Panel7.Controls.Add(Me.txtOVK) Me.Panel7.Controls.Add(Me.Label19) - Me.Panel7.Controls.Add(Me.Label1) - Me.Panel7.Controls.Add(Me.lblKreditlimit) - Me.Panel7.Location = New System.Drawing.Point(236, 272) + Me.Panel7.Location = New System.Drawing.Point(236, 247) Me.Panel7.Name = "Panel7" - Me.Panel7.Size = New System.Drawing.Size(253, 107) + Me.Panel7.Size = New System.Drawing.Size(253, 132) Me.Panel7.TabIndex = 43 ' + 'txtProforma + ' + Me.txtProforma._DateTimeOnly = False + Me.txtProforma._numbersOnly = False + Me.txtProforma._numbersOnlyKommastellen = "" + Me.txtProforma._numbersOnlyTrennzeichen = True + Me.txtProforma._Prozent = False + Me.txtProforma._ShortDateNew = False + Me.txtProforma._ShortDateOnly = False + Me.txtProforma._TimeOnly = False + Me.txtProforma._TimeOnly_Seconds = False + Me.txtProforma._value = Nothing + Me.txtProforma._Waehrung = False + Me.txtProforma._WaehrungZeichen = True + Me.txtProforma.BackColor = System.Drawing.Color.AntiqueWhite + Me.txtProforma.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtProforma.Cursor = System.Windows.Forms.Cursors.Hand + Me.txtProforma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtProforma.ForeColor = System.Drawing.Color.Green + Me.txtProforma.Location = New System.Drawing.Point(135, 46) + Me.txtProforma.MaxLineLength = -1 + Me.txtProforma.MaxLines_Warning = "" + Me.txtProforma.MaxLines_Warning_Label = Nothing + Me.txtProforma.Name = "txtProforma" + Me.txtProforma.ReadOnly = True + Me.txtProforma.Size = New System.Drawing.Size(108, 13) + Me.txtProforma.TabIndex = 53 + Me.txtProforma.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'Label24 + ' + Me.Label24.AutoSize = True + Me.Label24.Cursor = System.Windows.Forms.Cursors.Hand + Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label24.Location = New System.Drawing.Point(8, 46) + Me.Label24.Name = "Label24" + Me.Label24.Size = New System.Drawing.Size(120, 13) + Me.Label24.TabIndex = 52 + Me.Label24.Text = "- Proforma-Rechnungen" + ' 'txtKdSicherheiten ' Me.txtKdSicherheiten._DateTimeOnly = False @@ -1889,7 +1909,7 @@ Partial Class usrCntlKundenuebersicht Me.txtKdSicherheiten.Cursor = System.Windows.Forms.Cursors.Hand Me.txtKdSicherheiten.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtKdSicherheiten.ForeColor = System.Drawing.Color.Green - Me.txtKdSicherheiten.Location = New System.Drawing.Point(133, 24) + Me.txtKdSicherheiten.Location = New System.Drawing.Point(135, 69) Me.txtKdSicherheiten.MaxLineLength = -1 Me.txtKdSicherheiten.MaxLines_Warning = "" Me.txtKdSicherheiten.MaxLines_Warning_Label = Nothing @@ -1904,7 +1924,7 @@ Partial Class usrCntlKundenuebersicht Me.Label23.AutoSize = True Me.Label23.Cursor = System.Windows.Forms.Cursors.Hand Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label23.Location = New System.Drawing.Point(6, 64) + Me.Label23.Location = New System.Drawing.Point(8, 26) Me.Label23.Name = "Label23" Me.Label23.Size = New System.Drawing.Size(113, 13) Me.Label23.TabIndex = 50 @@ -1929,7 +1949,7 @@ Partial Class usrCntlKundenuebersicht Me.txtOffenePosten2.Cursor = System.Windows.Forms.Cursors.Hand Me.txtOffenePosten2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtOffenePosten2.ForeColor = System.Drawing.Color.Green - Me.txtOffenePosten2.Location = New System.Drawing.Point(133, 43) + Me.txtOffenePosten2.Location = New System.Drawing.Point(135, 5) Me.txtOffenePosten2.MaxLineLength = -1 Me.txtOffenePosten2.MaxLines_Warning = "" Me.txtOffenePosten2.MaxLines_Warning_Label = Nothing @@ -1944,7 +1964,7 @@ Partial Class usrCntlKundenuebersicht Me.Label22.AutoSize = True Me.Label22.Cursor = System.Windows.Forms.Cursors.Hand Me.Label22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label22.Location = New System.Drawing.Point(6, 43) + Me.Label22.Location = New System.Drawing.Point(8, 5) Me.Label22.Name = "Label22" Me.Label22.Size = New System.Drawing.Size(58, 13) Me.Label22.TabIndex = 48 @@ -1953,7 +1973,7 @@ Partial Class usrCntlKundenuebersicht 'Panel10 ' Me.Panel10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.Panel10.Location = New System.Drawing.Point(11, 81) + Me.Panel10.Location = New System.Drawing.Point(11, 84) Me.Panel10.Name = "Panel10" Me.Panel10.Size = New System.Drawing.Size(230, 1) Me.Panel10.TabIndex = 47 @@ -1962,7 +1982,7 @@ Partial Class usrCntlKundenuebersicht ' Me.Label21.AutoSize = True Me.Label21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label21.Location = New System.Drawing.Point(6, 86) + Me.Label21.Location = New System.Drawing.Point(6, 92) Me.Label21.Name = "Label21" Me.Label21.Size = New System.Drawing.Size(46, 13) Me.Label21.TabIndex = 45 @@ -1986,7 +2006,7 @@ Partial Class usrCntlKundenuebersicht Me.txtRisiko.BorderStyle = System.Windows.Forms.BorderStyle.None 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(133, 86) + Me.txtRisiko.Location = New System.Drawing.Point(135, 92) Me.txtRisiko.MaxLineLength = -1 Me.txtRisiko.MaxLines_Warning = "" Me.txtRisiko.MaxLines_Warning_Label = Nothing @@ -2015,7 +2035,7 @@ Partial Class usrCntlKundenuebersicht Me.txtOVK.Cursor = System.Windows.Forms.Cursors.Hand Me.txtOVK.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtOVK.ForeColor = System.Drawing.Color.Green - Me.txtOVK.Location = New System.Drawing.Point(133, 62) + Me.txtOVK.Location = New System.Drawing.Point(135, 25) Me.txtOVK.MaxLineLength = -1 Me.txtOVK.MaxLines_Warning = "" Me.txtOVK.MaxLines_Warning_Label = Nothing @@ -2030,7 +2050,7 @@ Partial Class usrCntlKundenuebersicht Me.Label19.AutoSize = True Me.Label19.Cursor = System.Windows.Forms.Cursors.Hand Me.Label19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label19.Location = New System.Drawing.Point(6, 24) + Me.Label19.Location = New System.Drawing.Point(8, 68) Me.Label19.Name = "Label19" Me.Label19.Size = New System.Drawing.Size(75, 13) Me.Label19.TabIndex = 43 @@ -2040,7 +2060,7 @@ Partial Class usrCntlKundenuebersicht ' Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(6, 5) + Me.Label1.Location = New System.Drawing.Point(6, 111) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(66, 13) Me.Label1.TabIndex = 19 @@ -2064,7 +2084,7 @@ Partial Class usrCntlKundenuebersicht Me.lblKreditlimit.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblKreditlimit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblKreditlimit.ForeColor = System.Drawing.Color.Black - Me.lblKreditlimit.Location = New System.Drawing.Point(133, 5) + Me.lblKreditlimit.Location = New System.Drawing.Point(135, 111) Me.lblKreditlimit.MaxLineLength = -1 Me.lblKreditlimit.MaxLines_Warning = "" Me.lblKreditlimit.MaxLines_Warning_Label = Nothing @@ -2101,13 +2121,13 @@ Partial Class usrCntlKundenuebersicht Me.txtZahlungsziel.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtZahlungsziel.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtZahlungsziel.ForeColor = System.Drawing.Color.Black - Me.txtZahlungsziel.Location = New System.Drawing.Point(310, 255) + Me.txtZahlungsziel.Location = New System.Drawing.Point(175, 340) Me.txtZahlungsziel.MaxLineLength = -1 Me.txtZahlungsziel.MaxLines_Warning = "" Me.txtZahlungsziel.MaxLines_Warning_Label = Nothing Me.txtZahlungsziel.Name = "txtZahlungsziel" Me.txtZahlungsziel.ReadOnly = True - Me.txtZahlungsziel.Size = New System.Drawing.Size(56, 13) + Me.txtZahlungsziel.Size = New System.Drawing.Size(50, 13) Me.txtZahlungsziel.TabIndex = 34 Me.txtZahlungsziel.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' @@ -2132,6 +2152,34 @@ Partial Class usrCntlKundenuebersicht Me.lblVeranlKd.TabIndex = 47 Me.lblVeranlKd.Text = "Veranl.Kd.:" ' + 'txtUmsatzJahr + ' + Me.txtUmsatzJahr._DateTimeOnly = False + Me.txtUmsatzJahr._numbersOnly = False + Me.txtUmsatzJahr._numbersOnlyKommastellen = "" + Me.txtUmsatzJahr._numbersOnlyTrennzeichen = True + Me.txtUmsatzJahr._Prozent = False + Me.txtUmsatzJahr._ShortDateNew = False + Me.txtUmsatzJahr._ShortDateOnly = False + Me.txtUmsatzJahr._TimeOnly = False + Me.txtUmsatzJahr._TimeOnly_Seconds = False + Me.txtUmsatzJahr._value = Nothing + Me.txtUmsatzJahr._Waehrung = False + Me.txtUmsatzJahr._WaehrungZeichen = True + Me.txtUmsatzJahr.BackColor = System.Drawing.Color.White + Me.txtUmsatzJahr.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtUmsatzJahr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtUmsatzJahr.ForeColor = System.Drawing.Color.Black + Me.txtUmsatzJahr.Location = New System.Drawing.Point(97, 359) + Me.txtUmsatzJahr.MaxLineLength = -1 + Me.txtUmsatzJahr.MaxLines_Warning = "" + Me.txtUmsatzJahr.MaxLines_Warning_Label = Nothing + Me.txtUmsatzJahr.Name = "txtUmsatzJahr" + Me.txtUmsatzJahr.ReadOnly = True + Me.txtUmsatzJahr.Size = New System.Drawing.Size(128, 13) + Me.txtUmsatzJahr.TabIndex = 32 + Me.txtUmsatzJahr.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'lblInsolvent ' Me.lblInsolvent.BackColor = System.Drawing.Color.Red @@ -2179,6 +2227,7 @@ Partial Class usrCntlKundenuebersicht ' 'tbKontaktKontakt ' + Me.tbKontaktKontakt.BackColor = System.Drawing.Color.FromArgb(CType(CType(250, Byte), Integer), CType(CType(250, Byte), Integer), CType(CType(250, Byte), Integer)) Me.tbKontaktKontakt.Controls.Add(Me.btncheckliste) Me.tbKontaktKontakt.Controls.Add(Me.FlatButton1) Me.tbKontaktKontakt.Controls.Add(Me.PictureBox1) @@ -2197,7 +2246,6 @@ Partial Class usrCntlKundenuebersicht Me.tbKontaktKontakt.Size = New System.Drawing.Size(479, 164) Me.tbKontaktKontakt.TabIndex = 2 Me.tbKontaktKontakt.Text = "Kontakt" - Me.tbKontaktKontakt.UseVisualStyleBackColor = True ' 'btncheckliste ' @@ -2249,7 +2297,7 @@ Partial Class usrCntlKundenuebersicht ' 'lblAnsprechpartner ' - Me.lblAnsprechpartner.BackColor = System.Drawing.Color.White + Me.lblAnsprechpartner.BackColor = System.Drawing.Color.FromArgb(CType(CType(250, Byte), Integer), CType(CType(250, Byte), Integer), CType(CType(250, Byte), Integer)) Me.lblAnsprechpartner.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblAnsprechpartner.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAnsprechpartner.Location = New System.Drawing.Point(38, 142) @@ -2261,7 +2309,7 @@ Partial Class usrCntlKundenuebersicht ' 'lblMobil ' - Me.lblMobil.BackColor = System.Drawing.Color.White + Me.lblMobil.BackColor = System.Drawing.Color.FromArgb(CType(CType(250, Byte), Integer), CType(CType(250, Byte), Integer), CType(CType(250, Byte), Integer)) 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, 53) @@ -2273,7 +2321,7 @@ Partial Class usrCntlKundenuebersicht ' 'lblFax ' - Me.lblFax.BackColor = System.Drawing.Color.White + Me.lblFax.BackColor = System.Drawing.Color.FromArgb(CType(CType(250, Byte), Integer), CType(CType(250, Byte), Integer), CType(CType(250, Byte), Integer)) 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, 30) @@ -2285,7 +2333,7 @@ Partial Class usrCntlKundenuebersicht ' 'lblEmail2 ' - Me.lblEmail2.BackColor = System.Drawing.Color.White + Me.lblEmail2.BackColor = System.Drawing.Color.FromArgb(CType(CType(250, Byte), Integer), CType(CType(250, Byte), Integer), CType(CType(250, Byte), Integer)) 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)) @@ -2298,7 +2346,7 @@ Partial Class usrCntlKundenuebersicht ' 'lblEmail ' - Me.lblEmail.BackColor = System.Drawing.Color.White + Me.lblEmail.BackColor = System.Drawing.Color.FromArgb(CType(CType(250, Byte), Integer), CType(CType(250, Byte), Integer), CType(CType(250, Byte), Integer)) 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)) @@ -2333,7 +2381,7 @@ Partial Class usrCntlKundenuebersicht ' 'lblTel ' - Me.lblTel.BackColor = System.Drawing.Color.White + Me.lblTel.BackColor = System.Drawing.Color.FromArgb(CType(CType(250, Byte), Integer), CType(CType(250, Byte), Integer), CType(CType(250, Byte), Integer)) 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, 6) @@ -2693,8 +2741,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvVollmachten.AllowUserToDeleteRows = False Me.dgvVollmachten.AllowUserToOrderColumns = True Me.dgvVollmachten.AllowUserToResizeRows = False - DataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvVollmachten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19 + DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvVollmachten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7 Me.dgvVollmachten.BackgroundColor = System.Drawing.Color.White Me.dgvVollmachten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvVollmachten.Dock = System.Windows.Forms.DockStyle.Fill @@ -2747,8 +2795,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvVertraege.AllowUserToDeleteRows = False Me.dgvVertraege.AllowUserToOrderColumns = True Me.dgvVertraege.AllowUserToResizeRows = False - DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvVertraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20 + DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvVertraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8 Me.dgvVertraege.BackgroundColor = System.Drawing.Color.White Me.dgvVertraege.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvVertraege.Dock = System.Windows.Forms.DockStyle.Fill @@ -2948,8 +2996,8 @@ Partial Class usrCntlKundenuebersicht Me.dgvGestGarantie.AllowUserToDeleteRows = False Me.dgvGestGarantie.AllowUserToOrderColumns = True Me.dgvGestGarantie.AllowUserToResizeRows = False - DataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvGestGarantie.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle21 + DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvGestGarantie.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9 Me.dgvGestGarantie.BackgroundColor = System.Drawing.Color.White Me.dgvGestGarantie.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvGestGarantie.Dock = System.Windows.Forms.DockStyle.Fill @@ -3439,24 +3487,24 @@ Partial Class usrCntlKundenuebersicht Me.dgvAufschub.AllowUserToResizeColumns = False Me.dgvAufschub.AllowUserToResizeRows = False Me.dgvAufschub.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22 + DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle10 Me.dgvAufschub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvAufschub.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.KtoId, Me.Art, Me.HZA, Me.KontoNr, Me.EORI, Me.NL, Me.BIN}) - DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle24 + DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle12 Me.dgvAufschub.Location = New System.Drawing.Point(13, 61) Me.dgvAufschub.MultiSelect = False Me.dgvAufschub.Name = "dgvAufschub" @@ -3483,8 +3531,8 @@ Partial Class usrCntlKundenuebersicht ' 'HZA ' - DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - Me.HZA.DefaultCellStyle = DataGridViewCellStyle23 + DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + Me.HZA.DefaultCellStyle = DataGridViewCellStyle11 Me.HZA.HeaderText = "HZA" Me.HZA.Name = "HZA" Me.HZA.ReadOnly = True @@ -4039,4 +4087,6 @@ Partial Class usrCntlKundenuebersicht Friend WithEvents Panel10 As Panel Friend WithEvents Label21 As Label Friend WithEvents txtRisiko As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtProforma As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label24 As Label End Class diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 0d2e71fe..36277b50 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -521,7 +521,10 @@ Public Class usrCntlKundenuebersicht initInsolvent(KUNDE_ERW.kde_CSinsolventAm) ' lblKreditlimit.BackColor = Color.White - lblKreditlimit.Text = checkNullNbr(KUNDE.Kreditlimit).ToString("C", CultureInfo.CurrentCulture) + lblKreditlimit.Text = checkNullNbr(KUNDE.Kreditlimit).ToString("C2", CultureInfo.CurrentCulture) + ' txtProforma.Text = getProformaKd(kdNr)-''''''''''''----> HIIIER!! + + If KUNDE.Kreditlimit <> 0 And KUNDE.Kreditlimit <> 2600 Then ' lblKreditlimit.BackColor = Color.Yellow End If @@ -858,7 +861,7 @@ Public Class usrCntlKundenuebersicht ' txtUmsatzJahr.Text = String.Format("{0:n}", .Rows(0).Cells("Nettoumsatz").Value) 'txtUmsatzJahr.Text = String.Format("{0:n}", .Rows(0).Cells("Nettoumsatz").Value) If IsNumeric(.Rows(0).Cells("Nettoumsatz").Value) Then - txtUmsatzJahr.Text = CDbl(.Rows(0).Cells("Nettoumsatz").Value).ToString("C") + txtUmsatzJahr.Text = CDbl(.Rows(0).Cells("Nettoumsatz").Value).ToString("C2") End If Label29.Text = "Umsatz " & .Rows(0).Cells("Jahr").Value & ":" Else @@ -1327,10 +1330,11 @@ Public Class usrCntlKundenuebersicht txtOffenePosten2.Text = txtOffenePosten.Text txtKdSicherheiten.Text = CDbl(VERAG_PROG_ALLGEMEIN.cKundenSicherheiten.GetSummeSicherheitenAktuell(kdNr)).ToString("C2") Dim Kreditlimit As Double = If(IsNumeric(lblKreditlimit.Text), CDbl(lblKreditlimit.Text), 0) + Dim Proforma As Double = If(IsNumeric(txtProforma.Text), CDbl(txtProforma.Text), 0) Dim OVK As Double = If(IsNumeric(txtOVK.Text), CDbl(txtOVK.Text), 0) Dim Sicherheiten As Double = If(IsNumeric(txtKdSicherheiten.Text), CDbl(txtKdSicherheiten.Text), 0) Dim OP As Double = If(IsNumeric(txtOffenePosten2.Text), CDbl(txtOffenePosten2.Text), 0) - Dim Risiko = Kreditlimit + Sicherheiten - OVK - OP + Dim Risiko = Kreditlimit + Sicherheiten - Proforma - OVK - OP txtRisiko.Text = Risiko.ToString("N2") If Risiko = 0 Then @@ -1436,14 +1440,14 @@ Public Class usrCntlKundenuebersicht ' txtOffenePosten.Text = "" 'End If - txtOPFaellig.Text = sumZZ.ToString("C") + txtOPFaellig.Text = sumZZ.ToString("C2") If sumZZ > 0 Then txtOPFaellig.ForeColor = Color.Red Else txtOPFaellig.ForeColor = Color.Black End If - txtOPNichtFaellig.Text = sumNOTZZ.ToString("C") + txtOPNichtFaellig.Text = sumNOTZZ.ToString("C2") txtOPNichtFaellig.ForeColor = Color.Black 'If sumNOTZZ > 0 Then ' txtOPNichtFaellig.ForeColor = Color.Red @@ -1451,7 +1455,7 @@ Public Class usrCntlKundenuebersicht ' txtOPNichtFaellig.ForeColor = Color.Black 'End If - txtOPCredit.Text = sumCredit.ToString("C") + txtOPCredit.Text = sumCredit.ToString("C2") txtOPCredit.ForeColor = Color.Green 'If sumCredit < 0 Then ' txtOPCredit.ForeColor = Color.Red @@ -1467,7 +1471,7 @@ Public Class usrCntlKundenuebersicht End If If sumGes <> 0 Then - txtOffenePosten.Text = sumGes.ToString("C") + txtOffenePosten.Text = sumGes.ToString("C2") If sumGes < 0 Then txtOffenePosten.ForeColor = Color.Green Else @@ -1589,7 +1593,7 @@ Public Class usrCntlKundenuebersicht If OP_tmp <> 0 Then ' txtOffenePosten.Text = String.Format("{0:n}", .Rows(0).Cells("KumSaldoEUR").Value) 'txtOffenePosten.Text = String.Format("{0:n}", OP_tmp) - txtOffenePosten.Text = OP_tmp.ToString("C") + txtOffenePosten.Text = OP_tmp.ToString("C2") If OP_tmp < 0 Then txtOffenePosten.ForeColor = Color.Green Else @@ -1617,14 +1621,14 @@ Public Class usrCntlKundenuebersicht Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try - txtOPFaellig.Text = sumZZ.ToString("C") + txtOPFaellig.Text = sumZZ.ToString("C2") If sumZZ > 0 Then txtOPFaellig.ForeColor = Color.Red Else txtOPFaellig.ForeColor = Color.Black End If - txtOPNichtFaellig.Text = sumNOTZZ.ToString("C") + txtOPNichtFaellig.Text = sumNOTZZ.ToString("C2") txtOPNichtFaellig.ForeColor = Color.Black 'If sumNOTZZ > 0 Then ' txtOPNichtFaellig.ForeColor = Color.Red @@ -1632,11 +1636,11 @@ Public Class usrCntlKundenuebersicht ' txtOPNichtFaellig.ForeColor = Color.Black 'End If - txtOPCredit.Text = sumCredit.ToString("C") + txtOPCredit.Text = sumCredit.ToString("C2") txtOPCredit.ForeColor = Color.Green If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("KUNDE_VK_OP") Then - txtOVK.Text = sumVK.ToString("C") + txtOVK.Text = sumVK.ToString("C2") txtOVK.ForeColor = Color.Red Else txtOVK.Text = "-" diff --git a/SDL/zoll/usrCntlZOLLAuswertungen.vb b/SDL/zoll/usrCntlZOLLAuswertungen.vb index 3c0fed25..2fd79690 100644 --- a/SDL/zoll/usrCntlZOLLAuswertungen.vb +++ b/SDL/zoll/usrCntlZOLLAuswertungen.vb @@ -1144,10 +1144,10 @@ Adressen.[E-Mail] as EMailKunde1, inner join zsAnmHea on zsAnmHea.LizenzNr=zsAnmGdsitem.LizenzNr and zsAnmHea.AnmID=zsAnmGdsitem.AnmID and zsAnmHea.VorgangID=zsAnmGdsitem.VorgangID and zsAnmHea.OperatorID=zsAnmGdsitem.OperatorID inner join zsAnmDeclarant on zsAnmHea.LizenzNr=zsAnmDeclarant.LizenzNr and zsAnmHea.AnmID=zsAnmDeclarant.AnmID and zsAnmHea.VorgangID=zsAnmDeclarant.VorgangID and zsAnmHea.OperatorID=zsAnmDeclarant.OperatorID inner join zsAnmTransp on zsAnmHea.LizenzNr=zsAnmTransp.LizenzNr and zsAnmHea.AnmID=zsAnmTransp.AnmID and zsAnmHea.VorgangID=zsAnmTransp.VorgangID and zsAnmHea.OperatorID=zsAnmTransp.OperatorID - Left Join [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[Kunden] on Kunden.EORITIN = (SELECT TIN FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )) - Left Join [FMZOLL\SQLFMZOLL].[VERAG].[dbo].Adressen on Adressen.AdressenNr = Kunden.KundenNr - Left Join [FMZOLL\SQLFMZOLL].[VERAG].[dbo].Offerten on Offerten.KundenNr = Kunden.KundenNr And OffertenNr = 65 - Left Join [FMZOLL\SQLFMZOLL].[VERAG].[dbo].tblKundenKontakt on Kunden.KundenNr = kkd_KundenNr And kkd_kkaBez = 'Allgemein' + Left Join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".[VERAG].[dbo].[Kunden] on Kunden.EORITIN = (SELECT TIN FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )) + Left Join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".[VERAG].[dbo].Adressen on Adressen.AdressenNr = Kunden.KundenNr + Left Join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".[VERAG].[dbo].Offerten on Offerten.KundenNr = Kunden.KundenNr And OffertenNr = 65 + Left Join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".[VERAG].[dbo].tblKundenKontakt on Kunden.KundenNr = kkd_KundenNr And kkd_kkaBez = 'Allgemein' where DecDT between '" & von & "' AND '" & bis & "' and diff --git a/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb b/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb index 4e454b32..1549c650 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb @@ -65,6 +65,22 @@ Public Class SQL End If + End Function + Public Shared Function GetNewOpenConnectionStringSQLGUIDE_ADMIN() As String + 'Properties.Settings.Default. + + If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then + + Return "" + Else + Try + Return My.MySettings.Default.VERAGConnectionStringPROD_ADMIN + Catch ex As Exception + Return "" + End Try + End If + + End Function Public Shared Function GetPARKZEITConnectionString() As String 'Properties.Settings.Default. @@ -289,6 +305,18 @@ Public Class SQL End Try Return Nothing + End Function + Public Shared Function GetNewOpenConnectionSQLGUIDE_ADMIN(Optional pooling As Boolean = True) As SqlConnection + Dim cn As New SqlConnection() + Try + cn.ConnectionString = GetNewOpenConnectionStringSQLGUIDE_ADMIN() & IIf(pooling, "", ";pooling=false") + cn.Open() + Return cn + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******").Replace("yp/THDd?xM+pZ$", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + Return Nothing + End Function Public Shared Function GetNewOpenConnectionAsfinag(Optional pooling As Boolean = True) As SqlConnection @@ -877,6 +905,7 @@ Public Class SQL Case "FIBU", "SYSKA" : conn = GetNewOpenConnectionSYSKA() Case "PARKZEIT" : conn = GetNewOpenConnectionPARKZEIT() + Case "SQLGUIDE_ADMIN" : conn = GetNewOpenConnectionSQLGUIDE_ADMIN() Case "AVISO_ATILLA" conn.ConnectionString = "Data Source=172.16.0.98;Initial Catalog=AVISO_ATILLA;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200" conn.Open() diff --git a/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb b/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb index 76c585bd..61ccbcec 100644 --- a/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb @@ -418,6 +418,18 @@ Namespace My Return CType(Me("VERAGConnectionStringPROD"),String) End Get End Property + + _ + Public ReadOnly Property VERAGConnectionStringPROD_ADMIN() As String + Get + Return CType(Me("VERAGConnectionStringPROD_ADMIN"),String) + End Get + End Property End Class End Namespace diff --git a/VERAG_PROG_ALLGEMEIN/My Project/Settings.settings b/VERAG_PROG_ALLGEMEIN/My Project/Settings.settings index 774445c6..45866b0e 100644 --- a/VERAG_PROG_ALLGEMEIN/My Project/Settings.settings +++ b/VERAG_PROG_ALLGEMEIN/My Project/Settings.settings @@ -190,5 +190,12 @@ </SerializableConnectionString> Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool Size=200 + + <?xml version="1.0" encoding="utf-16"?> +<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <ConnectionString>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200</ConnectionString> +</SerializableConnectionString> + Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200 + \ No newline at end of file diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_Zollanmeldung/cVERAG_Zollanmeldung.vb b/VERAG_PROG_ALLGEMEIN/VERAG_Zollanmeldung/cVERAG_Zollanmeldung.vb index 727c11ad..4ffa805e 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_Zollanmeldung/cVERAG_Zollanmeldung.vb +++ b/VERAG_PROG_ALLGEMEIN/VERAG_Zollanmeldung/cVERAG_Zollanmeldung.vb @@ -594,7 +594,7 @@ Public Class cVERAG_CustomsDeclarations ' "

" & ' VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(If(AD.E_Mail, ""), "CBAM-WARNUNG – " & If(WarnLevel = 3, " ACHTUNG: Überschreitung 50to! ", "Überschreitung der Meldeschwelle"), bodyHtml, "cbam@verag.ag", (WarnLevel = 3), "cbam@verag.ag",, "al@verag.ag") - VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(If(AD.E_Mail, ""), "CBAM-WARNUNG – " & If(WarnLevel = 3, " ACHTUNG: Überschreitung 50to! ", "Überschreitung der Meldeschwelle"), bodyHtml, "cbam@verag.ag", (WarnLevel = 3), False, "cbam@verag.ag", "al@verag.ag") + VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(If(AD.E_Mail, ""), "CBAM-WARNUNG – " & If(WarnLevel = 3, " ACHTUNG: Überschreitung 50to! ", "Überschreitung der Meldeschwelle"), bodyHtml, "cbam@verag.ag", (WarnLevel = 3), False, "cbam@verag.ag;" & If(AD.E_Mail2, ""), "al@verag.ag") 'VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail( ' "al@verag.ag",