Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO

Aviso/frmGesamtsicherheitenNEU.vb

@@ -170,9 +170,25 @@ Public Class frmGesamtsicherheitenNEU
                 .Columns("gs_freitext").HeaderText = "Freitext"
             End With
 
+            Dim changeColor = True
+
+            For i As Integer = 0 To dgvGesamtsicherheit.Rows.Count - 1
+
+                If dgvGesamtsicherheit.Rows(i).Cells("gs_posNr").Value = 1 Then changeColor = IIf(changeColor, False, True)
+
+                If changeColor Then
+                    Me.dgvGesamtsicherheit.Rows(i).DefaultCellStyle.BackColor = Color.LightBlue
+                Else
+
+                    Me.dgvGesamtsicherheit.Rows(i).DefaultCellStyle.BackColor = Color.White
+                End If
+
+
+            Next
+
         End If
 
-        calcGesamtsummen()
+                calcGesamtsummen()
 
 
     End Sub
@@ -415,6 +431,23 @@ Public Class frmGesamtsicherheitenNEU
 
             End With
 
+            Dim changeColor = True
+            For i As Integer = 0 To dgvSicherheitsPos.Rows.Count - 1
+
+
+                If dgvSicherheitsPos.Rows(i).Cells("gsp_gspPosId").Value = 1 Then changeColor = IIf(changeColor, False, True)
+
+                If changeColor Then
+                    Me.dgvSicherheitsPos.Rows(i).DefaultCellStyle.BackColor = Color.LightBlue
+                Else
+
+                    Me.dgvSicherheitsPos.Rows(i).DefaultCellStyle.BackColor = Color.White
+                End If
+
+
+            Next
+
+
         End If
         btnAddPos.Visible = True
 

Aviso/frmSendungsdetailsNEU.Designer.vb

@@ -127,6 +127,7 @@ Partial Class frmSendungsdetailsNEU
         Me.Label25 = New System.Windows.Forms.Label()
         Me.Button7 = New System.Windows.Forms.Button()
         Me.TabPage3 = New System.Windows.Forms.TabPage()
+        Me.RCntrlVermerke1 = New AVISO.rCntrlVermerke()
         Me.gridVermerke = New System.Windows.Forms.DataGridView()
         Me.tbATEZ = New System.Windows.Forms.TabPage()
         Me.dgvATEZNCTS = New System.Windows.Forms.DataGridView()
@@ -463,7 +464,6 @@ Partial Class frmSendungsdetailsNEU
         Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.XXXToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.timerValidation = New System.Windows.Forms.Timer(Me.components)
-        Me.RCntrlVermerke1 = New AVISO.rCntrlVermerke()
         Me.pnl.SuspendLayout()
         Me.Panel4.SuspendLayout()
         Me.TabControl1.SuspendLayout()
@@ -621,7 +621,7 @@ Partial Class frmSendungsdetailsNEU
         Me.tbAnhang.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
         Me.tbAnhang.Location = New System.Drawing.Point(4, 29)
         Me.tbAnhang.Name = "tbAnhang"
-        Me.tbAnhang.Size = New System.Drawing.Size(1206, 289)
+        Me.tbAnhang.Size = New System.Drawing.Size(1206, 288)
         Me.tbAnhang.TabIndex = 4
         Me.tbAnhang.Text = "Anhang"
         Me.tbAnhang.UseVisualStyleBackColor = True
@@ -642,7 +642,7 @@ Partial Class frmSendungsdetailsNEU
         Me.dgvAnhang.RowHeadersWidth = 51
         Me.dgvAnhang.RowTemplate.Height = 40
         Me.dgvAnhang.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvAnhang.Size = New System.Drawing.Size(1206, 244)
+        Me.dgvAnhang.Size = New System.Drawing.Size(1206, 243)
         Me.dgvAnhang.TabIndex = 1
         '
         'btnDirektAnfuegen
@@ -886,7 +886,7 @@ Partial Class frmSendungsdetailsNEU
         Me.tbZollabfertigung.Controls.Add(Me.Panel16)
         Me.tbZollabfertigung.Location = New System.Drawing.Point(4, 29)
         Me.tbZollabfertigung.Name = "tbZollabfertigung"
-        Me.tbZollabfertigung.Size = New System.Drawing.Size(1206, 289)
+        Me.tbZollabfertigung.Size = New System.Drawing.Size(1206, 288)
         Me.tbZollabfertigung.TabIndex = 2
         Me.tbZollabfertigung.Text = "Zollabfertigung"
         Me.tbZollabfertigung.UseVisualStyleBackColor = True
@@ -900,7 +900,7 @@ Partial Class frmSendungsdetailsNEU
         Me.Panel16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
         Me.Panel16.Location = New System.Drawing.Point(0, 0)
         Me.Panel16.Name = "Panel16"
-        Me.Panel16.Size = New System.Drawing.Size(1206, 289)
+        Me.Panel16.Size = New System.Drawing.Size(1206, 288)
         Me.Panel16.TabIndex = 0
         '
         'dgvZollAnmeldungen
@@ -918,7 +918,7 @@ Partial Class frmSendungsdetailsNEU
         Me.dgvZollAnmeldungen.RowHeadersWidth = 51
         Me.dgvZollAnmeldungen.RowTemplate.Height = 30
         Me.dgvZollAnmeldungen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvZollAnmeldungen.Size = New System.Drawing.Size(1206, 219)
+        Me.dgvZollAnmeldungen.Size = New System.Drawing.Size(1206, 218)
         Me.dgvZollAnmeldungen.TabIndex = 1
         '
         'Panel17
@@ -927,7 +927,7 @@ Partial Class frmSendungsdetailsNEU
         Me.Panel17.Controls.Add(Me.Button6)
         Me.Panel17.Controls.Add(Me.Button5)
         Me.Panel17.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.Panel17.Location = New System.Drawing.Point(0, 251)
+        Me.Panel17.Location = New System.Drawing.Point(0, 250)
         Me.Panel17.Name = "Panel17"
         Me.Panel17.Size = New System.Drawing.Size(1206, 38)
         Me.Panel17.TabIndex = 2
@@ -1133,8 +1133,8 @@ Partial Class frmSendungsdetailsNEU
         Me.TabPage1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
         Me.TabPage1.Location = New System.Drawing.Point(4, 29)
         Me.TabPage1.Name = "TabPage1"
-        Me.TabPage1.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
-        Me.TabPage1.Size = New System.Drawing.Size(1206, 289)
+        Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
+        Me.TabPage1.Size = New System.Drawing.Size(1206, 288)
         Me.TabPage1.TabIndex = 0
         Me.TabPage1.Text = "Kunden - Zolltarif"
         Me.TabPage1.UseVisualStyleBackColor = True
@@ -1150,7 +1150,7 @@ Partial Class frmSendungsdetailsNEU
         Me.pnlKundenZolltarif.Location = New System.Drawing.Point(3, 36)
         Me.pnlKundenZolltarif.MinimumSize = New System.Drawing.Size(2, 103)
         Me.pnlKundenZolltarif.Name = "pnlKundenZolltarif"
-        Me.pnlKundenZolltarif.Size = New System.Drawing.Size(1200, 250)
+        Me.pnlKundenZolltarif.Size = New System.Drawing.Size(1200, 249)
         Me.pnlKundenZolltarif.TabIndex = 1
         Me.pnlKundenZolltarif.TabStop = True
         '
@@ -1159,7 +1159,7 @@ Partial Class frmSendungsdetailsNEU
         Me.Label22.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label22.AutoSize = True
-        Me.Label22.Location = New System.Drawing.Point(4, 209)
+        Me.Label22.Location = New System.Drawing.Point(4, 208)
         Me.Label22.Name = "Label22"
         Me.Label22.Size = New System.Drawing.Size(209, 13)
         Me.Label22.TabIndex = 0
@@ -1171,7 +1171,7 @@ Partial Class frmSendungsdetailsNEU
         Me.lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden.AutoSize = True
-        Me.lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden.Location = New System.Drawing.Point(4, 224)
+        Me.lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden.Location = New System.Drawing.Point(4, 223)
         Me.lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden.Name = "lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden"
         Me.lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden.Size = New System.Drawing.Size(338, 13)
         Me.lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden.TabIndex = 1
@@ -1216,8 +1216,8 @@ Partial Class frmSendungsdetailsNEU
         Me.TabPage2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
         Me.TabPage2.Location = New System.Drawing.Point(4, 29)
         Me.TabPage2.Name = "TabPage2"
-        Me.TabPage2.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
-        Me.TabPage2.Size = New System.Drawing.Size(1206, 289)
+        Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
+        Me.TabPage2.Size = New System.Drawing.Size(1206, 288)
         Me.TabPage2.TabIndex = 1
         Me.TabPage2.Text = "Speditionsbuch"
         Me.TabPage2.UseVisualStyleBackColor = True
@@ -1235,7 +1235,7 @@ Partial Class frmSendungsdetailsNEU
         Me.DataGridView.Location = New System.Drawing.Point(3, 94)
         Me.DataGridView.Name = "DataGridView"
         Me.DataGridView.RowHeadersWidth = 51
-        Me.DataGridView.Size = New System.Drawing.Size(1200, 192)
+        Me.DataGridView.Size = New System.Drawing.Size(1200, 191)
         Me.DataGridView.TabIndex = 1
         '
         'pnlSpedBuchNacherfassung
@@ -1555,6 +1555,13 @@ Partial Class frmSendungsdetailsNEU
         Me.TabPage3.Text = "Vermerke"
         Me.TabPage3.UseVisualStyleBackColor = True
         '
+        'RCntrlVermerke1
+        '
+        Me.RCntrlVermerke1.Location = New System.Drawing.Point(251, 18)
+        Me.RCntrlVermerke1.Name = "RCntrlVermerke1"
+        Me.RCntrlVermerke1.Size = New System.Drawing.Size(575, 208)
+        Me.RCntrlVermerke1.TabIndex = 1
+        '
         'gridVermerke
         '
         Me.gridVermerke.AllowUserToAddRows = False
@@ -1600,8 +1607,8 @@ Partial Class frmSendungsdetailsNEU
         Me.tbATEZ.Controls.Add(Me.Panel23)
         Me.tbATEZ.Location = New System.Drawing.Point(4, 29)
         Me.tbATEZ.Name = "tbATEZ"
-        Me.tbATEZ.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
-        Me.tbATEZ.Size = New System.Drawing.Size(1206, 289)
+        Me.tbATEZ.Padding = New System.Windows.Forms.Padding(3)
+        Me.tbATEZ.Size = New System.Drawing.Size(1206, 288)
         Me.tbATEZ.TabIndex = 6
         Me.tbATEZ.Text = "ATEZ"
         Me.tbATEZ.UseVisualStyleBackColor = True
@@ -1641,7 +1648,7 @@ Partial Class frmSendungsdetailsNEU
         Me.dgvATEZNCTS.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
         Me.dgvATEZNCTS.ShowCellErrors = False
         Me.dgvATEZNCTS.ShowRowErrors = False
-        Me.dgvATEZNCTS.Size = New System.Drawing.Size(1200, 238)
+        Me.dgvATEZNCTS.Size = New System.Drawing.Size(1200, 237)
         Me.dgvATEZNCTS.TabIndex = 105
         Me.dgvATEZNCTS.TabStop = False
         '
@@ -1675,7 +1682,7 @@ Partial Class frmSendungsdetailsNEU
         Me.tbDigicust.Controls.Add(Me.Panel24)
         Me.tbDigicust.Location = New System.Drawing.Point(4, 29)
         Me.tbDigicust.Name = "tbDigicust"
-        Me.tbDigicust.Size = New System.Drawing.Size(1206, 289)
+        Me.tbDigicust.Size = New System.Drawing.Size(1206, 288)
         Me.tbDigicust.TabIndex = 7
         Me.tbDigicust.Text = "Digicust"
         Me.tbDigicust.UseVisualStyleBackColor = True
@@ -1715,7 +1722,7 @@ Partial Class frmSendungsdetailsNEU
         Me.dgvDigicust.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
         Me.dgvDigicust.ShowCellErrors = False
         Me.dgvDigicust.ShowRowErrors = False
-        Me.dgvDigicust.Size = New System.Drawing.Size(1206, 244)
+        Me.dgvDigicust.Size = New System.Drawing.Size(1206, 243)
         Me.dgvDigicust.TabIndex = 107
         Me.dgvDigicust.TabStop = False
         '
@@ -1749,8 +1756,8 @@ Partial Class frmSendungsdetailsNEU
         Me.tbMail.Controls.Add(Me.Panel25)
         Me.tbMail.Location = New System.Drawing.Point(4, 29)
         Me.tbMail.Name = "tbMail"
-        Me.tbMail.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
-        Me.tbMail.Size = New System.Drawing.Size(1206, 289)
+        Me.tbMail.Padding = New System.Windows.Forms.Padding(3)
+        Me.tbMail.Size = New System.Drawing.Size(1206, 288)
         Me.tbMail.TabIndex = 8
         Me.tbMail.Text = "Mail"
         Me.tbMail.UseVisualStyleBackColor = True
@@ -1791,7 +1798,7 @@ Partial Class frmSendungsdetailsNEU
         Me.dgvMail.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
         Me.dgvMail.ShowCellErrors = False
         Me.dgvMail.ShowRowErrors = False
-        Me.dgvMail.Size = New System.Drawing.Size(1200, 238)
+        Me.dgvMail.Size = New System.Drawing.Size(1200, 237)
         Me.dgvMail.TabIndex = 109
         Me.dgvMail.TabStop = False
         '
@@ -1934,7 +1941,7 @@ Partial Class frmSendungsdetailsNEU
         Me.TabPage4.Controls.Add(Me.Button14)
         Me.TabPage4.Location = New System.Drawing.Point(4, 22)
         Me.TabPage4.Name = "TabPage4"
-        Me.TabPage4.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+        Me.TabPage4.Padding = New System.Windows.Forms.Padding(3)
         Me.TabPage4.Size = New System.Drawing.Size(433, 299)
         Me.TabPage4.TabIndex = 0
         Me.TabPage4.Text = "Aktendeckel"
@@ -2638,7 +2645,7 @@ Partial Class frmSendungsdetailsNEU
         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, 3, 3, 3)
+        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"
@@ -2854,6 +2861,7 @@ Partial Class frmSendungsdetailsNEU
         Me.Label13.Size = New System.Drawing.Size(42, 13)
         Me.Label13.TabIndex = 96
         Me.Label13.Text = "ATA-Nr"
+        Me.Label13.Visible = False
         '
         'txtATANr
         '
@@ -5889,13 +5897,6 @@ Partial Class frmSendungsdetailsNEU
         Me.timerValidation.Enabled = True
         Me.timerValidation.Interval = 2000
         '
-        'RCntrlVermerke1
-        '
-        Me.RCntrlVermerke1.Location = New System.Drawing.Point(251, 18)
-        Me.RCntrlVermerke1.Name = "RCntrlVermerke1"
-        Me.RCntrlVermerke1.Size = New System.Drawing.Size(575, 208)
-        Me.RCntrlVermerke1.TabIndex = 1
-        '
         'frmSendungsdetailsNEU
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)

Aviso/frmSendungsdetailsNEU.vb

@@ -239,7 +239,7 @@ Public Class frmSendungsdetailsNEU
                 If SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATBFakturieren Is Nothing Then
                     Dim err = "- ATB-Gestellung: Bitte geben Sie an, ob die ATB Gestellung fakturiert (abgerechnet) werden sollte."
                     rtbValidierung.Text &= err & vbNewLine : pnlValidation.Visible = True
-                    If showErr Then MsgBox(err) : Return False
+                    'If showErr Then MsgBox(err) : Return False
                 End If
 
 

Aviso/rCntrlVermerke.vb

@@ -17,7 +17,7 @@ Public Class rCntrlVermerke
     End Sub
 
 
-    Public Sub Vermerke_anzeigen2(Optional rowindex As Integer = -1)
+    Public Sub Vermerke_anzeigen2(Optional SendungsIndex As Integer = -1, Optional rowindex As Integer = -1)
         aktiv = Now 'Damit nicht neu geladedt wird (frmHauptfenster -> timer.tick)
         gridVermerke.Columns.Clear()
         '  lblInfoAviso.Visible = False
@@ -87,12 +87,18 @@ Public Class rCntrlVermerke
         usrcntlAktDetails.gridVermerke_SpaltenFestlegen(gridVermerke)
 
         'If tbcntlVermerke.SelectedIndex = 2 And rowindex > 0 Then
-        If rowindex > 0 Then
+        If SendungsIndex > 0 Then
             'dgvSendungen.ClearSelection()
             'dgvSendungen.Rows(rowindex).Selected = True
         Else
             gridVermerke.ClearSelection()
         End If
+
+        If rowindex > 0 Then
+            gridVermerke.ClearSelection()
+            gridVermerke.Rows(rowindex).Selected = True
+        End If
+
         ' timer.Enabled = True
         ' initDGVSendungenRows()
     End Sub
@@ -105,14 +111,15 @@ Public Class rCntrlVermerke
         End If
         usrcntlAktDetails.gridVermerkeMouseClick(gridVermerke, e.ColumnIndex, e.RowIndex, AVISO, tmpIndex)
 
-        Vermerke_anzeigen2(tmpIndex)
+        Vermerke_anzeigen2(tmpIndex, e.RowIndex)
     End Sub
     Private Sub gridVermerke_Paint(sender As Object, e As PaintEventArgs) Handles gridVermerke.Paint
         If painted Then Exit Sub
-        painted = False
+        painted = True
+        'If gridVermerke.Columns("VermerkeOptions") Is Nothing Then Exit Sub
         '  If dgvSendungen.RowCount = 0 Then Exit Sub
         usrcntlAktDetails.gridVermerke_Paint(gridVermerke)
-        painted = True
+        painted = False
     End Sub
 
 

Aviso/usrcntlAktDetails.vb

@@ -1297,6 +1297,7 @@ Public Class usrcntlAktDetails
             End Select
 
         End If
+
     End Sub
 
     Private Sub gridVermerke_Paint(sender As Object, e As PaintEventArgs) Handles gridVermerke.Paint
@@ -1308,7 +1309,6 @@ Public Class usrcntlAktDetails
     End Sub
     Shared Sub gridVermerke_Paint(gridvermerke As DataGridView)
 
-
         Try
             If gridvermerke.Columns("VermerkeOptions") Is Nothing Then Exit Sub
             For Each r As DataGridViewRow In gridvermerke.Rows