Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024
This commit is contained in:
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("1.5.3.7")>
|
||||
<Assembly: AssemblyFileVersion("1.5.3.7")>
|
||||
<Assembly: AssemblyVersion("1.5.3.8")>
|
||||
<Assembly: AssemblyFileVersion("1.5.3.8")>
|
||||
|
||||
@@ -21,6 +21,7 @@ Public Class frmMDM_USTVAntrag
|
||||
Dim DiffernezbetragEUR As Double
|
||||
Dim GesamtUSteuerEUR As Double
|
||||
Dim GesamtUSteuer As Double
|
||||
Dim looked As Boolean = False
|
||||
|
||||
Sub New(UStVAn_ID)
|
||||
|
||||
@@ -542,12 +543,17 @@ Public Class frmMDM_USTVAntrag
|
||||
btnRMCQuartal.Visible = False
|
||||
End If
|
||||
|
||||
'If USTV_ANTRAG.UStVAn_LandKz IsNot Nothing Then
|
||||
' pbXMLExport.Visible = setXMLExportVisible(USTV_ANTRAG.UStVAn_LandKz)
|
||||
'End If
|
||||
If USTV_ANTRAG.UStVAn_AntragEingereichtAm IsNot Nothing AndAlso IsDate(USTV_ANTRAG.UStVAn_AntragEingereichtAm) Then
|
||||
looked = True
|
||||
Else
|
||||
looked = False
|
||||
End If
|
||||
|
||||
lookFields(looked)
|
||||
|
||||
|
||||
Else
|
||||
Dim sqlWhere As String = ""
|
||||
Dim sqlWhere As String = ""
|
||||
'neuer USTVA-Antrag
|
||||
KdSearchBox1.Visible = True
|
||||
cbxWahrung.Enabled = True
|
||||
@@ -1794,9 +1800,20 @@ Public Class frmMDM_USTVAntrag
|
||||
|
||||
If USTV_ANTRAG.UStVAn_Währungscode IsNot Nothing AndAlso USTV_ANTRAG.UStVAn_Währungscode <> "EUR" AndAlso USTV_ANTRAG.UStVAn_Währungscode <> "" Then
|
||||
Dim averageUmrechnungskurs As Double = 1
|
||||
Dim invoicedateOK As Boolean = True
|
||||
Dim PosNr As Integer = -1
|
||||
If dgvUSTVPositionen.Rows.Count > 0 Then
|
||||
For Each row In dgvUSTVPositionen.Rows
|
||||
averageUmrechnungskurs += row.Cells("UStVPo_Umrechnungskurs").Value
|
||||
|
||||
Dim reDat As Date = IIf(Not IsDBNull(row.Cells("invoice_date").Value) AndAlso IsDate(row.Cells("invoice_date").Value), row.Cells("invoice_date").Value, Nothing)
|
||||
|
||||
If reDat > USTV_ANTRAG.UStVAn_ReDatBis Or reDat < USTV_ANTRAG.UStVAn_ReDatVon Then
|
||||
invoicedateOK = False
|
||||
PosNr = row.Cells("UStVPo_ID").Value
|
||||
End If
|
||||
|
||||
|
||||
Next
|
||||
averageUmrechnungskurs = averageUmrechnungskurs / dgvUSTVPositionen.Rows.Count
|
||||
End If
|
||||
@@ -1807,6 +1824,10 @@ Public Class frmMDM_USTVAntrag
|
||||
MsgBox("Bitte Umrechnungskurs in den Antragspositionen kontrollieren!" & vbNewLine & "Der Steuerbetrag weicht um " & Math.Round(abw, 2) & "€ vom FW-Steuerbetrag ab! ")
|
||||
End If
|
||||
|
||||
If Not invoicedateOK Then
|
||||
MsgBox("Rechnungsdatum der Position " & PosNr & " befindet sich außerhalb der Antragsperiode, bitte korrigieren!")
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
|
||||
@@ -4511,4 +4532,17 @@ Public Class frmMDM_USTVAntrag
|
||||
|
||||
End Function
|
||||
|
||||
Private Function lookFields(look As Boolean)
|
||||
|
||||
For Each c As Control In Panel8.Controls
|
||||
|
||||
If c.Name <> "cbxWahrung" AndAlso c.Name <> "txtEingereichtAm" AndAlso c.Name <> "cbxInterneNr" Then
|
||||
c.Enabled = Not look
|
||||
End If
|
||||
Next
|
||||
btnEintragloeschen.Enabled = Not look
|
||||
btnNeuerEintrag.Enabled = Not look
|
||||
|
||||
End Function
|
||||
|
||||
End Class
|
||||
@@ -1,6 +1,4 @@
|
||||
|
||||
Imports itextsharp.text.pdf
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
|
||||
Public Class ustCntlUSTV_AntragPosition
|
||||
Public UStV_POS As VERAG_PROG_ALLGEMEIN.cUStVPositionen = Nothing
|
||||
@@ -8,7 +6,6 @@ Public Class ustCntlUSTV_AntragPosition
|
||||
Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
|
||||
Public Antrag_LandKz = ""
|
||||
Dim kdnr = ""
|
||||
|
||||
Public Event EV_PREV()
|
||||
Public Event EV_NEXT()
|
||||
Public Event CHANGED(UStVPo_ID)
|
||||
@@ -576,10 +573,17 @@ Public Class ustCntlUSTV_AntragPosition
|
||||
If txtRgDatum.Text <> "" Then
|
||||
txtRgDatum.Text = txtRgDatum.Text.Replace("-", ".")
|
||||
txtRgDatum.Text = txtRgDatum.Text.Replace(",", ".")
|
||||
'If IsDate(txtRgDatum.Text) Then txtChanged = True
|
||||
|
||||
Dim antr As New cUSTVAntrag(UStV_POS.UStVAn_ID)
|
||||
|
||||
If IsDate(txtRgDatum.Text) AndAlso ((CDate(txtRgDatum.Text) > antr.UStVAn_ReDatBis) OrElse (CDate(txtRgDatum.Text) < antr.UStVAn_ReDatVon)) Then
|
||||
MsgBox("Rechnungsdatum " & CDate(txtRgDatum.Text) & " darf nicht außerhalb der Antragsperiode liegen!")
|
||||
Else
|
||||
txtChanged = True
|
||||
End If
|
||||
End If
|
||||
|
||||
ElseIf sender Is txtLeistungsbezeichnung Then
|
||||
ElseIf sender Is txtLeistungsbezeichnung Then
|
||||
|
||||
txtChanged = True
|
||||
|
||||
|
||||
@@ -131,36 +131,42 @@ Public Class frmDakosyStammreferenzVerwalten
|
||||
SR.dySr_dy_Niederlassung = fd.cboNL._value
|
||||
SR.dySr_dy_Standard = fd.cbxStandard.Checked
|
||||
SR.dyStr_KdNr = fd.KdSearchBox1.KdNrNullInt
|
||||
|
||||
If SR.SAVE Then
|
||||
Dim ZA As New DAKOSY_Worker.cDakosy_Zollanmeldungen() 'dgvStammref.SelectedRows(0).Cells("dySr_dyId").Value)
|
||||
|
||||
ZA.dy_Id = 0
|
||||
ZA.dy_ART = SR.dySr_Verfahren
|
||||
ZA.dy_Status = -1
|
||||
ZA.dy_Status_KEWILL_Equivalent = -1
|
||||
If ZA.SAVE() Then
|
||||
DUPLICATE_Verfahren(dgvStammref.SelectedRows(0).Cells("dySr_dyId").Value, ZA)
|
||||
|
||||
SR.dySr_dyId = ZA.dy_Id
|
||||
SR.SAVE()
|
||||
|
||||
Dim f As New frmZollanmeldung(cboVerfahren._value, ZA)
|
||||
f.isSTAMMREF = True
|
||||
f.STAMMREF = SR.dySr_Stammreferenz
|
||||
f.ShowDialog(Me)
|
||||
' f.CopyFromZA_Id = dgvStammref.SelectedRows(0).Cells("dySr_Id").Value
|
||||
|
||||
|
||||
|
||||
' SQL.doSQL("UPDATE [tblDakosy_Stammreferenzen] SET dySr_dyId='" & ZA.dy_Id & "' WHERE dySr_Id='" & dgvStammref.SelectedRows(0).Cells("dySr_Id").Value & "'", "FMZOLL")
|
||||
End If
|
||||
initDGV()
|
||||
If cboVerfahren._value = "AA" Then
|
||||
SR.dySr_WarenortID = fd.cbxWarenort._value
|
||||
Else
|
||||
SR.dySr_WarenortID = -1
|
||||
End If
|
||||
|
||||
' Dim f As New frmZollanmeldung(cboVerfahren._value, New DAKOSY_Worker.cDakosy_Zollanmeldungen)
|
||||
|
||||
End If
|
||||
If SR.SAVE Then
|
||||
Dim ZA As New DAKOSY_Worker.cDakosy_Zollanmeldungen() 'dgvStammref.SelectedRows(0).Cells("dySr_dyId").Value)
|
||||
|
||||
ZA.dy_Id = 0
|
||||
ZA.dy_ART = SR.dySr_Verfahren
|
||||
ZA.dy_Status = -1
|
||||
ZA.dy_Status_KEWILL_Equivalent = -1
|
||||
If ZA.SAVE() Then
|
||||
DUPLICATE_Verfahren(dgvStammref.SelectedRows(0).Cells("dySr_dyId").Value, ZA)
|
||||
|
||||
SR.dySr_dyId = ZA.dy_Id
|
||||
SR.SAVE()
|
||||
|
||||
Dim f As New frmZollanmeldung(cboVerfahren._value, ZA)
|
||||
f.isSTAMMREF = True
|
||||
f.STAMMREF = SR.dySr_Stammreferenz
|
||||
f.ShowDialog(Me)
|
||||
' f.CopyFromZA_Id = dgvStammref.SelectedRows(0).Cells("dySr_Id").Value
|
||||
|
||||
|
||||
|
||||
' SQL.doSQL("UPDATE [tblDakosy_Stammreferenzen] SET dySr_dyId='" & ZA.dy_Id & "' WHERE dySr_Id='" & dgvStammref.SelectedRows(0).Cells("dySr_Id").Value & "'", "FMZOLL")
|
||||
End If
|
||||
initDGV()
|
||||
End If
|
||||
|
||||
' Dim f As New frmZollanmeldung(cboVerfahren._value, New DAKOSY_Worker.cDakosy_Zollanmeldungen)
|
||||
|
||||
End If
|
||||
|
||||
|
||||
|
||||
@@ -223,6 +229,7 @@ Public Class frmDakosyStammreferenzVerwalten
|
||||
cboNL.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("WAI", "WAI"))
|
||||
cboNL.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NEU", "NEU"))
|
||||
cboNL.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NKD", "NKD"))
|
||||
cboNL.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DTB", "DTB"))
|
||||
cboNL.changeItem("")
|
||||
|
||||
Case "IMEX"
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
If KdSearchBox1.KdNrNullInt IsNot Nothing Then where = " AND [dyStr_KdNr]='" & KdSearchBox1.KdNr_value & "' "
|
||||
|
||||
|
||||
If sql.getValueTxtBySql("SELECT count(*) FROM [tblDakosy_Stammreferenzen] where [dySr_Verfahren]='" & verfahren & "' AND [dySr_dy_Mandant]='" & mandant & "' AND [dySr_Bezeichnung]='" & txtBezeichnung.Text & "'" & where, "FMZOLL") > 0 AndAlso id < 1 Then
|
||||
If sql.getValueTxtBySql("SELECT count(*) FROM [tblDakosy_Stammreferenzen] where [dySr_Verfahren]='" & verfahren & "' AND [dySr_dy_Mandant]='" & mandant & "' AND [dySr_Bezeichnung]='" & txtBezeichnung.Text & "' AND [dySr_dy_Niederlassung] = '" & nl & "' " & where, "FMZOLL") > 0 AndAlso id < 1 Then
|
||||
MsgBox("Bezeichnung existiert bereits!") : Me.DialogResult = Windows.Forms.DialogResult.None
|
||||
End If
|
||||
End Sub
|
||||
|
||||
@@ -884,8 +884,7 @@ Public Class usrCntlBH
|
||||
AND op_debitor.i_personenkonto >= @KundeVon AND op_debitor.i_personenkonto <= @KundeBis
|
||||
AND op_debitor.d_zahlung >= @ZahlungVon AND op_debitor.d_zahlung <= @ZahlungBis
|
||||
AND DATEDIFF(DAY, DATEADD(DAY, (isnull(dbo.fibu_zahlziel.si_ntage,0) + ISNULL(tblKundenErweitert.kde_abwToleranzTage," & toleranztage & ")), op_debitor.d_rechnung), op_debitor.d_zahlung) > 0
|
||||
AND Left(op_debitor.c_bemerkung,2) <> 'AR' AND Left(op_debitor.c_bemerkung,2) <> 'DA' AND Left(op_debitor.c_bemerkung,2) <> 'AU' AND Left(op_debitor.c_bemerkung,2) <> 'RE' AND Left(op_debitor.c_bemerkung,2) <> 'VI' AND Left(op_debitor.c_bemerkung,2) <> 'Ha'
|
||||
AND op_debitor.c_bemerkung not like '%nicht verzinsen%'
|
||||
AND LEFT(op_debitor.c_bemerkung, 4) IN (SELECT CAST(FilialenNr AS VARCHAR(4)) FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".[VERAG].[dbo].[dbo].Filialen WHERE FilialenNr between 1000 and 9999)
|
||||
|
||||
ORDER BY op_debitor.i_personenkonto, op_debitor.c_urbelegid desc, op_debitor.d_rechnung, ISNULL(op_debitor.OWNFIELD_Belegdatum, '01.01.2000')"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user