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

commit

Browse Source
This commit is contained in:
d.breimaier
2024-12-13 10:12:33 +01:00
parent b7509f8637
commit 47335be674
15 changed files with 2614 additions and 2549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
SDL/App.config
View File

@@ -1,43 +1,47 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<configSections> <configSections>
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="SDL.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/> <section name="SDL.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</sectionGroup> </sectionGroup>
</configSections> </configSections>
<connectionStrings/> <connectionStrings />
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup> </startup>
<system.serviceModel> <system.serviceModel>
<bindings> <bindings>
<basicHttpBinding> <basicHttpBinding>
<binding name="BasicHttpBinding_IRKSVWcf"/> <binding name="BasicHttpBinding_IRKSVWcf" />
<binding name="checkVatBinding"/> <binding name="checkVatBinding" />
</basicHttpBinding> </basicHttpBinding>
</bindings> </bindings>
<client> <client>
<endpoint address="http://localhost:8733/Design_Time_Addresses/RKSVCompleteServer/Service1/" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IRKSVWcf" contract="RKSVServer.IRKSVWcf" name="BasicHttpBinding_IRKSVWcf"/> <endpoint address="http://localhost:8733/Design_Time_Addresses/RKSVCompleteServer/Service1/" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IRKSVWcf" contract="RKSVServer.IRKSVWcf" name="BasicHttpBinding_IRKSVWcf" />
<endpoint address="http://ec.europa.eu/taxation_customs/vies/services/checkVatService" binding="basicHttpBinding" bindingConfiguration="checkVatBinding" contract="EU_UID_Pruefung.checkVatPortType" name="checkVatPort"/> <endpoint address="http://ec.europa.eu/taxation_customs/vies/services/checkVatService" binding="basicHttpBinding" bindingConfiguration="checkVatBinding" contract="EU_UID_Pruefung.checkVatPortType" name="checkVatPort" />
</client> </client>
</system.serviceModel> </system.serviceModel>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="DocumentFormat.OpenXml" publicKeyToken="31bf3856ad364e35" culture="neutral"/> <assemblyIdentity name="DocumentFormat.OpenXml" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.5631.0" newVersion="2.5.5631.0"/> <bindingRedirect oldVersion="0.0.0.0-2.5.5631.0" newVersion="2.5.5631.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="WindowsBase" publicKeyToken="31bf3856ad364e35" culture="neutral"/> <assemblyIdentity name="WindowsBase" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/> <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/> <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/> <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="DocumentFormat.OpenXml" publicKeyToken="8fb06cb64d019a17" culture="neutral"/> <assemblyIdentity name="DocumentFormat.OpenXml" publicKeyToken="8fb06cb64d019a17" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.7.2.0" newVersion="2.7.2.0"/> <bindingRedirect oldVersion="0.0.0.0-2.7.2.0" newVersion="2.7.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Spire.Pdf" publicKeyToken="663f351905198cb3" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-10.7.21.0" newVersion="10.7.21.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
@@ -64,18 +68,18 @@
</SDL.My.MySettings> </SDL.My.MySettings>
</applicationSettings> </applicationSettings>
<appSettings> <appSettings>
<add key="EnableWindowsFormsHighDpiAutoResizing" value="true"/> <add key="EnableWindowsFormsHighDpiAutoResizing" value="true" />
<add key="ClientSettingsProvider.ServiceUri" value=""/> <add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings> </appSettings>
<system.web> <system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider"> <membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers> <providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/> <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers> </providers>
</membership> </membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true"> <roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers> <providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/> <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers> </providers>
</roleManager> </roleManager>
</system.web> </system.web>

4
SDL/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.3.3.7")> <Assembly: AssemblyVersion("1.3.3.8")>
<Assembly: AssemblyFileVersion("1.3.3.7")> <Assembly: AssemblyFileVersion("1.3.3.8")>

6
SDL/SDL.vbproj
View File

@@ -342,6 +342,9 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\dll\RKAesIcm.dll</HintPath> <HintPath>..\..\..\dll\RKAesIcm.dll</HintPath>
</Reference> </Reference>
<Reference Include="s2industries.ZUGFeRD, Version=16.0.2.0, Culture=neutral, PublicKeyToken=eae19aa9fbd2251d, processorArchitecture=MSIL">
<HintPath>..\..\..\Aviso\AVISO\packages\ZUGFeRD-csharp.16.0.2\lib\net48\s2industries.ZUGFeRD.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" /> <Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.ComponentModel.Composition.Registration" /> <Reference Include="System.ComponentModel.Composition.Registration" />
@@ -389,9 +392,6 @@
<HintPath>..\..\..\AVISO\Aviso\packages\WpfAnimatedGif.1.4.14\lib\net\WpfAnimatedGif.dll</HintPath> <HintPath>..\..\..\AVISO\Aviso\packages\WpfAnimatedGif.1.4.14\lib\net\WpfAnimatedGif.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="ZUGFeRD.NET, Version=1.0.0.0, Culture=neutral, PublicKeyToken=807dc6d06b184af9, processorArchitecture=MSIL">
<HintPath>..\packages\ZUGFeRD.NET.1.0.1\lib\ZUGFeRD.NET.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Import Include="Microsoft.VisualBasic" /> <Import Include="Microsoft.VisualBasic" />

61
SDL/USTV/frmMDM_USTVAntrag.vb
View File

@@ -443,6 +443,12 @@ Public Class frmMDM_USTVAntrag
Shared Function loadUSTVFrom_VERAG(UStVAn_ID, Antrag_LandKz, ArchivierteEintracheNochmalsEinarbetien) As Boolean Shared Function loadUSTVFrom_VERAG(UStVAn_ID, Antrag_LandKz, ArchivierteEintracheNochmalsEinarbetien) As Boolean
Try Try
If Antrag_LandKz <> "AT" Then
MsgBox("Nur für AT gültig!")
Return False
End If
Dim bytSchnittstellenNr = 1 Dim bytSchnittstellenNr = 1
Dim USTV_ANTRAG As New VERAG_PROG_ALLGEMEIN.cUSTVAntrag(UStVAn_ID) Dim USTV_ANTRAG As New VERAG_PROG_ALLGEMEIN.cUSTVAntrag(UStVAn_ID)
Dim dt_RE As New DataTable Dim dt_RE As New DataTable
@@ -466,10 +472,10 @@ Public Class frmMDM_USTVAntrag
If Not alreadyExists(USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_LandNr, USTV_POS) Then If Not alreadyExists(USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_LandNr, USTV_POS) Then
USTV_POS.UStVPo_Schnittstelle = True USTV_POS.UStVPo_Schnittstelle = True
USTV_POS.UStVPo_Leistender = "VERAG 360 GmbH; 4975 Suben" USTV_POS.UStVPo_Leistender = "VERAG 360 GmbH; 4975 Suben"
USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
USTV_POS.UStVPo_Zeitstempel = Now() USTV_POS.UStVPo_Zeitstempel = Now()
Dim dt_Prod As New DataTable Dim dt_Prod As New DataTable
@@ -504,11 +510,11 @@ Public Class frmMDM_USTVAntrag
End If End If
'Berechnungen 'Berechnungen - Beträge IMMER in EUR!
Dim umrechKurs As Double = 1 Dim umrechKurs As Double = 1
Dim UST_EUR = CDbl(r.Item("SteuerbetragLokal")) Dim UST_EUR = CDbl(r.Item("SteuerbetragLokal"))
USTV_POS.UStVPo_USteuerbetragEUR = UST_EUR 'Math.Round((UST_org / umrechKurs), 2) USTV_POS.UStVPo_USteuerbetragEUR = UST_EUR
USTV_POS.UStVPo_Umrechnungskurs = umrechKurs USTV_POS.UStVPo_Umrechnungskurs = umrechKurs
USTV_POS.UStVPo_USteuerbetrag = UST_EUR USTV_POS.UStVPo_USteuerbetrag = UST_EUR
@@ -568,6 +574,8 @@ Public Class frmMDM_USTVAntrag
USTV_POS.UStVPo_Zeitstempel = Now() USTV_POS.UStVPo_Zeitstempel = Now()
' Berechnungen ' Berechnungen
'von RMC bekommen wir Fremdwährung und EUR, d.b. wir können und den Umrechnungskurs selbst berechnen!
Dim umrechKurs As Double = 1 Dim umrechKurs As Double = 1
If (CDbl(r.Item("rmc_betragBrutto")) > 0 AndAlso CDbl(r.Item("rmc_euroBrutto")) > 0) Then If (CDbl(r.Item("rmc_betragBrutto")) > 0 AndAlso CDbl(r.Item("rmc_euroBrutto")) > 0) Then
@@ -631,10 +639,7 @@ Public Class frmMDM_USTVAntrag
USTV_POS.UStVPo_Zeitstempel = Now() USTV_POS.UStVPo_Zeitstempel = Now()
' Berechnungen ' Berechnungen
'von MSE bekommen wir Fremdwährung und EUR, d.b. wir können und den Umrechnungskurs selbst berechnen!
'!UStVPo_USteuerbetrag = rst1!Umsatzsteuerbetrag
'!UStVPo_Umrechnungskurs = fktEurokurs(Me![UStVAn_Währungscode], ![UStVPo_ReDat])
'!UStVPo_USteuerbetragEUR = Int(![UStVPo_USteuerbetrag] / !UStVPo_Umrechnungskurs * 100 + 0.5) / 100
Dim umrechKurs As Double = 1 Dim umrechKurs As Double = 1
Dim UST_EUR = CDbl(r.Item("UST_EUR")) Dim UST_EUR = CDbl(r.Item("UST_EUR"))
@@ -697,10 +702,7 @@ Public Class frmMDM_USTVAntrag
USTV_POS.UStVPo_Zeitstempel = Now() USTV_POS.UStVPo_Zeitstempel = Now()
' Berechnungen ' Berechnungen
'UTA liefert Beträge immer in EUR, wir müssen allerdings die Beträge in FREMDW umrechnen!
'!UStVPo_USteuerbetrag = rst1!Umsatzsteuerbetrag
'!UStVPo_Umrechnungskurs = fktEurokurs(Me![UStVAn_Währungscode], ![UStVPo_ReDat])
'!UStVPo_USteuerbetragEUR = Int(![UStVPo_USteuerbetrag] / !UStVPo_Umrechnungskurs * 100 + 0.5) / 100
Dim umrechKurs As Double = 1 Dim umrechKurs As Double = 1
@@ -713,6 +715,15 @@ Public Class frmMDM_USTVAntrag
End If End If
If USTV_ANTRAG.UStVAn_Währungscode <> "EUR" Then
Dim kurs As New cEZB_Waehrungskurse(USTV_ANTRAG.UStVAn_Währungscode)
UST_org = Math.Round(kurs.EXCHANGE_EURTOCUR(UST_EUR, USTV_ANTRAG.UStVAn_Währungscode, CDate(USTV_POS.UStVPo_ReDat)), 2)
End If
If (UST_org > 0 AndAlso UST_org <> UST_EUR) Then umrechKurs = (UST_org / UST_EUR * 100 + 0.5) / 100
If UST_org > 0 Then If UST_org > 0 Then
USTV_POS.UStVPo_USteuerbetragEUR = UST_org 'Math.Round((UST_org / umrechKurs), 2) USTV_POS.UStVPo_USteuerbetragEUR = UST_org 'Math.Round((UST_org / umrechKurs), 2)
USTV_POS.UStVPo_Umrechnungskurs = umrechKurs USTV_POS.UStVPo_Umrechnungskurs = umrechKurs
@@ -766,17 +777,21 @@ Public Class frmMDM_USTVAntrag
Dim umrechKurs As Double = 1 Dim umrechKurs As Double = 1
Dim UST_org = CDbl(r.Item("Steuerbetrag")) 'IDS liefert Beträge immer in EUR, wir müssen allerdings die Beträge in FREMDW umrechnen!
Dim UST_EUR = CDbl(r.Item("Steuerbetrag")) 'ist immer EUR Dim UST_EUR = CDbl(r.Item("Steuerbetrag")) 'ist immer EUR
Dim UST_org = CDbl(r.Item("Steuerbetrag"))
If (UST_org > 0 AndAlso UST_org <> UST_EUR) Then If USTV_ANTRAG.UStVAn_Währungscode <> "EUR" Then
Dim kurs As New cEZB_Waehrungskurse(USTV_ANTRAG.UStVAn_Währungscode)
umrechKurs = (UST_org / UST_EUR * 100 + 0.5) / 100 UST_org = Math.Round(kurs.EXCHANGE_EURTOCUR(UST_EUR, USTV_ANTRAG.UStVAn_Währungscode, CDate(USTV_POS.UStVPo_ReDat)), 2)
End If End If
If (UST_org > 0 AndAlso UST_org <> UST_EUR) Then umrechKurs = (UST_org / UST_EUR * 100 + 0.5) / 100
If UST_org > 0 Then If UST_org > 0 Then
USTV_POS.UStVPo_USteuerbetragEUR = UST_org 'Math.Round((UST_org / umrechKurs), 2) USTV_POS.UStVPo_USteuerbetragEUR = UST_EUR 'Math.Round((UST_org / umrechKurs), 2)
USTV_POS.UStVPo_Umrechnungskurs = umrechKurs USTV_POS.UStVPo_Umrechnungskurs = umrechKurs
USTV_POS.UStVPo_USteuerbetrag = UST_org USTV_POS.UStVPo_USteuerbetrag = UST_org
End If End If
@@ -784,8 +799,8 @@ Public Class frmMDM_USTVAntrag
If USTV_POS.INSERT() Then If USTV_POS.INSERT() Then
cIDS.UPDATE_ARCHIV(USTV_POS.UStVPo_ReDat, USTV_POS.UStVPo_ReNr, kdnr, Antrag_LandKz, USTV_POS.UStVAn_ID) cIDS.UPDATE_ARCHIV(USTV_POS.UStVPo_ReDat, USTV_POS.UStVPo_ReNr, kdnr, Antrag_LandKz, USTV_POS.UStVAn_ID)
End If End If
'tblUStVPositionen 'tblUStVPositionen
End If End If
Next Next
@@ -1100,7 +1115,7 @@ Public Class frmMDM_USTVAntrag
End If End If
If Not ContextMenuStrip1.Items.ContainsKey("offeneAntraege") Then If Not ContextMenuStrip1.Items.ContainsKey("offeneAntraege") Then
Dim oa = New ToolStripMenuItem() With {.Text = "offene Anträge", .Name = "offeneAntraege", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)} Dim oa = New ToolStripMenuItem() With {.Text = "nicht eingearbeitet USTV-Anträge", .Name = "offeneAntraege", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
AddHandler oa.Click, AddressOf mnuItem_Clicked AddHandler oa.Click, AddressOf mnuItem_Clicked
ContextMenuStrip1.Items.Add(oa) ContextMenuStrip1.Items.Add(oa)
End If End If

22
SDL/USTV/frmUSTVoffeneAntraege.Designer.vb generated
View File

@@ -44,6 +44,7 @@ Partial Class frmUSTVoffeneAntraege
Me.Label3 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label()
Me.cbxAlleoffenen = New System.Windows.Forms.CheckBox() Me.cbxAlleoffenen = New System.Windows.Forms.CheckBox()
Me.lblKunde = New System.Windows.Forms.Label() Me.lblKunde = New System.Windows.Forms.Label()
Me.btnAlle = New System.Windows.Forms.Button()
Me.FlowLayoutPanel.SuspendLayout() Me.FlowLayoutPanel.SuspendLayout()
CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel4.SuspendLayout() Me.Panel4.SuspendLayout()
@@ -60,6 +61,7 @@ Partial Class frmUSTVoffeneAntraege
Me.FlowLayoutPanel.Controls.Add(Me.Button1) Me.FlowLayoutPanel.Controls.Add(Me.Button1)
Me.FlowLayoutPanel.Controls.Add(Me.Button2) Me.FlowLayoutPanel.Controls.Add(Me.Button2)
Me.FlowLayoutPanel.Controls.Add(Me.Button3) Me.FlowLayoutPanel.Controls.Add(Me.Button3)
Me.FlowLayoutPanel.Controls.Add(Me.btnAlle)
Me.FlowLayoutPanel.Location = New System.Drawing.Point(12, 29) Me.FlowLayoutPanel.Location = New System.Drawing.Point(12, 29)
Me.FlowLayoutPanel.Name = "FlowLayoutPanel" Me.FlowLayoutPanel.Name = "FlowLayoutPanel"
Me.FlowLayoutPanel.Size = New System.Drawing.Size(1409, 31) Me.FlowLayoutPanel.Size = New System.Drawing.Size(1409, 31)
@@ -126,9 +128,9 @@ Partial Class frmUSTVoffeneAntraege
Me.lbl.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold) Me.lbl.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold)
Me.lbl.Location = New System.Drawing.Point(12, 9) Me.lbl.Location = New System.Drawing.Point(12, 9)
Me.lbl.Name = "lbl" Me.lbl.Name = "lbl"
Me.lbl.Size = New System.Drawing.Size(162, 17) Me.lbl.Size = New System.Drawing.Size(253, 17)
Me.lbl.TabIndex = 29 Me.lbl.TabIndex = 29
Me.lbl.Text = "USTV offene Anträge" Me.lbl.Text = "nicht eingearbeitet USTV-Anträge"
' '
'MyDatagridview1 'MyDatagridview1
' '
@@ -289,7 +291,7 @@ Partial Class frmUSTVoffeneAntraege
Me.txtmaxAnz.Name = "txtmaxAnz" Me.txtmaxAnz.Name = "txtmaxAnz"
Me.txtmaxAnz.Size = New System.Drawing.Size(59, 20) Me.txtmaxAnz.Size = New System.Drawing.Size(59, 20)
Me.txtmaxAnz.TabIndex = 42 Me.txtmaxAnz.TabIndex = 42
Me.txtmaxAnz.Text = "200" Me.txtmaxAnz.Text = "1000"
Me.txtmaxAnz.TextAlign = System.Windows.Forms.HorizontalAlignment.Right Me.txtmaxAnz.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
' '
'Label3 'Label3
@@ -323,6 +325,17 @@ Partial Class frmUSTVoffeneAntraege
Me.lblKunde.Size = New System.Drawing.Size(0, 16) Me.lblKunde.Size = New System.Drawing.Size(0, 16)
Me.lblKunde.TabIndex = 45 Me.lblKunde.TabIndex = 45
' '
'btnAlle
'
Me.btnAlle.BackColor = System.Drawing.Color.FloralWhite
Me.btnAlle.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnAlle.Location = New System.Drawing.Point(633, 3)
Me.btnAlle.Name = "btnAlle"
Me.btnAlle.Size = New System.Drawing.Size(120, 23)
Me.btnAlle.TabIndex = 5
Me.btnAlle.Text = "ALLE"
Me.btnAlle.UseVisualStyleBackColor = False
'
'frmUSTVoffeneAntraege 'frmUSTVoffeneAntraege
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -341,7 +354,7 @@ Partial Class frmUSTVoffeneAntraege
Me.Controls.Add(Me.lbl) Me.Controls.Add(Me.lbl)
Me.Controls.Add(Me.FlowLayoutPanel) Me.Controls.Add(Me.FlowLayoutPanel)
Me.Name = "frmUSTVoffeneAntraege" Me.Name = "frmUSTVoffeneAntraege"
Me.Text = "offene Anträge" Me.Text = "nicht eingearbeitet USTV Anträge"
Me.FlowLayoutPanel.ResumeLayout(False) Me.FlowLayoutPanel.ResumeLayout(False)
CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit()
Me.Panel4.ResumeLayout(False) Me.Panel4.ResumeLayout(False)
@@ -372,4 +385,5 @@ Partial Class frmUSTVoffeneAntraege
Friend WithEvents cbxAlleoffenen As CheckBox Friend WithEvents cbxAlleoffenen As CheckBox
Friend WithEvents lblKunde As Label Friend WithEvents lblKunde As Label
Friend WithEvents Button3 As Button Friend WithEvents Button3 As Button
Friend WithEvents btnAlle As Button
End Class End Class

2
SDL/USTV/frmUSTVoffeneAntraege.vb
View File

@@ -321,7 +321,7 @@ Public Class frmUSTVoffeneAntraege
.Columns.Clear() .Columns.Clear()
'Exit Sub 'Exit Sub
'MsgBox(.sql) 'MsgBox(.sql)
Dim sqlstring = "SELECT Dim sqlstring = "SELECT " & top & "
tblIDSTransactionsNew.KdNrVERAG, tblIDSTransactionsNew.KdNrVERAG,
Adressen.[Name 1], Adressen.[Name 1],
tbl_IDS_Länder.OutletCountry as Land, tbl_IDS_Länder.OutletCountry as Land,

2
SDL/USTV/usrCntlUSTV.vb
View File

@@ -499,7 +499,7 @@ Public Class usrCntlUSTV
If vbYes = MsgBox("Es werden " & item.Text & " Daten für " & cnt & " USTV-Anträge eingearbeitet. Möchten Sie fortfahren?", vbYesNoCancel) Then If vbYes = MsgBox("Es werden " & item.Text & " Daten für " & cnt & " USTV-Anträge eingearbeitet. Möchten Sie fortfahren?", vbYesNoCancel) Then
For Each r As DataGridViewRow In dgvUSTV.Rows For Each r As DataGridViewRow In dgvUSTV.Rows
If r.Cells("UStVAn_AntragEingereichtAm").Value Is DBNull.Value Then If r.Cells("UStVAn_AntragEingereichtAm").Value Is DBNull.Value Then
frmMDM_USTVAntrag.loadUSTVFrom_VERAG(r.Cells("UStVAn_ID").Value, r.Cells("LandKz").Value, False) If r.Cells("LandKz").Value = "AT" Then frmMDM_USTVAntrag.loadUSTVFrom_VERAG(r.Cells("UStVAn_ID").Value, r.Cells("LandKz").Value, False)
End If End If
Next Next
init() init()

2
SDL/UsrCntlEssensbestellungen.vb
View File

@@ -1,7 +1,5 @@
 
Imports System.Data.SqlTypes
Imports System.Windows.Documents Imports System.Windows.Documents
Imports io.konik.zugferd.unqualified
Imports VERAG_PROG_ALLGEMEIN Imports VERAG_PROG_ALLGEMEIN
Public Class UsrCntlessensbestellungen Public Class UsrCntlessensbestellungen

4970
SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb generated
View File

File diff suppressed because it is too large Load Diff

24
SDL/kunden/usrcntlKundeBearbeitenFull.vb
View File

@@ -110,6 +110,7 @@ Public Class usrcntlKundeBearbeitenFull
bntGOBOXUmstellung.Enabled = isVerag360 bntGOBOXUmstellung.Enabled = isVerag360
btnKKhinzufuegen.Enabled = isVerag360 btnKKhinzufuegen.Enabled = isVerag360
Button9.Enabled = isVerag360 Button9.Enabled = isVerag360
cbxkeineMWSt.Visible = isVerag360
usrCntlAufschubkonten.initMe(kdnr) usrCntlAufschubkonten.initMe(kdnr)
@@ -360,6 +361,7 @@ Public Class usrcntlKundeBearbeitenFull
cbxSonst_CsvMSE.Checked = loadValue(ADRESSE.MSEExportCSV, False) cbxSonst_CsvMSE.Checked = loadValue(ADRESSE.MSEExportCSV, False)
cbxSonst_CsvUTA.Checked = loadValue(ADRESSE.UTAExportCSV, False) cbxSonst_CsvUTA.Checked = loadValue(ADRESSE.UTAExportCSV, False)
cbxUIDMehrfachverwendung.Checked = KUNDE_ERW.kde_UIDMehrfachverwendung cbxUIDMehrfachverwendung.Checked = KUNDE_ERW.kde_UIDMehrfachverwendung
cbxkeineMWSt.Checked = KUNDE_ERW.kde_keineMWSt
txtAbf_ZollVmVom.Enabled = cbxAbf_ZollVM.Checked txtAbf_ZollVmVom.Enabled = cbxAbf_ZollVM.Checked
@@ -1856,6 +1858,7 @@ Public Class usrcntlKundeBearbeitenFull
Private Sub dgvBankverbindungen_CellMouseClick(sender As Object, e As DataGridViewCellMouseEventArgs) Handles dgvBankverbindungen.CellMouseClick Private Sub dgvBankverbindungen_CellMouseClick(sender As Object, e As DataGridViewCellMouseEventArgs) Handles dgvBankverbindungen.CellMouseClick
If e.RowIndex < 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt If e.RowIndex < 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt
If e.ColumnIndex < 0 Then Exit Sub
DirectCast(sender, DataGridView).Rows(e.RowIndex).Selected = True DirectCast(sender, DataGridView).Rows(e.RowIndex).Selected = True
If e.Button = MouseButtons.Right Then If e.Button = MouseButtons.Right Then
@@ -1864,7 +1867,7 @@ Public Class usrcntlKundeBearbeitenFull
If sender Is dgvBankverbindungen Then If sender Is dgvBankverbindungen Then
If Not bankverbindungBearbeiten Then Exit Sub If Not bankverbindungBearbeiten Then Exit Sub
If dgvBankverbindungen.SelectedRows.Count = 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt If dgvBankverbindungen.SelectedCells.Count = 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt
dgvBankverbindungen.CurrentCell = dgvBankverbindungen.Rows(e.RowIndex).Cells(e.ColumnIndex) dgvBankverbindungen.CurrentCell = dgvBankverbindungen.Rows(e.RowIndex).Cells(e.ColumnIndex)
If dgvBankverbindungen.CurrentRow.Cells("bnk_archiv").Value Is Nothing OrElse (Not IsDBNull(dgvBankverbindungen.CurrentRow.Cells("bnk_archiv").Value) AndAlso dgvBankverbindungen.CurrentRow.Cells("bnk_archiv").Value) AndAlso dgvBankverbindungen.CurrentRow.Cells("bnk_id").Value IsNot Nothing Then If dgvBankverbindungen.CurrentRow.Cells("bnk_archiv").Value Is Nothing OrElse (Not IsDBNull(dgvBankverbindungen.CurrentRow.Cells("bnk_archiv").Value) AndAlso dgvBankverbindungen.CurrentRow.Cells("bnk_archiv").Value) AndAlso dgvBankverbindungen.CurrentRow.Cells("bnk_id").Value IsNot Nothing Then
@@ -2163,4 +2166,23 @@ Public Class usrcntlKundeBearbeitenFull
End Sub End Sub
Private Sub cbxkeineMWSt_Click(sender As Object, e As EventArgs) Handles cbxkeineMWSt.Click
If cbxkeineMWSt.Checked Then
Dim sqlStringSteuerNr = "SELECT count(*) from tblSteuernummern where UStV = 1 and tblSteuernummern.AdressenNr = " & ADRESSE.AdressenNr
Dim aktiveSteuerNr As Integer = CInt((New SQL).getValueTxtBySql(sqlStringSteuerNr, "FMZOLL"))
If aktiveSteuerNr > 0 Then
If vbYes = MsgBox("Der Kunde hat aktuell " & aktiveSteuerNr & " aktive Steuer-Nummern!" & vbNewLine & "Trotzdem setzen? ", vbYesNoCancel) Then
cbxkeineMWSt.Checked = True
Else
cbxkeineMWSt.Checked = False
End If
End If
End If
End Sub
End Class End Class

2
SDL/mdm/frmMDMDatenverarbetiung.vb
View File

@@ -4318,7 +4318,7 @@ Public Class frmMDMDatenverarbetiung
From [VERAG].[dbo].[tblMSESettlements] as bills From [VERAG].[dbo].[tblMSESettlements] as bills
inner join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id] inner join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id]
inner join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id inner join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id
where bills.invoice_date = '" & DateTimePicker2.Text & "' and trans.chargedDatetime is not null and isnull(trans.charged) = 0 ", "FMZOLL") Then where bills.invoice_date = '" & DateTimePicker2.Text & "' and trans.chargedDatetime is not null and isnull(trans.charged,0) = 0 ", "FMZOLL") Then
PictureBox1.Visible = True PictureBox1.Visible = True
End If End If

2
SDL/packages.config
View File

@@ -13,5 +13,5 @@
<package id="System.IO.Packaging" version="4.0.0" targetFramework="net47" /> <package id="System.IO.Packaging" version="4.0.0" targetFramework="net47" />
<package id="TAlex.WPF.Controls" version="2.0.1.0" targetFramework="net40-Client" /> <package id="TAlex.WPF.Controls" version="2.0.1.0" targetFramework="net40-Client" />
<package id="WpfAnimatedGif" version="1.4.14" targetFramework="net45" /> <package id="WpfAnimatedGif" version="1.4.14" targetFramework="net45" />
<package id="ZUGFeRD.NET" version="1.0.1" targetFramework="net47" /> <package id="ZUGFeRD-csharp" version="16.0.2" targetFramework="net48" />
</packages> </packages>

11
VERAG_PROG_ALLGEMEIN/Classes/cEZB_Waehrungskurse.vb
View File

@@ -147,12 +147,17 @@ Public Class cEZB_Waehrungskurse
End Function End Function
Shared Function GET_KURS(ezb_waehrungscode As String, datum As Date) As Double Shared Function GET_KURS(ezb_waehrungscode As String, datum As Date) As Double
Dim sqlstr = " SELECT TOP 1 [ezb_kurs] FROM [tblEZB_Waehrungskurse] where ezb_waehrungscode='" & ezb_waehrungscode & "' and ezb_datum<='" & datum.ToShortTimeString & "' order by ezb_datum desc" Dim sqlstr = " SELECT TOP 1 [ezb_kurs] FROM [tblEZB_Waehrungskurse] where ezb_waehrungscode='" & ezb_waehrungscode & "' and ezb_datum<='" & datum.ToShortDateString & "' order by ezb_datum desc"
Return (New SQL).getValueTxtBySql(sqlstr, "FMZOLL",,, 0) Return (New SQL).getValueTxtBySql(sqlstr, "FMZOLL",,, 0)
End Function End Function
Shared Function EXCHANGE(betrag As Double, waehrungscode As String, datum As Date) As Double Shared Function EXCHANGE_CURTOEUR(betrag As Double, waehrungscode As String, datum As Date) As Double
Dim sqlstr = " SELECT TOP 1 [ezb_kurs] FROM [tblEZB_Waehrungskurse] where ezb_waehrungscode='" & waehrungscode & "' and ezb_datum<='" & datum.ToShortTimeString & "' order by ezb_datum desc" Dim sqlstr = " SELECT TOP 1 [ezb_kurs] FROM [tblEZB_Waehrungskurse] where ezb_waehrungscode='" & waehrungscode & "' and ezb_datum<='" & datum.ToShortDateString & "' order by ezb_datum desc"
Return betrag / (New SQL).getValueTxtBySql(sqlstr, "FMZOLL",,, 0)
End Function
Shared Function EXCHANGE_EURTOCUR(betrag As Double, waehrungscode As String, datum As Date) As Double
Dim sqlstr = " SELECT TOP 1 [ezb_kurs] FROM [tblEZB_Waehrungskurse] where ezb_waehrungscode='" & waehrungscode & "' and ezb_datum<='" & datum.ToShortDateString & "' order by ezb_datum desc"
Return (New SQL).getValueTxtBySql(sqlstr, "FMZOLL",,, 0) * betrag Return (New SQL).getValueTxtBySql(sqlstr, "FMZOLL",,, 0) * betrag
End Function End Function

5
VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
View File

@@ -87,9 +87,7 @@ Public Class cKundenErweitert
Property kde_BankgarantielErhaltenAm As Object = Nothing Property kde_BankgarantielErhaltenAm As Object = Nothing
Property kde_WechselBlanko As Boolean = False Property kde_WechselBlanko As Boolean = False
Property kde_UStV_SummeVorschaubetragEUR_PLOSE As Object = Nothing Property kde_UStV_SummeVorschaubetragEUR_PLOSE As Object = Nothing
Property kde_keineMWSt As Boolean = False
Dim SQL As New SQL Dim SQL As New SQL
@@ -179,6 +177,7 @@ Public Class cKundenErweitert
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_BankgarantielErhaltenAm", kde_BankgarantielErhaltenAm)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_BankgarantielErhaltenAm", kde_BankgarantielErhaltenAm))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_WechselBlanko", kde_WechselBlanko)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_WechselBlanko", kde_WechselBlanko))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_UStV_SummeVorschaubetragEUR_PLOSE", kde_UStV_SummeVorschaubetragEUR_PLOSE)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_UStV_SummeVorschaubetragEUR_PLOSE", kde_UStV_SummeVorschaubetragEUR_PLOSE))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_keineMWSt", kde_keineMWSt))
Return list Return list
End Function End Function

6
VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb
View File

@@ -10,12 +10,6 @@ Public Class cUTA
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Public Function clearimporttable() As Boolean
Return SQL.doSQL("DELETE FROM tblUTAImportNew", "FMZOLL")
End Function
Public Function importUTALeistungen() As Boolean Public Function importUTALeistungen() As Boolean
'Einträge in tblUTALeistungen machen, wenn Fakturierwarenart und Lieferland noch nicht in der Tabelle enthalten sind. 'Einträge in tblUTALeistungen machen, wenn Fakturierwarenart und Lieferland noch nicht in der Tabelle enthalten sind.