Timas, MDM Datenverarbeitung (Asfinag), UID-Nr bei Creditsafe

2024-02-06 11:09:03 +01:00
parent a4609e853d
commit f0d7729100
11 changed files with 633 additions and 386 deletions
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("1.2.7.9")>
-<Assembly: AssemblyFileVersion("1.2.7.9")>
+<Assembly: AssemblyVersion("1.2.8.0")>
+<Assembly: AssemblyFileVersion("1.2.8.0")>
--- a/SDL/SDL.vbproj
+++ b/SDL/SDL.vbproj
@@ -94,7 +94,7 @@
    <SignAssembly>false</SignAssembly>
  </PropertyGroup>
  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>SDL_1_TemporaryKey.pfx</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>AL20210908.pfx</AssemblyOriginatorKeyFile>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Accessibility" />
@@ -102,8 +102,9 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\BouncyCastle.Crypto.dll</HintPath>
    </Reference>
-    <Reference Include="ClosedXML, Version=0.95.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClosedXML.0.95.4\lib\net46\ClosedXML.dll</HintPath>
+    <Reference Include="ClosedXML, Version=0.76.0.0, Culture=neutral, PublicKeyToken=fd1eb21b62ae805b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>F:\PROGRAMMIERUNG\dll\closedxml\ClosedXML.dll</HintPath>
    </Reference>
    <Reference Include="com.esendex.sdk, Version=3.8.0.0, Culture=neutral, PublicKeyToken=9dceac28a20578e2, processorArchitecture=MSIL">
      <HintPath>..\..\..\AVISO\Aviso\packages\esendex-dotnet-sdk.3.8.0\lib\net35\com.esendex.sdk.dll</HintPath>
@@ -115,15 +116,16 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\..\dll\SharpSSH\DiffieHellman.dll</HintPath>
    </Reference>
-    <Reference Include="DocumentFormat.OpenXml, Version=2.7.2.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
-      <HintPath>..\..\..\AVISO\Aviso\packages\DocumentFormat.OpenXml.2.7.2\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
+    <Reference Include="documentformat.openxml%281%29, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>F:\PROGRAMMIERUNG\dll\documentformat.openxml(1).dll</HintPath>
    </Reference>
    <Reference Include="ExcelNumberFormat, Version=1.0.10.0, Culture=neutral, PublicKeyToken=23c6f5d73be07eca, processorArchitecture=MSIL">
      <HintPath>..\..\..\AVISO\Aviso\packages\ExcelNumberFormat.1.0.10\lib\net20\ExcelNumberFormat.dll</HintPath>
    </Reference>
    <Reference Include="Ghostscript.NET, Version=1.2.1.0, Culture=neutral, PublicKeyToken=f85051de34525b59, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dll\Ghostscript.NET.dll</HintPath>
+      <HintPath>F:\PROGRAMMIERUNG\dll\Ghostscript.NET.dll</HintPath>
    </Reference>
    <Reference Include="Gma.QrCodeNet.Encoding">
      <HintPath>..\..\..\..\RKSV DE\Gma.QrCodeNet.Encoding.dll</HintPath>
@@ -3184,7 +3186,6 @@
    <EmbeddedResource Include="mdm\SDLLeistungenDetails\usrCntlSDLLeistungVERAGCardNEU.resx">
      <DependentUpon>usrCntlSDLLeistungVERAGCardNEU.vb</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="My Project\licenses.licx" />
    <EmbeddedResource Include="OriginalArchiv_ATR\frmATR.resx">
      <DependentUpon>frmATR.vb</DependentUpon>
    </EmbeddedResource>
@@ -4279,6 +4280,7 @@
    <None Include="AL20210908.pfx" />
    <None Include="andreas.cer" />
    <None Include="ClassDiagram1.cd" />
+    <None Include="PrivateCodeSignaturDaniel20240131.pfx" />
    <None Include="Resources\FA_Graz_EV-Veranlagung_Muster.xlsx">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
@@ -4291,8 +4293,6 @@
    </None>
    <None Include="Resources\SR_EVOLOG.xlsx" />
    <None Include="Resources\SR_TransFerry360.xlsx" />
-    <None Include="SDL_1_TemporaryKey.pfx" />
-    <None Include="Test.pfx" />
    <None Include="Web References\eu.europa.ec1\eoriValidationResult.datasource">
      <DependentUpon>Reference.map</DependentUpon>
    </None>
@@ -4453,7 +4453,6 @@
    <None Include="Resources\MDM_Schreiben\Uebernahmebestätigung\ÜBERNAHMEBESTÄTIGUNG.dotx">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
-    <None Include="SDL_TemporaryKey.pfx" />
    <None Include="seriendruck\Vorlagen\Erstattungsschreiben\Erstattungsschreiben DE.dotx">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
--- a/SDL/buchhaltung/usrCntlBH.Designer.vb
+++ b/SDL/buchhaltung/usrCntlBH.Designer.vb
--- a/SDL/buchhaltung/usrCntlBH.vb
+++ b/SDL/buchhaltung/usrCntlBH.vb
@@ -691,4 +691,67 @@ Public Class usrCntlBH

        Me.Cursor = Cursors.Default
    End Sub
+
+    Private Sub Button9_Click(sender As Object, e As EventArgs) Handles Button9.Click
+
+
+        If txtStichtag.Text <> "" AndAlso Not IsNumeric(txtStichtag.Text) Then MsgBox("Stichtag nicht korrekt!") : Exit Sub
+
+        Dim SQLStichtag = ""
+        If txtStichtag.Text <> "" Then
+            Try : DateTime.ParseExact(txtStichtag._value, "dd.MM.yyyy", culture)
+            Catch ex As Exception : MsgBox("Stichtag nicht korrekt!") : Exit Sub : End Try
+            SQLStichtag = "And (UStVAn_ReDatVon <='" & txtStichtag._value & "' and tblUStVAntrag.UStVAn_ReDatBis >= '" & txtStichtag._value & "')"
+        End If
+
+        Dim sqlStr = "SELECT tblUStVAntrag.UStVAn_ID, tblUStVAntrag.UStVAn_KuNr, tblUStVAntrag.UStVAn_ReDatVon, tblUStVAntrag.UStVAn_ReDatBis, tblUStVAntrag.UStVAn_Ausstellungsdatum, tblUStVAntrag.UStVAn_LandNr, tblUStVAntrag.UStVAn_3470, Adressen.Ordnungsbegriff, Adressen.LandKz
+                        FROM tblUStVAntrag 
+                        INNER JOIN Adressen ON tblUStVAntrag.UStVAn_KuNr = Adressen.AdressenNr
+                        WHERE tblUStVAntrag.UStVAn_3470 Is Not Null" & SQLStichtag
+
+
+        Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL")
+
+        cProgramFunctions.genExcelFromDT_NEW(dt, {"G1:G" & (dt.Rows.Count + 1)})
+
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub Button10_Click(sender As Object, e As EventArgs) Handles Button10.Click, Button11.Click
+
+        If txtStichtag.Text <> "" AndAlso Not IsNumeric(txtStichtag.Text) Then MsgBox("Stichtag nicht korrekt!") : Exit Sub
+
+        Dim SQLStichtag = ""
+        Dim SQLKdNr = ""
+        If sender Is Button10 Then
+            SQLKdNr = " and [UStVAn_KuNr] Not Between 150000 And 155999"
+        Else
+            SQLKdNr = " and [UStVAn_KuNr] Between 150000 And 155999"
+        End If
+
+        If txtStichtag.Text <> "" Then
+            Try : DateTime.ParseExact(txtStichtag._value, "dd.MM.yyyy", culture)
+            Catch ex As Exception : MsgBox("Stichtag nicht korrekt!") : Exit Sub : End Try
+            SQLStichtag = " And (UStVAn_ReDatVon <='" & txtStichtag._value & "' and tblUStVAntrag.UStVAn_ReDatBis >= '" & txtStichtag._value & "')"
+        End If
+
+        Dim sqlStr = "SELECT tblUStVAntrag.UStVAn_ID, tblUStVAntrag.UStVAn_KuNr, tblUStVAntrag.UStVAn_ReDatVon, tblUStVAntrag.UStVAn_ReDatBis, tblUStVAntrag.UStVAn_Ausstellungsdatum, 
+                      tblUStVAntrag.UStVAn_LandNr, tblUStVAntrag.UStVAn_VZDatum, tblUStVAntrag.UStVAn_VZBetrag, tblUStVAntrag.UStVAn_RZBetragVZ, Adressen.Ordnungsbegriff, Adressen.LandKz,
+                       isnull([UStVEr_USteuerbetragEUR],0) AS Erstattungsbetrag, 
+                       case when ([UStVAn_VZBetrag]-isnull([UStVAn_RZBetragVZ],0)-isnull([UStVEr_USteuerbetragEUR],0))>0 then (([UStVAn_VZBetrag]-isnull([UStVAn_RZBetragVZ],0))-isnull([UStVEr_USteuerbetragEUR],0)) else 0 End AS UStVAn_VZBetragAktuell
+                      FROM tblUStVAntrag 
+                      INNER JOIN [tblUStVErstattung] ON [tblUStVErstattung].[UStVAn_ID] = tblUStVAntrag .[UStVAn_ID] 
+                      INNER JOIN Adressen ON tblUStVAntrag.UStVAn_KuNr = Adressen.AdressenNr
+                      WHERE tblUStVAntrag.UStVAn_VZBetrag Is Not Null" & SQLStichtag & SQLKdNr
+
+
+        Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL")
+
+        cProgramFunctions.genExcelFromDT_NEW(dt, {"H1:H" & (dt.Rows.Count + 1), "I1:I" & (dt.Rows.Count + 1), "L1:L" & (dt.Rows.Count + 1), "M1:M" & (dt.Rows.Count + 1)})
+
+        Me.Cursor = Cursors.Default
+
+    End Sub
+
+
 End Class
--- a/SDL/kunden/usrCntlKundenuebersicht.vb
+++ b/SDL/kunden/usrCntlKundenuebersicht.vb
@@ -2817,6 +2817,7 @@ Public Class usrCntlKundenuebersicht
        cBonitaetsauskunft.ba_CreditSaveBonitaetsIndex = Nothing
        cBonitaetsauskunft.ba_CreditSaveRisikoklasse = Nothing

+
        cBonitaetsauskunft.ba_KundenNr = (kdNr)
        cBonitaetsauskunft.ba_Datum = Now()

@@ -2848,6 +2849,7 @@ Public Class usrCntlKundenuebersicht
            cBonitaetsauskunft.ba_Hoechstkredit = 0
        End If

+        cBonitaetsauskunft.ba_UID = company.vatNo
        cBonitaetsauskunft.ba_Bankverbindung = company.csBank
        cBonitaetsauskunft.ba_Zahlungsweise = ""
        cBonitaetsauskunft.ba_GFName = company.csCEO
@@ -2992,6 +2994,14 @@ Public Class usrCntlKundenuebersicht
            setCreditSafeEntry(company, pdfObject, kdNr)
        End If

+        If company.vatNo <> "" AndAlso checkNullStr(ADRESSE.UstIdKz) = "" AndAlso checkNullStr(ADRESSE.UstIdNr) = "" Then
+            'set and check uid nr
+
+
+        End If
+
+
+
    End Sub


--- a/SDL/mdm/frmMDMDatenverarbetiung.vb
+++ b/SDL/mdm/frmMDMDatenverarbetiung.vb
@@ -2106,9 +2106,9 @@ Public Class frmMDMDatenverarbetiung

            RG.Buchungsjahr = cRKSV.getGJ(RG.RechnungsDatum)

-            Dim sqlstr As String = "SELECT '135' as leistungsNr, [contractPartner] as ProductCode, sum([netAmount]) as netamount ,sum([VATamount]) as Vatamount ,sum([totalAmount]) as amountInclVAT FROM Kreditkarten INNER JOIN tblAsfinagMaut ON Kreditkarten.KartenNr = tblAsfinagMaut.cardnumber Where Kreditkarten.AdressenNr= '" & KD.KundenNr & "' and tblAsfinagMaut.VATamount <> 0 Group by [contractPartner]
+            Dim sqlstr As String = "SELECT '135' as leistungsNr, 'MAUT AT lt. Auslage' as ProductCode, sum([netAmount]) as netamount ,sum([VATamount]) as Vatamount ,sum([totalAmount]) as amountInclVAT FROM Kreditkarten INNER JOIN tblAsfinagMaut ON Kreditkarten.KartenNr = tblAsfinagMaut.cardnumber Where Kreditkarten.AdressenNr= '" & KD.KundenNr & "' and tblAsfinagMaut.VATamount <> 0 group by Kreditkarten.AdressenNr
                                    UNION
-                                    SELECT '153' as leistungsNr, [contractPartner] as ProductCode, sum([netAmount]) as netamount ,sum([VATamount]) as Vatamount ,sum([totalAmount]) as amountInclVAT FROM Kreditkarten INNER JOIN tblAsfinagMaut ON Kreditkarten.KartenNr = tblAsfinagMaut.cardnumber Where Kreditkarten.AdressenNr= '" & KD.KundenNr & "' and tblAsfinagMaut.VATamount = 0 Group by [contractPartner]"
+                                    SELECT '153' as leistungsNr, 'MAUT AT lt. Auslage' as ProductCode, sum([netAmount]) as netamount ,sum([VATamount]) as Vatamount ,sum([totalAmount]) as amountInclVAT FROM Kreditkarten INNER JOIN tblAsfinagMaut ON Kreditkarten.KartenNr = tblAsfinagMaut.cardnumber Where Kreditkarten.AdressenNr= '" & KD.KundenNr & "' and tblAsfinagMaut.VATamount = 0 group by Kreditkarten.AdressenNr"

            Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")

@@ -2795,7 +2795,7 @@ Public Class frmMDMDatenverarbetiung
                        Return False
                    End If
                    For Each row As DataRow In dt.Rows
-                        Dim maut As New cAsfinagMaut()
+                        Dim maut As New VERAG_PROG_ALLGEMEIN.cAsfinagMaut()
                        maut.cardnumber = row.Item("CardNumber")
                        maut.licenceplate = IIf(Not IsDBNull(row.Item("vehicleLicensePlate")), row.Item("vehicleLicensePlate"), row.Item("InfoField"))
                        maut.turnoverdate = row.Item("DeliveryDate")