fakt, Nacherfassung

SDL/Fakturierung/cFakturierung.vb

@@ -2351,8 +2351,9 @@ Public Class cFakturierung
                 '        'rpt.lbl_onlyZR_ZinsenUeberschrift.Text = "Dobândă p.a."
 
                 Case Else
+
                     rpt.lblLeistungUeberschrift.Text = "RENR"
-            rpt.lblAnzahlUeberschrift.Text = "VZ Tage"
+                    rpt.lblAnzahlUeberschrift.Text = "VZ Tage"
             rpt.lblSteuerpflichtigUeberschrift.Text = "Zahlungsbetrag"
             rpt.lblSteuerfreiUeberschrift.Text = "Verzugszinsen"
             'rpt.lbl_onlyZR_ZinsenUeberschrift.Text = "Zinsen p.a."

SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.Designer.vb

@@ -121,6 +121,7 @@ Partial Class frmNacherfassungNEU
         Me.Label34 = New System.Windows.Forms.Label()
         Me.btnFertig = New System.Windows.Forms.Button()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Label66 = New System.Windows.Forms.Label()
         Me.cboAbfertigungsLand = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.cbxEIDR = New System.Windows.Forms.CheckBox()
         Me.Button4 = New System.Windows.Forms.Button()
@@ -236,7 +237,6 @@ Partial Class frmNacherfassungNEU
         Me.DataGridViewTextBoxColumn5 = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.KopierenZwischenablageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.Label66 = New System.Windows.Forms.Label()
         Me.pnl.SuspendLayout()
         Me.Panel3.SuspendLayout()
         Me.GroupBox4.SuspendLayout()
@@ -1572,6 +1572,17 @@ Partial Class frmNacherfassungNEU
         Me.Panel1.Size = New System.Drawing.Size(883, 818)
         Me.Panel1.TabIndex = 1
         '
+        'Label66
+        '
+        Me.Label66.AutoSize = True
+        Me.Label66.ForeColor = System.Drawing.Color.Red
+        Me.Label66.Location = New System.Drawing.Point(491, 613)
+        Me.Label66.Name = "Label66"
+        Me.Label66.Size = New System.Drawing.Size(105, 13)
+        Me.Label66.TabIndex = 94
+        Me.Label66.Text = "Antrags-ID angeben!"
+        Me.Label66.Visible = False
+        '
         'cboAbfertigungsLand
         '
         Me.cboAbfertigungsLand._allowedValuesFreiText = Nothing
@@ -3444,17 +3455,6 @@ Partial Class frmNacherfassungNEU
         Me.KopierenZwischenablageToolStripMenuItem.Size = New System.Drawing.Size(217, 22)
         Me.KopierenZwischenablageToolStripMenuItem.Text = "Kopieren (Zwischenablage)"
         '
-        'Label66
-        '
-        Me.Label66.AutoSize = True
-        Me.Label66.ForeColor = System.Drawing.Color.Red
-        Me.Label66.Location = New System.Drawing.Point(491, 613)
-        Me.Label66.Name = "Label66"
-        Me.Label66.Size = New System.Drawing.Size(105, 13)
-        Me.Label66.TabIndex = 94
-        Me.Label66.Text = "Antrags-ID angeben!"
-        Me.Label66.Visible = False
-        '
         'frmNacherfassungNEU
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb

@@ -1,6 +1,7 @@
 Imports GrapeCity.ActiveReports
 Imports Gemeinsames
 Imports System.Web.UI.WebControls.Expressions
+Imports VERAG_PROG_ALLGEMEIN
 
 Public Class frmNacherfassungNEU
 
@@ -850,7 +851,7 @@ Public Class frmNacherfassungNEU
         End If
         If cboFiliale._value = 4817 AndAlso txtErfassungsnummer.Text = "" Then Label66.Visible = True : Return False
 
-            Return True
+        Return True
     End Function
     Function updateMe() As Boolean
         'If SPEDITIONSBUCH.FilialenNr < 0 Then
@@ -1511,30 +1512,39 @@ Public Class frmNacherfassungNEU
             End If
         ElseIf tbcntrRg.SelectedTab Is TabPage2 Then
             If dgvBelege.SelectedRows.Count = 0 Then Exit Sub
-            Dim f As New frmKundenUebersichtZollRgDetails(dgvBelege.SelectedRows(0).Cells("RK_ID").Value)
+            If dgvBelege.SelectedRows(0).Cells("RK_ID").Value > 0 Then
-            f.ShowDialog()
+                Dim rechnugn As New cRechnungsausgang(dgvBelege.SelectedRows(0).Cells("RK_ID").Value)
-        ElseIf tbcntrRg.SelectedTab Is TabPage3 Then
+                If rechnugn.DruckDatumZeit IsNot Nothing Then
-            Try
+                    Dim f As New frmKundenUebersichtZollRgDetails(dgvBelege.SelectedRows(0).Cells("RK_ID").Value)
-                Me.Cursor = Cursors.WaitCursor
+                    f.ShowDialog()
-
+                Else
-                If dgvBelege.SelectedRows.Count = 0 Then Exit Sub
+                    MsgBox("Rechnung kann nicht geöffnet werden, weil sie noch nicht gedruckt wurde!")
-
-                Dim DY As DAKOSY_Worker.cDakosy_Zollanmeldungen = New DAKOSY_Worker.cDakosy_Zollanmeldungen(dgvBelege.SelectedRows(0).Cells("dy_Id").Value)
-
-                If DY IsNot Nothing Then
-                    Dim f As New SDL.frmZollanmeldung(DY.dy_ART, DY, AVISO, Nothing, Now.ToString("yy"))
-                    AddHandler f.FormClosed, Sub()
-                                                 initDgvRg()
-                                             End Sub
-
-                    f.Show(Me)
                 End If
-            Catch ex As Exception
+
-                MsgBox(ex.Message & ex.StackTrace)
+            End If
-            End Try
+
-            Me.Cursor = Cursors.Default
+        ElseIf tbcntrRg.SelectedTab Is TabPage3 Then
-        ElseIf tbcntrRg.SelectedTab Is TabPage4 Then
+                Try
-            Try
+                    Me.Cursor = Cursors.WaitCursor
+
+                    If dgvBelege.SelectedRows.Count = 0 Then Exit Sub
+
+                    Dim DY As DAKOSY_Worker.cDakosy_Zollanmeldungen = New DAKOSY_Worker.cDakosy_Zollanmeldungen(dgvBelege.SelectedRows(0).Cells("dy_Id").Value)
+
+                    If DY IsNot Nothing Then
+                        Dim f As New SDL.frmZollanmeldung(DY.dy_ART, DY, AVISO, Nothing, Now.ToString("yy"))
+                        AddHandler f.FormClosed, Sub()
+                                                     initDgvRg()
+                                                 End Sub
+
+                        f.Show(Me)
+                    End If
+                Catch ex As Exception
+                    MsgBox(ex.Message & ex.StackTrace)
+                End Try
+                Me.Cursor = Cursors.Default
+            ElseIf tbcntrRg.SelectedTab Is TabPage4 Then
+                Try
                 Me.Cursor = Cursors.WaitCursor
                 If dgvBelege.SelectedRows.Count = 0 Then Exit Sub
 
@@ -1668,6 +1678,7 @@ Public Class frmNacherfassungNEU
         End If
     End Sub
 
+
 End Class
 
 Class cSpedBuch_Aktendeckel