diff --git a/AVISOUPDATER/AVISOUPDATER_Version.txt b/AVISOUPDATER/AVISOUPDATER_Version.txt index be4cea5..a88f811 100644 --- a/AVISOUPDATER/AVISOUPDATER_Version.txt +++ b/AVISOUPDATER/AVISOUPDATER_Version.txt @@ -1 +1 @@ -7.2 \ No newline at end of file +7.3 \ No newline at end of file diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index b9c86b8..2e6f49c 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/My Project/Resources.Designer.vb b/Aviso/My Project/Resources.Designer.vb index 57d9230..183afc8 100644 --- a/Aviso/My Project/Resources.Designer.vb +++ b/Aviso/My Project/Resources.Designer.vb @@ -1700,7 +1700,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 7.2 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 7.3 ähnelt. ''' Public ReadOnly Property UpdaterVersion() As String Get diff --git a/Aviso/My Project/Resources.resx b/Aviso/My Project/Resources.resx index a89c0b1..4d2bff8 100644 --- a/Aviso/My Project/Resources.resx +++ b/Aviso/My Project/Resources.resx @@ -545,7 +545,7 @@ ..\Resources\mitarbeiter_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 7.2 + 7.3 ..\resources\dgs_instructions_import.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index cb85bba..361d80f 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -1519,7 +1519,7 @@ ELSE_ATILLA: End If sqlStr = " SELECT AvisoID, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig],CASE WHEN [VerwahrungStatus] = 1 THEN 'OK' ELSE '' END AS [VerwahrungStatus], [Status],tblSendungen.LetzterMitarbeiterId,tblSendungen.LetzterMitarbeiter, LKW_Nr, VoraussichtlichesEintreffen,Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe, Aviso.LetzterMitarbeiterId AS maId,AvisoTVHinweis " & - " ,tblSnd_Empfaenger,AbfertigungsNr,tblSnd_Abfertigungsart_ID,tblSnd_Vorgeschrieben,tblSnd_Vorbereitet,tblSnd_Status,tblSnd_SendungID,tblSnd_Fremdspedition,tblSnd_FremdspeditionText " & + " ,tblSnd_Empfaenger,AbfertigungsNr,tblSnd_Abfertigungsart_ID,isnull(tblSnd_Zollsystem_Land,'')tblSnd_Zollsystem_Land,tblSnd_Vorgeschrieben,tblSnd_Vorbereitet,tblSnd_Status,tblSnd_SendungID,tblSnd_Fremdspedition,tblSnd_FremdspeditionText " & " FROM Aviso INNER JOIN tblSendungen ON AvisoID=tblSnd_AvisoID " & " WHERE ( Status IN (0, 3, 4, 5) OR ( Status = 1 AND [Abgeschlossen] = 0 )) " & sqlStrFirma & " AND ( " & inBearbeitungSQL & ") " @@ -1719,6 +1719,7 @@ ELSE_ATILLA: .Columns("tblSnd_Status").Visible = False .Columns("tblSnd_Abfertigungsart_ID").Visible = False + .Columns("tblSnd_Zollsystem_Land").Visible = False .Columns("tblSnd_Vorgeschrieben").Visible = False .Columns("tblSnd_Vorbereitet").Visible = False .Columns("tblSnd_SendungID").Visible = False @@ -1767,7 +1768,7 @@ ELSE_ATILLA: Dim t2 = New DataGridViewTextBoxColumn t2.Name = "Abfertigungsart" t2.HeaderText = "Abfertigungsart" - t2.Width = 90 : t.DefaultCellStyle.Padding = New Padding(2) : t2.DefaultCellStyle.BackColor = Color.White + t2.Width = 110 : t.DefaultCellStyle.Padding = New Padding(2) : t2.DefaultCellStyle.BackColor = Color.White 't.ToolTipText = "" .Columns.Insert(7, t2) @@ -1784,8 +1785,13 @@ ELSE_ATILLA: ' r.Cells("Abfertigungsart").Value = "FREMD" r.Cells("Abfertigungsart").Value = r.Cells("tblSnd_FremdspeditionText").Value Else 'Nomal + Dim Abfertigungsland As String = r.Cells("tblSnd_Zollsystem_Land").Value + If Abfertigungsland <> "" Then Abfertigungsland = "[" & Abfertigungsland & "] " + r.Cells("Abfertigungsart").Value = VERAGSQL.getValueTxtBySql("SELECT Abfertigungsbezeichnung FROM Abfertigungsarten WHERE [Abfertigungsart]='" & r.Cells("tblSnd_Abfertigungsart_ID").Value.ToString & "'", "FMZOLL") - If r.Cells("Abfertigungsart").Value.ToString.Length > 15 Then r.Cells("Abfertigungsart").Value = r.Cells("Abfertigungsart").Value.Substring(0, 15) & ".." + r.Cells("Abfertigungsart").Value = Abfertigungsland & r.Cells("Abfertigungsart").Value + + If r.Cells("Abfertigungsart").Value.ToString.Length > 20 Then r.Cells("Abfertigungsart").Value = r.Cells("Abfertigungsart").Value.Substring(0, 20) & ".." End If If .Columns("StatusVorbereitetQS") IsNot Nothing Then @@ -2846,26 +2852,26 @@ ELSE_ATILLA: ' End If 'Else setAkive_AuswahlID() - avisoAktualisierenAktiveIdBehalten(tmpId, , False) - Dim hStatus = AvisoDAL.LesenAviso(tmpId, "").Status - If hStatus <> VERAG_PROG_ALLGEMEIN.cGlobal.Status_Ankunft And hStatus <> VERAG_PROG_ALLGEMEIN.cGlobal.Status_Vorgeschrieben And hStatus <> VERAG_PROG_ALLGEMEIN.cGlobal.Status_Erfasst And hStatus <> VERAG_PROG_ALLGEMEIN.cGlobal.Status_Vorbereitet Then - 'MsgBox("Ein Vermerk kann nur erfasst werden, wenn der Status des Aviso auf 'Erfasst', 'Vorbereitet', 'Vorgeschrieben' oder 'Ankunft' steht.", vbInformation) - lblErrVermerk.Width = 300 - lblErrVermerk.Visible = True - hideErr.Enabled = True - Exit Sub - End If - - Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm() - Dim sv As New frmAddAktenvermerkShort(tmpId) - sv.Location = Me.PointToClient(Cursor.Position) - ' sv.ShowDialog() - sv.ShowDialog(frmGrayOut) - frmGrayOut.Close() - + avisoAktualisierenAktiveIdBehalten(tmpId, , False) + Dim hStatus = AvisoDAL.LesenAviso(tmpId, "").Status + If hStatus <> VERAG_PROG_ALLGEMEIN.cGlobal.Status_Ankunft And hStatus <> VERAG_PROG_ALLGEMEIN.cGlobal.Status_Vorgeschrieben And hStatus <> VERAG_PROG_ALLGEMEIN.cGlobal.Status_Erfasst And hStatus <> VERAG_PROG_ALLGEMEIN.cGlobal.Status_Vorbereitet Then + 'MsgBox("Ein Vermerk kann nur erfasst werden, wenn der Status des Aviso auf 'Erfasst', 'Vorbereitet', 'Vorgeschrieben' oder 'Ankunft' steht.", vbInformation) + lblErrVermerk.Width = 300 + lblErrVermerk.Visible = True + hideErr.Enabled = True + Exit Sub End If - ElseIf e.Button = MouseButtons.Left Then - VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = tmpId + + Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm() + Dim sv As New frmAddAktenvermerkShort(tmpId) + sv.Location = Me.PointToClient(Cursor.Position) + ' sv.ShowDialog() + sv.ShowDialog(frmGrayOut) + frmGrayOut.Close() + + End If + ElseIf e.Button = MouseButtons.Left Then + VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = tmpId avisoAktualisierenAktiveIdBehalten(tmpId, , False) End If End Sub @@ -3720,7 +3726,7 @@ ELSE_ATILLA: 'Process.Start("http://www.zoll.de/DE/Fachthemen/Zoelle/Zollwert/Aktuelle-Umrechnungskurse/Datenbankanwendung/datenbankanwendung_node.html") 'Process.Start("http://www.zoll.de/SiteGlobals/Forms/KursSuche/KurseSuche_Formular_NotierteWaehrung.html?method=post&iso2code2=TR") - 'Process.Start("https://www.zoll.de/SiteGlobals/Forms/KursSuche/KurseSuche_Formular_NotierteWaehrung.html") + ' Process.Start("https://www.zoll.de/SiteGlobals/Forms/KursSuche/KurseSuche_Formular_NotierteWaehrung.html") 'http://www.zoll.de/SiteGlobals/Functions/Kurse/KursExport.xml?nn=21174&date=20170127165538660&kursart=1&iso2code2=TR&view=xmlexportkurse !!!!!!!!!!!!!!!!!!!!!!!!!! Process.Start("https://www.zoll.de/SiteGlobals/Forms/KursSuche/NotierteWaehrungen/KurseSuche_Formular_NotierteWaehrung.html") @@ -6271,36 +6277,36 @@ Public Class AvisoStatusFunctions ' AvisoDAL.addAenderung(AvisoID, "AKT erneut geöffnet", "auf 'AKT OFFEN' gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm")) ' End If Else - If value Then - For Each r In AvisoDAL.loadDataTableBySQL("SELECT tblSnd_SpeditionsbuchEingetragen FROM tblSendungen WHERE tblSnd_AvisoID=" & AvisoID & " AND [tblSnd_Fremdspedition]=0").Rows - If Not CBool(r(0)) Then - MsgBox("Sie müssen erst alle Sendungen ins Speditionsbuch eintragen!") - Return False - End If - Next - Aviso.Abgeschlossen = value - AvisoDAL.SpeichernAviso(Aviso) + If value Then + For Each r In AvisoDAL.loadDataTableBySQL("SELECT tblSnd_SpeditionsbuchEingetragen FROM tblSendungen WHERE tblSnd_AvisoID=" & AvisoID & " AND [tblSnd_Fremdspedition]=0").Rows + If Not CBool(r(0)) Then + MsgBox("Sie müssen erst alle Sendungen ins Speditionsbuch eintragen!") + Return False + End If + Next + Aviso.Abgeschlossen = value + AvisoDAL.SpeichernAviso(Aviso) - '--> Nicht mehr benötigt, alte Archiv Software IMEX - 'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA - ' Case "IMEX" : createNLC(Aviso) - 'End Select + '--> Nicht mehr benötigt, alte Archiv Software IMEX + 'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + ' Case "IMEX" : createNLC(Aviso) + 'End Select - AvisoDAL.addAenderung(AvisoID, "AKT abgeschlossen", "auf 'AKT ABGESCHLOSSEN' gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm")) + AvisoDAL.addAenderung(AvisoID, "AKT abgeschlossen", "auf 'AKT ABGESCHLOSSEN' gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm")) - 'Benachrichtigungen erledigen - VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.BESTAETIGEN_BENACHRICHTIGUNG_ALL(Aviso.AvisoID, False) - Else - Aviso.Abgeschlossen = value - AvisoDAL.SpeichernAviso(Aviso) - AvisoDAL.addAenderung(AvisoID, "AKT erneut geöffnet", "auf 'AKT OFFEN' gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm")) - End If + 'Benachrichtigungen erledigen + VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.BESTAETIGEN_BENACHRICHTIGUNG_ALL(Aviso.AvisoID, False) + Else + Aviso.Abgeschlossen = value + AvisoDAL.SpeichernAviso(Aviso) + AvisoDAL.addAenderung(AvisoID, "AKT erneut geöffnet", "auf 'AKT OFFEN' gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm")) End If + End If - Return True - Else - MsgBox("LKW-Status muss auf 'Freigegeben' sein.", vbInformation) + Return True + Else + MsgBox("LKW-Status muss auf 'Freigegeben' sein.", vbInformation) Return False End If diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb index 6ae35e6..47b5a88 100644 --- a/Aviso/frmSendungsdetailsNEU.Designer.vb +++ b/Aviso/frmSendungsdetailsNEU.Designer.vb @@ -24,25 +24,25 @@ 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 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 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 DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle33 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 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() Me.pnl = New System.Windows.Forms.Panel() Me.Panel4 = New System.Windows.Forms.Panel() Me.TabControl1 = New System.Windows.Forms.TabControl() @@ -133,7 +133,7 @@ Partial Class frmSendungsdetailsNEU Me.tbATEZ = New System.Windows.Forms.TabPage() Me.dgvATEZNCTS = New System.Windows.Forms.DataGridView() Me.Panel23 = New System.Windows.Forms.Panel() - Me.Button20 = New System.Windows.Forms.Button() + Me.btnATEZNew = New System.Windows.Forms.Button() Me.tbDigicust = New System.Windows.Forms.TabPage() Me.dgvDigicust = New System.Windows.Forms.DataGridView() Me.Panel24 = New System.Windows.Forms.Panel() @@ -205,6 +205,7 @@ Partial Class frmSendungsdetailsNEU 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() Me.txtATANr = New System.Windows.Forms.TextBox() Me.txtFrachtfuehrer = New VERAG_PROG_ALLGEMEIN.KdSearchBox() @@ -313,6 +314,7 @@ Partial Class frmSendungsdetailsNEU Me.txtKdAuftragsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.LinkLabel4 = New System.Windows.Forms.LinkLabel() Me.Panel5 = New System.Windows.Forms.Panel() + Me.lblAbfArtLand = New System.Windows.Forms.Label() Me.pnlValidation = New System.Windows.Forms.Panel() Me.rtbValidierung = New VERAG_PROG_ALLGEMEIN.MyRichTextBox() Me.Label15 = New System.Windows.Forms.Label() @@ -345,6 +347,7 @@ Partial Class frmSendungsdetailsNEU Me.lblUnterNr = New System.Windows.Forms.Label() Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.txtAbfertigungsnummer = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.lblFilialeAbfNr = New System.Windows.Forms.Label() Me.Panel2 = New System.Windows.Forms.Panel() Me.FlowLayoutPanel = New System.Windows.Forms.FlowLayoutPanel() Me.FlatButton2 = New VERAG_PROG_ALLGEMEIN.FlatButton() @@ -471,9 +474,6 @@ 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.lblAbfArtLand = New System.Windows.Forms.Label() - Me.lblFilialeAbfNr = New System.Windows.Forms.Label() - Me.lblErr_Auftrageber = New System.Windows.Forms.Label() Me.pnl.SuspendLayout() Me.Panel4.SuspendLayout() Me.TabControl1.SuspendLayout() @@ -1584,18 +1584,18 @@ Partial Class frmSendungsdetailsNEU Me.gridVermerke.AllowUserToAddRows = False Me.gridVermerke.AllowUserToDeleteRows = False Me.gridVermerke.AllowUserToResizeRows = False - DataGridViewCellStyle20.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.gridVermerke.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle21.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - 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.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle21 + 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 Me.gridVermerke.ColumnHeadersHeight = 29 Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill @@ -1606,8 +1606,8 @@ Partial Class frmSendungsdetailsNEU Me.gridVermerke.RowHeadersVisible = False Me.gridVermerke.RowHeadersWidth = 51 Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle22 + DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle3 Me.gridVermerke.RowTemplate.Height = 20 Me.gridVermerke.RowTemplate.ReadOnly = True Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -1635,18 +1635,18 @@ Partial Class frmSendungsdetailsNEU Me.dgvATEZNCTS.AllowUserToAddRows = False Me.dgvATEZNCTS.AllowUserToDeleteRows = False Me.dgvATEZNCTS.AllowUserToResizeRows = False - DataGridViewCellStyle23.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvATEZNCTS.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23 + DataGridViewCellStyle4.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvATEZNCTS.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4 Me.dgvATEZNCTS.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle24.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - 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.dgvATEZNCTS.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle24 + 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 Me.dgvATEZNCTS.ColumnHeadersHeight = 29 Me.dgvATEZNCTS.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing Me.dgvATEZNCTS.Dock = System.Windows.Forms.DockStyle.Fill @@ -1657,8 +1657,8 @@ Partial Class frmSendungsdetailsNEU Me.dgvATEZNCTS.RowHeadersVisible = False Me.dgvATEZNCTS.RowHeadersWidth = 51 Me.dgvATEZNCTS.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvATEZNCTS.RowsDefaultCellStyle = DataGridViewCellStyle25 + DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvATEZNCTS.RowsDefaultCellStyle = DataGridViewCellStyle6 Me.dgvATEZNCTS.RowTemplate.Height = 20 Me.dgvATEZNCTS.RowTemplate.ReadOnly = True Me.dgvATEZNCTS.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -1671,27 +1671,27 @@ Partial Class frmSendungsdetailsNEU ' 'Panel23 ' - Me.Panel23.Controls.Add(Me.Button20) + Me.Panel23.Controls.Add(Me.btnATEZNew) Me.Panel23.Dock = System.Windows.Forms.DockStyle.Top Me.Panel23.Location = New System.Drawing.Point(3, 3) Me.Panel23.Name = "Panel23" Me.Panel23.Size = New System.Drawing.Size(1200, 45) Me.Panel23.TabIndex = 106 ' - 'Button20 + 'btnATEZNew ' - Me.Button20.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Button20.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button20.Image = Global.AVISO.My.Resources.Resources.plus - Me.Button20.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button20.Location = New System.Drawing.Point(3, 8) - Me.Button20.Name = "Button20" - Me.Button20.Size = New System.Drawing.Size(136, 34) - Me.Button20.TabIndex = 8 - Me.Button20.Text = "ATEZ-NCTS" - Me.Button20.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button20.UseVisualStyleBackColor = True - Me.Button20.Visible = False + Me.btnATEZNew.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnATEZNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnATEZNew.Image = Global.AVISO.My.Resources.Resources.plus + Me.btnATEZNew.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnATEZNew.Location = New System.Drawing.Point(3, 8) + Me.btnATEZNew.Name = "btnATEZNew" + Me.btnATEZNew.Size = New System.Drawing.Size(136, 34) + Me.btnATEZNew.TabIndex = 8 + Me.btnATEZNew.Text = "ATEZ-NCTS" + Me.btnATEZNew.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnATEZNew.UseVisualStyleBackColor = True + Me.btnATEZNew.Visible = False ' 'tbDigicust ' @@ -1709,18 +1709,18 @@ Partial Class frmSendungsdetailsNEU Me.dgvDigicust.AllowUserToAddRows = False Me.dgvDigicust.AllowUserToDeleteRows = False Me.dgvDigicust.AllowUserToResizeRows = False - DataGridViewCellStyle26.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvDigicust.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle26 + DataGridViewCellStyle7.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvDigicust.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7 Me.dgvDigicust.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle27.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - 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.dgvDigicust.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle27 + 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 Me.dgvDigicust.ColumnHeadersHeight = 29 Me.dgvDigicust.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing Me.dgvDigicust.Dock = System.Windows.Forms.DockStyle.Fill @@ -1731,8 +1731,8 @@ Partial Class frmSendungsdetailsNEU Me.dgvDigicust.RowHeadersVisible = False Me.dgvDigicust.RowHeadersWidth = 51 Me.dgvDigicust.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvDigicust.RowsDefaultCellStyle = DataGridViewCellStyle28 + DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvDigicust.RowsDefaultCellStyle = DataGridViewCellStyle9 Me.dgvDigicust.RowTemplate.Height = 20 Me.dgvDigicust.RowTemplate.ReadOnly = True Me.dgvDigicust.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -1784,18 +1784,18 @@ Partial Class frmSendungsdetailsNEU Me.dgvMail.AllowUserToAddRows = False Me.dgvMail.AllowUserToDeleteRows = False Me.dgvMail.AllowUserToResizeRows = False - DataGridViewCellStyle29.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvMail.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle29 + DataGridViewCellStyle10.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvMail.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10 Me.dgvMail.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle30.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle30.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - DataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvMail.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle30 + 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 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 +1807,8 @@ Partial Class frmSendungsdetailsNEU Me.dgvMail.RowHeadersVisible = False Me.dgvMail.RowHeadersWidth = 51 Me.dgvMail.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvMail.RowsDefaultCellStyle = DataGridViewCellStyle31 + DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvMail.RowsDefaultCellStyle = DataGridViewCellStyle12 Me.dgvMail.RowTemplate.Height = 20 Me.dgvMail.RowTemplate.ReadOnly = True Me.dgvMail.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -2590,36 +2590,36 @@ Partial Class frmSendungsdetailsNEU Me.dgvVorkosten.AllowUserToResizeColumns = False Me.dgvVorkosten.AllowUserToResizeRows = False Me.dgvVorkosten.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle32.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvVorkosten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle32 + 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 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}) - DataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvVorkosten.DefaultCellStyle = DataGridViewCellStyle34 + 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 Me.dgvVorkosten.Location = New System.Drawing.Point(3, 4) Me.dgvVorkosten.MultiSelect = False Me.dgvVorkosten.Name = "dgvVorkosten" Me.dgvVorkosten.ReadOnly = True - DataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvVorkosten.RowHeadersDefaultCellStyle = DataGridViewCellStyle35 + 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 Me.dgvVorkosten.RowHeadersVisible = False Me.dgvVorkosten.RowHeadersWidth = 51 Me.dgvVorkosten.RowTemplate.Height = 18 @@ -2657,8 +2657,8 @@ Partial Class frmSendungsdetailsNEU 'clmnPreis ' Me.clmnPreis.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - DataGridViewCellStyle33.Format = "C2" - Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle33 + DataGridViewCellStyle14.Format = "C2" + Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle14 Me.clmnPreis.HeaderText = "Preis" Me.clmnPreis.MaxInputLength = 15 Me.clmnPreis.MinimumWidth = 6 @@ -2687,35 +2687,35 @@ Partial Class frmSendungsdetailsNEU Me.dgvBelege.AllowUserToResizeColumns = False Me.dgvBelege.AllowUserToResizeRows = False Me.dgvBelege.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle36.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvBelege.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle36 + 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 - DataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle37.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle37.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle37.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle37.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle37.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvBelege.DefaultCellStyle = DataGridViewCellStyle37 + 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 - DataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle38.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle38.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - 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.dgvBelege.RowHeadersDefaultCellStyle = DataGridViewCellStyle38 + 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 @@ -2882,6 +2882,18 @@ Partial Class frmSendungsdetailsNEU Me.Panel6.Size = New System.Drawing.Size(775, 325) Me.Panel6.TabIndex = 1 ' + 'lblErr_Auftrageber + ' + Me.lblErr_Auftrageber.AutoSize = True + Me.lblErr_Auftrageber.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold) + Me.lblErr_Auftrageber.ForeColor = System.Drawing.Color.Red + Me.lblErr_Auftrageber.Location = New System.Drawing.Point(120, 44) + Me.lblErr_Auftrageber.Name = "lblErr_Auftrageber" + Me.lblErr_Auftrageber.Size = New System.Drawing.Size(137, 13) + Me.lblErr_Auftrageber.TabIndex = 97 + Me.lblErr_Auftrageber.Text = "Auftraggeber angeben!" + Me.lblErr_Auftrageber.Visible = False + ' 'Label13 ' Me.Label13.AutoSize = True @@ -4437,6 +4449,18 @@ Partial Class frmSendungsdetailsNEU Me.Panel5.Size = New System.Drawing.Size(1214, 69) Me.Panel5.TabIndex = 0 ' + 'lblAbfArtLand + ' + Me.lblAbfArtLand.AutoSize = True + Me.lblAbfArtLand.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold) + Me.lblAbfArtLand.ForeColor = System.Drawing.Color.Red + Me.lblAbfArtLand.Location = New System.Drawing.Point(424, 52) + Me.lblAbfArtLand.Name = "lblAbfArtLand" + Me.lblAbfArtLand.Size = New System.Drawing.Size(184, 13) + Me.lblAbfArtLand.TabIndex = 114 + Me.lblAbfArtLand.Text = "Abfertigungsart/-land angeben!" + Me.lblAbfArtLand.Visible = False + ' 'pnlValidation ' Me.pnlValidation.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -4922,6 +4946,18 @@ Partial Class frmSendungsdetailsNEU Me.txtAbfertigungsnummer.Size = New System.Drawing.Size(224, 24) Me.txtAbfertigungsnummer.TabIndex = 10 ' + 'lblFilialeAbfNr + ' + Me.lblFilialeAbfNr.AutoSize = True + Me.lblFilialeAbfNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold) + Me.lblFilialeAbfNr.ForeColor = System.Drawing.Color.Red + Me.lblFilialeAbfNr.Location = New System.Drawing.Point(32, 53) + Me.lblFilialeAbfNr.Name = "lblFilialeAbfNr" + Me.lblFilialeAbfNr.Size = New System.Drawing.Size(245, 13) + Me.lblFilialeAbfNr.TabIndex = 115 + Me.lblFilialeAbfNr.Text = "FilialenNr / Abfertigungsnummer angeben!" + Me.lblFilialeAbfNr.Visible = False + ' 'Panel2 ' Me.Panel2.AutoSize = True @@ -5970,42 +6006,6 @@ Partial Class frmSendungsdetailsNEU Me.DataGridViewTextBoxColumn5.ReadOnly = True Me.DataGridViewTextBoxColumn5.Width = 200 ' - 'lblAbfArtLand - ' - Me.lblAbfArtLand.AutoSize = True - Me.lblAbfArtLand.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold) - Me.lblAbfArtLand.ForeColor = System.Drawing.Color.Red - Me.lblAbfArtLand.Location = New System.Drawing.Point(424, 52) - Me.lblAbfArtLand.Name = "lblAbfArtLand" - Me.lblAbfArtLand.Size = New System.Drawing.Size(184, 13) - Me.lblAbfArtLand.TabIndex = 114 - Me.lblAbfArtLand.Text = "Abfertigungsart/-land angeben!" - Me.lblAbfArtLand.Visible = False - ' - 'lblFilialeAbfNr - ' - Me.lblFilialeAbfNr.AutoSize = True - Me.lblFilialeAbfNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold) - Me.lblFilialeAbfNr.ForeColor = System.Drawing.Color.Red - Me.lblFilialeAbfNr.Location = New System.Drawing.Point(32, 53) - Me.lblFilialeAbfNr.Name = "lblFilialeAbfNr" - Me.lblFilialeAbfNr.Size = New System.Drawing.Size(245, 13) - Me.lblFilialeAbfNr.TabIndex = 115 - Me.lblFilialeAbfNr.Text = "FilialenNr / Abfertigungsnummer angeben!" - Me.lblFilialeAbfNr.Visible = False - ' - 'lblErr_Auftrageber - ' - Me.lblErr_Auftrageber.AutoSize = True - Me.lblErr_Auftrageber.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold) - Me.lblErr_Auftrageber.ForeColor = System.Drawing.Color.Red - Me.lblErr_Auftrageber.Location = New System.Drawing.Point(120, 44) - Me.lblErr_Auftrageber.Name = "lblErr_Auftrageber" - Me.lblErr_Auftrageber.Size = New System.Drawing.Size(137, 13) - Me.lblErr_Auftrageber.TabIndex = 97 - Me.lblErr_Auftrageber.Text = "Auftraggeber angeben!" - Me.lblErr_Auftrageber.Visible = False - ' 'frmSendungsdetailsNEU ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -6399,7 +6399,7 @@ Partial Class frmSendungsdetailsNEU Friend WithEvents tbATEZ As TabPage Friend WithEvents dgvATEZNCTS As DataGridView Friend WithEvents Panel23 As Panel - Friend WithEvents Button20 As Button + Friend WithEvents btnATEZNew As Button Friend WithEvents tbDigicust As TabPage Friend WithEvents Button19 As Button Friend WithEvents dgvDigicust As DataGridView diff --git a/Aviso/frmSendungsdetailsNEU.resx b/Aviso/frmSendungsdetailsNEU.resx index ffdfcb2..725b4fa 100644 --- a/Aviso/frmSendungsdetailsNEU.resx +++ b/Aviso/frmSendungsdetailsNEU.resx @@ -117,45 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 404, 17 - - - 765, 17 - - - - /9j/4AAQSkZJRgABAQEAAAAAAAD/7gAOQWRvYmUAZAAAAAAB/9sAQwABAQEBAQEBAQEBAQEBAQEBAQEB - AQECAQEBAQECAgICAgICAgICAgIDAgICAwMDAwMDBQUFBQUFBQUFBQUFBQUF/9sAQwEBAQECAQIDAgID - BAQDBAQFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUF/8AAEQgA - GQAZAwERAAIRAQMRAf/EABgAAAMBAQAAAAAAAAAAAAAAAAAICQcK/8QAKRAAAQUAAgIABAcBAAAAAAAA - AQIDBAUGAAcRITESIxVBYSIyEzMIFv/EABQBAQAAAAAAAAAAAAAAAAAAAAD/xAAUEQEAAAAAAAAAAAAA - AAAAAAAA/9oADAMBAAIRAxEAPwDsSKq/7Vudfqtf2Ky3W77t1EhyJ2zp6WBFraLTW8SKwzFh3EeKwhmM - w202htsDwB64CSWH+lrc3ilVadknOB9Pyx5/c+5cunIwP6vrN6dDCVKHw+kQPz4DTyLim0vTGs7ByGt7 - VhTIWM1NlDU73LrX3qq7qoLzqUqQ5dracLLyQfCklJ/EEHxwKNcCflzQva7Adn5eM8iPKtd/3dGjOrHl - CX/+uu1oCvY9FQAPASxnqXraJBDWh1mqq9RFZSzZZtvKOy5ItAAC0w4glhxLi/61FYBHs+OAxOYzVhjv - 8072rtGHIkiXkewbJuHJAEuJGnQZBabeAJSFhAHzAHgVN4Eiu2d5aQqnXZPF6TM12hk9sdyt3a5uzqc/ - ZU0FWpt3EJ+SbMjvIVJS6FIUgeQkefXkHgLI1adyMwzAa7QpUxShaP4h3HSftc+Pv7r54GoZDeaeu697 - KyW71mPsIEnA6z7BMPYFReXTtvJirbbhIRHnPvuh4LUUeR6ICR8QOBcDgHAOAcA4H//Z - - - - - /9j/4AAQSkZJRgABAQEAAAAAAAD/7gAOQWRvYmUAZAAAAAAB/9sAQwABAQEBAQEBAQEBAQEBAQEBAQEB - AQECAQEBAQECAgICAgICAgICAgIDAgICAwMDAwMDBQUFBQUFBQUFBQUFBQUF/9sAQwEBAQECAQIDAgID - BAQDBAQFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUF/8AAEQgA - GQAZAwERAAIRAQMRAf/EABgAAAMBAQAAAAAAAAAAAAAAAAAICQcK/8QAKRAAAQUAAgIABAcBAAAAAAAA - AQIDBAUGAAcRITESIxVBYSIyEzMIFv/EABQBAQAAAAAAAAAAAAAAAAAAAAD/xAAUEQEAAAAAAAAAAAAA - AAAAAAAA/9oADAMBAAIRAxEAPwDsSKq/7Vudfqtf2Ky3W77t1EhyJ2zp6WBFraLTW8SKwzFh3EeKwhmM - w202htsDwB64CSWH+lrc3ilVadknOB9Pyx5/c+5cunIwP6vrN6dDCVKHw+kQPz4DTyLim0vTGs7ByGt7 - VhTIWM1NlDU73LrX3qq7qoLzqUqQ5dracLLyQfCklJ/EEHxwKNcCflzQva7Adn5eM8iPKtd/3dGjOrHl - CX/+uu1oCvY9FQAPASxnqXraJBDWh1mqq9RFZSzZZtvKOy5ItAAC0w4glhxLi/61FYBHs+OAxOYzVhjv - 8072rtGHIkiXkewbJuHJAEuJGnQZBabeAJSFhAHzAHgVN4Eiu2d5aQqnXZPF6TM12hk9sdyt3a5uzqc/ - ZU0FWpt3EJ+SbMjvIVJS6FIUgeQkefXkHgLI1adyMwzAa7QpUxShaP4h3HSftc+Pv7r54GoZDeaeu697 - KyW71mPsIEnA6z7BMPYFReXTtvJirbbhIRHnPvuh4LUUeR6ICR8QOBcDgHAOAcA4H//Z - - iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V @@ -1569,9 +1531,6 @@ mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg== - - 296, 17 - iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V @@ -1803,6 +1762,44 @@ rGp33g/w9ql7NoGnXyWw0LUP726+A48ybH5BknCWWY7Lq2TVaSzNVMvnjcLjoYqrHD5NUxOdyqYOtXoR rY7H4jHYSnSdT2lHL8uwNOUI/FU+hyHGUMfjc2xVDEQxsJvDOOIVCrQdKLqYyNPBKNaFOo4UMPToVZT5 eWpiMRXkm9o//9k= + + + + 404, 17 + + + 765, 17 + + + + /9j/4AAQSkZJRgABAQEAAAAAAAD/7gAOQWRvYmUAZAAAAAAB/9sAQwABAQEBAQEBAQEBAQEBAQEBAQEB + AQECAQEBAQECAgICAgICAgICAgIDAgICAwMDAwMDBQUFBQUFBQUFBQUFBQUF/9sAQwEBAQECAQIDAgID + BAQDBAQFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUF/8AAEQgA + GQAZAwERAAIRAQMRAf/EABgAAAMBAQAAAAAAAAAAAAAAAAAICQcK/8QAKRAAAQUAAgIABAcBAAAAAAAA + AQIDBAUGAAcRITESIxVBYSIyEzMIFv/EABQBAQAAAAAAAAAAAAAAAAAAAAD/xAAUEQEAAAAAAAAAAAAA + AAAAAAAA/9oADAMBAAIRAxEAPwDsSKq/7Vudfqtf2Ky3W77t1EhyJ2zp6WBFraLTW8SKwzFh3EeKwhmM + w202htsDwB64CSWH+lrc3ilVadknOB9Pyx5/c+5cunIwP6vrN6dDCVKHw+kQPz4DTyLim0vTGs7ByGt7 + VhTIWM1NlDU73LrX3qq7qoLzqUqQ5dracLLyQfCklJ/EEHxwKNcCflzQva7Adn5eM8iPKtd/3dGjOrHl + CX/+uu1oCvY9FQAPASxnqXraJBDWh1mqq9RFZSzZZtvKOy5ItAAC0w4glhxLi/61FYBHs+OAxOYzVhjv + 8072rtGHIkiXkewbJuHJAEuJGnQZBabeAJSFhAHzAHgVN4Eiu2d5aQqnXZPF6TM12hk9sdyt3a5uzqc/ + ZU0FWpt3EJ+SbMjvIVJS6FIUgeQkefXkHgLI1adyMwzAa7QpUxShaP4h3HSftc+Pv7r54GoZDeaeu697 + KyW71mPsIEnA6z7BMPYFReXTtvJirbbhIRHnPvuh4LUUeR6ICR8QOBcDgHAOAcA4H//Z + + + + + /9j/4AAQSkZJRgABAQEAAAAAAAD/7gAOQWRvYmUAZAAAAAAB/9sAQwABAQEBAQEBAQEBAQEBAQEBAQEB + AQECAQEBAQECAgICAgICAgICAgIDAgICAwMDAwMDBQUFBQUFBQUFBQUFBQUF/9sAQwEBAQECAQIDAgID + BAQDBAQFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUF/8AAEQgA + GQAZAwERAAIRAQMRAf/EABgAAAMBAQAAAAAAAAAAAAAAAAAICQcK/8QAKRAAAQUAAgIABAcBAAAAAAAA + AQIDBAUGAAcRITESIxVBYSIyEzMIFv/EABQBAQAAAAAAAAAAAAAAAAAAAAD/xAAUEQEAAAAAAAAAAAAA + AAAAAAAA/9oADAMBAAIRAxEAPwDsSKq/7Vudfqtf2Ky3W77t1EhyJ2zp6WBFraLTW8SKwzFh3EeKwhmM + w202htsDwB64CSWH+lrc3ilVadknOB9Pyx5/c+5cunIwP6vrN6dDCVKHw+kQPz4DTyLim0vTGs7ByGt7 + VhTIWM1NlDU73LrX3qq7qoLzqUqQ5dracLLyQfCklJ/EEHxwKNcCflzQva7Adn5eM8iPKtd/3dGjOrHl + CX/+uu1oCvY9FQAPASxnqXraJBDWh1mqq9RFZSzZZtvKOy5ItAAC0w4glhxLi/61FYBHs+OAxOYzVhjv + 8072rtGHIkiXkewbJuHJAEuJGnQZBabeAJSFhAHzAHgVN4Eiu2d5aQqnXZPF6TM12hk9sdyt3a5uzqc/ + ZU0FWpt3EJ+SbMjvIVJS6FIUgeQkefXkHgLI1adyMwzAa7QpUxShaP4h3HSftc+Pv7r54GoZDeaeu697 + KyW71mPsIEnA6z7BMPYFReXTtvJirbbhIRHnPvuh4LUUeR6ICR8QOBcDgHAOAcA4H//Z @@ -2077,9 +2074,6 @@ 174, 17 - - 404, 17 - 596, 17 diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index d586b89..136b809 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -559,7 +559,7 @@ Public Class frmSendungsdetailsNEU End If If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ATEZ_NCTS", Me) Then - Button20.Visible = True + btnATEZNew.Visible = True End If If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("DIGICUST", Me) Then @@ -4546,21 +4546,17 @@ Public Class frmSendungsdetailsNEU ' ContextMenuStrip2.Show(Cursor.Position) If dgvAnhang.SelectedRows.Count >= 1 Then Try - Dim files As New List(Of String) ' String() = New String() {"Sample1.pdf", "Sample2.pdf", "Sample3.pdf"} + Dim files As New List(Of String) ' Dim outputFile As String = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Merge.pdf", ".pdf", True,, "Merge") ' "result.pdf" - 'Dim outl As New Outlook.Application - 'Dim Mail As Microsoft.Office.Interop.Outlook.MailItem - 'Mail = outl.CreateItem(0) For Each r As DataGridViewRow In dgvAnhang.SelectedRows files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value)) Next VERAG_PROG_ALLGEMEIN.cFormularManager.mergePDFs(files, outputFile) - 'Dim doc As Spire.Pdf.PdfDocumentBase = Spire.Pdf.PdfDocument.MergeFiles(files.ToArray) - 'doc.Save(outputFile, Spire.Pdf.FileFormat.PDF) + Process.Start(outputFile) - ' VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.OPEN_PATH() + Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try @@ -6601,7 +6597,7 @@ Public Class frmSendungsdetailsNEU 'End Sub - Private Sub Button20_Click_1(sender As Object, e As EventArgs) Handles Button20.Click + Private Sub Button20_Click_1(sender As Object, e As EventArgs) Handles btnATEZNew.Click SAVE_ME() Try @@ -6829,6 +6825,13 @@ Public Class frmSendungsdetailsNEU If abfTmp <> "" Then cboAbfertigungsart.changeItem(abfTmp) End If + + Select Case cboAbfertigungsLand._value + Case "AT" + MenuStrip.Enabled = False + Case Else + MenuStrip.Enabled = True + End Select End Sub Sub checkinitOLDAbfertigungsart(Optional AbfNr As Object = Nothing) diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index 88e9b65..f7bc3df 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -522,7 +522,7 @@ Public Class usrcntlAktDetails With dgvSendungen ' Dim selRow = If(.SelectedRows.Count > 0, .SelectedRows(0).Index, -1) .Columns.Clear() - .DataSource = AvisoDAL.loadDataTableBySQL(" SELECT FilialenNr ,/*rank() OVER (ORDER BY tblSnd_PosUnterNr) as */ tblSnd_PosUnterNr, [tblSnd_SendungID],[tblSnd_AvisoID],[tblSnd_Abfertigungsart_ID],[tblSnd_EmpfaengerKdNr],[tblSnd_Empfaenger],isnull(cast(FilialenNr as varchar (4)),'')+'/' + isnull(cast(AbfertigungsNr as varchar (8)),'') as AbfertigungsNr,(SELECT (CASE WHEN Count(*)>0 THEN cast(COUNT(*) as varchar(4)) ELSE '-' END) FROM Vermerke WHERE AvisoID=" & AvisoID & " AND SendungID=tblSnd_SendungID) as Vermerke, tblSnd_SpeditionsbuchEingetragen,tblSnd_Fremdspedition,tblSnd_FremdspeditionText,isnull(tblSnd_QS_MA,-1) as tblSnd_QS_MA,tblSnd_Vorbereitet,tblSnd_Vorgeschrieben,LetzterMitarbeiterId,tblSnd_VG_MA,LetzterMitarbeiter,tblSnd_BARzuKassieren,tblSnd_Fakturiert, AbfertigungsNr as AbfertigungsNr2, tblSnd_AbklaerungTR, tblSnd_AbklaerungTR_MA ,tblSnd_AbfertigungTR, tblSnd_AbfertigungTR_MA " & + .DataSource = AvisoDAL.loadDataTableBySQL(" SELECT FilialenNr ,/*rank() OVER (ORDER BY tblSnd_PosUnterNr) as */ tblSnd_PosUnterNr, [tblSnd_SendungID],[tblSnd_AvisoID],[tblSnd_Abfertigungsart_ID],isnull(tblSnd_Zollsystem_Land,'')tblSnd_Zollsystem_Land,[tblSnd_EmpfaengerKdNr],[tblSnd_Empfaenger],isnull(cast(FilialenNr as varchar (4)),'')+'/' + isnull(cast(AbfertigungsNr as varchar (8)),'') as AbfertigungsNr,(SELECT (CASE WHEN Count(*)>0 THEN cast(COUNT(*) as varchar(4)) ELSE '-' END) FROM Vermerke WHERE AvisoID=" & AvisoID & " AND SendungID=tblSnd_SendungID) as Vermerke, tblSnd_SpeditionsbuchEingetragen,tblSnd_Fremdspedition,tblSnd_FremdspeditionText,isnull(tblSnd_QS_MA,-1) as tblSnd_QS_MA,tblSnd_Vorbereitet,tblSnd_Vorgeschrieben,LetzterMitarbeiterId,tblSnd_VG_MA,LetzterMitarbeiter,tblSnd_BARzuKassieren,tblSnd_Fakturiert, AbfertigungsNr as AbfertigungsNr2, tblSnd_AbklaerungTR, tblSnd_AbklaerungTR_MA ,tblSnd_AbfertigungTR, tblSnd_AbfertigungTR_MA " & " FROM tblSendungen WHERE tblSnd_AvisoId=" & AvisoID & " ORDER BY tblSnd_PosUnterNr") 'LEFT JOIN tblQS_Abfertigungsarten ON [tblSnd_Abfertigungsart_ID]=QS_Abfertigungsart_ID ' If .RowCount = 0 Then .Columns.Clear() : Exit Sub @@ -532,6 +532,7 @@ Public Class usrcntlAktDetails .Columns("tblSnd_AvisoID").Visible = False 'AvisoID nicht anzeigen .Columns("tblSnd_EmpfaengerKdNr").Visible = False 'AvisoID nicht anzeigen .Columns("tblSnd_Abfertigungsart_ID").Visible = False + .Columns("tblSnd_Zollsystem_Land").Visible = False .Columns("tblSnd_SpeditionsbuchEingetragen").Visible = False .Columns("tblSnd_QS_MA").Visible = False .Columns("tblSnd_Fremdspedition").Visible = False @@ -688,7 +689,7 @@ Public Class usrcntlAktDetails t.Name = "Abfertigungsart" t.HeaderText = "Abfertigungsart" t.HeaderText = VERAG_PROG_ALLGEMEIN.cAllgemein._getTRANSLATE_SUB(Me, dgvSendungen, t, t.HeaderText) - t.Width = 100 : t.DefaultCellStyle.Padding = New Padding(2) : t.DefaultCellStyle.BackColor = Color.White + t.Width = 110 : t.DefaultCellStyle.Padding = New Padding(2) : t.DefaultCellStyle.BackColor = Color.White 't.ToolTipText = "" .Columns.Insert(3, t) @@ -702,8 +703,11 @@ Public Class usrcntlAktDetails ' r.Cells("Abfertigungsart").Value = "FREMD" r.Cells("Abfertigungsart").Value = r.Cells("tblSnd_FremdspeditionText").Value Else 'Nomal - r.Cells("Abfertigungsart").Value = ADMIN.getValueTxtBySql("SELECT Abfertigungsbezeichnung FROM Abfertigungsarten WHERE [Abfertigungsart]='" & r.Cells("tblSnd_Abfertigungsart_ID").Value.ToString & "'", "FMZOLL") - If r.Cells("Abfertigungsart").Value.ToString.Length > 15 Then r.Cells("Abfertigungsart").Value = r.Cells("Abfertigungsart").Value.Substring(0, 15) & ".." + Dim Abfertigungsland As String = r.Cells("tblSnd_Zollsystem_Land").Value + If Abfertigungsland <> "" Then Abfertigungsland = "[" & Abfertigungsland & "] " + r.Cells("Abfertigungsart").Value = Abfertigungsland & ADMIN.getValueTxtBySql("SELECT Abfertigungsbezeichnung FROM Abfertigungsarten WHERE [Abfertigungsart]='" & r.Cells("tblSnd_Abfertigungsart_ID").Value.ToString & "'", "FMZOLL") + + If r.Cells("Abfertigungsart").Value.ToString.Length > 18 Then r.Cells("Abfertigungsart").Value = r.Cells("Abfertigungsart").Value.Substring(0, 18) & ".." End If r.Cells("FilialenNr").Style.ForeColor = Color.White