Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

2024-02-26 12:42:59 +01:00
parent 39dd8a0501 df525119eb
commit 0a16c5e958
22 changed files with 2305 additions and 516 deletions
--- a/SDL/Fakturierung/cFakturierung.vb
+++ b/SDL/Fakturierung/cFakturierung.vb
@@ -252,7 +252,7 @@ Public Class cFakturierung

    End Function

-    Shared Sub setGesamtBetraege(ByRef RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, Optional Steuersatz_Proz As Object = Nothing)
+    Shared Sub setGesamtBetraege(ByRef RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, Optional Steuersatz_Proz As Object = Nothing, Optional useNettogesatbetrag As Boolean = False)
        Dim steuerPflichtigerBetrag As Double = 0
        Dim steuerFreierBetrag As Double = 0
        Dim Abfertigungskosten As Double = 0
@@ -287,7 +287,7 @@ Public Class cFakturierung
        Dim steuerBetrag As Double = 0
        If RECHNUNG.Steuersatz_Proz <> 0 Then
            steuerBetrag = steuerPflichtigerBetrag * RECHNUNG.Steuersatz_Proz
-            RECHNUNG.SteuerpflichtigerGesamtbetrag = steuerPflichtigerBetrag + steuerBetrag
+            RECHNUNG.SteuerpflichtigerGesamtbetrag = steuerPflichtigerBetrag + IIf(Not useNettogesatbetrag, steuerBetrag, 0) '+ steuerBetrag
            RECHNUNG.SteuerfreierGesamtbetrag = steuerFreierBetrag
        Else
            RECHNUNG.SteuerpflichtigerGesamtbetrag = 0
@@ -1759,7 +1759,7 @@ Public Class cFakturierung
        Return getSignature(RECHNUNG.RechnungsLandKz, RECHNUNG.Firma_ID)
    End Function

-    Shared Function getSignature(Optional landKz = "", Optional firma = -1, Optional individuell = False, Optional displayFirmenmane = True, Optional special = "", Optional additionalLine = "") As String
+    Shared Function getSignature(Optional landKz = "", Optional firma = -1, Optional individuell = False, Optional displayFirmenmane = True, Optional special = "", Optional additionalLine = "", Optional departmentmailadress = True) As String
        getSignature = ""

        firma = getFirmaNr(firma)
@@ -1804,8 +1804,8 @@ Public Class cFakturierung
                        getSignature &= "<div style=""font-size:12px"">A 4975 Suben, Autobahngrenze 15  <br><b>T</b>  +43 7711 31630  |  <b>F</b>  +43 7711 31630-1  |  <b>@</b>  " & If(individuell, emailindividuell, "info@imex-group.at") & "  |  www.imex-group.at  |  FN 410356s</div>"
                        If additionalLine <> "" Then getSignature &= vbNewLine & additionalLine & vbNewLine
                    Case 24 'AMBAR
-                        Dim defaultMail = getDefaultMail("AMBAR")
-                        getSignature &= "<img width=""250"" height=""70"" src=""" & imgsrc & "ambar_simple.png""/>"
+                        Dim defaultMail = getDefaultMail("AMBAR", departmentmailadress)
+                        getSignature &= "<img width=""250"" height=""70"" src=""" & imgsrc & "ambar_boarder.png""/>"
                        If displayFirmenmane Then getSignature &= "<br><b>AMBAR Logistic Services GmbH</b><br>"
                        getSignature &= "<div style=""font-size:12px"">D 83435 Bad Reichenhall, Reichenhallerstrasse 62<br><b>T</b>  +49 8651 99624911  |  <b>F</b>  +49 8651 9962493   |  <b>@</b>  " & If(individuell, emailindividuell, defaultMail) & "  |  www.ambarlog.com  |  DE309105428</div>"
                        If additionalLine <> "" Then getSignature &= vbNewLine & additionalLine & vbNewLine
@@ -1877,15 +1877,17 @@ Public Class cFakturierung
        End Select
    End Function

-    Shared Function getDefaultMail(firma)
+    Shared Function getDefaultMail(firma, Optional useDepartmentmailadress = True) As String
        Dim defaultMail = ""
        Select Case firma
            Case "AMBAR"
                defaultMail = "import@ambarlog.de"
-                If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "BH" Then defaultMail = "buchhaltung@ambarlog.de"
-                If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "EXPORT" Then defaultMail = "office@ambarlog.de"
-
+                If useDepartmentmailadress Then
+                    If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "BH" Then defaultMail = "buchhaltung@ambarlog.de"
+                    If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "EXPORT" Then defaultMail = "office@ambarlog.de"
+                End If
        End Select
+        Return defaultMail
    End Function

    Shared Function Abrechnugsdaten_AKTUALISIEREN(ByRef RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, Optional RechnungsDatum As Object = Nothing) As Boolean
--- a/SDL/Fakturierung/frmFaktEmail.vb
+++ b/SDL/Fakturierung/frmFaktEmail.vb
@@ -739,7 +739,7 @@ Public Class frmFaktEmail
        For Each r In SR_DT.Rows 
            Dim SPEDBUCH As New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(r("FilialenNr"), r("AbfertigungsNr"), r("SpeditionsbuchUnterNr"))
            initRowSpedbuch(SPEDBUCH)
-            If SPEDBUCH.AbfertigungsNr = 26 Or SPEDBUCH.AbfertigungsNr = 28 Then
+            If (SPEDBUCH.AbfertigungsNr = 26 Or SPEDBUCH.AbfertigungsNr = 28) AndAlso (SPEDBUCH.FilialenNr = 4805 Or SPEDBUCH.FilialenNr = 4811) Then
                isFiskal = True
            End If
        Next
--- 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>
@@ -3199,7 +3201,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>
@@ -4297,6 +4298,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>
@@ -4309,8 +4311,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>
@@ -4471,7 +4471,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,70 @@ 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_KuNr as Kunde, Adressen.Ordnungsbegriff as Bezeichnung, sum(tblUStVAntrag.UStVAn_3470) as Betrag
+                        FROM tblUStVAntrag 
+                        INNER JOIN Adressen ON tblUStVAntrag.UStVAn_KuNr = Adressen.AdressenNr
+                        WHERE tblUStVAntrag.UStVAn_3470 Is Not Null" & SQLStichtag & " Group by tblUStVAntrag.UStVAn_KuNr, Adressen.Ordnungsbegriff"
+
+
+        Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL")
+
+        cProgramFunctions.genExcelFromDT_NEW(dt, {"C1:C" & (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_KuNr as Kunde, Adressen.Ordnungsbegriff as Kundenbezeichnung,
+                        sum(tblUStVAntrag.UStVAn_VZBetrag) as VZges,
+                        sum(isnull([UStVEr_USteuerbetragEUR],0)) AS Erstattungsbetrag,
+                        case when (sum([UStVAn_VZBetrag])-sum(isnull([UStVAn_RZBetragVZ],0))-sum(isnull([UStVEr_USteuerbetragEUR],0)))>0 
+                        	then sum((([UStVAn_VZBetrag]-isnull([UStVAn_RZBetragVZ],0))-isnull([UStVEr_USteuerbetragEUR],0))) 
+                        	else 0 End AS 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 & " Group by tblUStVAntrag.UStVAn_KuNr, Adressen.Ordnungsbegriff"
+
+
+        Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL")
+
+        cProgramFunctions.genExcelFromDT_NEW(dt, {"C1:C" & (dt.Rows.Count + 1), "D1:D" & (dt.Rows.Count + 1), "E1:E" & (dt.Rows.Count + 1)})
+
+        Me.Cursor = Cursors.Default
+
+    End Sub
+
+
 End Class
--- a/SDL/kunden/usrCntlKundenBesonderheiten.vb
+++ b/SDL/kunden/usrCntlKundenBesonderheiten.vb
@@ -85,7 +85,9 @@ Public Class usrCntlKundenBesonderheiten
    End Sub
    Private Sub initDGV(Optional kdnrTmp = -1, Optional simpleView = False, Optional preferedKategorie = "", Optional preferedKategorieOtherIN = "")

-        dgvBesonderheiten.Columns.Clear()
+        If dgvBesonderheiten.Columns IsNot Nothing Then
+            dgvBesonderheiten.Columns.Clear()
+        End If

        If kdnrTmp > 0 Then Me.kdNr = kdnrTmp
        If kdNr <= 0 Then Exit Sub
--- a/SDL/kunden/usrCntlKundenuebersicht.vb
+++ b/SDL/kunden/usrCntlKundenuebersicht.vb
@@ -1789,34 +1789,37 @@ Public Class usrCntlKundenuebersicht


    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
-        If ADRESSE.UstIdNr Is Nothing Then Exit Sub
-        If ADRESSE.UstIdKz Is Nothing Then Exit Sub
-        If ADRESSE.UstIdKz = "" Then Exit Sub
-        If ADRESSE.UstIdNr = "" Then Exit Sub

-        sender.BackgroundImage = My.Resources.wait
-        ' Button5.Visible = False
+        checkUIDNr(sender)
+
+        'If ADRESSE.UstIdNr Is Nothing Then Exit Sub
+        'If ADRESSE.UstIdKz Is Nothing Then Exit Sub
+        'If ADRESSE.UstIdKz = "" Then Exit Sub
+        'If ADRESSE.UstIdNr = "" Then Exit Sub
+
+        'sender.BackgroundImage = My.Resources.wait
+        '' Button5.Visible = False


-        Dim FO As New VERAG_PROG_ALLGEMEIN.cFinanzOnlineWebService
-        FO.initValues()
+        'Dim FO As New VERAG_PROG_ALLGEMEIN.cFinanzOnlineWebService
+        'FO.initValues()

-        If FO.Call_Web_Service_MethodUID_Login_NEU2020() = 0 Then
-            Dim UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(ADRESSE.AdressenNr,, , , 2)
-            If UID_TMP IsNot Nothing Then
-                If UID_TMP.uid_valid Then
-                    setKD(kdNr)
-                    sender.BackgroundImage = My.Resources.ok
-                Else
-                    sender.BackgroundImage = My.Resources.del
-                End If
-            Else
-                sender.BackgroundImage = My.Resources.fragezeichen
-            End If
+        'If FO.Call_Web_Service_MethodUID_Login_NEU2020() = 0 Then
+        '    Dim UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(ADRESSE.AdressenNr,, , , 2)
+        '    If UID_TMP IsNot Nothing Then
+        '        If UID_TMP.uid_valid Then
+        '            setKD(kdNr)
+        '            sender.BackgroundImage = My.Resources.ok
+        '        Else
+        '            sender.BackgroundImage = My.Resources.del
+        '        End If
+        '    Else
+        '        sender.BackgroundImage = My.Resources.fragezeichen
+        '    End If

-            FO.Call_Web_Service_MethodUID_Logout_NEU2020()
+        '    FO.Call_Web_Service_MethodUID_Logout_NEU2020()

-        End If
+        'End If

        ''  If cProgramFunctions.validUID(ADRESSE.UstIdKz, ADRESSE.UstIdNr) Then
        'Dim UID = VERAG_PROG_ALLGEMEIN.cUIDPruefung.doUIDPruefung(ADRESSE.AdressenNr, True)
@@ -2764,7 +2767,7 @@ Public Class usrCntlKundenuebersicht
                        Dim a As MsgBoxResult = MsgBox("Seit der letzen Abfrage (" & lastChecked.ToShortDateString & ") wurde bei Creditsafe keine Änderung gemacht!" & vbNewLine & "Trotzdem Creditreport-Daten aktualisieren?", vbYesNo)
                        If a = vbYes Then

-                            setCreditsafereportEntry(cs, company)
+                            setCreditsafereportEntry(cs, company, True) 'doppelte Abfragen mitprotokollieren

                        End If

@@ -2792,7 +2795,7 @@ Public Class usrCntlKundenuebersicht

    End Sub

-    Private Sub setCreditSafeEntry(company As cCreditSafeAPI.Company, PDF As Byte(), krn As Integer)
+    Private Sub setCreditSafeEntry(company As cCreditSafeAPI.Company, PDF As Byte(), krn As Integer, Optional forcedRequest As Boolean = False)

        If company.csFailure <> "" Then
            MsgBox(company.csFailure)
@@ -2816,6 +2819,7 @@ Public Class usrCntlKundenuebersicht
        cBonitaetsauskunft.ba_CreditSaveBonitaetsScore = Nothing
        cBonitaetsauskunft.ba_CreditSaveBonitaetsIndex = Nothing
        cBonitaetsauskunft.ba_CreditSaveRisikoklasse = Nothing
+        cBonitaetsauskunft.ba_forcedRequest = forcedRequest

        cBonitaetsauskunft.ba_KundenNr = (kdNr)
        cBonitaetsauskunft.ba_Datum = Now()
@@ -2848,6 +2852,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
@@ -2973,7 +2978,7 @@ Public Class usrCntlKundenuebersicht
        genUIDEORIList(kdNr, "EORI")
    End Sub

-    Private Sub setCreditsafereportEntry(cs As cCreditSafeAPI, company As cCreditSafeAPI.Company)
+    Private Sub setCreditsafereportEntry(cs As cCreditSafeAPI, company As cCreditSafeAPI.Company, Optional forecedReqest As Boolean = False)

        Dim pdfObject As Byte() = Nothing

@@ -2989,9 +2994,29 @@ Public Class usrCntlKundenuebersicht
            setCreditSafeEntry(company, Nothing, kdNr)
            MsgBox("Fehler beim Erstellen des PDF-Dokuments" & vbNewLine & failureDesc)
        Else
-            setCreditSafeEntry(company, pdfObject, kdNr)
+            setCreditSafeEntry(company, pdfObject, kdNr, forecedReqest)
        End If

+        If company.vatNo <> "" AndAlso checkNullStr(ADRESSE.UstIdKz) = "" AndAlso checkNullStr(ADRESSE.UstIdNr) = "" Then
+            'set and check uid nr
+
+            Dim countryKz = company.vatNo.Substring(0, 2)
+
+            ADRESSE.UstIdKz = countryKz
+            ADRESSE.UstIdNr = company.vatNo.Replace(countryKz, "").Replace(" ", "")
+            ADRESSE.SAVE()
+            Dim validUID As Boolean = False
+            checkUIDNr(, validUID)
+            If Not validUID Then
+                ADRESSE.UstIdKz = ""
+                ADRESSE.UstIdNr = ""
+                ADRESSE.SAVE()
+            End If
+
+        End If
+
+
+
    End Sub


@@ -3019,4 +3044,38 @@ Public Class usrCntlKundenuebersicht
        Dim webAddress As String = "https://wiki.verag.ag/software/aviso/howtos/Creditsafe"
        Process.Start(webAddress)
    End Sub
+
+    Private Sub checkUIDNr(Optional sender As Object = Nothing, Optional ByRef validUID As Boolean = False)
+
+        If ADRESSE.UstIdNr Is Nothing Then Exit Sub
+        If ADRESSE.UstIdKz Is Nothing Then Exit Sub
+        If ADRESSE.UstIdKz = "" Then Exit Sub
+        If ADRESSE.UstIdNr = "" Then Exit Sub
+
+        If sender IsNot Nothing Then sender.BackgroundImage = My.Resources.wait
+        ' Button5.Visible = False
+
+
+        Dim FO As New VERAG_PROG_ALLGEMEIN.cFinanzOnlineWebService
+        FO.initValues()
+
+        If FO.Call_Web_Service_MethodUID_Login_NEU2020() = 0 Then
+            Dim UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(ADRESSE.AdressenNr,, , , 2)
+            If UID_TMP IsNot Nothing Then
+                If UID_TMP.uid_valid Then
+                    setKD(kdNr)
+                    If sender IsNot Nothing Then sender.BackgroundImage = My.Resources.ok
+                    validUID = True
+                Else
+                    If sender IsNot Nothing Then sender.BackgroundImage = My.Resources.del
+                End If
+            Else
+                If sender IsNot Nothing Then sender.BackgroundImage = My.Resources.fragezeichen
+            End If
+
+            FO.Call_Web_Service_MethodUID_Logout_NEU2020()
+
+        End If
+
+    End Sub
 End Class
--- a/SDL/kunden/usrCntlOfferte.vb
+++ b/SDL/kunden/usrCntlOfferte.vb
@@ -415,9 +415,12 @@ Public Class usrCntlOfferte

    Private Sub btnStandardLaden_Click(sender As Object, e As EventArgs) Handles btnStandardLaden.Click

+
+
        Dim KUNDE As New VERAG_PROG_ALLGEMEIN.cKunde(kdNr)
        Dim FIRMA_TMP = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(KUNDE.FilialenNr)

+        If Not vbYes = MsgBox("Möchten Sie die Standardofferte für den Kunden " & KUNDE.KundenNr & " laden?" & vbNewLine & "Aktuelle Offerteneinstellungen werden gelöscht.", vbYesNo) Then Exit Sub

        edit = True
        handleEditMode(edit)
@@ -431,7 +434,6 @@ Public Class usrCntlOfferte
            currentOffert.LOAD_POSITIONEN()
            If currentOffert.POSITIONEN.Count = 0 Then '
                currentOffert.RESET_STANDARTOFFERTEN_FIRMA(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME, FIRMA_TMP)
-
            End If

            dgvOfferteNew.GetOrder()
--- 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")

@@ -2122,10 +2122,6 @@ Public Class frmMDMDatenverarbetiung

                allPlosePos(RG, OFFERTE, LeistungsNr, NettoBetrag, BruttoBetrag) 'kann generisch verwendet werden

-                'Rückvergütung Consortio !!
-                'If r("plp_LeistungsNr") = "190" Then '(PRODUCTCODE=301; VERAG-LEISTUNGSNR=190!!
-                '    rabattPlosePos(RG, OFFERTE, LeistungsNr, NettoBetrag, BruttoBetrag)
-                'End If
            Next


@@ -2134,7 +2130,8 @@ Public Class frmMDMDatenverarbetiung
                RG.Steuersatz_Proz = dtSt.Rows(0)(0)
            End If

-            cFakturierung.setGesamtBetraege(RG)
+            Dim useNettogesamtbetrag As Boolean = True
+            cFakturierung.setGesamtBetraege(RG,, useNettogesamtbetrag)

            RG.Text = (cFakturierung.przRechnungstextTXT(RG, SPEDBUCH) & vbNewLine & cFakturierung.przRechnungstextZZ(RG)).Trim

@@ -2238,7 +2235,6 @@ Public Class frmMDMDatenverarbetiung

                    If POS.Steuerpflichtig Then
                        POS.SteuerpflichtigerBetrag = NettoBetrag
-
                        POS.Preis = NettoBetrag
                    Else
                        POS.SteuerfreierBetrag = BruttoBetrag
@@ -2795,7 +2791,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")