diff --git a/AVISO_INFO/frmInfo.vb b/AVISO_INFO/frmInfo.vb index 9242059..f1ac00a 100644 --- a/AVISO_INFO/frmInfo.vb +++ b/AVISO_INFO/frmInfo.vb @@ -93,7 +93,7 @@ Public Class frmInfo End Sub Function validlink(link) As Boolean If link = "" Then Return False - If Not link.contains("https://login.verag.ag/status.aspx?AvisoId=") Then Return False + If Not link.contains("https://login.verag.ag/status.aspx?AvisoId=") And Not link.contains("https://status.app.verag.ag/aviso-status") Then Return False Return True End Function diff --git a/Aviso/AvisoReports/rptQRAviso.vb b/Aviso/AvisoReports/rptQRAviso.vb index 72a804d..f837e71 100644 --- a/Aviso/AvisoReports/rptQRAviso.vb +++ b/Aviso/AvisoReports/rptQRAviso.vb @@ -51,8 +51,11 @@ Public Class rptQRAviso lblNr.Text = AVISO.AvisoID txtGrenze.Text = AVISO.Grenzstelle txtFraechter.Text = AVISO.Frächter - ' QR.Image = getQRCode("https://login.verag.ag/status.aspx?AvisoId=" & VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(AVISO.AvisoID)) - QR.Image = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getQRCode("https://login.verag.ag/status.aspx?AvisoId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID)) + + QR.Image = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getQRCode("https://status.app.verag.ag/aviso-status/" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID)) + + + picQRAviso.Image = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getBARCODEAviso(AVISO.AvisoID) diff --git a/Aviso/AvisoReports/rptQRSendung_VerwahrungApp.vb b/Aviso/AvisoReports/rptQRSendung_VerwahrungApp.vb index 6b4badd..c9bdfba 100644 --- a/Aviso/AvisoReports/rptQRSendung_VerwahrungApp.vb +++ b/Aviso/AvisoReports/rptQRSendung_VerwahrungApp.vb @@ -57,7 +57,6 @@ Public Class rptQRSendung_VerwahrungApp lblNr.Text = AVISO.AvisoID txtGrenze.Text = AVISO.Grenzstelle txtFraechter.Text = AVISO.Frächter - ' QR.Image = getQRCode("https://login.verag.ag/status.aspx?AvisoId=" & VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(AVISO.AvisoID)) 'QR.Image = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getQRCode("https://verwahrung.app.verag.ag/lkw-driver?avisoid=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID) & "&sendungsid=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(SND.tblSnd_SendungID) & "×tamp=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(Now.ToString("ddMMyyyy_HHmm"))) Dim token = VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt("avisoid=" & (AVISO.AvisoID) & "&sendungsid=" & (tblSnd_SendungID) & "×tamp=" & Now.ToString("ddMMyyyy_HHmm") & "&nation=" & If(AVISO.LKW_Nationalitaet, "")) diff --git a/Aviso/Classes/cSendungsoptions.vb b/Aviso/Classes/cSendungsoptions.vb index deb2b67..ffe7cfa 100644 --- a/Aviso/Classes/cSendungsoptions.vb +++ b/Aviso/Classes/cSendungsoptions.vb @@ -166,7 +166,6 @@ Public Class SendungOptions Dim imgQR As Image = Nothing If SENDUNG.tblSnd_Abfertigungsart_ID.ToString = "44" Then imgQR = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getQRCode("https://verwahrung.app.verag.ag/upload?avisoid=" & AVISO.AvisoID & "&sendungsid=" & SENDUNG.tblSnd_SendungID) - 'imgQR = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getQRCode("https://login.verag.ag/status.aspx?AvisoId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID) & "&SendungId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(SENDUNG.tblSnd_SendungID)) End If If barcode IsNot Nothing Then VALUES.imgQR = imgQR diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 6584e6f..99e8b8d 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 361d80f..19bd030 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -4587,63 +4587,140 @@ ELSE_ATILLA: ' Dim dt As DataTable = SQL.loadDgvBySql("", "EZOLL") Dim slist As New List(Of String) - slist.Add("510322017583") - slist.Add("510322017588") - slist.Add("510322017594") - slist.Add("510322017789") - slist.Add("510322017825") - slist.Add("510322017898") - slist.Add("510322017884") - slist.Add("510322018006") - slist.Add("510322017982") - slist.Add("510322018045") - slist.Add("510322018174") - slist.Add("510322018180") - slist.Add("480322071811") - slist.Add("510322018187") - slist.Add("510322018188") - slist.Add("510322018190") - slist.Add("510322018193") - slist.Add("510322018195") - slist.Add("510322018207") - slist.Add("510322018211") - slist.Add("510322018225") - slist.Add("510322018226") - slist.Add("510322018233") - slist.Add("510322018234") - slist.Add("510322018249") - slist.Add("480322072358") - slist.Add("510322018012") - slist.Add("510322018181") - slist.Add("510322018255") - slist.Add("510322018295") - slist.Add("510322018318") - slist.Add("510322018319") - slist.Add("510322018413") - slist.Add("510322018424") - slist.Add("510322018425") - slist.Add("510322018440") - slist.Add("510322018498") - slist.Add("510322018409") - slist.Add("510322018594") - slist.Add("510322018595") - slist.Add("510322018600") - slist.Add("510322018603") - slist.Add("510322018604") - slist.Add("510322018615") - slist.Add("510322018632") - slist.Add("510322018728") - slist.Add("510322018762") - slist.Add("510322018835") - slist.Add("510322018869") - slist.Add("510322018898") - slist.Add("510322018937") - slist.Add("510322018938") - slist.Add("510322018939") - slist.Add("510322018947") - slist.Add("510322018984") - slist.Add("510322018985") - slist.Add("510322019045") + slist.Add("510322010193") + slist.Add("510322011571") + slist.Add("480322050190") + slist.Add("480322050410") + slist.Add("510322013047") + slist.Add("480322052547") + slist.Add("510322014009") + slist.Add("480322056856") + slist.Add("510322014450") + slist.Add("510322015430") + slist.Add("480322064453") + slist.Add("510322010825") + slist.Add("510322010960") + slist.Add("510322011010") + slist.Add("510322011054") + slist.Add("510322011220") + slist.Add("510322011416") + slist.Add("510322011334") + slist.Add("510322015642") + slist.Add("510322015821") + slist.Add("510322015984") + slist.Add("510322015883") + slist.Add("510322016423") + slist.Add("510322016609") + slist.Add("510322017257") + slist.Add("510322017397") + slist.Add("510322011605") + slist.Add("510322011813") + slist.Add("510322012097") + slist.Add("510322012102") + slist.Add("510322012106") + slist.Add("510322011759") + slist.Add("510322012131") + slist.Add("510322012220") + slist.Add("510322012248") + slist.Add("510322011680") + slist.Add("510322012454") + slist.Add("510322012499") + slist.Add("510322012495") + slist.Add("510322012477") + slist.Add("510322012565") + slist.Add("510322012924") + slist.Add("510322013000") + slist.Add("510322009806") + slist.Add("510322009814") + slist.Add("510322009820") + slist.Add("510322010007") + slist.Add("510322010221") + slist.Add("510322010223") + slist.Add("510322010237") + slist.Add("510322010321") + slist.Add("510322010115") + slist.Add("510322010427") + slist.Add("510322010497") + slist.Add("510322010362") + slist.Add("510322010651") + slist.Add("510322010698") + slist.Add("510322013133") + slist.Add("510322013407") + slist.Add("510322013581") + slist.Add("510322013558") + slist.Add("510322013713") + slist.Add("510322013714") + slist.Add("510322013736") + slist.Add("510322016954") + slist.Add("510322017014") + slist.Add("510322016978") + slist.Add("510322017065") + slist.Add("510322017044") + slist.Add("510322017078") + slist.Add("510322017062") + slist.Add("510322017308") + slist.Add("510322017406") + slist.Add("510322017408") + slist.Add("510322017398") + slist.Add("510322015326") + slist.Add("510322015332") + slist.Add("510322015340") + slist.Add("510322015350") + slist.Add("510322015631") + slist.Add("510322015635") + slist.Add("510322015634") + slist.Add("510322015639") + slist.Add("510322015626") + slist.Add("510322015907") + slist.Add("510322016034") + slist.Add("510322017410") + slist.Add("510322017402") + slist.Add("510322017323") + slist.Add("510322017407") + slist.Add("510322017401") + slist.Add("510322017619") + slist.Add("510322017599") + slist.Add("510322013950") + slist.Add("510322013929") + slist.Add("510322013960") + slist.Add("510322014077") + slist.Add("510322014084") + slist.Add("510322014268") + slist.Add("510322014301") + slist.Add("510322014451") + slist.Add("510322016288") + slist.Add("510322016371") + slist.Add("510322016384") + slist.Add("510322016380") + slist.Add("510322016459") + slist.Add("510322016709") + slist.Add("510322016736") + slist.Add("510322016644") + slist.Add("510322016787") + slist.Add("510322016793") + slist.Add("510322014437") + slist.Add("510322014373") + slist.Add("510322014675") + slist.Add("510322014682") + slist.Add("510322014679") + slist.Add("510322014751") + slist.Add("510322014750") + slist.Add("510322014849") + slist.Add("510322014853") + slist.Add("510322014894") + slist.Add("510322014915") + slist.Add("510322014914") + slist.Add("510322014912") + slist.Add("510322014947") + slist.Add("510322015084") + slist.Add("510322015101") + slist.Add("510322015059") + slist.Add("510322014880") + slist.Add("510322015143") + slist.Add("510322015234") + slist.Add("510322015260") + slist.Add("510322015295") + slist.Add("510322015235") @@ -5076,6 +5153,13 @@ ELSE_ATILLA: Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click + + + saveLukowaPDFsFromTherefore() + + + Exit Sub + MsgBox(VERAG_PROG_ALLGEMEIN.cOpenAI.askAI_TruckPlate("AW: Kennzeichen: CB4178EB | Grenze SUB DE007701 Suben | Absender CEMOBSAN;TEKIRDAG | Gewicht: 7.200,0")) MsgBox(VERAG_PROG_ALLGEMEIN.cOpenAI.askAI_TruckPlate("*00*Fwd: Abgabenbescheid 5003/25001269 T31M492")) MsgBox(VERAG_PROG_ALLGEMEIN.cOpenAI.askAI_TruckPlate("AW: Warenbeschreibung in T1-Dokumenten - 5003/25000389")) @@ -5652,8 +5736,13 @@ Public Class AvisoStatusFunctions 'Prüfen ob WO oder ZA, in dem Fall keine Mail senden Dim GRZ As New VERAG_PROG_ALLGEMEIN.cGrenzstelle(GrenzstelleMail) If GRZ IsNot Nothing AndAlso GRZ.hasEntry Then - If GRZ.grz_Zollamt Then GrenzstelleMail = "" 'KEINE MAIL - If GRZ.grz_Warenort Then GrenzstelleMail = "" 'KEINE MAIL + + If Not GRZ.grz_AvisoStatusVorOrt Then + GrenzstelleMail = "" 'KEINE MAIL + End If + + 'If GRZ.grz_Zollamt Then GrenzstelleMail = "" 'KEINE MAIL + 'If GRZ.grz_Warenort Then GrenzstelleMail = "" 'KEINE MAIL End If @@ -7197,7 +7286,6 @@ ELSE_ATILLA: Select Case art Case "5" - 'Dim linkAviso = "https://login.verag.ag/status.aspx?AvisoId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID) Dim linkAviso = "https://status.app.verag.ag/aviso-status/" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID) hText = hText.Replace("%Link%", "") diff --git a/Aviso/frmLogin.vb b/Aviso/frmLogin.vb index 48ece25..d45356a 100644 --- a/Aviso/frmLogin.vb +++ b/Aviso/frmLogin.vb @@ -62,19 +62,30 @@ Public Class frmLogin lblVersion.ContextMenuStrip = ctxUpdate If Application.ProductVersion.StartsWith("0") Then lblVersion.Text += " BETA" + 'STARTPARAMETER - DP + Dim PARAM = "" + Dim parameter() As String = Environment.GetCommandLineArgs().ToArray + If (parameter.Count - 1) >= 1 Then 'Höher als 1 weil der index 0 der Pfad zum programm ist + PARAM = parameter(1) + End If - If System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\Programme\AVISO\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\f\Programme\AVISO\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\install\Programme\AVISO\" OrElse + If PARAM = "" Then 'nur wenn keinee Startparameter gesetzt sind... + + If System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\Programme\AVISO\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\f\Programme\AVISO\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\install\Programme\AVISO\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\Programme\AVISO_INSTALL\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\f\Programme\AVISO_INSTALL\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\install\Programme\AVISO_INSTALL\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "F:\PROGRAMME\AVISO\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "F:\PROGRAMME\AVISO_INSTALL\" OrElse System.AppDomain.CurrentDomain.BaseDirectory.Contains("F:\") OrElse System.AppDomain.CurrentDomain.BaseDirectory.Contains("\\share") OrElse System.AppDomain.CurrentDomain.BaseDirectory.Contains("\\install") Then - MsgBox("Programm kann im Quellpfad " & System.AppDomain.CurrentDomain.BaseDirectory & " nicht gestartet werden!" & vbNewLine & "Vorgang wird abgebrochen!", MsgBoxStyle.Critical) - Application.Exit() - Me.Close() - Exit Sub + MsgBox("Programm kann im Quellpfad " & System.AppDomain.CurrentDomain.BaseDirectory & " nicht gestartet werden!" & vbNewLine & "Vorgang wird abgebrochen!", MsgBoxStyle.Critical) + Application.Exit() + Me.Close() + Exit Sub + End If + End If + If Not VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense() Then MsgBox("Fehler beim Laden der SPIRE-Lizenz") Dim pfadDatei As String = Application.StartupPath & "\Standort.txt" @@ -131,13 +142,7 @@ Public Class frmLogin ' Me.Visible = False ' Me.Hide() - 'STARTPARAMETER - DP - Dim PARAM = "" - Dim parameter() As String = Environment.GetCommandLineArgs().ToArray - If (parameter.Count - 1) >= 1 Then 'Höher als 1 weil der index 0 der Pfad zum programm ist - PARAM = parameter(1) - End If - + If PARAM = "DIENSTPLAN" Then Me.ShowInTaskbar = False VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" diff --git a/Aviso/frmSendungsdetailsAbrechnung.vb b/Aviso/frmSendungsdetailsAbrechnung.vb index c552a20..2a7bde6 100644 --- a/Aviso/frmSendungsdetailsAbrechnung.vb +++ b/Aviso/frmSendungsdetailsAbrechnung.vb @@ -47,7 +47,7 @@ Public Class frmSendungsdetailsAbrechnung Dim preis As Object = Nothing If IsNumeric(r.Cells("Preis").Value) Then preis = CDbl(r.Cells("Preis").Value) If leistung <> "" Then - SENDUNG.ABRECHNUNG.Add(New VERAG_PROG_ALLGEMEIN.cSendungAbrechnung(SENDUNG.tblSnd_SendungID, usr._beteiligter, "", "", leistung, 1, preis, preis)) + SENDUNG.ABRECHNUNG.Add(New VERAG_PROG_ALLGEMEIN.cSendungAbrechnung(SENDUNG.tblSnd_SendungID, usr._beteiligter, "", "", leistung, 1, preis, preis, Nothing)) End If Next diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb index 47b5a88..17e9707 100644 --- a/Aviso/frmSendungsdetailsNEU.Designer.vb +++ b/Aviso/frmSendungsdetailsNEU.Designer.vb @@ -24,25 +24,29 @@ Partial Class frmSendungsdetailsNEU Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSendungsdetailsNEU)) - 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 DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle14 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 DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle37 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle38 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle39 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle24 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 DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle40 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle41 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle42 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle43 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle45 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle46 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle44 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnl = New System.Windows.Forms.Panel() Me.Panel4 = New System.Windows.Forms.Panel() Me.TabControl1 = New System.Windows.Forms.TabControl() @@ -188,6 +192,26 @@ Partial Class frmSendungsdetailsNEU Me.rtbAnmerkung = New System.Windows.Forms.RichTextBox() Me.Label7 = New System.Windows.Forms.Label() Me.Button14 = New System.Windows.Forms.Button() + Me.tbAbrechnung = New System.Windows.Forms.TabPage() + Me.Label14 = New System.Windows.Forms.Label() + Me.cboFilterAbrAn = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboAbrAn = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboAbrLeistungen = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txtAbrLeistungsBez = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.lblAbrAbbrechen = New System.Windows.Forms.LinkLabel() + Me.btnAddAbr = New System.Windows.Forms.Button() + Me.txtAbrPreis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.dgvAbrechnung = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.clmnAbrId = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.clmnAbrFirma = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.clmnAbrLeistungsNr = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.clmnAbrLeistung = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.clmnAbrPreis = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.tbBAR = New System.Windows.Forms.TabPage() + Me.dgvBelege = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.Button9 = New System.Windows.Forms.Button() + Me.btnKassenbuchEintrag = New System.Windows.Forms.Button() + Me.btnLeihgeld = New System.Windows.Forms.Button() Me.tbVorkosten = New System.Windows.Forms.TabPage() Me.lblVK_BEarbeitungAbbrechen = New System.Windows.Forms.LinkLabel() Me.btnVorkostenAdd = New System.Windows.Forms.Button() @@ -199,11 +223,6 @@ Partial Class frmSendungsdetailsNEU Me.clmnFirma = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.clmnLeistung = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.clmnPreis = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.tbBAR = New System.Windows.Forms.TabPage() - Me.dgvBelege = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.Button9 = New System.Windows.Forms.Button() - Me.btnKassenbuchEintrag = New System.Windows.Forms.Button() - Me.btnLeihgeld = New System.Windows.Forms.Button() Me.Panel6 = New System.Windows.Forms.Panel() Me.lblErr_Auftrageber = New System.Windows.Forms.Label() Me.Label13 = New System.Windows.Forms.Label() @@ -474,6 +493,7 @@ Partial Class frmSendungsdetailsNEU Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn5 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.lblErrAbr = New System.Windows.Forms.Label() Me.pnl.SuspendLayout() Me.Panel4.SuspendLayout() Me.TabControl1.SuspendLayout() @@ -508,10 +528,12 @@ Partial Class frmSendungsdetailsNEU Me.tbcntr.SuspendLayout() Me.TabPage4.SuspendLayout() Me.Panel22.SuspendLayout() - Me.tbVorkosten.SuspendLayout() - CType(Me.dgvVorkosten, System.ComponentModel.ISupportInitialize).BeginInit() + Me.tbAbrechnung.SuspendLayout() + CType(Me.dgvAbrechnung, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbBAR.SuspendLayout() CType(Me.dgvBelege, System.ComponentModel.ISupportInitialize).BeginInit() + Me.tbVorkosten.SuspendLayout() + CType(Me.dgvVorkosten, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel6.SuspendLayout() CType(Me.picKdAtrNr_Fraechter, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picKdAtrNr_Empfänger, System.ComponentModel.ISupportInitialize).BeginInit() @@ -1584,18 +1606,18 @@ Partial Class frmSendungsdetailsNEU Me.gridVermerke.AllowUserToAddRows = False Me.gridVermerke.AllowUserToDeleteRows = False Me.gridVermerke.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle28.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle28 Me.gridVermerke.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle2.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle29.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + DataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle29 Me.gridVermerke.ColumnHeadersHeight = 29 Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill @@ -1606,8 +1628,8 @@ Partial Class frmSendungsdetailsNEU Me.gridVermerke.RowHeadersVisible = False Me.gridVermerke.RowHeadersWidth = 51 Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle30 Me.gridVermerke.RowTemplate.Height = 20 Me.gridVermerke.RowTemplate.ReadOnly = True Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -1635,18 +1657,18 @@ Partial Class frmSendungsdetailsNEU Me.dgvATEZNCTS.AllowUserToAddRows = False Me.dgvATEZNCTS.AllowUserToDeleteRows = False Me.dgvATEZNCTS.AllowUserToResizeRows = False - DataGridViewCellStyle4.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvATEZNCTS.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle31.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvATEZNCTS.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle31 Me.dgvATEZNCTS.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle5.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - 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.dgvATEZNCTS.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle32.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle32.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + DataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvATEZNCTS.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle32 Me.dgvATEZNCTS.ColumnHeadersHeight = 29 Me.dgvATEZNCTS.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing Me.dgvATEZNCTS.Dock = System.Windows.Forms.DockStyle.Fill @@ -1657,8 +1679,8 @@ Partial Class frmSendungsdetailsNEU Me.dgvATEZNCTS.RowHeadersVisible = False Me.dgvATEZNCTS.RowHeadersWidth = 51 Me.dgvATEZNCTS.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvATEZNCTS.RowsDefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvATEZNCTS.RowsDefaultCellStyle = DataGridViewCellStyle33 Me.dgvATEZNCTS.RowTemplate.Height = 20 Me.dgvATEZNCTS.RowTemplate.ReadOnly = True Me.dgvATEZNCTS.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -1709,18 +1731,18 @@ Partial Class frmSendungsdetailsNEU Me.dgvDigicust.AllowUserToAddRows = False Me.dgvDigicust.AllowUserToDeleteRows = False Me.dgvDigicust.AllowUserToResizeRows = False - DataGridViewCellStyle7.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvDigicust.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle34.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvDigicust.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle34 Me.dgvDigicust.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle8.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvDigicust.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle35.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle35.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + DataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvDigicust.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle35 Me.dgvDigicust.ColumnHeadersHeight = 29 Me.dgvDigicust.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing Me.dgvDigicust.Dock = System.Windows.Forms.DockStyle.Fill @@ -1731,8 +1753,8 @@ Partial Class frmSendungsdetailsNEU Me.dgvDigicust.RowHeadersVisible = False Me.dgvDigicust.RowHeadersWidth = 51 Me.dgvDigicust.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvDigicust.RowsDefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvDigicust.RowsDefaultCellStyle = DataGridViewCellStyle36 Me.dgvDigicust.RowTemplate.Height = 20 Me.dgvDigicust.RowTemplate.ReadOnly = True Me.dgvDigicust.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -1784,18 +1806,18 @@ Partial Class frmSendungsdetailsNEU Me.dgvMail.AllowUserToAddRows = False Me.dgvMail.AllowUserToDeleteRows = False Me.dgvMail.AllowUserToResizeRows = False - DataGridViewCellStyle10.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvMail.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle37.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvMail.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle37 Me.dgvMail.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle11.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvMail.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle38.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle38.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + DataGridViewCellStyle38.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle38.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle38.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvMail.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle38 Me.dgvMail.ColumnHeadersHeight = 29 Me.dgvMail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing Me.dgvMail.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnSender, Me.clmnRec, Me.clmnSbj, Me.clmnAtt, Me.clmnUIDL}) @@ -1807,8 +1829,8 @@ Partial Class frmSendungsdetailsNEU Me.dgvMail.RowHeadersVisible = False Me.dgvMail.RowHeadersWidth = 51 Me.dgvMail.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvMail.RowsDefaultCellStyle = DataGridViewCellStyle12 + DataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvMail.RowsDefaultCellStyle = DataGridViewCellStyle39 Me.dgvMail.RowTemplate.Height = 20 Me.dgvMail.RowTemplate.ReadOnly = True Me.dgvMail.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -1911,8 +1933,9 @@ Partial Class frmSendungsdetailsNEU ' Me.tbcntr.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.tbcntr.Controls.Add(Me.TabPage4) - Me.tbcntr.Controls.Add(Me.tbVorkosten) + Me.tbcntr.Controls.Add(Me.tbAbrechnung) Me.tbcntr.Controls.Add(Me.tbBAR) + Me.tbcntr.Controls.Add(Me.tbVorkosten) Me.tbcntr.Location = New System.Drawing.Point(773, 69) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 @@ -2468,6 +2491,342 @@ Partial Class frmSendungsdetailsNEU Me.Button14.TextAlign = System.Drawing.ContentAlignment.BottomCenter Me.Button14.UseVisualStyleBackColor = True ' + 'tbAbrechnung + ' + Me.tbAbrechnung.Controls.Add(Me.lblErrAbr) + Me.tbAbrechnung.Controls.Add(Me.Label14) + Me.tbAbrechnung.Controls.Add(Me.cboFilterAbrAn) + Me.tbAbrechnung.Controls.Add(Me.cboAbrAn) + Me.tbAbrechnung.Controls.Add(Me.cboAbrLeistungen) + Me.tbAbrechnung.Controls.Add(Me.txtAbrLeistungsBez) + Me.tbAbrechnung.Controls.Add(Me.lblAbrAbbrechen) + Me.tbAbrechnung.Controls.Add(Me.btnAddAbr) + Me.tbAbrechnung.Controls.Add(Me.txtAbrPreis) + Me.tbAbrechnung.Controls.Add(Me.dgvAbrechnung) + Me.tbAbrechnung.Location = New System.Drawing.Point(4, 22) + Me.tbAbrechnung.Name = "tbAbrechnung" + Me.tbAbrechnung.Padding = New System.Windows.Forms.Padding(3) + Me.tbAbrechnung.Size = New System.Drawing.Size(433, 299) + Me.tbAbrechnung.TabIndex = 3 + Me.tbAbrechnung.Text = "Abrechnung" + Me.tbAbrechnung.UseVisualStyleBackColor = True + ' + 'Label14 + ' + Me.Label14.AutoSize = True + Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label14.Location = New System.Drawing.Point(6, 11) + Me.Label14.Name = "Label14" + Me.Label14.Size = New System.Drawing.Size(32, 13) + Me.Label14.TabIndex = 98 + Me.Label14.Text = "Filter:" + Me.Label14.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'cboFilterAbrAn + ' + Me.cboFilterAbrAn._allowedValuesFreiText = Nothing + Me.cboFilterAbrAn._allowFreiText = False + Me.cboFilterAbrAn._value = "" + Me.cboFilterAbrAn.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend + Me.cboFilterAbrAn.DropDownWidth = 350 + Me.cboFilterAbrAn.FormattingEnabled = True + Me.cboFilterAbrAn.Location = New System.Drawing.Point(47, 8) + Me.cboFilterAbrAn.Name = "cboFilterAbrAn" + Me.cboFilterAbrAn.Size = New System.Drawing.Size(193, 21) + Me.cboFilterAbrAn.TabIndex = 17 + ' + 'cboAbrAn + ' + Me.cboAbrAn._allowedValuesFreiText = Nothing + Me.cboAbrAn._allowFreiText = False + Me.cboAbrAn._value = "" + Me.cboAbrAn.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend + Me.cboAbrAn.DropDownWidth = 350 + Me.cboAbrAn.FormattingEnabled = True + Me.cboAbrAn.Location = New System.Drawing.Point(6, 235) + Me.cboAbrAn.Name = "cboAbrAn" + Me.cboAbrAn.Size = New System.Drawing.Size(71, 21) + Me.cboAbrAn.TabIndex = 16 + ' + 'cboAbrLeistungen + ' + Me.cboAbrLeistungen._allowedValuesFreiText = Nothing + Me.cboAbrLeistungen._allowFreiText = False + Me.cboAbrLeistungen._value = "" + Me.cboAbrLeistungen.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend + Me.cboAbrLeistungen.DropDownWidth = 350 + Me.cboAbrLeistungen.FormattingEnabled = True + Me.cboAbrLeistungen.Location = New System.Drawing.Point(76, 235) + Me.cboAbrLeistungen.Name = "cboAbrLeistungen" + Me.cboAbrLeistungen.Size = New System.Drawing.Size(47, 21) + Me.cboAbrLeistungen.TabIndex = 14 + ' + 'txtAbrLeistungsBez + ' + Me.txtAbrLeistungsBez._DateTimeOnly = False + Me.txtAbrLeistungsBez._numbersOnly = False + Me.txtAbrLeistungsBez._numbersOnlyKommastellen = "" + Me.txtAbrLeistungsBez._numbersOnlyTrennzeichen = True + Me.txtAbrLeistungsBez._Prozent = False + Me.txtAbrLeistungsBez._ShortDateNew = False + Me.txtAbrLeistungsBez._ShortDateOnly = False + Me.txtAbrLeistungsBez._TimeOnly = False + Me.txtAbrLeistungsBez._TimeOnly_Seconds = False + Me.txtAbrLeistungsBez._value = Nothing + Me.txtAbrLeistungsBez._Waehrung = False + Me.txtAbrLeistungsBez._WaehrungZeichen = True + Me.txtAbrLeistungsBez.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) + Me.txtAbrLeistungsBez.ForeColor = System.Drawing.Color.Black + Me.txtAbrLeistungsBez.Location = New System.Drawing.Point(122, 235) + Me.txtAbrLeistungsBez.MaxLineLength = -1 + Me.txtAbrLeistungsBez.MaxLines_Warning = "" + Me.txtAbrLeistungsBez.MaxLines_Warning_Label = Nothing + Me.txtAbrLeistungsBez.Name = "txtAbrLeistungsBez" + Me.txtAbrLeistungsBez.Size = New System.Drawing.Size(203, 21) + Me.txtAbrLeistungsBez.TabIndex = 15 + ' + 'lblAbrAbbrechen + ' + Me.lblAbrAbbrechen.AutoSize = True + Me.lblAbrAbbrechen.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) + Me.lblAbrAbbrechen.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(30, Byte), Integer), CType(CType(90, Byte), Integer)) + Me.lblAbrAbbrechen.Location = New System.Drawing.Point(316, 259) + Me.lblAbrAbbrechen.Name = "lblAbrAbbrechen" + Me.lblAbrAbbrechen.Size = New System.Drawing.Size(117, 13) + Me.lblAbrAbbrechen.TabIndex = 11 + Me.lblAbrAbbrechen.TabStop = True + Me.lblAbrAbbrechen.Text = "Bearbeitung abbrechen" + Me.lblAbrAbbrechen.Visible = False + ' + 'btnAddAbr + ' + Me.btnAddAbr.BackColor = System.Drawing.Color.Transparent + Me.btnAddAbr.BackgroundImage = Global.AVISO.My.Resources.Resources.plus + Me.btnAddAbr.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnAddAbr.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAddAbr.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnAddAbr.Location = New System.Drawing.Point(397, 235) + Me.btnAddAbr.Name = "btnAddAbr" + Me.btnAddAbr.Size = New System.Drawing.Size(34, 21) + Me.btnAddAbr.TabIndex = 9 + Me.btnAddAbr.TabStop = False + Me.btnAddAbr.UseVisualStyleBackColor = False + ' + 'txtAbrPreis + ' + Me.txtAbrPreis._DateTimeOnly = False + Me.txtAbrPreis._numbersOnly = True + Me.txtAbrPreis._numbersOnlyKommastellen = "" + Me.txtAbrPreis._numbersOnlyTrennzeichen = True + Me.txtAbrPreis._Prozent = False + Me.txtAbrPreis._ShortDateNew = False + Me.txtAbrPreis._ShortDateOnly = False + Me.txtAbrPreis._TimeOnly = False + Me.txtAbrPreis._TimeOnly_Seconds = False + Me.txtAbrPreis._value = "" + Me.txtAbrPreis._Waehrung = True + Me.txtAbrPreis._WaehrungZeichen = True + Me.txtAbrPreis.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) + Me.txtAbrPreis.ForeColor = System.Drawing.Color.Black + Me.txtAbrPreis.Location = New System.Drawing.Point(324, 235) + Me.txtAbrPreis.MaxLength = 15 + Me.txtAbrPreis.MaxLineLength = -1 + Me.txtAbrPreis.MaxLines_Warning = "" + Me.txtAbrPreis.MaxLines_Warning_Label = Nothing + Me.txtAbrPreis.Name = "txtAbrPreis" + Me.txtAbrPreis.Size = New System.Drawing.Size(75, 21) + Me.txtAbrPreis.TabIndex = 10 + ' + 'dgvAbrechnung + ' + Me.dgvAbrechnung.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvAbrechnung.AllowUserToAddRows = False + Me.dgvAbrechnung.AllowUserToDeleteRows = False + Me.dgvAbrechnung.AllowUserToResizeColumns = False + Me.dgvAbrechnung.AllowUserToResizeRows = False + Me.dgvAbrechnung.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.dgvAbrechnung.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle24 + Me.dgvAbrechnung.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvAbrechnung.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnAbrId, Me.clmnAbrFirma, Me.clmnAbrLeistungsNr, Me.clmnAbrLeistung, Me.clmnAbrPreis}) + DataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvAbrechnung.DefaultCellStyle = DataGridViewCellStyle26 + Me.dgvAbrechnung.Location = New System.Drawing.Point(6, 35) + Me.dgvAbrechnung.MultiSelect = False + Me.dgvAbrechnung.Name = "dgvAbrechnung" + Me.dgvAbrechnung.ReadOnly = True + 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.dgvAbrechnung.RowHeadersDefaultCellStyle = DataGridViewCellStyle27 + Me.dgvAbrechnung.RowHeadersVisible = False + Me.dgvAbrechnung.RowHeadersWidth = 51 + Me.dgvAbrechnung.RowTemplate.Height = 18 + Me.dgvAbrechnung.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvAbrechnung.Size = New System.Drawing.Size(417, 194) + Me.dgvAbrechnung.TabIndex = 6 + ' + 'clmnAbrId + ' + Me.clmnAbrId.HeaderText = "ID" + Me.clmnAbrId.MinimumWidth = 6 + Me.clmnAbrId.Name = "clmnAbrId" + Me.clmnAbrId.ReadOnly = True + Me.clmnAbrId.Visible = False + Me.clmnAbrId.Width = 125 + ' + 'clmnAbrFirma + ' + Me.clmnAbrFirma.HeaderText = "An" + Me.clmnAbrFirma.Name = "clmnAbrFirma" + Me.clmnAbrFirma.ReadOnly = True + Me.clmnAbrFirma.Width = 70 + ' + 'clmnAbrLeistungsNr + ' + Me.clmnAbrLeistungsNr.HeaderText = "Nr" + Me.clmnAbrLeistungsNr.Name = "clmnAbrLeistungsNr" + Me.clmnAbrLeistungsNr.ReadOnly = True + Me.clmnAbrLeistungsNr.Width = 35 + ' + 'clmnAbrLeistung + ' + Me.clmnAbrLeistung.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.clmnAbrLeistung.HeaderText = "Leistung" + Me.clmnAbrLeistung.MaxInputLength = 30 + Me.clmnAbrLeistung.MinimumWidth = 6 + Me.clmnAbrLeistung.Name = "clmnAbrLeistung" + Me.clmnAbrLeistung.ReadOnly = True + ' + 'clmnAbrPreis + ' + DataGridViewCellStyle25.Format = "C2" + Me.clmnAbrPreis.DefaultCellStyle = DataGridViewCellStyle25 + Me.clmnAbrPreis.HeaderText = "Preis" + Me.clmnAbrPreis.MaxInputLength = 15 + Me.clmnAbrPreis.MinimumWidth = 6 + Me.clmnAbrPreis.Name = "clmnAbrPreis" + Me.clmnAbrPreis.ReadOnly = True + ' + 'tbBAR + ' + Me.tbBAR.Controls.Add(Me.dgvBelege) + Me.tbBAR.Controls.Add(Me.Button9) + Me.tbBAR.Controls.Add(Me.btnKassenbuchEintrag) + Me.tbBAR.Controls.Add(Me.btnLeihgeld) + Me.tbBAR.Location = New System.Drawing.Point(4, 22) + Me.tbBAR.Name = "tbBAR" + Me.tbBAR.Padding = New System.Windows.Forms.Padding(3) + Me.tbBAR.Size = New System.Drawing.Size(433, 299) + Me.tbBAR.TabIndex = 1 + Me.tbBAR.Text = "BAR-Belege" + Me.tbBAR.UseVisualStyleBackColor = True + ' + 'dgvBelege + ' + Me.dgvBelege.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvBelege.AllowUserToAddRows = False + Me.dgvBelege.AllowUserToDeleteRows = False + Me.dgvBelege.AllowUserToResizeColumns = False + Me.dgvBelege.AllowUserToResizeRows = False + Me.dgvBelege.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle40.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle40.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle40.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle40.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle40.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvBelege.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle40 + Me.dgvBelege.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + DataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle41.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvBelege.DefaultCellStyle = DataGridViewCellStyle41 + Me.dgvBelege.Location = New System.Drawing.Point(6, 40) + Me.dgvBelege.MultiSelect = False + Me.dgvBelege.Name = "dgvBelege" + Me.dgvBelege.ReadOnly = True + DataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle42.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle42.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle42.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle42.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle42.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvBelege.RowHeadersDefaultCellStyle = DataGridViewCellStyle42 + Me.dgvBelege.RowHeadersVisible = False + Me.dgvBelege.RowHeadersWidth = 51 + Me.dgvBelege.RowTemplate.Height = 18 + Me.dgvBelege.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvBelege.Size = New System.Drawing.Size(360, 165) + Me.dgvBelege.TabIndex = 3 + ' + 'Button9 + ' + Me.Button9.BackColor = System.Drawing.Color.WhiteSmoke + Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button9.Image = CType(resources.GetObject("Button9.Image"), System.Drawing.Image) + Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button9.Location = New System.Drawing.Point(203, 6) + Me.Button9.Name = "Button9" + Me.Button9.Size = New System.Drawing.Size(163, 35) + Me.Button9.TabIndex = 2 + Me.Button9.Text = "Daten für Abrechnung " + Me.Button9.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button9.UseVisualStyleBackColor = False + Me.Button9.Visible = False + ' + 'btnKassenbuchEintrag + ' + Me.btnKassenbuchEintrag.BackColor = System.Drawing.Color.White + Me.btnKassenbuchEintrag.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnKassenbuchEintrag.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnKassenbuchEintrag.Image = CType(resources.GetObject("btnKassenbuchEintrag.Image"), System.Drawing.Image) + Me.btnKassenbuchEintrag.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnKassenbuchEintrag.Location = New System.Drawing.Point(6, 6) + Me.btnKassenbuchEintrag.Name = "btnKassenbuchEintrag" + Me.btnKassenbuchEintrag.Size = New System.Drawing.Size(119, 35) + Me.btnKassenbuchEintrag.TabIndex = 0 + Me.btnKassenbuchEintrag.Text = "BAR - Beleg" + Me.btnKassenbuchEintrag.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnKassenbuchEintrag.UseVisualStyleBackColor = False + ' + 'btnLeihgeld + ' + Me.btnLeihgeld.BackColor = System.Drawing.Color.White + Me.btnLeihgeld.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnLeihgeld.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnLeihgeld.Image = CType(resources.GetObject("btnLeihgeld.Image"), System.Drawing.Image) + Me.btnLeihgeld.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnLeihgeld.Location = New System.Drawing.Point(123, 6) + Me.btnLeihgeld.Name = "btnLeihgeld" + Me.btnLeihgeld.Size = New System.Drawing.Size(74, 35) + Me.btnLeihgeld.TabIndex = 1 + Me.btnLeihgeld.Text = "LG" + Me.btnLeihgeld.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnLeihgeld.UseVisualStyleBackColor = False + ' 'tbVorkosten ' Me.tbVorkosten.Controls.Add(Me.lblVK_BEarbeitungAbbrechen) @@ -2590,36 +2949,36 @@ Partial Class frmSendungsdetailsNEU Me.dgvVorkosten.AllowUserToResizeColumns = False Me.dgvVorkosten.AllowUserToResizeRows = False Me.dgvVorkosten.BackgroundColor = System.Drawing.Color.White - 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.dgvVorkosten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle43.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle43.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvVorkosten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle43 Me.dgvVorkosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvVorkosten.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnVK_id, Me.clmnFirma, Me.clmnLeistung, Me.clmnPreis}) - DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Window - 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.ControlText - DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvVorkosten.DefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle45.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle45.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle45.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle45.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle45.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle45.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle45.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvVorkosten.DefaultCellStyle = DataGridViewCellStyle45 Me.dgvVorkosten.Location = New System.Drawing.Point(3, 4) Me.dgvVorkosten.MultiSelect = False Me.dgvVorkosten.Name = "dgvVorkosten" Me.dgvVorkosten.ReadOnly = True - DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control - 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.WindowText - DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvVorkosten.RowHeadersDefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle46.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle46.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle46.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle46.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle46.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle46.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvVorkosten.RowHeadersDefaultCellStyle = DataGridViewCellStyle46 Me.dgvVorkosten.RowHeadersVisible = False Me.dgvVorkosten.RowHeadersWidth = 51 Me.dgvVorkosten.RowTemplate.Height = 18 @@ -2657,117 +3016,14 @@ Partial Class frmSendungsdetailsNEU 'clmnPreis ' Me.clmnPreis.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - DataGridViewCellStyle14.Format = "C2" - Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle44.Format = "C2" + Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle44 Me.clmnPreis.HeaderText = "Preis" Me.clmnPreis.MaxInputLength = 15 Me.clmnPreis.MinimumWidth = 6 Me.clmnPreis.Name = "clmnPreis" Me.clmnPreis.ReadOnly = True ' - 'tbBAR - ' - Me.tbBAR.Controls.Add(Me.dgvBelege) - Me.tbBAR.Controls.Add(Me.Button9) - Me.tbBAR.Controls.Add(Me.btnKassenbuchEintrag) - Me.tbBAR.Controls.Add(Me.btnLeihgeld) - Me.tbBAR.Location = New System.Drawing.Point(4, 22) - Me.tbBAR.Name = "tbBAR" - Me.tbBAR.Padding = New System.Windows.Forms.Padding(3) - Me.tbBAR.Size = New System.Drawing.Size(433, 299) - Me.tbBAR.TabIndex = 1 - Me.tbBAR.Text = "Abrechnung/BAR-Belege" - Me.tbBAR.UseVisualStyleBackColor = True - ' - 'dgvBelege - ' - Me.dgvBelege.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvBelege.AllowUserToAddRows = False - Me.dgvBelege.AllowUserToDeleteRows = False - Me.dgvBelege.AllowUserToResizeColumns = False - Me.dgvBelege.AllowUserToResizeRows = False - Me.dgvBelege.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvBelege.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle17 - Me.dgvBelege.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window - 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.ControlText - DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvBelege.DefaultCellStyle = DataGridViewCellStyle18 - Me.dgvBelege.Location = New System.Drawing.Point(6, 40) - Me.dgvBelege.MultiSelect = False - Me.dgvBelege.Name = "dgvBelege" - Me.dgvBelege.ReadOnly = True - DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control - 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.WindowText - DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvBelege.RowHeadersDefaultCellStyle = DataGridViewCellStyle19 - Me.dgvBelege.RowHeadersVisible = False - Me.dgvBelege.RowHeadersWidth = 51 - Me.dgvBelege.RowTemplate.Height = 18 - Me.dgvBelege.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvBelege.Size = New System.Drawing.Size(360, 165) - Me.dgvBelege.TabIndex = 3 - ' - 'Button9 - ' - Me.Button9.BackColor = System.Drawing.Color.WhiteSmoke - Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button9.Image = CType(resources.GetObject("Button9.Image"), System.Drawing.Image) - Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button9.Location = New System.Drawing.Point(203, 6) - Me.Button9.Name = "Button9" - Me.Button9.Size = New System.Drawing.Size(163, 35) - Me.Button9.TabIndex = 2 - Me.Button9.Text = "Daten für Abrechnung " - Me.Button9.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button9.UseVisualStyleBackColor = False - Me.Button9.Visible = False - ' - 'btnKassenbuchEintrag - ' - Me.btnKassenbuchEintrag.BackColor = System.Drawing.Color.White - Me.btnKassenbuchEintrag.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btnKassenbuchEintrag.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnKassenbuchEintrag.Image = CType(resources.GetObject("btnKassenbuchEintrag.Image"), System.Drawing.Image) - Me.btnKassenbuchEintrag.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnKassenbuchEintrag.Location = New System.Drawing.Point(6, 6) - Me.btnKassenbuchEintrag.Name = "btnKassenbuchEintrag" - Me.btnKassenbuchEintrag.Size = New System.Drawing.Size(119, 35) - Me.btnKassenbuchEintrag.TabIndex = 0 - Me.btnKassenbuchEintrag.Text = "BAR - Beleg" - Me.btnKassenbuchEintrag.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnKassenbuchEintrag.UseVisualStyleBackColor = False - ' - 'btnLeihgeld - ' - Me.btnLeihgeld.BackColor = System.Drawing.Color.White - Me.btnLeihgeld.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btnLeihgeld.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnLeihgeld.Image = CType(resources.GetObject("btnLeihgeld.Image"), System.Drawing.Image) - Me.btnLeihgeld.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnLeihgeld.Location = New System.Drawing.Point(123, 6) - Me.btnLeihgeld.Name = "btnLeihgeld" - Me.btnLeihgeld.Size = New System.Drawing.Size(74, 35) - Me.btnLeihgeld.TabIndex = 1 - Me.btnLeihgeld.Text = "LG" - Me.btnLeihgeld.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnLeihgeld.UseVisualStyleBackColor = False - ' 'Panel6 ' Me.Panel6.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ @@ -6006,6 +6262,18 @@ Partial Class frmSendungsdetailsNEU Me.DataGridViewTextBoxColumn5.ReadOnly = True Me.DataGridViewTextBoxColumn5.Width = 200 ' + 'lblErrAbr + ' + Me.lblErrAbr.AutoSize = True + Me.lblErrAbr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold) + Me.lblErrAbr.ForeColor = System.Drawing.Color.Red + Me.lblErrAbr.Location = New System.Drawing.Point(6, 259) + Me.lblErrAbr.Name = "lblErrAbr" + Me.lblErrAbr.Size = New System.Drawing.Size(38, 13) + Me.lblErrAbr.TabIndex = 99 + Me.lblErrAbr.Text = "Error!" + Me.lblErrAbr.Visible = False + ' 'frmSendungsdetailsNEU ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -6065,11 +6333,14 @@ Partial Class frmSendungsdetailsNEU Me.TabPage4.PerformLayout() Me.Panel22.ResumeLayout(False) Me.Panel22.PerformLayout() + Me.tbAbrechnung.ResumeLayout(False) + Me.tbAbrechnung.PerformLayout() + CType(Me.dgvAbrechnung, System.ComponentModel.ISupportInitialize).EndInit() + Me.tbBAR.ResumeLayout(False) + CType(Me.dgvBelege, System.ComponentModel.ISupportInitialize).EndInit() Me.tbVorkosten.ResumeLayout(False) Me.tbVorkosten.PerformLayout() CType(Me.dgvVorkosten, System.ComponentModel.ISupportInitialize).EndInit() - Me.tbBAR.ResumeLayout(False) - CType(Me.dgvBelege, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel6.ResumeLayout(False) Me.Panel6.PerformLayout() CType(Me.picKdAtrNr_Fraechter, System.ComponentModel.ISupportInitialize).EndInit() @@ -6547,4 +6818,20 @@ Partial Class frmSendungsdetailsNEU Friend WithEvents lblAbfArtLand As Label Friend WithEvents lblFilialeAbfNr As Label Friend WithEvents lblErr_Auftrageber As Label + Friend WithEvents tbAbrechnung As TabPage + Friend WithEvents lblAbrAbbrechen As LinkLabel + Friend WithEvents btnAddAbr As Button + Friend WithEvents txtAbrPreis As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents dgvAbrechnung As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents clmnAbrId As DataGridViewTextBoxColumn + Friend WithEvents clmnAbrFirma As DataGridViewTextBoxColumn + Friend WithEvents clmnAbrLeistungsNr As DataGridViewTextBoxColumn + Friend WithEvents clmnAbrLeistung As DataGridViewTextBoxColumn + Friend WithEvents clmnAbrPreis As DataGridViewTextBoxColumn + Friend WithEvents Label14 As Label + Friend WithEvents cboFilterAbrAn As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents cboAbrAn As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents cboAbrLeistungen As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents txtAbrLeistungsBez As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents lblErrAbr As Label End Class diff --git a/Aviso/frmSendungsdetailsNEU.resx b/Aviso/frmSendungsdetailsNEU.resx index 725b4fa..81be819 100644 --- a/Aviso/frmSendungsdetailsNEU.resx +++ b/Aviso/frmSendungsdetailsNEU.resx @@ -117,6 +117,21 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + + + True + + + True + @@ -1531,6 +1546,9 @@ mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg== + + 296, 17 + iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V @@ -1654,18 +1672,6 @@ GthsjMjd738Gj5ASh80mtVrtUpqmOT8ASDXvdskQmQUAAAAASUVORK5CYII= - - True - - - True - - - True - - - True - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAHtJREFUSEvt @@ -1764,6 +1770,18 @@ eWpiMRXkm9o//9k= + + True + + + True + + + True + + + True + 404, 17 @@ -2074,6 +2092,9 @@ 174, 17 + + 404, 17 + 596, 17 diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 136b809..845e3cd 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -4186,6 +4186,15 @@ Public Class frmSendungsdetailsNEU Next End Sub + + Sub initDGVAbrechnung() + dgvVorkosten.Rows.Clear() + For Each ABR In SENDUNG_LIST(CURRENT_INDEX).ABRECHNUNG + dgvVorkosten.Rows.Add(SENDUNG_LIST(CURRENT_INDEX).ABRECHNUNG.IndexOf(ABR), ABR.sndabr_beteiligter, ABR.sndabr_LeistungsNr, ABR.sndabr_bezeichnung, ABR.sndabr_preis) + Next + + End Sub + Private Sub ToolStripMenuItem13_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem13.Click End Sub @@ -4918,6 +4927,116 @@ Public Class frmSendungsdetailsNEU 'End If End Sub + + + '--------------------------- + + + Private Sub btnAddAbr_Click_1(sender As Object, e As EventArgs) Handles btnAddAbr.Click + lblErrAbr.Visible = False + If cboAbrAn._value.Trim = "" Then + lblErrAbr.Text = "Abrechnung An fehlt!" : lblErrAbr.Visible = True : Exit Sub + End If + If cboAbrLeistungen._value = "" Then + lblErrAbr.Text = "Leistungs-Nr fehlt!" : lblErrAbr.Visible = True : Exit Sub + End If + If txtAbrLeistungsBez.Text.Trim = "" Then + lblErrAbr.Text = "Leistungs-Bezeichnung fehlt!" : lblErrAbr.Visible = True : Exit Sub + End If + If txtAbrLeistungsBez.Text.Trim.Length <= 35 Then + lblErrAbr.Text = "Leistungs-Bezeichnung zu lang!" : lblErrAbr.Visible = True : Exit Sub + End If + If txtAbrPreis._value = "" Then + lblErrAbr.Text = "Preis fehlt!" : lblErrAbr.Visible = True : Exit Sub + End If + + Try + If ABR_ID >= 0 Then + Dim ABR = SENDUNG_LIST(CURRENT_INDEX).ABRECHNUNG(ABR_ID) + ABR.sndabr_LeistungsNr = cboAbrLeistungen._value + abr.sndabr_abrArt = "" + ABR.sndabr_bezeichnung = txtAbrLeistungsBez.Text.Trim + ABR.sndabr_beteiligter = cboAbrAn._value.Trim + abr.sndabr_preis = CDbl(txtAbrPreis._value) + abr.sndabr_einzelPreis = CDbl(txtAbrPreis._value) + abr.sndabr_anzahl = 1 + 'SENDUNG_LIST(CURRENT_INDEX).SAVE() + btnAddAbr.BackgroundImage = My.Resources.plus + Else + Dim ABR As New VERAG_PROG_ALLGEMEIN.cSendungAbrechnung(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) + ABR.sndabr_LeistungsNr = cboAbrLeistungen._value + ABR.sndabr_abrArt = "" + ABR.sndabr_bezeichnung = txtAbrLeistungsBez.Text.Trim + ABR.sndabr_beteiligter = cboAbrAn._value.Trim + ABR.sndabr_preis = CDbl(txtAbrPreis._value) + ABR.sndabr_einzelPreis = CDbl(txtAbrPreis._value) + ABR.sndabr_anzahl = 1 + + SENDUNG_LIST(CURRENT_INDEX).ABRECHNUNG.Add(ABR) + End If + ABR_ID = -1 + lblVK_BEarbeitungAbbrechen.Visible = False + txtVK_Leistung.Text = "" + txtVK_Firma.Text = "" + txtVK_Preis.Text = "" + initdgvAbrechnung() + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + End Sub + + + Private Sub dgvAbrechnung_KeyDown(sender As Object, e As KeyEventArgs) Handles dgvAbrechnung.KeyDown + If dgvAbrechnung.SelectedRows.Count = 0 Then Exit Sub + + If e.KeyCode = Keys.Delete Then + If vbYes = MsgBox("Möchten Sie die Abrechnungs-Position wirklich löschen?", vbYesNoCancel) Then + Dim ABR = SENDUNG_LIST(CURRENT_INDEX).ABRECHNUNG.Find(Function(x) x.sndabr_id = dgvAbrechnung.SelectedRows(0).Cells("clmnAbrID").Value) + SENDUNG_LIST(CURRENT_INDEX).ABRECHNUNG.Remove(ABR) + SENDUNG_LIST(CURRENT_INDEX).SAVE(False) + initdgvAbrechnung() + End If + End If + End Sub + + Dim ABR_ID = -1 + Private Sub dgvAbrechnung_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvAbrechnung.CellDoubleClick, dgvAbrechnung.CellContentDoubleClick + If e.RowIndex >= 0 Then + Try + + Dim VK = SENDUNG_LIST(CURRENT_INDEX).ABRECHNUNG(dgvAbrechnung.SelectedRows(0).Cells("clmnAbrId").Value) + cboAbrAn.changeItem(VK.sndabr_beteiligter) + txtAbrLeistungsBez.Text = VK.sndabr_bezeichnung + cboAbrLeistungen.changeItem(VK.sndabr_LeistungsNr) + txtAbrPreis.Text = CDbl(VK.sndabr_preis).ToString("N2") + + ABR_ID = dgvAbrechnung.SelectedRows(0).Cells("clmnAbrId").Value + lblVK_BEarbeitungAbbrechen.Visible = True + btnAddAbr.BackgroundImage = My.Resources.stift + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + End If + End Sub + + Private Sub lblAbrAbbrechen_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles lblAbrAbbrechen.LinkClicked + ABR_ID = -1 + lblVK_BEarbeitungAbbrechen.Visible = False + btnAddAbr.BackgroundImage = My.Resources.plus + txtVK_Leistung.Text = "" + txtVK_Firma.Text = "" + txtVK_Preis.Text = "" + End Sub + + + + + '--------------------------- + + + Private Sub Button17_Click_1(sender As Object, e As EventArgs) Handles btnVorkostenAdd.Click If txtVK_Leistung.Text.Trim = "" Then Exit Sub If txtVK_Firma.Text.Trim = "" Then Exit Sub diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index f7bc3df..f4f1cea 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -3872,7 +3872,6 @@ Public Class usrcntlAktDetails End Sub Private Sub Button16_Click(sender As Object, e As EventArgs) Handles Button16.Click - ' Process.Start("https://login.verag.ag/status.aspx?AvisoId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID)) Process.Start("https://status.app.verag.ag/aviso-status/" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID)) End Sub