edv/AVISO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

verscuh merge probleme zu beheben

Browse Source
This commit is contained in:
Andreas Luxbauer
2026-03-27 10:24:57 +01:00
parent fe469f9741
commit 9c8f91b3fa
1 changed files with 51 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
Aviso/frmSendungsdetailsNEU.Designer.vb generated
View File

@@ -38,6 +38,20 @@ Partial Class frmSendungsdetailsNEU
Dim DataGridViewCellStyle12 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 DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim 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()
Me.pnl = New System.Windows.Forms.Panel() Me.pnl = New System.Windows.Forms.Panel()
Me.Panel4 = New System.Windows.Forms.Panel() Me.Panel4 = New System.Windows.Forms.Panel()
Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabControl1 = New System.Windows.Forms.TabControl()
@@ -93,13 +107,6 @@ Partial Class frmSendungsdetailsNEU
Me.toolModal_Transit = New System.Windows.Forms.ToolStripMenuItem() Me.toolModal_Transit = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItem12 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem12 = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItem32 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem32 = New System.Windows.Forms.ToolStripMenuItem()
Me.tbATEZ = New System.Windows.Forms.TabPage()
Me.dgvATEZNCTS = New System.Windows.Forms.DataGridView()
Me.Panel23 = New System.Windows.Forms.Panel()
Me.Label18 = New System.Windows.Forms.Label()
Me.Label17 = New System.Windows.Forms.Label()
Me.btnATEZNewEZA = New System.Windows.Forms.Button()
Me.btnATEZNew = New System.Windows.Forms.Button()
Me.TabPage1 = New System.Windows.Forms.TabPage() Me.TabPage1 = New System.Windows.Forms.TabPage()
Me.pnlKundenZolltarif = New System.Windows.Forms.Panel() Me.pnlKundenZolltarif = New System.Windows.Forms.Panel()
Me.Label22 = New System.Windows.Forms.Label() Me.Label22 = New System.Windows.Forms.Label()
@@ -133,7 +140,13 @@ Partial Class frmSendungsdetailsNEU
Me.Label25 = New System.Windows.Forms.Label() Me.Label25 = New System.Windows.Forms.Label()
Me.Button7 = New System.Windows.Forms.Button() Me.Button7 = New System.Windows.Forms.Button()
Me.TabPage3 = New System.Windows.Forms.TabPage() Me.TabPage3 = New System.Windows.Forms.TabPage()
Me.RCntrlVermerke1 = New AVISO.rCntrlVermerke()
Me.gridVermerke = New System.Windows.Forms.DataGridView() Me.gridVermerke = New System.Windows.Forms.DataGridView()
Me.tbATEZ = New System.Windows.Forms.TabPage()
Me.dgvATEZNCTS = New System.Windows.Forms.DataGridView()
Me.Panel23 = New System.Windows.Forms.Panel()
Me.btnATEZNewEZA = New System.Windows.Forms.Button()
Me.btnATEZNew = New System.Windows.Forms.Button()
Me.tbDigicust = New System.Windows.Forms.TabPage() Me.tbDigicust = New System.Windows.Forms.TabPage()
Me.dgvDigicust = New System.Windows.Forms.DataGridView() Me.dgvDigicust = New System.Windows.Forms.DataGridView()
Me.Panel24 = New System.Windows.Forms.Panel() Me.Panel24 = New System.Windows.Forms.Panel()
@@ -259,10 +272,35 @@ Partial Class frmSendungsdetailsNEU
Me.btnAvisierer = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.btnAvisierer = New VERAG_PROG_ALLGEMEIN.FlatButton()
Me.Button4 = New System.Windows.Forms.Button() Me.Button4 = New System.Windows.Forms.Button()
Me.Button1 = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button()
Me.cntlFrachtfuehrer_Sonst = New AVISO.usrcntlCheckBox()
Me.cntlAbsender_Sonst = New AVISO.usrcntlCheckBox()
Me.cntlEmpfaenger_Sonst = New AVISO.usrcntlCheckBox()
Me.cntlAuftraggeber_Sonst = New AVISO.usrcntlCheckBox()
Me.cntlAvisierer_Sonst = New AVISO.usrcntlCheckBox()
Me.lblSonstigesKosten = New System.Windows.Forms.Label() Me.lblSonstigesKosten = New System.Windows.Forms.Label()
Me.btnAufschub_Atr = New System.Windows.Forms.Button() Me.btnAufschub_Atr = New System.Windows.Forms.Button()
Me.btnAufschub_Empf = New System.Windows.Forms.Button() Me.btnAufschub_Empf = New System.Windows.Forms.Button()
Me.btnAufschub_VERAG = New System.Windows.Forms.Button() Me.btnAufschub_VERAG = New System.Windows.Forms.Button()
Me.cntlFrachtf_Clear = New AVISO.usrcntlCheckBox()
Me.cntlFrachtf_Abf = New AVISO.usrcntlCheckBox()
Me.cntlFrachtf_Eust = New AVISO.usrcntlCheckBox()
Me.cntlFrachtf_Zoll = New AVISO.usrcntlCheckBox()
Me.cntlAbsender_Clear = New AVISO.usrcntlCheckBox()
Me.cntlAbsender_Abf = New AVISO.usrcntlCheckBox()
Me.cntlAbsender_Eust = New AVISO.usrcntlCheckBox()
Me.cntlAbsender_Zoll = New AVISO.usrcntlCheckBox()
Me.cntlEmpf_Clear = New AVISO.usrcntlCheckBox()
Me.cntlEmpf_Abf = New AVISO.usrcntlCheckBox()
Me.cntlEmpf_Eust = New AVISO.usrcntlCheckBox()
Me.cntlEmpf_Zoll = New AVISO.usrcntlCheckBox()
Me.cntlAuftr_Clear = New AVISO.usrcntlCheckBox()
Me.cntlAuftr_Abf = New AVISO.usrcntlCheckBox()
Me.cntlAuftr_Eust = New AVISO.usrcntlCheckBox()
Me.cntlAuftr_Zoll = New AVISO.usrcntlCheckBox()
Me.cntlAvisierer_Clear = New AVISO.usrcntlCheckBox()
Me.cntlAvisierer_Abf = New AVISO.usrcntlCheckBox()
Me.cntlAvisierer_Eust = New AVISO.usrcntlCheckBox()
Me.cntlAvisierer_Zoll = New AVISO.usrcntlCheckBox()
Me.Panel15 = New System.Windows.Forms.Panel() Me.Panel15 = New System.Windows.Forms.Panel()
Me.txtAvisierer = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.txtAvisierer = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
Me.txtAuftraggeber = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.txtAuftraggeber = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
@@ -275,6 +313,7 @@ Partial Class frmSendungsdetailsNEU
Me.lblEmpfAufschubEust = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblEmpfAufschubEust = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.lblFrachtfuehrer = New System.Windows.Forms.Label() Me.lblFrachtfuehrer = New System.Windows.Forms.Label()
Me.pnlT1 = New System.Windows.Forms.Panel() Me.pnlT1 = New System.Windows.Forms.Panel()
Me.UsrCntlSND_NCTSGestellungsadresse1 = New AVISO.usrCntlSND_NCTSGestellungsadresse()
Me.Label43 = New System.Windows.Forms.Label() Me.Label43 = New System.Windows.Forms.Label()
Me.lblAbsender = New System.Windows.Forms.Label() Me.lblAbsender = New System.Windows.Forms.Label()
Me.txtAbsenderKdNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtAbsenderKdNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -480,6 +519,8 @@ Partial Class frmSendungsdetailsNEU
Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.DataGridViewTextBoxColumn5 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn5 = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.Label17 = New System.Windows.Forms.Label()
Me.Label18 = New System.Windows.Forms.Label()
Me.pnl.SuspendLayout() Me.pnl.SuspendLayout()
Me.Panel4.SuspendLayout() Me.Panel4.SuspendLayout()
Me.TabControl1.SuspendLayout() Me.TabControl1.SuspendLayout()
@@ -493,9 +534,6 @@ Partial Class frmSendungsdetailsNEU
CType(Me.dgvZollAnmeldungen, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvZollAnmeldungen, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel17.SuspendLayout() Me.Panel17.SuspendLayout()
Me.MenuStrip.SuspendLayout() Me.MenuStrip.SuspendLayout()
Me.tbATEZ.SuspendLayout()
CType(Me.dgvATEZNCTS, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel23.SuspendLayout()
Me.TabPage1.SuspendLayout() Me.TabPage1.SuspendLayout()
Me.pnlKundenZolltarif.SuspendLayout() Me.pnlKundenZolltarif.SuspendLayout()
Me.Panel18.SuspendLayout() Me.Panel18.SuspendLayout()
@@ -504,6 +542,9 @@ Partial Class frmSendungsdetailsNEU
Me.pnlSpedBuchNacherfassung.SuspendLayout() Me.pnlSpedBuchNacherfassung.SuspendLayout()
Me.TabPage3.SuspendLayout() Me.TabPage3.SuspendLayout()
CType(Me.gridVermerke, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.gridVermerke, System.ComponentModel.ISupportInitialize).BeginInit()
Me.tbATEZ.SuspendLayout()
CType(Me.dgvATEZNCTS, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel23.SuspendLayout()
Me.tbDigicust.SuspendLayout() Me.tbDigicust.SuspendLayout()
CType(Me.dgvDigicust, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvDigicust, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel24.SuspendLayout() Me.Panel24.SuspendLayout()