diff --git a/SDL/Classes/cRKSV.vb b/SDL/Classes/cRKSV.vb index bf7d41b4..23cc5bda 100644 --- a/SDL/Classes/cRKSV.vb +++ b/SDL/Classes/cRKSV.vb @@ -2507,11 +2507,18 @@ Public Class cRKSV Public Shared Function CreateSyskaBuchung(RKSV_id As Integer, beleg As EABeleg, KBEntry_list As List(Of cKassenbuch), KBEntryGB_list As List(Of cKassenbuch), KBEntryST_list As List(Of cKassenbuch), typ As String) As Boolean + + If beleg Is Nothing Then Throw New ArgumentNullException(NameOf(beleg)) If Not (beleg.Beleg_TYP = "L" Or beleg.Beleg_TYP = "K") Then Return False End If + + If DefaultMandant = 9 Then + MsgBox("ACHTUNG, Daten werden in Mandant " & DefaultMandant & " eingespielt -> TESTMANDANT!") + End If + Dim sql As New VERAG_PROG_ALLGEMEIN.SQL() Dim mandant = DefaultMandant @@ -2534,6 +2541,7 @@ Public Class cRKSV If betrag = 0 Then Return False + Dim ForderungktoTxt As String = sql.getValueTxtBySqlVarList("SELECT i_fordkto FROM [FIBU2].dbo.fibu_konto WHERE i_konto = " & SafeIntToSql(beleg.KundenNr) & " AND i_firm_refid = " & SafeIntToSql(mandant), "FIBU",, "2000") Dim forderungskonto As Integer = SafeCIntDef(ForderungktoTxt, 2000) Dim dtKonten As DataTable = BuildVerbuchungskonten(KBEntryGB_list, beleg, kassenkonto, forderungskonto, bestandskonto) diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index 19ccb54a..b61df8b6 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -908,6 +908,7 @@ Public Class usrCntlFaktAbrechnung RECHNUNG.Vorkasse = KD.Vorkasse RECHNUNG.Kreditaufwendungen_Proz = KD.Kreditaufwendungen RECHNUNG.Vorlageprovision_Proz = KD.Vorlageprovision + RECHNUNG.Vorlageprovision_Mindestbetrag = KD.Vorlageprovision_Mindestbetrag If FIRMA IsNot Nothing Then If FIRMA.Firma_ID = 11 Then ' Bei VERAG Customs Service GmbH --> kein Bankeinzug @@ -2351,6 +2352,7 @@ Public Class usrCntlFaktAbrechnung End If RECHNUNG.Kunden_SVS = kdFirmaRechnungAn.KdData_KUNDE.SVS RECHNUNG.Vorlageprovision_Proz = kdFirmaRechnungAn.KdData_KUNDE.Vorlageprovision '!!!!% + RECHNUNG.Vorlageprovision_Mindestbetrag = kdFirmaRechnungAn.KdData_KUNDE.Vorlageprovision_Mindestbetrag '!!!!% RECHNUNG.Kreditaufwendungen_Proz = kdFirmaRechnungAn.KdData_KUNDE.Kreditaufwendungen '!!!!% RECHNUNG.Besonderheiten = kdFirmaRechnungAn.KdData_KUNDE.Besonderheiten @@ -2594,8 +2596,21 @@ Public Class usrCntlFaktAbrechnung If RECHNUNG.RechnungSprache = "DE" Or FindPOS.LeistungsBez Is Nothing Then FindPOS.LeistungsBez = "Vorlageprovision" 'RECHNUNG.POSITIONEN.Add(FindPOS) FindPOS.Anzahl = 1 - FindPOS.Preis = Math.Round(Vorlageprovision_Berechnungbetrag * (RECHNUNG.Vorlageprovision_Proz), 2) 'Int(Vorlageprovision_Berechnungbetrag * (RECHNUNG.Vorlageprovision_Proz) * 10 + 0.5) / 10 - '...und der Wert gesetzt. + + Dim Vorlageprov As Double = Math.Round(Vorlageprovision_Berechnungbetrag * (RECHNUNG.Vorlageprovision_Proz), 2) + + 'If Vorlageprov < 0 Then Vorlageprov *= -1 + + If Not IsDBNull(RECHNUNG.Vorlageprovision_Mindestbetrag) AndAlso IsNumeric(RECHNUNG.Vorlageprovision_Mindestbetrag) AndAlso CDbl(RECHNUNG.Vorlageprovision_Mindestbetrag) <> 0.00 AndAlso Vorlageprov < CDbl(RECHNUNG.Vorlageprovision_Mindestbetrag) Then + FindPOS.Preis = CDbl(RECHNUNG.Vorlageprovision_Mindestbetrag) + Else + FindPOS.Preis = Math.Round(Vorlageprovision_Berechnungbetrag * (RECHNUNG.Vorlageprovision_Proz), 2) + End If + + 'Int(Vorlageprovision_Berechnungbetrag * (RECHNUNG.Vorlageprovision_Proz) * 10 + 0.5) / 10 + + + initSteuerbetraege(RECHNUNG, FindPOS) End If diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 61f95f75..56310f72 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/kassenbuch/frmBelegNeu.vb b/SDL/kassenbuch/frmBelegNeu.vb index 25645b24..fae1152f 100644 --- a/SDL/kassenbuch/frmBelegNeu.vb +++ b/SDL/kassenbuch/frmBelegNeu.vb @@ -1586,6 +1586,16 @@ Public Class frmBelegNeu If p.LeistungsNr = 111 AndAlso p.LeistungsBez = "Rückzahlung Leihgeld" AndAlso BELEG.POS.Count = 1 Then isLeihgeldeinzahlung = True 'nur bei 1 POS und Leihgeld-Einzahlung! Next + If isLeihgeldeinzahlung Then + If BELEG.KundenNr > 0 Then + Dim KundenKontoArchiv As String = SQL.getValueTxtBySqlVarList("SELECT c_archiv FROM [FIBU2].dbo.fibu_konto WHERE i_konto = " & BELEG.KundenNr & " AND i_firm_refid = 7", "FIBU") 'ATILLA MANDANT!' + If KundenKontoArchiv <> "" Then + MsgBox("ACHTUNG, die Kundennummer ist in der Syska-FIBU inaktiv, bitte andere KundenNr verwenden!") + Exit Sub + End If + End If + End If + Dim summeBRUTTO = summeNETTO Dim steuersatz As Double = SQL.getValueTxtBySql("SELECT isnull(tblSteuersätze.Steuersatz,0) FROM tblSteuersätze WHERE tblSteuersätze.Nr='" & BELEG.Steuerschlüssel & "' ", "FMZOLL") If IsNumeric(steuersatz) Then summeBRUTTO += (summeNETTO * steuersatz) diff --git a/SDL/kassenbuch/frmNacherfassungLeihgeld.vb b/SDL/kassenbuch/frmNacherfassungLeihgeld.vb index 4cd01c2e..26ab38ad 100644 --- a/SDL/kassenbuch/frmNacherfassungLeihgeld.vb +++ b/SDL/kassenbuch/frmNacherfassungLeihgeld.vb @@ -277,7 +277,18 @@ Public Class frmNacherfassungLeihgeld Private Sub btnPrint_Click(sender As Object, e As EventArgs) Handles btnPrint.Click + Try + If BELEG.KundenNr > 0 AndAlso cbxOP_sofort_buchen.Checked Then + Dim KundenKontoArchiv As String = SQL.getValueTxtBySqlVarList("SELECT c_archiv FROM [FIBU2].dbo.fibu_konto WHERE i_konto = " & BELEG.KundenNr & " AND i_firm_refid = 7", "FIBU") 'ATILLA MANDANT!' + If KundenKontoArchiv <> "" Then + MsgBox("ACHTUNG, die Kundennummer ist in der Syska-FIBU inaktiv, bitte andere KundenNr verwenden!") + Exit Sub + End If + + End If + + If BELEG.gebucht Or BELEG.gebuchtStorno Then If BELEG.rksv_id > 0 Then KASSE.LOAD(BELEG.rksv_id) cRKSV.printKundenBelegLG(BELEG, KASSE, PERSONAL, cboPrinter.SelectedItem.ToString, "LG") diff --git a/SDL/kunden/usrCntlCBAM.vb b/SDL/kunden/usrCntlCBAM.vb index 4c3dece4..e4491f2c 100644 --- a/SDL/kunden/usrCntlCBAM.vb +++ b/SDL/kunden/usrCntlCBAM.vb @@ -1496,6 +1496,7 @@ Public Class usrCntlCBAM Dim f As New List(Of String) If btnCBAM_DS_DHF_VERAG_Detail.Tag <> "" Then f.Add(btnCBAM_DS_DHF_VERAG_Detail.Tag) If btnCBAM_DS_DHF_VERAG_Summe.Tag <> "" Then f.Add(btnCBAM_DS_DHF_VERAG_Summe.Tag) + If btnCBAM_DS_DHF_VERAG_GP.Tag <> "" Then f.Add(btnCBAM_DS_DHF_VERAG_GP.Tag) If f.Count > 0 Then 'Zwischenablage @@ -1509,6 +1510,8 @@ Public Class usrCntlCBAM Dim f As New List(Of String) If btnCBAM_DS_DHF_UNISPED_Detail.Tag <> "" Then f.Add(btnCBAM_DS_DHF_UNISPED_Detail.Tag) If btnCBAM_DS_DHF_UNISPED_Summe.Tag <> "" Then f.Add(btnCBAM_DS_DHF_UNISPED_Summe.Tag) + If btnCBAM_DS_DHF_UNISPED_GP.Tag <> "" Then f.Add(btnCBAM_DS_DHF_UNISPED_GP.Tag) + If f.Count > 0 Then 'Zwischenablage @@ -1522,6 +1525,7 @@ Public Class usrCntlCBAM Dim f As New List(Of String) If btnCBAM_DS_TELOTEC_Detail.Tag <> "" Then f.Add(btnCBAM_DS_TELOTEC_Detail.Tag) If btnCBAM_DS_TELOTEC_Summe.Tag <> "" Then f.Add(btnCBAM_DS_TELOTEC_Summe.Tag) + If btnCBAM_DS_TELOTEC_GP.Tag <> "" Then f.Add(btnCBAM_DS_TELOTEC_GP.Tag) If f.Count > 0 Then 'Zwischenablage @@ -1582,7 +1586,6 @@ Public Class usrCntlCBAM btnCBAM_DS_DHF_UNISPED_Detail.Enabled = True btnCBAM_DS_DHF_UNISPED_Copy.Enabled = True End If - Me.Cursor = Cursors.Default End If diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index 13a791d5..4c91a7d7 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -23,34 +23,34 @@ Partial Class usrcntlKundeBearbeitenFull Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - 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 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 DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle12 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 DataGridViewCellStyle22 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 DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle57 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle58 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle59 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle60 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle61 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle62 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle63 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle64 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 DataGridViewCellStyle67 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle68 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle69 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 DataGridViewCellStyle74 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle75 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() Me.tbcntrDetails = New System.Windows.Forms.TabControl() Me.tbAbfertigung = New System.Windows.Forms.TabPage() Me.cbxVerzolltBeiExport = New System.Windows.Forms.CheckBox() @@ -337,6 +337,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.lblEORI = New System.Windows.Forms.Label() Me.Label84 = New System.Windows.Forms.Label() Me.GroupBox3 = New System.Windows.Forms.GroupBox() + Me.Label116 = New System.Windows.Forms.Label() + Me.cbxBetreuer = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cbxkeineMWSt = New System.Windows.Forms.CheckBox() Me.txtGruendungsDatum = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label33 = New System.Windows.Forms.Label() @@ -424,8 +426,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboAuswahl = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.cbxBetreuer = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.Label116 = New System.Windows.Forms.Label() + Me.Label117 = New System.Windows.Forms.Label() + Me.txtAbf_Vorlageprovision_Mindestbetrag = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.tbcntrDetails.SuspendLayout() Me.tbAbfertigung.SuspendLayout() Me.tbcntrAbf.SuspendLayout() @@ -1154,6 +1156,8 @@ Partial Class usrcntlKundeBearbeitenFull ' 'tbVerrechnung ' + Me.tbVerrechnung.Controls.Add(Me.txtAbf_Vorlageprovision_Mindestbetrag) + Me.tbVerrechnung.Controls.Add(Me.Label117) Me.tbVerrechnung.Controls.Add(Me.Panel2) Me.tbVerrechnung.Controls.Add(Me.cbpKopfsammelrechnung) Me.tbVerrechnung.Controls.Add(Me.pnlverag360) @@ -1533,7 +1537,7 @@ Partial Class usrcntlKundeBearbeitenFull 'Label101 ' Me.Label101.AutoSize = True - Me.Label101.Location = New System.Drawing.Point(191, 53) + Me.Label101.Location = New System.Drawing.Point(12, 116) Me.Label101.Name = "Label101" Me.Label101.Size = New System.Drawing.Size(50, 13) Me.Label101.TabIndex = 42 @@ -1687,16 +1691,16 @@ Partial Class usrcntlKundeBearbeitenFull 'Label47 ' Me.Label47.AutoSize = True - Me.Label47.Location = New System.Drawing.Point(12, 135) + Me.Label47.Location = New System.Drawing.Point(191, 72) Me.Label47.Name = "Label47" - Me.Label47.Size = New System.Drawing.Size(92, 13) + Me.Label47.Size = New System.Drawing.Size(30, 13) Me.Label47.TabIndex = 15 - Me.Label47.Text = "Bankspesen Min.:" + Me.Label47.Text = "Min.:" ' 'Label46 ' Me.Label46.AutoSize = True - Me.Label46.Location = New System.Drawing.Point(12, 113) + Me.Label46.Location = New System.Drawing.Point(12, 72) Me.Label46.Name = "Label46" Me.Label46.Size = New System.Drawing.Size(69, 13) Me.Label46.TabIndex = 10 @@ -1705,7 +1709,7 @@ Partial Class usrcntlKundeBearbeitenFull 'Label45 ' Me.Label45.AutoSize = True - Me.Label45.Location = New System.Drawing.Point(12, 91) + Me.Label45.Location = New System.Drawing.Point(12, 50) Me.Label45.Name = "Label45" Me.Label45.Size = New System.Drawing.Size(108, 13) Me.Label45.TabIndex = 5 @@ -1734,7 +1738,7 @@ Partial Class usrcntlKundeBearbeitenFull 'Label44 ' Me.Label44.AutoSize = True - Me.Label44.Location = New System.Drawing.Point(12, 69) + Me.Label44.Location = New System.Drawing.Point(12, 92) Me.Label44.Name = "Label44" Me.Label44.Size = New System.Drawing.Size(88, 13) Me.Label44.TabIndex = 0 @@ -1852,7 +1856,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtAbwZZVL._Waehrung = False Me.txtAbwZZVL._WaehrungZeichen = True Me.txtAbwZZVL.ForeColor = System.Drawing.Color.Red - Me.txtAbwZZVL.Location = New System.Drawing.Point(191, 66) + Me.txtAbwZZVL.Location = New System.Drawing.Point(125, 113) Me.txtAbwZZVL.MaxLength = 10 Me.txtAbwZZVL.MaxLineLength = -1 Me.txtAbwZZVL.MaxLines_Warning = "" @@ -2123,13 +2127,13 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtAbf_BankspesenMindestbetrag._Waehrung = True Me.txtAbf_BankspesenMindestbetrag._WaehrungZeichen = True Me.txtAbf_BankspesenMindestbetrag.ForeColor = System.Drawing.Color.Red - Me.txtAbf_BankspesenMindestbetrag.Location = New System.Drawing.Point(125, 132) + Me.txtAbf_BankspesenMindestbetrag.Location = New System.Drawing.Point(222, 65) Me.txtAbf_BankspesenMindestbetrag.MaxLength = 50 Me.txtAbf_BankspesenMindestbetrag.MaxLineLength = -1 Me.txtAbf_BankspesenMindestbetrag.MaxLines_Warning = "" Me.txtAbf_BankspesenMindestbetrag.MaxLines_Warning_Label = Nothing Me.txtAbf_BankspesenMindestbetrag.Name = "txtAbf_BankspesenMindestbetrag" - Me.txtAbf_BankspesenMindestbetrag.Size = New System.Drawing.Size(86, 20) + Me.txtAbf_BankspesenMindestbetrag.Size = New System.Drawing.Size(43, 20) Me.txtAbf_BankspesenMindestbetrag.TabIndex = 16 Me.txtAbf_BankspesenMindestbetrag.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' @@ -2148,7 +2152,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtAbf_Bankspesen._Waehrung = False Me.txtAbf_Bankspesen._WaehrungZeichen = True Me.txtAbf_Bankspesen.ForeColor = System.Drawing.Color.Black - Me.txtAbf_Bankspesen.Location = New System.Drawing.Point(125, 110) + Me.txtAbf_Bankspesen.Location = New System.Drawing.Point(125, 69) Me.txtAbf_Bankspesen.MaxLength = 10 Me.txtAbf_Bankspesen.MaxLineLength = -1 Me.txtAbf_Bankspesen.MaxLines_Warning = "" @@ -2174,7 +2178,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtAbf_Kreditaufwendungen._Waehrung = False Me.txtAbf_Kreditaufwendungen._WaehrungZeichen = True Me.txtAbf_Kreditaufwendungen.ForeColor = System.Drawing.Color.Black - Me.txtAbf_Kreditaufwendungen.Location = New System.Drawing.Point(125, 88) + Me.txtAbf_Kreditaufwendungen.Location = New System.Drawing.Point(125, 47) Me.txtAbf_Kreditaufwendungen.MaxLength = 10 Me.txtAbf_Kreditaufwendungen.MaxLineLength = -1 Me.txtAbf_Kreditaufwendungen.MaxLines_Warning = "" @@ -2200,7 +2204,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtAbf_Vorlageprovision._Waehrung = False Me.txtAbf_Vorlageprovision._WaehrungZeichen = True Me.txtAbf_Vorlageprovision.ForeColor = System.Drawing.Color.Black - Me.txtAbf_Vorlageprovision.Location = New System.Drawing.Point(125, 66) + Me.txtAbf_Vorlageprovision.Location = New System.Drawing.Point(125, 91) Me.txtAbf_Vorlageprovision.MaxLength = 10 Me.txtAbf_Vorlageprovision.MaxLineLength = -1 Me.txtAbf_Vorlageprovision.MaxLines_Warning = "" @@ -3227,8 +3231,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvUmsatzbericht.AllowUserToDeleteRows = False Me.dgvUmsatzbericht.AllowUserToOrderColumns = True Me.dgvUmsatzbericht.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle57.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle57 Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUmsatzbericht.Location = New System.Drawing.Point(6, 25) @@ -3327,8 +3331,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvOffenePosten.AllowUserToDeleteRows = False Me.dgvOffenePosten.AllowUserToOrderColumns = True Me.dgvOffenePosten.AllowUserToResizeRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle58.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle58 Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvOffenePosten.Location = New System.Drawing.Point(6, 38) @@ -3503,40 +3507,40 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvKreditkarten.AllowUserToDeleteRows = False Me.dgvKreditkarten.AllowUserToOrderColumns = True Me.dgvKreditkarten.AllowUserToResizeRows = False - DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle59.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle59 Me.dgvKreditkarten.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle60.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle60.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle60.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle60.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle60.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle60.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle60.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle60 Me.dgvKreditkarten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window - 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.ControlText - DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle61.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle61.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle61.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle61.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle61.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle61.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle61.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle61 Me.dgvKreditkarten.Location = New System.Drawing.Point(9, 20) Me.dgvKreditkarten.MultiSelect = False Me.dgvKreditkarten.Name = "dgvKreditkarten" - 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.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle62.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle62.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle62.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle62.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle62.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle62.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle62.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle62 Me.dgvKreditkarten.RowHeadersVisible = False - DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle63.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle63 Me.dgvKreditkarten.RowTemplate.DefaultCellStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.dgvKreditkarten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvKreditkarten.Size = New System.Drawing.Size(642, 312) @@ -3616,26 +3620,26 @@ Partial Class usrcntlKundeBearbeitenFull ' 'dgvMWST ' - DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvMWST.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle64.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvMWST.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle64 Me.dgvMWST.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvMWST.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle65.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle65.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle65.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle65.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle65.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle65.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle65.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvMWST.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle65 Me.dgvMWST.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window - 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.ControlText - DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvMWST.DefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle66.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle66.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle66.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle66.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle66.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle66.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle66.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvMWST.DefaultCellStyle = DataGridViewCellStyle66 Me.dgvMWST.Location = New System.Drawing.Point(9, 359) Me.dgvMWST.Name = "dgvMWST" Me.dgvMWST.Size = New System.Drawing.Size(171, 125) @@ -3720,26 +3724,26 @@ Partial Class usrcntlKundeBearbeitenFull ' 'dgvUstv_LaenderUndSteuernummern ' - DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle67.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle67 Me.dgvUstv_LaenderUndSteuernummern.BackgroundColor = System.Drawing.Color.White - 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.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12 + 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.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle68 Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window - 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.ControlText - DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle69.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle69.BackColor = System.Drawing.SystemColors.Window + 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.ControlText + DataGridViewCellStyle69.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle69.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle69.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle69 Me.dgvUstv_LaenderUndSteuernummern.Location = New System.Drawing.Point(9, 94) Me.dgvUstv_LaenderUndSteuernummern.Name = "dgvUstv_LaenderUndSteuernummern" Me.dgvUstv_LaenderUndSteuernummern.Size = New System.Drawing.Size(657, 259) @@ -3990,26 +3994,26 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvIDS_Standard.AllowUserToAddRows = False Me.dgvIDS_Standard.AllowUserToDeleteRows = False Me.dgvIDS_Standard.AllowUserToResizeRows = False - DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvIDS_Standard.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle70.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvIDS_Standard.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle70 Me.dgvIDS_Standard.BackgroundColor = System.Drawing.Color.White - 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.dgvIDS_Standard.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle71.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle71.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle71.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle71.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle71.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle71.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle71.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvIDS_Standard.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle71 Me.dgvIDS_Standard.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvIDS_Standard.DefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle72.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle72.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle72.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle72.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle72.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle72.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle72.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvIDS_Standard.DefaultCellStyle = DataGridViewCellStyle72 Me.dgvIDS_Standard.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvIDS_Standard.Location = New System.Drawing.Point(3, 3) Me.dgvIDS_Standard.Name = "dgvIDS_Standard" @@ -4032,26 +4036,26 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvIDS_Rabatte.AllowUserToAddRows = False Me.dgvIDS_Rabatte.AllowUserToDeleteRows = False Me.dgvIDS_Rabatte.AllowUserToResizeRows = False - DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvIDS_Rabatte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17 + DataGridViewCellStyle73.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvIDS_Rabatte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle73 Me.dgvIDS_Rabatte.BackgroundColor = System.Drawing.Color.White - 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.dgvIDS_Rabatte.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle18 + DataGridViewCellStyle74.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle74.BackColor = System.Drawing.SystemColors.Control + 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.WindowText + DataGridViewCellStyle74.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle74.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle74.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvIDS_Rabatte.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle74 Me.dgvIDS_Rabatte.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.dgvIDS_Rabatte.DefaultCellStyle = DataGridViewCellStyle19 + DataGridViewCellStyle75.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle75.BackColor = System.Drawing.SystemColors.Window + 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.ControlText + DataGridViewCellStyle75.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle75.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle75.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvIDS_Rabatte.DefaultCellStyle = DataGridViewCellStyle75 Me.dgvIDS_Rabatte.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvIDS_Rabatte.Location = New System.Drawing.Point(3, 3) Me.dgvIDS_Rabatte.Name = "dgvIDS_Rabatte" @@ -4223,26 +4227,26 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvSonst_IDSKunden.AllowUserToAddRows = False Me.dgvSonst_IDSKunden.AllowUserToDeleteRows = False Me.dgvSonst_IDSKunden.AllowUserToResizeRows = False - DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20 + DataGridViewCellStyle76.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle76 Me.dgvSonst_IDSKunden.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle21 + DataGridViewCellStyle77.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle77.BackColor = System.Drawing.SystemColors.Control + 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.WindowText + DataGridViewCellStyle77.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle77.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle77.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle77 Me.dgvSonst_IDSKunden.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Window - 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.ControlText - DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle22 + DataGridViewCellStyle78.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle78.BackColor = System.Drawing.SystemColors.Window + 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.ControlText + DataGridViewCellStyle78.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle78.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle78.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle78 Me.dgvSonst_IDSKunden.Location = New System.Drawing.Point(9, 214) Me.dgvSonst_IDSKunden.MultiSelect = False Me.dgvSonst_IDSKunden.Name = "dgvSonst_IDSKunden" @@ -4553,26 +4557,26 @@ Partial Class usrcntlKundeBearbeitenFull 'DataGridView1 ' Me.DataGridView1.AllowUserToResizeRows = False - DataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23 + DataGridViewCellStyle79.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle79 Me.DataGridView1.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control - 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.WindowText - DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle24 + DataGridViewCellStyle80.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle80.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle80.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle80.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle80.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle80.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle80.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle80 Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - 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.DataGridView1.DefaultCellStyle = DataGridViewCellStyle25 + DataGridViewCellStyle81.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle81.BackColor = System.Drawing.SystemColors.Window + 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.ControlText + DataGridViewCellStyle81.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle81.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle81.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle81 Me.DataGridView1.Enabled = False Me.DataGridView1.Location = New System.Drawing.Point(6, 111) Me.DataGridView1.MultiSelect = False @@ -4639,26 +4643,26 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.dgvBankverbindungen.AllowUserToDeleteRows = False Me.dgvBankverbindungen.AllowUserToResizeRows = False - DataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvBankverbindungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle26 + DataGridViewCellStyle82.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvBankverbindungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle82 Me.dgvBankverbindungen.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.dgvBankverbindungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle27 + 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.dgvBankverbindungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle83 Me.dgvBankverbindungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvBankverbindungen.DefaultCellStyle = DataGridViewCellStyle28 + DataGridViewCellStyle84.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle84.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle84.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle84.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle84.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle84.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle84.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvBankverbindungen.DefaultCellStyle = DataGridViewCellStyle84 Me.dgvBankverbindungen.Location = New System.Drawing.Point(3, 40) Me.dgvBankverbindungen.MultiSelect = False Me.dgvBankverbindungen.Name = "dgvBankverbindungen" @@ -4758,6 +4762,31 @@ Partial Class usrcntlKundeBearbeitenFull Me.GroupBox3.TabStop = False Me.GroupBox3.Text = "Firma" ' + 'Label116 + ' + Me.Label116.AutoSize = True + Me.Label116.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label116.Location = New System.Drawing.Point(11, 185) + Me.Label116.Name = "Label116" + Me.Label116.Size = New System.Drawing.Size(50, 13) + Me.Label116.TabIndex = 138 + Me.Label116.Text = "Betreuer:" + ' + 'cbxBetreuer + ' + Me.cbxBetreuer._allowedValuesFreiText = Nothing + Me.cbxBetreuer._allowFreiText = False + Me.cbxBetreuer._value = "" + Me.cbxBetreuer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cbxBetreuer.DropDownWidth = 150 + Me.cbxBetreuer.FlatStyle = System.Windows.Forms.FlatStyle.System + Me.cbxBetreuer.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxBetreuer.FormattingEnabled = True + Me.cbxBetreuer.Location = New System.Drawing.Point(110, 182) + Me.cbxBetreuer.Name = "cbxBetreuer" + Me.cbxBetreuer.Size = New System.Drawing.Size(120, 21) + Me.cbxBetreuer.TabIndex = 137 + ' 'cbxkeineMWSt ' Me.cbxkeineMWSt.AutoSize = True @@ -5789,30 +5818,39 @@ Partial Class usrcntlKundeBearbeitenFull Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' - 'cbxBetreuer + 'Label117 ' - Me.cbxBetreuer._allowedValuesFreiText = Nothing - Me.cbxBetreuer._allowFreiText = False - Me.cbxBetreuer._value = "" - Me.cbxBetreuer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cbxBetreuer.DropDownWidth = 150 - Me.cbxBetreuer.FlatStyle = System.Windows.Forms.FlatStyle.System - Me.cbxBetreuer.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxBetreuer.FormattingEnabled = True - Me.cbxBetreuer.Location = New System.Drawing.Point(110, 182) - Me.cbxBetreuer.Name = "cbxBetreuer" - Me.cbxBetreuer.Size = New System.Drawing.Size(120, 21) - Me.cbxBetreuer.TabIndex = 137 + Me.Label117.AutoSize = True + Me.Label117.Location = New System.Drawing.Point(191, 94) + Me.Label117.Name = "Label117" + Me.Label117.Size = New System.Drawing.Size(30, 13) + Me.Label117.TabIndex = 52 + Me.Label117.Text = "Min.:" ' - 'Label116 + 'txtAbf_Vorlageprovision_Mindestbetrag ' - Me.Label116.AutoSize = True - Me.Label116.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label116.Location = New System.Drawing.Point(11, 185) - Me.Label116.Name = "Label116" - Me.Label116.Size = New System.Drawing.Size(50, 13) - Me.Label116.TabIndex = 138 - Me.Label116.Text = "Betreuer:" + Me.txtAbf_Vorlageprovision_Mindestbetrag._DateTimeOnly = False + Me.txtAbf_Vorlageprovision_Mindestbetrag._numbersOnly = False + Me.txtAbf_Vorlageprovision_Mindestbetrag._numbersOnlyKommastellen = "" + Me.txtAbf_Vorlageprovision_Mindestbetrag._numbersOnlyTrennzeichen = True + Me.txtAbf_Vorlageprovision_Mindestbetrag._Prozent = False + Me.txtAbf_Vorlageprovision_Mindestbetrag._ShortDateNew = False + Me.txtAbf_Vorlageprovision_Mindestbetrag._ShortDateOnly = False + Me.txtAbf_Vorlageprovision_Mindestbetrag._TimeOnly = False + Me.txtAbf_Vorlageprovision_Mindestbetrag._TimeOnly_Seconds = False + Me.txtAbf_Vorlageprovision_Mindestbetrag._value = "" + Me.txtAbf_Vorlageprovision_Mindestbetrag._Waehrung = True + Me.txtAbf_Vorlageprovision_Mindestbetrag._WaehrungZeichen = True + Me.txtAbf_Vorlageprovision_Mindestbetrag.ForeColor = System.Drawing.Color.Red + Me.txtAbf_Vorlageprovision_Mindestbetrag.Location = New System.Drawing.Point(222, 90) + Me.txtAbf_Vorlageprovision_Mindestbetrag.MaxLength = 50 + Me.txtAbf_Vorlageprovision_Mindestbetrag.MaxLineLength = -1 + Me.txtAbf_Vorlageprovision_Mindestbetrag.MaxLines_Warning = "" + Me.txtAbf_Vorlageprovision_Mindestbetrag.MaxLines_Warning_Label = Nothing + Me.txtAbf_Vorlageprovision_Mindestbetrag.Name = "txtAbf_Vorlageprovision_Mindestbetrag" + Me.txtAbf_Vorlageprovision_Mindestbetrag.Size = New System.Drawing.Size(43, 20) + Me.txtAbf_Vorlageprovision_Mindestbetrag.TabIndex = 53 + Me.txtAbf_Vorlageprovision_Mindestbetrag.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' 'usrcntlKundeBearbeitenFull ' @@ -6297,4 +6335,6 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents txtSonst_weitereKdNrWOELFL As TextBox Friend WithEvents Label116 As Label Friend WithEvents cbxBetreuer As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents txtAbf_Vorlageprovision_Mindestbetrag As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label117 As Label End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index f8e9e0ba..9a571fae 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -192,6 +192,7 @@ Public Class usrcntlKundeBearbeitenFull txtAbf_ErsteAbfertigung._value = loadValue(KUNDE.Erste_Abfertigung, "") txtAbf_Vorlageprovision._value = loadValue(KUNDE.Vorlageprovision, "") + txtAbf_Vorlageprovision_Mindestbetrag._value = loadValue(KUNDE.Vorlageprovision_Mindestbetrag, "") txtDebKdNr.Text = loadValue(KUNDE.KundenNrZentrale, KUNDE.KundenNr) txtAbf_Kreditaufwendungen._value = loadValue(KUNDE.Kreditaufwendungen, "") @@ -631,6 +632,7 @@ Public Class usrcntlKundeBearbeitenFull KUNDE.Bankspesen = isLeerNothingDbl(txtAbf_Bankspesen._value, 0) KUNDE.Bankspesen_Mindestbetrag = If(IsNumeric(txtAbf_BankspesenMindestbetrag._value), CDbl(txtAbf_BankspesenMindestbetrag._value), 0) + KUNDE.Vorlageprovision_Mindestbetrag = If(IsNumeric(txtAbf_Vorlageprovision_Mindestbetrag._value), CDbl(txtAbf_Vorlageprovision_Mindestbetrag._value), 0) KUNDE.Kreditlimit = txtVers_Kreditlimit.Text KUNDE_ERW.kde_abweichendesZZVL = If(txtAbwZZVL._value <> "" And IsNumeric(txtAbwZZVL._value), txtAbwZZVL._value, Nothing) @@ -874,25 +876,31 @@ Public Class usrcntlKundeBearbeitenFull End If Dim allowdelete = Not (KUNDE.hasEntry And ADRESSE.hasEntry) ' wenn der Eintrag bereits existiert + + If Not checkAbfertigungsverbot() Then + txtERROR.Text = "Grund für Abfertigungsverbot angeben!" : Exit Sub + End If + + If ADRESSE.SAVE() Then - If KUNDE.SAVE() Then - If FISKAL.SAVE AndAlso KUNDE_ERW.SAVE Then - If usrCntlAufschubkonten.SAVE() Then - pnlNeukunde.Visible = False - btnUIDPruef.Visible = True - RaiseEvent KD_SAVED(ADRESSE.AdressenNr) - init(KUNDE.KundenNr) + If KUNDE.SAVE() Then + If FISKAL.SAVE AndAlso KUNDE_ERW.SAVE Then + If usrCntlAufschubkonten.SAVE() Then + pnlNeukunde.Visible = False + btnUIDPruef.Visible = True + RaiseEvent KD_SAVED(ADRESSE.AdressenNr) + init(KUNDE.KundenNr) + End If End If + Else + If allowdelete Then sql.doSQL("DELETE FROM Adressen WHERE AdressenNr=" & ADRESSE.AdressenNr, "FMZOLL") + txtERROR.Text = "FEHLER beim Eintragen in die Tabelle 'Kunden'!" End If Else - If allowdelete Then sql.doSQL("DELETE FROM Adressen WHERE AdressenNr=" & ADRESSE.AdressenNr, "FMZOLL") - txtERROR.Text = "FEHLER beim Eintragen in die Tabelle 'Kunden'!" + txtERROR.Text = "FEHLER beim Eintragen in die Tabelle 'Adressen'!" End If - Else - txtERROR.Text = "FEHLER beim Eintragen in die Tabelle 'Adressen'!" End If - End If - initBesonderheitenNEU() + initBesonderheitenNEU() pnlverag360.Visible = isVerag360 @@ -2637,4 +2645,26 @@ Public Class usrcntlKundeBearbeitenFull End If End Sub + + Private Function checkAbfertigungsverbot() + + + If cboAbfVerb_Abfertigungsverbot.Checked Then + + If rtbAbfVerb_Grund.Text.Trim <> "" AndAlso rtbAbfVerb_Grund.TextLength < 4 Then + Return False + + Else + + Return True + End If + + End If + + + Return True + + End Function + + End Class diff --git a/SDL/mdm/usrcntlFremdrechnungen.Designer.vb b/SDL/mdm/usrcntlFremdrechnungen.Designer.vb index e30e1d38..2ac7d739 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.Designer.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.Designer.vb @@ -23,8 +23,8 @@ Partial Class usrcntlFremdrechnungen Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - 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 DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.DetailsAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.FlowLayoutPanel = New System.Windows.Forms.FlowLayoutPanel() Me.btnSDL_Alle = New System.Windows.Forms.Button() @@ -39,6 +39,10 @@ Partial Class usrcntlFremdrechnungen Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.KundenblattAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Panel1 = New System.Windows.Forms.Panel() + Me.Label7 = New System.Windows.Forms.Label() + Me.txtKundenNrbis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtKundenNrvon = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label6 = New System.Windows.Forms.Label() Me.lblSumBto = New System.Windows.Forms.Label() Me.Label5 = New System.Windows.Forms.Label() Me.cbxMailoeffnen = New System.Windows.Forms.CheckBox() @@ -64,11 +68,8 @@ Partial Class usrcntlFremdrechnungen Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem() - Me.Label6 = New System.Windows.Forms.Label() Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.txtKundenNrvon = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtKundenNrbis = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label7 = New System.Windows.Forms.Label() + Me.cbxTest = New System.Windows.Forms.CheckBox() Me.FlowLayoutPanel.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() Me.Panel1.SuspendLayout() @@ -282,6 +283,7 @@ Partial Class usrcntlFremdrechnungen Me.Panel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.Panel1.BackColor = System.Drawing.SystemColors.ControlLightLight Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel1.Controls.Add(Me.cbxTest) Me.Panel1.Controls.Add(Me.Label7) Me.Panel1.Controls.Add(Me.txtKundenNrbis) Me.Panel1.Controls.Add(Me.txtKundenNrvon) @@ -309,6 +311,70 @@ Partial Class usrcntlFremdrechnungen Me.Panel1.Size = New System.Drawing.Size(260, 907) Me.Panel1.TabIndex = 23 ' + 'Label7 + ' + Me.Label7.AutoSize = True + Me.Label7.Location = New System.Drawing.Point(121, 126) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(10, 13) + Me.Label7.TabIndex = 60 + Me.Label7.Text = "-" + ' + 'txtKundenNrbis + ' + Me.txtKundenNrbis._DateTimeOnly = False + Me.txtKundenNrbis._numbersOnly = True + Me.txtKundenNrbis._numbersOnlyKommastellen = "" + Me.txtKundenNrbis._numbersOnlyTrennzeichen = False + Me.txtKundenNrbis._Prozent = False + Me.txtKundenNrbis._ShortDateNew = False + Me.txtKundenNrbis._ShortDateOnly = False + Me.txtKundenNrbis._TimeOnly = False + Me.txtKundenNrbis._TimeOnly_Seconds = False + Me.txtKundenNrbis._value = "" + Me.txtKundenNrbis._Waehrung = False + Me.txtKundenNrbis._WaehrungZeichen = False + Me.txtKundenNrbis.ForeColor = System.Drawing.Color.Black + Me.txtKundenNrbis.Location = New System.Drawing.Point(146, 123) + Me.txtKundenNrbis.MaxLineLength = -1 + Me.txtKundenNrbis.MaxLines_Warning = "" + Me.txtKundenNrbis.MaxLines_Warning_Label = Nothing + Me.txtKundenNrbis.Name = "txtKundenNrbis" + Me.txtKundenNrbis.Size = New System.Drawing.Size(98, 20) + Me.txtKundenNrbis.TabIndex = 59 + ' + 'txtKundenNrvon + ' + Me.txtKundenNrvon._DateTimeOnly = False + Me.txtKundenNrvon._numbersOnly = True + Me.txtKundenNrvon._numbersOnlyKommastellen = "" + Me.txtKundenNrvon._numbersOnlyTrennzeichen = False + Me.txtKundenNrvon._Prozent = False + Me.txtKundenNrvon._ShortDateNew = False + Me.txtKundenNrvon._ShortDateOnly = False + Me.txtKundenNrvon._TimeOnly = False + Me.txtKundenNrvon._TimeOnly_Seconds = False + Me.txtKundenNrvon._value = "" + Me.txtKundenNrvon._Waehrung = False + Me.txtKundenNrvon._WaehrungZeichen = False + Me.txtKundenNrvon.ForeColor = System.Drawing.Color.Black + Me.txtKundenNrvon.Location = New System.Drawing.Point(11, 123) + Me.txtKundenNrvon.MaxLineLength = -1 + Me.txtKundenNrvon.MaxLines_Warning = "" + Me.txtKundenNrvon.MaxLines_Warning_Label = Nothing + Me.txtKundenNrvon.Name = "txtKundenNrvon" + Me.txtKundenNrvon.Size = New System.Drawing.Size(98, 20) + Me.txtKundenNrvon.TabIndex = 58 + ' + 'Label6 + ' + Me.Label6.AutoSize = True + Me.Label6.Location = New System.Drawing.Point(8, 107) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(58, 13) + Me.Label6.TabIndex = 57 + Me.Label6.Text = "KundenNr." + ' 'lblSumBto ' Me.lblSumBto.AutoSize = True @@ -529,12 +595,13 @@ Partial Class usrcntlFremdrechnungen Me.dgvLFRechnung.AllowUserToDeleteRows = False Me.dgvLFRechnung.AllowUserToResizeColumns = False Me.dgvLFRechnung.AllowUserToResizeRows = False - DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvLFRechnung.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvLFRechnung.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvLFRechnung.BackgroundColor = System.Drawing.Color.White Me.dgvLFRechnung.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvLFRechnung.Location = New System.Drawing.Point(4, 3) Me.dgvLFRechnung.Name = "dgvLFRechnung" + Me.dgvLFRechnung.ReadOnly = True Me.dgvLFRechnung.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvLFRechnung.Size = New System.Drawing.Size(1354, 770) Me.dgvLFRechnung.TabIndex = 29 @@ -546,8 +613,8 @@ Partial Class usrcntlFremdrechnungen Me.dgvDetails.AllowUserToDeleteRows = False Me.dgvDetails.AllowUserToResizeColumns = False Me.dgvDetails.AllowUserToResizeRows = False - DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.dgvDetails.BackgroundColor = System.Drawing.Color.White Me.dgvDetails.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvDetails.Location = New System.Drawing.Point(-1, 3) @@ -585,74 +652,21 @@ Partial Class usrcntlFremdrechnungen Me.ToolStripMenuItem6.Size = New System.Drawing.Size(210, 22) Me.ToolStripMenuItem6.Text = "Formatiert (dauert länger)" ' - 'Label6 - ' - Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(8, 107) - Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(58, 13) - Me.Label6.TabIndex = 57 - Me.Label6.Text = "KundenNr." - ' 'ContextMenuStrip2 ' Me.ContextMenuStrip2.Name = "ContextMenuStrip2" Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4) ' - 'txtKundenNrvon + 'cbxTest ' - Me.txtKundenNrvon._DateTimeOnly = False - Me.txtKundenNrvon._numbersOnly = True - Me.txtKundenNrvon._numbersOnlyKommastellen = "" - Me.txtKundenNrvon._numbersOnlyTrennzeichen = False - Me.txtKundenNrvon._Prozent = False - Me.txtKundenNrvon._ShortDateNew = False - Me.txtKundenNrvon._ShortDateOnly = False - Me.txtKundenNrvon._TimeOnly = False - Me.txtKundenNrvon._TimeOnly_Seconds = False - Me.txtKundenNrvon._value = "" - Me.txtKundenNrvon._Waehrung = False - Me.txtKundenNrvon._WaehrungZeichen = False - Me.txtKundenNrvon.ForeColor = System.Drawing.Color.Black - Me.txtKundenNrvon.Location = New System.Drawing.Point(11, 123) - Me.txtKundenNrvon.MaxLineLength = -1 - Me.txtKundenNrvon.MaxLines_Warning = "" - Me.txtKundenNrvon.MaxLines_Warning_Label = Nothing - Me.txtKundenNrvon.Name = "txtKundenNrvon" - Me.txtKundenNrvon.Size = New System.Drawing.Size(98, 20) - Me.txtKundenNrvon.TabIndex = 58 - ' - 'txtKundenNrbis - ' - Me.txtKundenNrbis._DateTimeOnly = False - Me.txtKundenNrbis._numbersOnly = True - Me.txtKundenNrbis._numbersOnlyKommastellen = "" - Me.txtKundenNrbis._numbersOnlyTrennzeichen = False - Me.txtKundenNrbis._Prozent = False - Me.txtKundenNrbis._ShortDateNew = False - Me.txtKundenNrbis._ShortDateOnly = False - Me.txtKundenNrbis._TimeOnly = False - Me.txtKundenNrbis._TimeOnly_Seconds = False - Me.txtKundenNrbis._value = "" - Me.txtKundenNrbis._Waehrung = False - Me.txtKundenNrbis._WaehrungZeichen = False - Me.txtKundenNrbis.ForeColor = System.Drawing.Color.Black - Me.txtKundenNrbis.Location = New System.Drawing.Point(146, 123) - Me.txtKundenNrbis.MaxLineLength = -1 - Me.txtKundenNrbis.MaxLines_Warning = "" - Me.txtKundenNrbis.MaxLines_Warning_Label = Nothing - Me.txtKundenNrbis.Name = "txtKundenNrbis" - Me.txtKundenNrbis.Size = New System.Drawing.Size(98, 20) - Me.txtKundenNrbis.TabIndex = 59 - ' - 'Label7 - ' - Me.Label7.AutoSize = True - Me.Label7.Location = New System.Drawing.Point(121, 126) - Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(10, 13) - Me.Label7.TabIndex = 60 - Me.Label7.Text = "-" + Me.cbxTest.AutoSize = True + Me.cbxTest.Location = New System.Drawing.Point(146, 214) + Me.cbxTest.Name = "cbxTest" + Me.cbxTest.Size = New System.Drawing.Size(61, 17) + Me.cbxTest.TabIndex = 61 + Me.cbxTest.Text = "testmail" + Me.cbxTest.UseVisualStyleBackColor = True + Me.cbxTest.Visible = False ' 'usrcntlFremdrechnungen ' @@ -723,4 +737,5 @@ Partial Class usrcntlFremdrechnungen Friend WithEvents txtKundenNrvon As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label6 As Label Friend WithEvents ContextMenuStrip2 As ContextMenuStrip + Friend WithEvents cbxTest As CheckBox End Class diff --git a/SDL/mdm/usrcntlFremdrechnungen.vb b/SDL/mdm/usrcntlFremdrechnungen.vb index 3ad02243..14020259 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.vb @@ -53,6 +53,9 @@ Public Class usrcntlFremdrechnungen txtKundenNrvon.Enabled = kdNr <= 0 txtKundenNrbis.Enabled = kdNr <= 0 + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMINFUNCTIONS", "SDL") Then + cbxTest.Visible = True + End If Dim kdNr_WHERE = "" If kdNr_filter Then @@ -887,14 +890,13 @@ Public Class usrcntlFremdrechnungen Dim TextHTMLtable = "" Dim pdflist = createEMailTable(TextHTMLtable, kvp, cbx.Checked) - If Not cbxMailoeffnen.Checked And pdflist.Count > 0 Then + If pdflist.Count > 0 Then + + createEmail(kvp.Key, TextHTMLtable, pdflist) - Else - If pdflist.Count > 0 Then createEmail(kvp.Key, TextHTMLtable, pdflist) End If - Next @@ -1126,6 +1128,12 @@ Public Class usrcntlFremdrechnungen Mail.To &= kundeMail.EMail Mail.CC &= kundeMail.EMail2 + If cbxTest.Checked Then + Mail.To = "d.breimaier@verag.ag" + Mail.CC = "d.breimaier@verag.ag" + + End If + If cbxMailoeffnen.Checked Then Try @@ -1155,7 +1163,6 @@ Public Class usrcntlFremdrechnungen If Mail IsNot Nothing Then - Dim API = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.OUT, VERAG_PROG_ALLGEMEIN.cAPI_Type.MAIL, VERAG_PROG_ALLGEMEIN.cAPI_ART.SDL_OUT_SAMMELRECHNUNG, "MAIL-ORIG-RG",,, kdNr) API.api_EMail = Mail.To diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKunde.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKunde.vb index 7caa0ea9..3ae5f7b4 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cKunde.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cKunde.vb @@ -84,10 +84,7 @@ Public Class cKunde Property Höchstkredit As Object = Nothing Property DakosyExport As Object = Nothing Property FiBuSchnittstelleNr As Object = Nothing - - - - + Property Vorlageprovision_Mindestbetrag As Object = Nothing Public hasEntry As Boolean = False @@ -191,6 +188,7 @@ Public Class cKunde list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStV_SummeVorschaubetragEUR_MSE", UStV_SummeVorschaubetragEUR_MSE)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStV_SummeVorschaubetragEUR_UTA", UStV_SummeVorschaubetragEUR_UTA)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStV_SummeVorschaubetragEUR_IT", UStV_SummeVorschaubetragEUR_IT)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Vorlageprovision_Mindestbetrag", Vorlageprovision_Mindestbetrag)) Return list End Function diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb index 77eb86ee..f45ef55a 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb @@ -122,6 +122,9 @@ Public Class cRechnungsausgang Property Rechnungsart As String = "RG" ' RG=Rechnung; RU=Rechnung Unvollständig; RK=RechnungKopf -> bei unvollständiger Rechnung ein Kopf benötigt (zB Staffelabrechnung) + Property Vorlageprovision_Mindestbetrag As Object = Nothing + + ' FROM [VERAG as object=nothing.[dbo as object=nothing.[Rechnungsausgang as object=nothing Public POSITIONEN As New List(Of cRechnungsausgangPositionen) @@ -365,6 +368,7 @@ Public Class cRechnungsausgang list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ForceSteuerschlüssel", ForceSteuerschlüssel)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Automailversand", Automailversand)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Rechnungsart", Rechnungsart)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Vorlageprovision_Mindestbetrag", Vorlageprovision_Mindestbetrag)) Return list End Function diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb index a3c09400..ce7f2a57 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb @@ -408,14 +408,14 @@ Public Class frmUeberstundenauszahlen Next If (stunden100bereitsausbezahl + stunden50bereitsausbezahlt + stunden25bereitsausbezahlt) > 0 Then - If MA.mit_firma = "ATILLA" Then GoTo sonderRegelungAtilla : + ' If MA.mit_firma = "ATILLA" Then GoTo sonderRegelungAtilla : Laut ANDREAS mit 25.11.2025 wieder deaktiviert!!!!!!!!!!!! -> VILDAN soll hier direkt mit Andreas sprechen picDel.Visible = True Button1.Enabled = False txtAusz.Enabled = False picShow.Visible = True Else -sonderRegelungAtilla: - Button1.Enabled = True + 'sonderRegelungAtilla: Laut ANDREAS mit 25.11.2025 wieder deaktiviert!!!!!!!!!!!! -> VILDAN soll hier direkt mit Andreas sprechen + Button1.Enabled = True txtAusz.Enabled = True picShow.Visible = False