fix ustva, etc.

SDL/USTV/frmMDM_USTVAntrag.vb

@@ -5,6 +5,7 @@ Imports System.Web.UI.WebControls.Expressions
 Imports System.Windows.Documents
 Imports itextsharp.text.pdf
 Imports Microsoft.Office.Interop
+Imports TAlex.WPF.Helpers
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class frmMDM_USTVAntrag
@@ -55,6 +56,7 @@ Public Class frmMDM_USTVAntrag
 
         suppressSelectionChanged = True
 
+
         pnlBody.AutoScroll = False
 
         lblGesamtUSteuerFW.Text = "-"
@@ -354,6 +356,12 @@ Public Class frmMDM_USTVAntrag
             End If
         End If
 
+        If dgvUSTVPositionen.Rows.Count = 1 Then
+            posIndex = dgvUSTVPositionen.Rows.Count
+            suppressSelectionChanged = False
+        End If
+
+
         If posIndex > 0 Then
             Dim idx As Integer = posIndex - 1
             If idx >= 0 AndAlso dgvUSTVPositionen.Rows.Count > idx Then
@@ -2324,6 +2332,8 @@ Public Class frmMDM_USTVAntrag
         UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ID = USTV_ANTRAG.getMaxPosNr
         UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_interneNr = USTV_ANTRAG.getMaxPosinterneNr
         UstCntlUSTV_AntragPosition1.Enabled = True
+        UstCntlUSTV_AntragPosition1.txtRgDatum.Focus()
+
 
     End Sub
 
@@ -2358,6 +2368,7 @@ Public Class frmMDM_USTVAntrag
 
                             End If
                         End If
+                    End If
 
                 ElseIf UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_daId > 0 Then
 
@@ -2370,6 +2381,7 @@ Public Class frmMDM_USTVAntrag
                         End If
 
                     End If
+                End If
 
             End If
 
@@ -2385,11 +2397,10 @@ Public Class frmMDM_USTVAntrag
             End If
             init()
         End If
-                End If
+        init()
 
         UstCntlUSTV_AntragPosition1.Enabled = False
 
-            End If
     End Sub
 
     Private Sub btnMail_Click(sender As Object, e As EventArgs) Handles btnMail.Click

SDL/USTV/usrCntlUSTV.vb

@@ -2089,7 +2089,7 @@ Public Class usrCntlUSTV
 
                                     updateVURZ = False 'frm.cbxDivers.Checked
 
-                                    Dim UStV_ERS = New VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen(Belegdatum, BelegNr, fd.SafeFileName)
+                                    Dim UStV_ERS = New VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen(Belegdatum, BelegNr, fd.SafeFileName, USTV_ANTRAG.UStVAn_ID)
                                     If Not UStV_ERS.hasEntry Then
 
                                         Dim isVZ As Boolean = False

SDL/USTV/ustCntlUSTV_AntragPosition.vb

@@ -26,9 +26,8 @@ Public Class ustCntlUSTV_AntragPosition
         txtRgDatum._value = ""
         txtRgNr._value = ""
         btnLeistenderSave.Visible = False
-        txtUmrechnungskurs._value = 1
+        txtUmrechnungskurs._value = ""
         txtLeistungsbezeichnung._value = ""
-        txtUmrechnungskurs._value = 1
         txtUSTBetrag._value = 0
         txtUSTBetragEUR._value = 0
         txtNettobetrag._value = 0
@@ -773,15 +772,11 @@ Public Class ustCntlUSTV_AntragPosition
             Return
         End If
 
-        Dim oldValueChanged As Boolean =
+        Dim oldValueChanged As Boolean = UStV_POS Is Nothing OrElse UStV_POS.UStVPo_USteuerbetragEUR Is Nothing OrElse Convert.ToDecimal(UStV_POS.UStVPo_USteuerbetragEUR) <> ustBetragEUR
-        UStV_POS Is Nothing OrElse
-        UStV_POS.UStVPo_USteuerbetragEUR Is Nothing OrElse
-        Convert.ToDecimal(UStV_POS.UStVPo_USteuerbetragEUR) <> ustBetragEUR
 
         If Not oldValueChanged Then Return
 
-        Dim kurs As Decimal =
+        Dim kurs As Decimal = RoundCurrency(ustBetrag / ustBetragEUR)
-        RoundCurrency(ustBetrag / ustBetragEUR)
 
         txtUmrechnungskurs.Text = kurs.ToString()
 

VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb

@@ -640,12 +640,13 @@ Public Class cUStVErstattungPositionen
         Return list
     End Function
 
-    Sub New(Belegdatum As Date, Belegnummer As Integer, UStVEr_Importfilename As String)
+    Sub New(Belegdatum As Date, Belegnummer As String, UStVEr_Importfilename As String, antragsid As Integer)
         Me.Belegdatum = Belegdatum
         Me.Belegnummer = Belegnummer
         Me.UStVEr_Importfilename = UStVEr_Importfilename
+        Me.UStVAn_ID = antragsid
 
-        LOAD(Belegdatum, Belegnummer, UStVEr_Importfilename)
+        LOAD(Belegdatum, Belegnummer, UStVEr_Importfilename, antragsid)
     End Sub
 
 
@@ -698,16 +699,17 @@ Public Class cUStVErstattungPositionen
         End Try
     End Sub
 
-    Public Sub LOAD(Belegdatum As Date, Belegnummer As Integer, UStVEr_Importfilename As String)
+    Public Sub LOAD(Belegdatum As Date, Belegnummer As String, UStVEr_Importfilename As String, UStVAn_ID As Integer)
         Try
 
             hasEntry = False
 
             Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
-                Using cmd As New SqlCommand("SELECT * FROM tblUStVErstattung WHERE Belegdatum=@Belegdatum AND Belegnummer=@Belegnummer AND UStVEr_Importfilename=@UStVEr_Importfilename ", conn)
+                Using cmd As New SqlCommand("SELECT * FROM tblUStVErstattung WHERE Belegdatum=@Belegdatum AND Belegnummer=@Belegnummer AND UStVEr_Importfilename=@UStVEr_Importfilename AND UStVAn_ID=@UStVAn_ID ", conn)
                     cmd.Parameters.AddWithValue("@Belegdatum", Belegdatum)
                     cmd.Parameters.AddWithValue("@Belegnummer", Belegnummer)
                     cmd.Parameters.AddWithValue("@UStVEr_Importfilename", UStVEr_Importfilename)
+                    cmd.Parameters.AddWithValue("@UStVAn_ID", UStVAn_ID)
                     Dim dr = cmd.ExecuteReader()
                     If dr.Read Then
                         'Dim l As New cOfferte