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

MDM (POS-Liste, Nummerierung auf Rechnungen).

Browse Source
This commit is contained in:
d.breimaier
2026-01-16 17:02:19 +01:00
parent b5f2fc96fb
commit 6e00c67dd8
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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.5.1.2")> <Assembly: AssemblyVersion("1.5.1.3")>
<Assembly: AssemblyFileVersion("1.5.1.2")> <Assembly: AssemblyFileVersion("1.5.1.3")>

4
SDL/USTV/frmMDM_USTVAntrag.vb
View File

@@ -2276,8 +2276,8 @@ Public Class frmMDM_USTVAntrag
Private Function excelAuswertung(ByRef Optional filepath As String = "", Optional feedback As Boolean = False, Optional openExcel As Boolean = True) As Boolean Private Function excelAuswertung(ByRef Optional filepath As String = "", Optional feedback As Boolean = False, Optional openExcel As Boolean = True) As Boolean
Dim sqlStr = "Select [UStVPo_ReDat] As InvoiceDate , [UStVPo_ReNr] As InvoiceNumber, antr.UStVAn_Name As Company, LandKz as CountryOfRefund ,'EUR' as Currency ,[UStVPo_Leistender] as SupplierName, leist.[UstV_Leistender_Strasse] AS SupplierStreet, leist.[UstV_Leistender_StrasseNr] as SupplierStreetNumber, leist.[UstV_Leistender_PLZ] as SupplierPostalCode, leist.[UstV_Leistender_Stadt] as SupplierCity, leist.[UstV_Leistender_Land] as SupplierCountry, leist.[UstV_Leistender_UstNr] as SupplierVAT_TaxNumber, [UStVPo_Leistungsbezeichnung] as ExpenseCategory Dim sqlStr = "Select [UStVPo_ReDat] As InvoiceDate , [UStVPo_ReNr] As InvoiceNumber, antr.UStVAn_Name As Company, LandKz as CountryOfRefund ,UStVAn_Währungscode as Currency ,[UStVPo_Leistender] as SupplierName, leist.[UstV_Leistender_Strasse] AS SupplierStreet, leist.[UstV_Leistender_StrasseNr] as SupplierStreetNumber, leist.[UstV_Leistender_PLZ] as SupplierPostalCode, leist.[UstV_Leistender_Stadt] as SupplierCity, leist.[UstV_Leistender_Land] as SupplierCountry, leist.[UstV_Leistender_UstNr] as SupplierVAT_TaxNumber, [UStVPo_Leistungsbezeichnung] as ExpenseCategory
,Round((100 *[UStVPo_USteuerbetragEUR] / (isnull([Länderverzeichnis für die Außenhandelsstatistik].Steuersatz,1) * 100) ),2) as ExpenseNetAmount, [UStVPo_USteuerbetragEUR] as ExpenseVATAmount,Round(Round((100 *[UStVPo_USteuerbetragEUR] / (isnull([Länderverzeichnis für die Außenhandelsstatistik].Steuersatz,1) * 100) ),2) + [UStVPo_USteuerbetragEUR],2) as ExpenseGrossAmount, ,Round((100 *[UStVPo_USteuerbetrag] / (isnull([Länderverzeichnis für die Außenhandelsstatistik].Steuersatz,1) * 100) ),2) as ExpenseNetAmount, [UStVPo_USteuerbetrag] as ExpenseVATAmount,Round(Round((100 *[UStVPo_USteuerbetrag] / (isnull([Länderverzeichnis für die Außenhandelsstatistik].Steuersatz,1) * 100) ),2) + [UStVPo_USteuerbetrag],2) as ExpenseGrossAmount,
[Länderverzeichnis für die Außenhandelsstatistik].Steuersatz * 100 as TaxRate [Länderverzeichnis für die Außenhandelsstatistik].Steuersatz * 100 as TaxRate
From [tblUStVPositionen] From [tblUStVPositionen]
inner Join [tblUStVLeistender] as leist on leist.UStV_Leistender = [tblUStVPositionen].[UStVPo_Leistender] inner Join [tblUStVLeistender] as leist on leist.UStV_Leistender = [tblUStVPositionen].[UStVPo_Leistender]

2
VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb
View File

@@ -999,7 +999,7 @@ Public Class cMDMFunctionsAllgemein
Dim merged As Boolean = False Dim merged As Boolean = False
If DS.DATA_LIST.coll_daId > 0 Then If DS.DATA_LIST.coll_daId > 0 Then
For Each L As cDatenarchiv_Collection In DS.DATA_LIST.LIST For Each L As cDatenarchiv_Collection In DS.DATA_LIST.LIST.OrderBy(Function(dgvr) dgvr.coll_date)
If L.coll_pfad <> "" Then PathList.Add(L.coll_pfad) If L.coll_pfad <> "" Then PathList.Add(L.coll_pfad)
Next Next

14
VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
View File

@@ -1723,6 +1723,16 @@ Public Class cDatenarchiv_Collection
Me.coll_archiv = coll_archiv Me.coll_archiv = coll_archiv
End Sub End Sub
Sub New(coll_id, coll_daId, coll_pfad, coll_bezeichnung, coll_info, coll_archiv, coll_date)
Me.coll_id = coll_id
Me.coll_daId = coll_daId
Me.coll_pfad = coll_pfad
Me.coll_bezeichnung = coll_bezeichnung
Me.coll_info = coll_info
Me.coll_archiv = coll_archiv
Me.coll_date = coll_date
End Sub
Public Function DELETE() As Boolean Public Function DELETE() As Boolean
Try Try
If coll_pfad.Contains(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir) Then '"\\192.168.0.91\DATENARCHIV\") Then 'Um sicher zu gehen, dass der pfad im richtigem VZ ist. If coll_pfad.Contains(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir) Then '"\\192.168.0.91\DATENARCHIV\") Then 'Um sicher zu gehen, dass der pfad im richtigem VZ ist.
@@ -1864,12 +1874,12 @@ Public Class cDatenserverIDCollectionList
LIST.Clear() LIST.Clear()
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
'Using cmd As New SqlCommand("SELECT coll_id, coll_daId, da_pfad, da_name FROM tblDatenarchiv_Collection INNER JOIN tblDatenarchiv ON coll_daId=da_id WHERE coll_id=@coll_id ", conn) 'Using cmd As New SqlCommand("SELECT coll_id, coll_daId, da_pfad, da_name FROM tblDatenarchiv_Collection INNER JOIN tblDatenarchiv ON coll_daId=da_id WHERE coll_id=@coll_id ", conn)
Using cmd As New SqlCommand("SELECT coll_id, coll_daId, coll_pfad, coll_bezeichnung,coll_info,coll_archiv FROM tblDatenarchiv_Collection WHERE coll_daId=@coll_daId order by coll_bezeichnung ", conn) ' order by [coll_date] desc Using cmd As New SqlCommand("SELECT coll_id, coll_daId, coll_pfad, coll_bezeichnung,coll_info,coll_archiv, coll_date FROM tblDatenarchiv_Collection WHERE coll_daId=@coll_daId order by coll_bezeichnung ", conn) ' order by [coll_date] desc
cmd.Parameters.AddWithValue("@coll_daId", Me.coll_daId) cmd.Parameters.AddWithValue("@coll_daId", Me.coll_daId)
Dim dr = cmd.ExecuteReader() Dim dr = cmd.ExecuteReader()
'LIST = New List(Of cDatenarchiv_Collection) 'LIST = New List(Of cDatenarchiv_Collection)
While dr.Read While dr.Read
LIST.Add(New cDatenarchiv_Collection(dr.Item("coll_id"), dr.Item("coll_daId"), dr.Item("coll_pfad"), dr.Item("coll_bezeichnung"), dr.Item("coll_info"), dr.Item("coll_archiv"))) LIST.Add(New cDatenarchiv_Collection(dr.Item("coll_id"), dr.Item("coll_daId"), dr.Item("coll_pfad"), dr.Item("coll_bezeichnung"), dr.Item("coll_info"), dr.Item("coll_archiv"), dr.Item("coll_date")))
End While End While
dr.Close() dr.Close()
End Using End Using