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

picture

Browse Source
This commit is contained in:
d.breimaier
2024-10-01 11:02:00 +02:00
parent a5921c5faf
commit 76fbf96823
13 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SDL/My Project/Resources.Designer.vb generated
View File

@@ -1806,9 +1806,9 @@ Namespace My.Resources
'''<summary> '''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary> '''</summary>
Friend ReadOnly Property reloadFinance() As System.Drawing.Bitmap Friend ReadOnly Property reloadFinance_() As System.Drawing.Bitmap
Get Get
Dim obj As Object = ResourceManager.GetObject("reloadFinance", resourceCulture) Dim obj As Object = ResourceManager.GetObject("reloadFinance_", resourceCulture)
Return CType(obj,System.Drawing.Bitmap) Return CType(obj,System.Drawing.Bitmap)
End Get End Get
End Property End Property

2
SDL/My Project/Resources.resx
View File

@@ -160,7 +160,7 @@
<data name="word" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="word" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\word.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\word.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="reloadFinance" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="reloadFinance_" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\..\data\reloadFinance.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\..\..\data\reloadFinance.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="plose_it" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="plose_it" type="System.Resources.ResXFileRef, System.Windows.Forms">

2
SDL/kunden/frmKundenblatt.Designer.vb generated
View File

@@ -373,7 +373,7 @@ Partial Class frmKundenblatt
' '
'btnReloadOP 'btnReloadOP
' '
Me.btnReloadOP.BackgroundImage = Global.SDL.My.Resources.Resources.reloadFinance Me.btnReloadOP.BackgroundImage = Global.SDL.My.Resources.Resources.reloadFinance_
Me.btnReloadOP.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.btnReloadOP.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.btnReloadOP.Cursor = System.Windows.Forms.Cursors.Hand Me.btnReloadOP.Cursor = System.Windows.Forms.Cursors.Hand
Me.btnReloadOP.FlatAppearance.BorderSize = 0 Me.btnReloadOP.FlatAppearance.BorderSize = 0

2
SDL/kunden/usrCntlKundenuebersicht.Designer.vb generated
View File

@@ -3368,7 +3368,7 @@ Partial Class usrCntlKundenuebersicht
' '
'btnReloadOP 'btnReloadOP
' '
Me.btnReloadOP.BackgroundImage = Global.SDL.My.Resources.Resources.reloadFinance Me.btnReloadOP.BackgroundImage = Global.SDL.My.Resources.Resources.reloadFinance_
Me.btnReloadOP.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.btnReloadOP.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.btnReloadOP.Cursor = System.Windows.Forms.Cursors.Hand Me.btnReloadOP.Cursor = System.Windows.Forms.Cursors.Hand
Me.btnReloadOP.FlatAppearance.BorderSize = 0 Me.btnReloadOP.FlatAppearance.BorderSize = 0

20
SDL/mdm/frmMDMDatenverarbetiung.vb
View File

@@ -15,7 +15,7 @@ Public Class frmMDMDatenverarbetiung
' Dim ProduktCode_NOT_IN = "SELECT plp_ProductCode FROM [tblPLOSE_Produktbeschreibung] WHERE [plp_einarbeiten]=0 " ' Dim ProduktCode_NOT_IN = "SELECT plp_ProductCode FROM [tblPLOSE_Produktbeschreibung] WHERE [plp_einarbeiten]=0 "
Dim ProduktCode_NOT_IN = "'9020'" Dim ProduktCode_NOT_IN = "'9020'"
Dim datum As Date = Nothing Dim datum As Date = Nothing
Dim test As Boolean = False Dim test As Boolean = True
Private Sub frmPloseDatenverarbetiung_Load(sender As Object, e As EventArgs) Handles MyBase.Load Private Sub frmPloseDatenverarbetiung_Load(sender As Object, e As EventArgs) Handles MyBase.Load
Me.Top = 0 Me.Top = 0
@@ -3006,10 +3006,11 @@ Public Class frmMDMDatenverarbetiung
Dim NettoBetrag As Double = r("Netto") Dim NettoBetrag As Double = r("Netto")
Dim BruttoBetrag As Double = r("Brutto") Dim BruttoBetrag As Double = r("Brutto")
Dim UstBetrag As Double = BruttoBetrag = NettoBetrag
Dim LeistungsNr As Integer = r("LeistungsNr") Dim LeistungsNr As Integer = r("LeistungsNr")
Dim OFFERTE As New VERAG_PROG_ALLGEMEIN.cOfferte(KdNr, OffertenNr, True) Dim OFFERTE As New VERAG_PROG_ALLGEMEIN.cOfferte(KdNr, OffertenNr, True)
allPos(RG, OFFERTE, LeistungsNr, NettoBetrag, BruttoBetrag) allPos(RG, OFFERTE, LeistungsNr, NettoBetrag, BruttoBetrag, UstBetrag)
Next Next
@@ -3069,11 +3070,12 @@ Public Class frmMDMDatenverarbetiung
useNettogesamtbetrag = False useNettogesamtbetrag = False
'alles steuerfrei also Brutto = Netto 'alles steuerfrei also Brutto = Netto
sqlstr = "select customer_id, LeistungsNr, sum(Netto) as Netto, Sum (Brutto) as Brutto from (select cust.[customer_id], trans.device_product_type, Offertenpositionen.LeistungsNr , sqlstr = "select customer_id, LeistungsNr, sum(Netto) as Netto, Sum (Brutto) as Brutto, Sum (UST) as UST from (select cust.[customer_id], trans.device_product_type, Offertenpositionen.LeistungsNr ,
case when trans.device_product_type like '%System Fee' then sum(msts_fee_amount) + sum(transaction_gross_amount) case when trans.device_product_type like '%System Fee' then sum(msts_fee_amount) + sum(transaction_gross_amount)
else sum(transaction_gross_amount) End as Netto, else sum(transaction_gross_amount) End as Netto,
case when trans.device_product_type like '%System Fee' then sum(msts_fee_amount) + sum(transaction_gross_amount) case when trans.device_product_type like '%System Fee' then sum(msts_fee_amount) + sum(transaction_gross_amount)
else sum(transaction_gross_amount) End as Brutto else sum(transaction_gross_amount) End as Brutto,
sum(USteuer_EUR) as UST
FROM [VERAG].[dbo].[tblMSESettlements] as bills FROM [VERAG].[dbo].[tblMSESettlements] as bills
left join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id] left join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id]
left join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id left join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id
@@ -3089,10 +3091,11 @@ Public Class frmMDMDatenverarbetiung
Dim NettoBetrag As Double = r("Netto") Dim NettoBetrag As Double = r("Netto")
Dim BruttoBetrag As Double = r("Brutto") Dim BruttoBetrag As Double = r("Brutto")
Dim UstBetrag As Double = r("UST")
Dim LeistungsNr As Integer = r("LeistungsNr") Dim LeistungsNr As Integer = r("LeistungsNr")
Dim OFFERTE As New VERAG_PROG_ALLGEMEIN.cOfferte(KdNr, OffertenNr, True) Dim OFFERTE As New VERAG_PROG_ALLGEMEIN.cOfferte(KdNr, OffertenNr, True)
allPos(RG, OFFERTE, LeistungsNr, NettoBetrag, BruttoBetrag) allPos(RG, OFFERTE, LeistungsNr, NettoBetrag, BruttoBetrag, UstBetrag)
Next Next
@@ -3123,7 +3126,7 @@ Public Class frmMDMDatenverarbetiung
End Function End Function
Function allPos(ByRef RG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, OFFERTE As VERAG_PROG_ALLGEMEIN.cOfferte, LeistungsNr As Integer, NettoBetrag As Double, BruttoBetrag As Double) Function allPos(ByRef RG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, OFFERTE As VERAG_PROG_ALLGEMEIN.cOfferte, LeistungsNr As Integer, NettoBetrag As Double, BruttoBetrag As Double, Optional UstBetrag As Double = 0)
Try Try
For Each o In OFFERTE.POSITIONEN For Each o In OFFERTE.POSITIONEN
@@ -3143,7 +3146,8 @@ Public Class frmMDMDatenverarbetiung
'POS.Preis = BruttoBetrag 'POS.Preis = BruttoBetrag
POS.Anzahl = 1 POS.Anzahl = 1
POS.Steuerpflichtig = LEISTUNG.Steuerpflichtig POS.Steuerpflichtig = LEISTUNG.Steuerpflichtig
POS.BGebBgl = IIf(LIEFERANT = "UTA", BruttoBetrag, NettoBetrag) 'Berrechnunggebühr wird immer vom übergebenen Betrag abzüglich UST berechnet (Nettobetrag)!
POS.BGebBgl = IIf(LIEFERANT = "UTA", BruttoBetrag - UstBetrag, NettoBetrag - UstBetrag)
If POS.Steuerpflichtig Then If POS.Steuerpflichtig Then
@@ -3160,6 +3164,7 @@ Public Class frmMDMDatenverarbetiung
RG.POSITIONEN.Add(POS) RG.POSITIONEN.Add(POS)
If (If(POS.BGebLeistungsNr, 0) > 0) AndAlso (If(POS.BGebProzent, 0) > 0) AndAlso (If(POS.BGebBgl, 0) > 0) Then If (If(POS.BGebLeistungsNr, 0) > 0) AndAlso (If(POS.BGebProzent, 0) > 0) AndAlso (If(POS.BGebBgl, 0) > 0) Then
allPlosePosBGeb(RG, OFFERTE, POS.BGebLeistungsNr, POS.BGebBgl, POS.BGebProzent) allPlosePosBGeb(RG, OFFERTE, POS.BGebLeistungsNr, POS.BGebBgl, POS.BGebProzent)
End If End If
@@ -3207,6 +3212,7 @@ Public Class frmMDMDatenverarbetiung
Function allPlosePosBGeb(ByRef RG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, OFFERTE As VERAG_PROG_ALLGEMEIN.cOfferte, BGebLeistungsNr As Integer, BGebBgl As Double, BGebProzent As Double) Function allPlosePosBGeb(ByRef RG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, OFFERTE As VERAG_PROG_ALLGEMEIN.cOfferte, BGebLeistungsNr As Integer, BGebBgl As Double, BGebProzent As Double)
Try Try
Dim Betrag As Double = Math.Round(BGebBgl * BGebProzent, 1) Dim Betrag As Double = Math.Round(BGebBgl * BGebProzent, 1)
For Each o In OFFERTE.POSITIONEN For Each o In OFFERTE.POSITIONEN
If o.LeistungsNr = BGebLeistungsNr Then If o.LeistungsNr = BGebLeistungsNr Then

5
SDLUPDATER/UPDATERfrm.vb
View File

@@ -29,6 +29,11 @@
CopyIncremental = False CopyIncremental = False
End If End If
If System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\Programme\SDL\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\f\Programme\SDL\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\install\Programme\SDL\" Then
MsgBox("Programm kann nicht im Quellpfad " & System.AppDomain.CurrentDomain.BaseDirectory & " geupdated werden!" & vbNewLine & "Vorgang wird abgebrochen!", MsgBoxStyle.Critical)
Exit Sub
End If
'Falls Settings existiert, wird der Pfad daraus verwendet. 'Falls Settings existiert, wird der Pfad daraus verwendet.
F = System.IO.File.ReadAllText(AppDomain.CurrentDomain.BaseDirectory & "SDLUPDATER_Settings.txt") F = System.IO.File.ReadAllText(AppDomain.CurrentDomain.BaseDirectory & "SDLUPDATER_Settings.txt")
If Not System.IO.Directory.Exists(F) Then If Not System.IO.Directory.Exists(F) Then

2
VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb
View File

@@ -392,7 +392,7 @@ Public Class cADMIN
End Using End Using
dr.Close() dr.Close()
Catch ex As Exception Catch ex As Exception
MsgBox("Fehler mit der Datenbankverbindung.", "Datenbankfehler") VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler mit der Datenbankverbindung. " & ex.Message, "Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
Return False Return False
End Try End Try

4
VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/MyTextBox.vb
View File

@@ -129,7 +129,7 @@ Public Class MyTextBox
AddHandler pb.Click, AddressOf linkclicked AddHandler pb.Click, AddressOf linkclicked
End Sub End Sub
Public Sub addNowBtnToDate2() Public Sub addNowBtnToDate2()
Dim tb = Me Dim tb As MyTextBox = Me
Dim pb As New MyLinkPicBoxVALUE Dim pb As New MyLinkPicBoxVALUE
tb.Parent.Controls.Add(pb) tb.Parent.Controls.Add(pb)
pb.Tag = "Heute" pb.Tag = "Heute"
@@ -223,7 +223,7 @@ Public Class MyTextBox
End Try End Try
End Sub End Sub
Public Sub addPicToGueltigBis() Public Sub addPicToGueltigBis()
Dim tb = Me Dim tb As MyTextBox = Me
Dim pb As New MyLinkPicBoxVALUE Dim pb As New MyLinkPicBoxVALUE
tb.Parent.Controls.Add(pb) tb.Parent.Controls.Add(pb)
pb.Tag = "Gültig Bis" pb.Tag = "Gültig Bis"

2
VERAG_PROG_ALLGEMEIN/Classes/cSendMailAttach.vb
View File

@@ -249,7 +249,7 @@ Namespace Fsolutions.Fbase.Common.Mail
binaryWriter.Write(System.Text.Encoding.UTF8.GetBytes("X-Unsent: 1" & Environment.NewLine)) binaryWriter.Write(System.Text.Encoding.UTF8.GetBytes("X-Unsent: 1" & Environment.NewLine))
End If End If
Dim assembly = GetType(SmtpClient).Assembly Dim assembly As Assembly = GetType(SmtpClient).Assembly
Dim mailWriterType = assembly.[GetType]("System.Net.Mail.MailWriter") Dim mailWriterType = assembly.[GetType]("System.Net.Mail.MailWriter")
Dim mailWriterContructor = mailWriterType.GetConstructor(BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, {GetType(Stream)}, Nothing) Dim mailWriterContructor = mailWriterType.GetConstructor(BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, {GetType(Stream)}, Nothing)
Dim mailWriter = mailWriterContructor.Invoke(New Object() {filestream}) Dim mailWriter = mailWriterContructor.Invoke(New Object() {filestream})

8
VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
View File

@@ -854,7 +854,7 @@ Public Class cFormularManager
Try Try
Dim DS As New cDATENSERVER(da_kategorie, da_ordner, da_uOrdner1, da_uOrdner2, da_uOrdner3, da_name) Dim DS As New cDATENSERVER(da_kategorie, da_ordner, da_uOrdner1, da_uOrdner2, da_uOrdner3, da_name)
If Not DS.hasITEMS Then Return "" If Not DS.hasITEMS Then Return ""
Dim path_src = DS.OPEN_SINGLE(False) Dim path_src As String = DS.OPEN_SINGLE(False)
If path_src = "" Then Return "" If path_src = "" Then Return ""
Dim fi As New System.IO.DirectoryInfo(path_src) Dim fi As New System.IO.DirectoryInfo(path_src)
@@ -978,7 +978,7 @@ Public Class cFormularManager
Dim DS As New cDATENSERVER(da_kategorie, da_ordner, da_uOrdner1, da_uOrdner2, da_uOrdner3, da_name) Dim DS As New cDATENSERVER(da_kategorie, da_ordner, da_uOrdner1, da_uOrdner2, da_uOrdner3, da_name)
If Not DS.hasITEMS Then Return list If Not DS.hasITEMS Then Return list
Dim path_src = DS.OPEN_SINGLE(False) Dim path_src As String = DS.OPEN_SINGLE(False)
If path_src = "" Then Return list If path_src = "" Then Return list
Dim fi As New System.IO.DirectoryInfo(path_src) Dim fi As New System.IO.DirectoryInfo(path_src)
@@ -1028,7 +1028,7 @@ Public Class cFormularManager
Public Function fillPDF(da_kategorie As String, da_ordner As String, da_uOrdner1 As String, da_uOrdner2 As String, da_uOrdner3 As String, da_name As String, listToWrite As List(Of cPDFWriteValues), Optional editierbar As Boolean = True, Optional autoDruck As Boolean = False, Optional printerName As String = "", Optional genNewPath As Boolean = True, Optional vorhandenesLokalesPDF_Path As String = "", Optional barcode As List(Of barcodeToPdf) = Nothing) As String Public Function fillPDF(da_kategorie As String, da_ordner As String, da_uOrdner1 As String, da_uOrdner2 As String, da_uOrdner3 As String, da_name As String, listToWrite As List(Of cPDFWriteValues), Optional editierbar As Boolean = True, Optional autoDruck As Boolean = False, Optional printerName As String = "", Optional genNewPath As Boolean = True, Optional vorhandenesLokalesPDF_Path As String = "", Optional barcode As List(Of barcodeToPdf) = Nothing) As String
Try Try
Dim path_src = "" Dim path_src As String = ""
If vorhandenesLokalesPDF_Path = "" Then If vorhandenesLokalesPDF_Path = "" Then
Dim DS As New cDATENSERVER(da_kategorie, da_ordner, da_uOrdner1, da_uOrdner2, da_uOrdner3, da_name) Dim DS As New cDATENSERVER(da_kategorie, da_ordner, da_uOrdner1, da_uOrdner2, da_uOrdner3, da_name)
If Not DS.hasITEMS Then Return "" If Not DS.hasITEMS Then Return ""
@@ -1395,7 +1395,7 @@ Public Class cFormularManager
'If Not VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense() Then MsgBox("Fehler beim Laden der SPIRE-Lizenz") 'If Not VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense() Then MsgBox("Fehler beim Laden der SPIRE-Lizenz")
For Each pdfPath In PDFFile For Each pdfPath As String In PDFFile
Dim doc As New Spire.Pdf.PdfDocument(pdfPath) Dim doc As New Spire.Pdf.PdfDocument(pdfPath)

2
VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb
View File

@@ -846,7 +846,7 @@ Public Class cATEZ_NCTS_IN
VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_Routen.LOAD_LIST_ByNCTS(Route_LIST, ncts.Id) VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_Routen.LOAD_LIST_ByNCTS(Route_LIST, ncts.Id)
Dim i As Integer = 0 Dim i As Integer = 0
For Each route In Route_LIST For Each route As cATEZ_NCTS_Routen In Route_LIST
success = jsonData.UpdateString("Route[" & i & "].Country", route.Route_Country) success = jsonData.UpdateString("Route[" & i & "].Country", route.Route_Country)
i = i + 1 i = i + 1
Next Next

4
VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
View File

@@ -38,7 +38,7 @@
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<OptionExplicit>On</OptionExplicit> <OptionExplicit>Off</OptionExplicit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<OptionCompare>Binary</OptionCompare> <OptionCompare>Binary</OptionCompare>
@@ -47,7 +47,7 @@
<OptionStrict>Off</OptionStrict> <OptionStrict>Off</OptionStrict>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<OptionInfer>On</OptionInfer> <OptionInfer>Off</OptionInfer>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>

2
VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb
View File

@@ -246,7 +246,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
wb.Worksheets(0).Tables.FirstOrDefault().ShowAutoFilter = ShowAutoFilter wb.Worksheets(0).Tables.FirstOrDefault().ShowAutoFilter = ShowAutoFilter
If rangeAsWaehrung IsNot Nothing Then If rangeAsWaehrung IsNot Nothing Then
For Each r In rangeAsWaehrung For Each r As IXLRangeAddress In rangeAsWaehrung
Try Try
wb.Worksheets(0).Range(r).Style.NumberFormat.SetFormat("###,###,##0.00 €") wb.Worksheets(0).Range(r).Style.NumberFormat.SetFormat("###,###,##0.00 €")
Catch ex As Exception Catch ex As Exception