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

Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

Browse Source
This commit is contained in:
Andreas Luxbauer
2025-01-02 15:52:17 +01:00
parent e2d88b47e1 e45f865a0d
commit 6993674c03
5 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SDL/USTV/frmMDM_USTVAntrag.vb
View File

@@ -39,6 +39,8 @@ Public Class frmMDM_USTVAntrag
Me.von = von
Me.bis = bis
End Sub
Sub init(Optional Lieferant As String = "")
@@ -252,6 +254,7 @@ Public Class frmMDM_USTVAntrag
USTV_ANTRAG.UStVAn_Status = cboStatus._value
USTV_ANTRAG.UStVAn_AntragArt = cboAntragArt._value
USTV_ANTRAG.UStVAn_StatusText = rtbStatusText.Text
USTV_ANTRAG.FilialenNr = cbxFiliale._value
If txt3470.Text <> "" AndAlso IsNumeric(txt3470.Text) Then
@@ -351,10 +354,13 @@ Public Class frmMDM_USTVAntrag
cboAntragArt.changeItem(" ")
cbxFiliale.fillWithSQL("SELECT Filialen.FilialenNr, Filialen.Grenzstelle FROM Filialen WHERE Filialen.FilialenNr>=4800 AND Filialen.Fil_Status='A' ORDER BY Filialen.FilialenNr",, "FMZOLL", True)
cboAntragArt.changeItem(" ")
For i As Integer = 0 To cbxFiliale.Items.Count - 1
If cbxFiliale.Items(i).ToString().Contains("MWST Rückerstattung") Then
cbxFiliale.SelectedIndex = i
Exit For
End If
Next
lbl_EintrageVerarbetiet.Text = ""

2
SDL/USTV/usrCntlUSTV.vb
View File

@@ -695,7 +695,7 @@ Public Class usrCntlUSTV
Exit Sub
End If
Dim frm = New frmMDM_USTVAntrag(-1, "AT", New Date(Now.Year(), 1, 1), New Date(Now.Year(), 12, 31))
Dim frm = New frmMDM_USTVAntrag(IIf(KdSearchBox1.KdNr_value > 0, KdSearchBox1.KdNr_value, -1), "AT", Nothing, Nothing)
frm.ShowDialog()
End Sub

6
SDL/USTV/ustCntlUSTV_AntragPosition.vb
View File

@@ -99,13 +99,13 @@ Public Class ustCntlUSTV_AntragPosition
save = False
End If
If txtUSTBetrag._value <> "" Then
UStV_POS.UStVPo_USteuerbetrag = txtUSTBetrag._value
UStV_POS.UStVPo_USteuerbetrag = txtUSTBetrag._value.Replace(",", ".")
Else
save = False
End If
If txtUSTBetragEUR._value <> "" Then
UStV_POS.UStVPo_USteuerbetragEUR = txtUSTBetragEUR._value
UStV_POS.UStVPo_USteuerbetragEUR = txtUSTBetragEUR._value.Replace(",", ".")
Else
save = False
End If
@@ -192,7 +192,7 @@ Public Class ustCntlUSTV_AntragPosition
ElseIf sender Is txtUSTBetragEUR Then
If IsNumeric(txtUSTBetragEUR._value) AndAlso IsNumeric(txtUmrechnungskurs._value) AndAlso txtUmrechnungskurs._value <> 1 Then
If IsNumeric(txtUSTBetragEUR._value) AndAlso IsNumeric(txtUmrechnungskurs._value) Then
txtUSTBetrag.Text = Math.Floor((txtUSTBetragEUR._value * txtUmrechnungskurs._value) * 100 + 0.5) / 100
'values_changed()
End If

2
SDL/mdm/usrCntlMDMAuswertungen.Designer.vb generated
View File

@@ -1213,7 +1213,7 @@ Partial Class usrCntlMDMAuswertungen
Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage1.Size = New System.Drawing.Size(1049, 990)
Me.TabPage1.TabIndex = 0
Me.TabPage1.Text = "VERAG Auswertugnen"
Me.TabPage1.Text = "VERAG Auswertungen"
Me.TabPage1.UseVisualStyleBackColor = True
'
'Label33

2
VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb
View File

@@ -349,7 +349,7 @@ Public Class cIDS
AND tblIDSTransactionsNew.KdNrVERAG = @AdressenNr
AND tbl_IDS_Länder.[Lieferland_ISO2] = @LandKZ
AND tblIDSTransactionsNew.[VATAmount] <> 0
AND isnull(UStVAn_ID,0) = " & IIf(Archiv IsNot Nothing AndAlso Archiv, 1, 0) &
AND isnull(UStVAn_ID,0) " & IIf(Archiv IsNot Nothing AndAlso Archiv, " <> 0 ", " = 0 ") &
"GROUP BY
tblIDSTransactionsNew.KdNrVERAG,
tblIDSTransactionsNew.[YearMonthDay],