diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 7e5b2175..82ef5cbf 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -777,6 +777,7 @@ Public Class cFakturierung rpt.txtBank3.Visible = True rpt.txtBank3.Text = "Garanti Bank Türkei – Euro Konto" & vbNewLine & "IBAN: TR90 0006 2001 6040 0009 0804 66" & vbNewLine & "BIC/SWIFT: TGBATRISXXX".ToString.Trim rpt.picVERAG.Size = New SizeF(2.712, 0.61) + rpt.txtDisclaimer.Text = rpt.txtDisclaimer.Text.Replace("Schärding oder Passau", "Bad Reichenhall") Case 26 rpt.txtBank1.Text = If(FIRMA.Firma_Bankverbindung1, "") & vbNewLine & If(FIRMA.Firma_IBAN1, "") & vbNewLine & If(FIRMA.Firma_BIC1, "").ToString.Trim rpt.txtBank2.Text = If(FIRMA.Firma_Bankverbindung2, "") & vbNewLine & If(FIRMA.Firma_IBAN2, "") & vbNewLine & If(FIRMA.Firma_BIC2, "").ToString.Trim @@ -891,6 +892,7 @@ Public Class cFakturierung rpt.txtBank2.Text = If(FIRMA.Firma_Bankverbindung2, "") & vbNewLine & If(FIRMA.Firma_IBAN2, "") & vbNewLine & If(FIRMA.Firma_BIC2, "").ToString.Trim rpt.txtBank3.Visible = True rpt.txtBank3.Text = "Garanti Bank Türkei – Euro Konto" & vbNewLine & "IBAN: TR90 0006 2001 6040 0009 0804 66" & vbNewLine & "BIC/SWIFT: TGBATRISXXX".ToString.Trim + rpt.txtDisclaimer.Text = rpt.txtDisclaimer.Text.Replace("Schärding oder Passau", "Bad Reichenhall") Case 26 'VERAG-UNISPED" rpt.txtBank1.Text = If(FIRMA.Firma_Bankverbindung1, "") & vbNewLine & If(FIRMA.Firma_IBAN1, "") & vbNewLine & If(FIRMA.Firma_BIC1, "").ToString.Trim rpt.txtBank2.Text = If(FIRMA.Firma_Bankverbindung2, "") & vbNewLine & If(FIRMA.Firma_IBAN2, "") & vbNewLine & If(FIRMA.Firma_BIC2, "").ToString.Trim @@ -961,6 +963,7 @@ Public Class cFakturierung rpt.txtBank2.Text = If(FIRMA.Firma_Bankverbindung2, "") & vbNewLine & If(FIRMA.Firma_IBAN2, "") & vbNewLine & If(FIRMA.Firma_BIC2, "").ToString.Trim rpt.txtBank3.Visible = True rpt.txtBank3.Text = "Garanti Bank Türkei – Euro Konto" & vbNewLine & "IBAN: TR90 0006 2001 6040 0009 0804 66" & vbNewLine & "BIC/SWIFT: TGBATRISXXX".ToString.Trim + rpt.txtDisclaimer.Text = rpt.txtDisclaimer.Text.Replace("Schärding oder Passau", "Bad Reichenhall") Case 20 '"IMEX" If RechnungsLandKz = "TR" Then @@ -1132,7 +1135,7 @@ Public Class cFakturierung Select Case RECHNUNG.Firma_ID - Case 21, 22, 23, 26, 24 : rpt.Label1.Visible = False : rpt.Label2.Visible = False + Case 21, 22, 23, 26 : rpt.Label1.Visible = False : rpt.Label2.Visible = False 'Ka warum End Select rpt.lblKundenNr.Text = If(RECHNUNG.RechnungsKundenNr > 0, RECHNUNG.RechnungsKundenNr, "") @@ -3285,6 +3288,10 @@ Public Class cFakturierung 'rpt.lblAbfertigungsDatum.Text = RECHNUNG.Abfertigungsdatum.ToShortDateString 'rpt.lblLKWId.Text = If(RECHNUNG.AvisoID, "") + Dim sachbearbeiterAufRechnung = getSBRgName(ROW("Firma_ID"), VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME) + rpt.lblSachbearbeiter.Text = IIf(sachbearbeiterAufRechnung = "Herr Ordu", "Verrechnung", sachbearbeiterAufRechnung) 'könnten ja mehrerer SB die Rg-Anlagen geschreiben haben - NEU + + rpt.lblSachbearbeiter.Text = getSBRgName(FIRMA.Firma_ID, VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME) 'könnten ja mehrerer SB die Rg-Anlagen geschreiben haben rpt.lblFirmenbuch.Text = If(FIRMA.Firma_Firmenbuch, "").ToString.Replace("Firmenbuch: ", "").Trim rpt.lblUID.Text = If(FIRMA.Firma_UID, "") diff --git a/SDL/Fakturierung/rptRechnungDruck.Designer.vb b/SDL/Fakturierung/rptRechnungDruck.Designer.vb index 6ba082f5..854b76b3 100644 --- a/SDL/Fakturierung/rptRechnungDruck.Designer.vb +++ b/SDL/Fakturierung/rptRechnungDruck.Designer.vb @@ -1637,7 +1637,7 @@ Partial Public Class rptRechnungDruck Private WithEvents lblUIDUeberschrift As GrapeCity.ActiveReports.SectionReportModel.Label Private WithEvents lblSendungsdatenUeberschrift As GrapeCity.ActiveReports.SectionReportModel.Label Private WithEvents lblBankUeberschrift As GrapeCity.ActiveReports.SectionReportModel.Label - Private WithEvents txtDisclaimer As GrapeCity.ActiveReports.SectionReportModel.TextBox + Public WithEvents txtDisclaimer As GrapeCity.ActiveReports.SectionReportModel.TextBox Public WithEvents lblRgNr As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents lblRgDatum As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents lblAbfertigungsNr As GrapeCity.ActiveReports.SectionReportModel.Label diff --git a/SDL/Fakturierung/rptSammelRechnungAnlagenDruck.Designer.vb b/SDL/Fakturierung/rptSammelRechnungAnlagenDruck.Designer.vb index 594b6e33..fa558e2a 100644 --- a/SDL/Fakturierung/rptSammelRechnungAnlagenDruck.Designer.vb +++ b/SDL/Fakturierung/rptSammelRechnungAnlagenDruck.Designer.vb @@ -301,7 +301,7 @@ Partial Public Class rptSammelRechnungAnlagenDruck ' 'PageFooter ' - Me.PageFooter.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Line2, Me.ReportInfo2, Me.lblBankUeberschrift, Me.txtBank1, Me.txtBank2, Me.txtDisclaimer, Me.txtBank3}) + Me.PageFooter.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.txtBank1, Me.Line2, Me.ReportInfo2, Me.lblBankUeberschrift, Me.txtBank2, Me.txtDisclaimer, Me.txtBank3}) Me.PageFooter.Height = 0.8791339! Me.PageFooter.Name = "PageFooter" ' @@ -343,14 +343,14 @@ Partial Public Class rptSammelRechnungAnlagenDruck 'txtBank1 ' Me.txtBank1.Height = 0.4181103! - Me.txtBank1.Left = 1.211024! + Me.txtBank1.Left = 1.129134! Me.txtBank1.Name = "txtBank1" Me.txtBank1.Style = "font-size: 8pt; font-weight: normal; text-align: left; text-justify: auto; ddo-ch" & "ar-set: 1" Me.txtBank1.Text = "Deutschland:" & Global.Microsoft.VisualBasic.ChrW(10) & "Raiffeisenbank Suben" & Global.Microsoft.VisualBasic.ChrW(10) & "IBAN: AT54 3445 5000 0420 7791" & Global.Microsoft.VisualBasic.ChrW(10) & "BIC: RZOOAT2L455" & "" Me.txtBank1.Top = 0.1173228! - Me.txtBank1.Width = 1.764173! + Me.txtBank1.Width = 1.899606! ' 'txtBank2 ' @@ -1225,7 +1225,7 @@ Partial Public Class rptSammelRechnungAnlagenDruck Private WithEvents Line5 As GrapeCity.ActiveReports.SectionReportModel.Line Private WithEvents lblEORIUeberschrift As GrapeCity.ActiveReports.SectionReportModel.Label Private WithEvents lblBankUeberschrift As GrapeCity.ActiveReports.SectionReportModel.Label - Private WithEvents txtDisclaimer As GrapeCity.ActiveReports.SectionReportModel.TextBox + Public WithEvents txtDisclaimer As GrapeCity.ActiveReports.SectionReportModel.TextBox Public WithEvents lblRgNr As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents lblRgDatum As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents lblSachbearbeiter As GrapeCity.ActiveReports.SectionReportModel.Label diff --git a/SDL/Fakturierung/rptSammelRechnungDruck.Designer.vb b/SDL/Fakturierung/rptSammelRechnungDruck.Designer.vb index 7b10e7c4..80cd8f4c 100644 --- a/SDL/Fakturierung/rptSammelRechnungDruck.Designer.vb +++ b/SDL/Fakturierung/rptSammelRechnungDruck.Designer.vb @@ -302,14 +302,14 @@ Partial Public Class rptSammelRechnungDruck 'txtBank1 ' Me.txtBank1.Height = 0.4181103! - Me.txtBank1.Left = 1.211024! + Me.txtBank1.Left = 1.157874! Me.txtBank1.Name = "txtBank1" Me.txtBank1.Style = "font-size: 8pt; font-weight: normal; text-align: left; text-justify: auto; ddo-ch" & "ar-set: 1" - Me.txtBank1.Text = "Deutschland:" & Global.Microsoft.VisualBasic.ChrW(10) & "Raiffeisenbank Suben" & Global.Microsoft.VisualBasic.ChrW(10) & "IBAN: AT54 3445 5000 0420 7791" & Global.Microsoft.VisualBasic.ChrW(10) & "BIC: RZOOAT2L455" & - "" + Me.txtBank1.Text = "Deutschland:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Raiffeisenbank Suben" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "IBAN: DE56 1111 2222 3333 4444 55" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "BIC: RZOO" & + "AT2L455" Me.txtBank1.Top = 0.1173228! - Me.txtBank1.Width = 1.866535! + Me.txtBank1.Width = 1.970866! ' 'txtBank2 ' @@ -1244,7 +1244,7 @@ Partial Public Class rptSammelRechnungDruck Private WithEvents Line5 As GrapeCity.ActiveReports.SectionReportModel.Line Private WithEvents lblEORIUeberschrift As GrapeCity.ActiveReports.SectionReportModel.Label Private WithEvents lblBankUeberschrift As GrapeCity.ActiveReports.SectionReportModel.Label - Private WithEvents txtDisclaimer As GrapeCity.ActiveReports.SectionReportModel.TextBox + Public WithEvents txtDisclaimer As GrapeCity.ActiveReports.SectionReportModel.TextBox Public WithEvents lblRgNr As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents lblRgDatum As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents lblSachbearbeiter As GrapeCity.ActiveReports.SectionReportModel.Label diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb index 80096c21..726fcfc4 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 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 DataGridViewCellStyle64 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle67 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle68 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle65 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle66 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle69 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle74 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle75 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle70 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle71 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle72 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle73 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle76 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle77 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle78 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle79 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle80 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle81 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle82 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle83 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle84 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() @@ -169,7 +169,6 @@ Partial Class usrCntlFaktAbrechnung Me.txtKdAuftragsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label43 = New System.Windows.Forms.Label() Me.txtRechnungAnUIDKz = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.lblVorauskasse = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.cboRechnungAn = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.txtRechnungAnUIDNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -189,6 +188,7 @@ Partial Class usrCntlFaktAbrechnung Me.txtAbsenderStrasse = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.FlatButton1 = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Panel7 = New System.Windows.Forms.Panel() + Me.lblOFgesperrt = New System.Windows.Forms.Label() Me.picVK = New System.Windows.Forms.PictureBox() Me.Button1 = New System.Windows.Forms.Button() Me.Button12 = New System.Windows.Forms.Button() @@ -279,7 +279,7 @@ Partial Class usrCntlFaktAbrechnung Me.GutschriftAnVeragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.VeragAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.VeragCSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.lblOFgesperrt = New System.Windows.Forms.Label() + Me.cboVorauskasse = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.pnlTop.SuspendLayout() Me.Panel3.SuspendLayout() Me.Panel1.SuspendLayout() @@ -869,36 +869,36 @@ Partial Class usrCntlFaktAbrechnung Me.dgvAnhaenge.AllowUserToResizeColumns = False Me.dgvAnhaenge.AllowUserToResizeRows = False Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White - 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 + DataGridViewCellStyle64.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle64.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle64.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle64.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle64.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle64.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle64.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvAnhaenge.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle64 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}) - 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 + DataGridViewCellStyle67.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle67.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle67.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle67.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle67.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle67.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle67.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvAnhaenge.DefaultCellStyle = DataGridViewCellStyle67 Me.dgvAnhaenge.Location = New System.Drawing.Point(493, 911) Me.dgvAnhaenge.MultiSelect = False Me.dgvAnhaenge.Name = "dgvAnhaenge" Me.dgvAnhaenge.ReadOnly = True - 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 + DataGridViewCellStyle68.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle68.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle68.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle68.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle68.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle68.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle68.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvAnhaenge.RowHeadersDefaultCellStyle = DataGridViewCellStyle68 Me.dgvAnhaenge.RowHeadersVisible = False Me.dgvAnhaenge.RowHeadersWidth = 62 Me.dgvAnhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect @@ -920,10 +920,10 @@ Partial Class usrCntlFaktAbrechnung ' 'DataGridViewTextBoxColumn2 ' - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle2.Format = "N0" - DataGridViewCellStyle2.NullValue = Nothing - Me.DataGridViewTextBoxColumn2.DefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle65.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle65.Format = "N0" + DataGridViewCellStyle65.NullValue = Nothing + Me.DataGridViewTextBoxColumn2.DefaultCellStyle = DataGridViewCellStyle65 Me.DataGridViewTextBoxColumn2.HeaderText = "Art" Me.DataGridViewTextBoxColumn2.MinimumWidth = 8 Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" @@ -933,9 +933,9 @@ Partial Class usrCntlFaktAbrechnung 'clmnBezeichnung ' Me.clmnBezeichnung.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle3.Format = "c2" - Me.clmnBezeichnung.DefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle66.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle66.Format = "c2" + Me.clmnBezeichnung.DefaultCellStyle = DataGridViewCellStyle66 Me.clmnBezeichnung.FillWeight = 121.2598! Me.clmnBezeichnung.HeaderText = "Bezeichnung" Me.clmnBezeichnung.MinimumWidth = 8 @@ -1967,6 +1967,7 @@ Partial Class usrCntlFaktAbrechnung ' Me.pnlRechnungAn.BackColor = System.Drawing.Color.PapayaWhip Me.pnlRechnungAn.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnlRechnungAn.Controls.Add(Me.cboVorauskasse) Me.pnlRechnungAn.Controls.Add(Me.Label56) Me.pnlRechnungAn.Controls.Add(Me.txtRechnungAnZusatz) Me.pnlRechnungAn.Controls.Add(Me.Button15) @@ -1984,7 +1985,6 @@ Partial Class usrCntlFaktAbrechnung Me.pnlRechnungAn.Controls.Add(Me.txtKdAuftragsNr) Me.pnlRechnungAn.Controls.Add(Me.Label43) Me.pnlRechnungAn.Controls.Add(Me.txtRechnungAnUIDKz) - Me.pnlRechnungAn.Controls.Add(Me.lblVorauskasse) Me.pnlRechnungAn.Controls.Add(Me.Label1) Me.pnlRechnungAn.Controls.Add(Me.cboRechnungAn) Me.pnlRechnungAn.Controls.Add(Me.txtRechnungAnUIDNr) @@ -2271,17 +2271,6 @@ Partial Class usrCntlFaktAbrechnung Me.txtRechnungAnUIDKz.TabIndex = 18 Me.txtRechnungAnUIDKz.TabStop = False ' - 'lblVorauskasse - ' - Me.lblVorauskasse.AutoSize = True - Me.lblVorauskasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblVorauskasse.Location = New System.Drawing.Point(537, 8) - Me.lblVorauskasse.Name = "lblVorauskasse" - Me.lblVorauskasse.Size = New System.Drawing.Size(37, 13) - Me.lblVorauskasse.TabIndex = 6 - Me.lblVorauskasse.Text = "NEIN" - Me.lblVorauskasse.TextAlign = System.Drawing.ContentAlignment.TopRight - ' 'Label1 ' Me.Label1.AutoSize = True @@ -2678,6 +2667,18 @@ Partial Class usrCntlFaktAbrechnung Me.Panel7.Size = New System.Drawing.Size(828, 453) Me.Panel7.TabIndex = 27 ' + 'lblOFgesperrt + ' + Me.lblOFgesperrt.AutoSize = True + Me.lblOFgesperrt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold) + Me.lblOFgesperrt.ForeColor = System.Drawing.Color.Red + Me.lblOFgesperrt.Location = New System.Drawing.Point(8, 1) + Me.lblOFgesperrt.Name = "lblOFgesperrt" + Me.lblOFgesperrt.Size = New System.Drawing.Size(73, 13) + Me.lblOFgesperrt.TabIndex = 46 + Me.lblOFgesperrt.Text = "OF gesperrt" + Me.lblOFgesperrt.Visible = False + ' 'picVK ' Me.picVK.BackgroundImage = Global.SDL.My.Resources.Resources.ok @@ -2904,35 +2905,35 @@ Partial Class usrCntlFaktAbrechnung Me.dgvRechnungenPositionen.AllowUserToResizeColumns = False Me.dgvRechnungenPositionen.AllowUserToResizeRows = False Me.dgvRechnungenPositionen.BackgroundColor = System.Drawing.Color.White - 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 + DataGridViewCellStyle69.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle69.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle69.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle69.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle69.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle69.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle69.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvRechnungenPositionen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle69 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}) - 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 + DataGridViewCellStyle74.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle74.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle74.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle74.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle74.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle74.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle74.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvRechnungenPositionen.DefaultCellStyle = DataGridViewCellStyle74 Me.dgvRechnungenPositionen.Location = New System.Drawing.Point(10, 258) Me.dgvRechnungenPositionen.Name = "dgvRechnungenPositionen" Me.dgvRechnungenPositionen.ReadOnly = True - 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 + DataGridViewCellStyle75.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle75.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle75.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle75.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle75.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle75.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle75.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvRechnungenPositionen.RowHeadersDefaultCellStyle = DataGridViewCellStyle75 Me.dgvRechnungenPositionen.RowHeadersVisible = False Me.dgvRechnungenPositionen.RowHeadersWidth = 62 Me.dgvRechnungenPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect @@ -2950,10 +2951,10 @@ Partial Class usrCntlFaktAbrechnung ' 'Anzahl ' - DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle7.Format = "N0" - DataGridViewCellStyle7.NullValue = Nothing - Me.Anzahl.DefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle70.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle70.Format = "N0" + DataGridViewCellStyle70.NullValue = Nothing + Me.Anzahl.DefaultCellStyle = DataGridViewCellStyle70 Me.Anzahl.HeaderText = "Anzahl" Me.Anzahl.MinimumWidth = 8 Me.Anzahl.Name = "Anzahl" @@ -2962,9 +2963,9 @@ Partial Class usrCntlFaktAbrechnung ' 'Preis ' - DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle8.Format = "c2" - Me.Preis.DefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle71.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle71.Format = "c2" + Me.Preis.DefaultCellStyle = DataGridViewCellStyle71 Me.Preis.HeaderText = "Preis" Me.Preis.MinimumWidth = 8 Me.Preis.Name = "Preis" @@ -2973,9 +2974,9 @@ Partial Class usrCntlFaktAbrechnung ' 'SteuerpflichtigerBetrag ' - DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle9.Format = "c2" - Me.SteuerpflichtigerBetrag.DefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle72.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle72.Format = "c2" + Me.SteuerpflichtigerBetrag.DefaultCellStyle = DataGridViewCellStyle72 Me.SteuerpflichtigerBetrag.HeaderText = "Steuerpfl." Me.SteuerpflichtigerBetrag.MinimumWidth = 8 Me.SteuerpflichtigerBetrag.Name = "SteuerpflichtigerBetrag" @@ -2984,10 +2985,10 @@ Partial Class usrCntlFaktAbrechnung ' 'SteuerfreierBetrag ' - DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle10.Format = "C2" - DataGridViewCellStyle10.NullValue = Nothing - Me.SteuerfreierBetrag.DefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle73.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle73.Format = "C2" + DataGridViewCellStyle73.NullValue = Nothing + Me.SteuerfreierBetrag.DefaultCellStyle = DataGridViewCellStyle73 Me.SteuerfreierBetrag.HeaderText = "Steuerfrei" Me.SteuerfreierBetrag.MinimumWidth = 8 Me.SteuerfreierBetrag.Name = "SteuerfreierBetrag" @@ -3010,41 +3011,41 @@ Partial Class usrCntlFaktAbrechnung Me.dgvOffertenSperrliste.AllowUserToResizeRows = False Me.dgvOffertenSperrliste.BackgroundColor = System.Drawing.Color.White Me.dgvOffertenSperrliste.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D - 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 + DataGridViewCellStyle76.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle76.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle76.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle76.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle76.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle76.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle76.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvOffertenSperrliste.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle76 Me.dgvOffertenSperrliste.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - 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 + DataGridViewCellStyle77.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle77.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle77.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle77.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle77.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle77.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle77.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvOffertenSperrliste.DefaultCellStyle = DataGridViewCellStyle77 Me.dgvOffertenSperrliste.Location = New System.Drawing.Point(11, 29) Me.dgvOffertenSperrliste.MultiSelect = False Me.dgvOffertenSperrliste.Name = "dgvOffertenSperrliste" Me.dgvOffertenSperrliste.ReadOnly = True - 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 + DataGridViewCellStyle78.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle78.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle78.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle78.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle78.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle78.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle78.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvOffertenSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle78 Me.dgvOffertenSperrliste.RowHeadersVisible = False Me.dgvOffertenSperrliste.RowHeadersWidth = 62 - 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 + DataGridViewCellStyle79.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle79.SelectionBackColor = System.Drawing.Color.PapayaWhip + DataGridViewCellStyle79.SelectionForeColor = System.Drawing.Color.Black + Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle79 Me.dgvOffertenSperrliste.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvOffertenSperrliste.Size = New System.Drawing.Size(204, 201) Me.dgvOffertenSperrliste.TabIndex = 2 @@ -3057,44 +3058,44 @@ Partial Class usrCntlFaktAbrechnung Me.dgvOfferteDetailsUebersicht.AllowUserToDeleteRows = False Me.dgvOfferteDetailsUebersicht.AllowUserToOrderColumns = True Me.dgvOfferteDetailsUebersicht.AllowUserToResizeRows = False - 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 + DataGridViewCellStyle80.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle80 Me.dgvOfferteDetailsUebersicht.BackgroundColor = System.Drawing.Color.White Me.dgvOfferteDetailsUebersicht.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D - 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 + DataGridViewCellStyle81.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle81.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle81.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle81.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle81.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle81.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle81.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvOfferteDetailsUebersicht.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle81 Me.dgvOfferteDetailsUebersicht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - 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 + DataGridViewCellStyle82.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle82.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle82.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle82.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle82.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle82.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle82.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvOfferteDetailsUebersicht.DefaultCellStyle = DataGridViewCellStyle82 Me.dgvOfferteDetailsUebersicht.Location = New System.Drawing.Point(220, 29) Me.dgvOfferteDetailsUebersicht.MultiSelect = False Me.dgvOfferteDetailsUebersicht.Name = "dgvOfferteDetailsUebersicht" - 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 + DataGridViewCellStyle83.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle83.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle83.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle83.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle83.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle83.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle83.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvOfferteDetailsUebersicht.RowHeadersDefaultCellStyle = DataGridViewCellStyle83 Me.dgvOfferteDetailsUebersicht.RowHeadersVisible = False Me.dgvOfferteDetailsUebersicht.RowHeadersWidth = 62 - 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 + DataGridViewCellStyle84.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle84.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer)) + DataGridViewCellStyle84.SelectionForeColor = System.Drawing.Color.Black + Me.dgvOfferteDetailsUebersicht.RowsDefaultCellStyle = DataGridViewCellStyle84 Me.dgvOfferteDetailsUebersicht.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvOfferteDetailsUebersicht.Size = New System.Drawing.Size(601, 201) Me.dgvOfferteDetailsUebersicht.TabIndex = 3 @@ -3966,17 +3967,16 @@ Partial Class usrCntlFaktAbrechnung Me.VeragCSToolStripMenuItem.Size = New System.Drawing.Size(122, 22) Me.VeragCSToolStripMenuItem.Text = "Verag CS" ' - 'lblOFgesperrt + 'cboVorauskasse ' - Me.lblOFgesperrt.AutoSize = True - Me.lblOFgesperrt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold) - Me.lblOFgesperrt.ForeColor = System.Drawing.Color.Red - Me.lblOFgesperrt.Location = New System.Drawing.Point(8, 1) - Me.lblOFgesperrt.Name = "lblOFgesperrt" - Me.lblOFgesperrt.Size = New System.Drawing.Size(73, 13) - Me.lblOFgesperrt.TabIndex = 46 - Me.lblOFgesperrt.Text = "OF gesperrt" - Me.lblOFgesperrt.Visible = False + Me.cboVorauskasse._allowedValuesFreiText = Nothing + Me.cboVorauskasse._allowFreiText = False + Me.cboVorauskasse._value = "" + Me.cboVorauskasse.FormattingEnabled = True + Me.cboVorauskasse.Location = New System.Drawing.Point(506, 5) + Me.cboVorauskasse.Name = "cboVorauskasse" + Me.cboVorauskasse.Size = New System.Drawing.Size(69, 21) + Me.cboVorauskasse.TabIndex = 244 ' 'usrCntlFaktAbrechnung ' @@ -4105,7 +4105,6 @@ Partial Class usrCntlFaktAbrechnung Friend WithEvents Label38 As System.Windows.Forms.Label Friend WithEvents lblDruckDatum As System.Windows.Forms.Label Friend WithEvents Label41 As System.Windows.Forms.Label - Friend WithEvents lblVorauskasse As System.Windows.Forms.Label Friend WithEvents Label1 As System.Windows.Forms.Label Friend WithEvents txtAuftraggeberName2 As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents txtEmpfeangerName2 As VERAG_PROG_ALLGEMEIN.MyTextBox @@ -4263,4 +4262,5 @@ Partial Class usrCntlFaktAbrechnung Friend WithEvents VeragAGToolStripMenuItem As ToolStripMenuItem Friend WithEvents VeragCSToolStripMenuItem As ToolStripMenuItem Friend WithEvents lblOFgesperrt As Label + Friend WithEvents cboVorauskasse As VERAG_PROG_ALLGEMEIN.MyComboBox End Class diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index 235e5ef4..4146d4bf 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -298,12 +298,6 @@ Public Class usrCntlFaktAbrechnung rtbHandling.Text = If(RECHNUNG.Handling, "") - If RECHNUNG.Vorkasse Then - lblVorauskasse.Text = "JA" - Else - lblVorauskasse.Text = "NEIN" - End If - txtText.Text = If(RECHNUNG.Text, "") txtTextZZ.Text = If(RECHNUNG.TextZZ, "") @@ -321,6 +315,15 @@ Public Class usrCntlFaktAbrechnung cboRechnungAn.changeItem(RECHNUNG.Rechnung_an) + + If RECHNUNG.Vorkasse Then + 'lblVorauskasse.Text = "JA" + cboVorauskasse.changeItem("1") + Else + 'lblVorauskasse.Text = "NEIN" + cboVorauskasse.changeItem("0") + End If + txtKdAuftragsNr.Text = If(RECHNUNG.KdAuftragsNr, "") Button2.Enabled = (RECHNUNG.Status = 0) @@ -525,6 +528,10 @@ Public Class usrCntlFaktAbrechnung End If + cboVorauskasse.Items.Clear() + cboVorauskasse.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NEIN", 0)) + cboVorauskasse.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("JA", 1)) + cboSammelrechnung.Items.Clear() cboSammelrechnung.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("0 Einzel", 0)) cboSammelrechnung.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("1 täglich", 1)) @@ -946,7 +953,7 @@ Public Class usrCntlFaktAbrechnung End If cboSammelrechnung.changeItem(If(kdFirmaAbsender.KdData_KUNDE.Sammelrechnung, "")) cboWaehrungUmrechnung.changeItem(If(kdFirmaAbsender.KdData_KUNDE.Währungscode, "")) - + cboVorauskasse.changeItem(CInt(kdFirmaAbsender.KdData_KUNDE.Vorkasse)) End If Case "2" kdFirmaRechnungAn.KdNr = kdFirmaEmpfaenger.KdNr @@ -963,6 +970,7 @@ Public Class usrCntlFaktAbrechnung End If cboSammelrechnung.changeItem(If(kdFirmaEmpfaenger.KdData_KUNDE.Sammelrechnung, "")) cboWaehrungUmrechnung.changeItem(If(kdFirmaEmpfaenger.KdData_KUNDE.Währungscode, "")) + cboVorauskasse.changeItem(CInt(kdFirmaEmpfaenger.KdData_KUNDE.Vorkasse)) End If Case "3" kdFirmaRechnungAn.KdNr = kdFirmaAuftraggeber.KdNr @@ -979,6 +987,7 @@ Public Class usrCntlFaktAbrechnung End If cboSammelrechnung.changeItem(If(kdFirmaAuftraggeber.KdData_KUNDE.Sammelrechnung, "")) cboWaehrungUmrechnung.changeItem(If(kdFirmaAuftraggeber.KdData_KUNDE.Währungscode, "")) + cboVorauskasse.changeItem(CInt(kdFirmaAuftraggeber.KdData_KUNDE.Vorkasse)) End If Case "4" kdFirmaRechnungAn.KdNr = kdFirmaAvisierer.KdNr @@ -992,6 +1001,7 @@ Public Class usrCntlFaktAbrechnung End If cboSammelrechnung.changeItem(If(kdFirmaAvisierer.KdData_KUNDE.Sammelrechnung, "")) cboWaehrungUmrechnung.changeItem(If(kdFirmaAvisierer.KdData_KUNDE.Währungscode, "")) + cboVorauskasse.changeItem(CInt(kdFirmaAvisierer.KdData_KUNDE.Vorkasse)) End If Case Else End Select @@ -1995,7 +2005,15 @@ Public Class usrCntlFaktAbrechnung RECHNUNG.Vorlageprovision_Proz = kdFirmaRechnungAn.KdData_KUNDE.Vorlageprovision '!!!!% RECHNUNG.Kreditaufwendungen_Proz = kdFirmaRechnungAn.KdData_KUNDE.Kreditaufwendungen '!!!!% RECHNUNG.Besonderheiten = kdFirmaRechnungAn.KdData_KUNDE.Besonderheiten - RECHNUNG.Vorkasse = kdFirmaRechnungAn.KdData_KUNDE.Vorkasse + + + If cboVorauskasse._value <> "" Then + RECHNUNG.Vorkasse = CBool(cboVorauskasse._value) + Else + RECHNUNG.Vorkasse = kdFirmaRechnungAn.KdData_KUNDE.Vorkasse + End If + + RECHNUNG.Nettozahlungsziel = kdFirmaRechnungAn.KdData_KUNDE.Zahlungsziel End If @@ -4154,5 +4172,11 @@ Nächste_Textzeile_lesen: End Sub - + Private Sub cboVorauskasse_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboVorauskasse.SelectedIndexChanged + If cboVorauskasse._value <> "" Then RECHNUNG.Vorkasse = CBool(cboVorauskasse._value) + If loaded Then + txtTextZZ.Text = cFakturierung.przRechnungstextZZ(RECHNUNG) + txtText.Text = cFakturierung.przRechnungstextTXT(RECHNUNG, SPEDBUCH) + End If + End Sub End Class \ No newline at end of file diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsnummern.vb b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsnummern.vb index 2e5b515c..a805f98f 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsnummern.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsnummern.vb @@ -1,5 +1,6 @@  Imports System.Data.SqlClient +Imports System.Security.Cryptography.X509Certificates Public Class cRechnungsnummern Property SpeditionsbuchNr As String = "" 'FIRMA! @@ -61,11 +62,14 @@ Public Class cRechnungsnummern VonRechnungsNr = "5000000" BisRechnungsNr = "5999999" Case 24 ' AMBAR - VonRechnungsNr = "0000001" - BisRechnungsNr = "9999999" + VonRechnungsNr = BJ_short & "000001" + BisRechnungsNr = BJ_short & "999999" Case 26 ' VERAG-UNISPED VonRechnungsNr = BJ_short & "0000001" BisRechnungsNr = BJ_short & "9999999" + Case Else + VonRechnungsNr = BJ_short & "0000001" + BisRechnungsNr = BJ_short & "9999999" End Select LfdRechnungsNr = VonRechnungsNr '-------------------------------------