From 76fbf96823510301ac09520500115c1fa23d0ec1 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 1 Oct 2024 11:02:00 +0200 Subject: [PATCH] picture --- SDL/My Project/Resources.Designer.vb | 4 ++-- SDL/My Project/Resources.resx | 2 +- SDL/kunden/frmKundenblatt.Designer.vb | 2 +- .../usrCntlKundenuebersicht.Designer.vb | 2 +- SDL/mdm/frmMDMDatenverarbetiung.vb | 20 ++++++++++++------- SDLUPDATER/UPDATERfrm.vb | 5 +++++ VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb | 2 +- .../MyTextBox.vb | 4 ++-- .../Classes/cSendMailAttach.vb | 2 +- .../DATENSERVER/cDATENSERVER.vb | 8 ++++---- .../ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb | 2 +- .../VERAG_PROG_ALLGEMEIN.vbproj | 4 ++-- VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb | 2 +- 13 files changed, 35 insertions(+), 24 deletions(-) diff --git a/SDL/My Project/Resources.Designer.vb b/SDL/My Project/Resources.Designer.vb index 11bacc69..989b8958 100644 --- a/SDL/My Project/Resources.Designer.vb +++ b/SDL/My Project/Resources.Designer.vb @@ -1806,9 +1806,9 @@ Namespace My.Resources ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' - Friend ReadOnly Property reloadFinance() As System.Drawing.Bitmap + Friend ReadOnly Property reloadFinance_() As System.Drawing.Bitmap Get - Dim obj As Object = ResourceManager.GetObject("reloadFinance", resourceCulture) + Dim obj As Object = ResourceManager.GetObject("reloadFinance_", resourceCulture) Return CType(obj,System.Drawing.Bitmap) End Get End Property diff --git a/SDL/My Project/Resources.resx b/SDL/My Project/Resources.resx index 8a673c00..ab0e54b5 100644 --- a/SDL/My Project/Resources.resx +++ b/SDL/My Project/Resources.resx @@ -160,7 +160,7 @@ ..\Resources\word.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\..\..\data\reloadFinance.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index 00a9f197..d29b507f 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -373,7 +373,7 @@ Partial Class frmKundenblatt ' '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.Cursor = System.Windows.Forms.Cursors.Hand Me.btnReloadOP.FlatAppearance.BorderSize = 0 diff --git a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb index a2824910..6397b6cd 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb @@ -3368,7 +3368,7 @@ Partial Class usrCntlKundenuebersicht ' '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.Cursor = System.Windows.Forms.Cursors.Hand Me.btnReloadOP.FlatAppearance.BorderSize = 0 diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 6432cdd8..f6d15587 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -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 = "'9020'" 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 Me.Top = 0 @@ -3006,10 +3006,11 @@ Public Class frmMDMDatenverarbetiung Dim NettoBetrag As Double = r("Netto") Dim BruttoBetrag As Double = r("Brutto") + Dim UstBetrag As Double = BruttoBetrag = NettoBetrag Dim LeistungsNr As Integer = r("LeistungsNr") 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 @@ -3069,11 +3070,12 @@ Public Class frmMDMDatenverarbetiung useNettogesamtbetrag = False '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) 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) - 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 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 @@ -3089,10 +3091,11 @@ Public Class frmMDMDatenverarbetiung Dim NettoBetrag As Double = r("Netto") Dim BruttoBetrag As Double = r("Brutto") + Dim UstBetrag As Double = r("UST") Dim LeistungsNr As Integer = r("LeistungsNr") 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 @@ -3123,7 +3126,7 @@ Public Class frmMDMDatenverarbetiung 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 For Each o In OFFERTE.POSITIONEN @@ -3143,7 +3146,8 @@ Public Class frmMDMDatenverarbetiung 'POS.Preis = BruttoBetrag POS.Anzahl = 1 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 @@ -3160,6 +3164,7 @@ Public Class frmMDMDatenverarbetiung RG.POSITIONEN.Add(POS) + 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) 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) Try + Dim Betrag As Double = Math.Round(BGebBgl * BGebProzent, 1) For Each o In OFFERTE.POSITIONEN If o.LeistungsNr = BGebLeistungsNr Then diff --git a/SDLUPDATER/UPDATERfrm.vb b/SDLUPDATER/UPDATERfrm.vb index a0cb408f..fd73b45e 100644 --- a/SDLUPDATER/UPDATERfrm.vb +++ b/SDLUPDATER/UPDATERfrm.vb @@ -29,6 +29,11 @@ CopyIncremental = False 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. F = System.IO.File.ReadAllText(AppDomain.CurrentDomain.BaseDirectory & "SDLUPDATER_Settings.txt") If Not System.IO.Directory.Exists(F) Then diff --git a/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb b/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb index 400aca99..02821350 100644 --- a/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb +++ b/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb @@ -392,7 +392,7 @@ Public Class cADMIN End Using dr.Close() 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 End Try diff --git a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/MyTextBox.vb b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/MyTextBox.vb index f4f8d38c..fa447b42 100644 --- a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/MyTextBox.vb +++ b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/MyTextBox.vb @@ -129,7 +129,7 @@ Public Class MyTextBox AddHandler pb.Click, AddressOf linkclicked End Sub Public Sub addNowBtnToDate2() - Dim tb = Me + Dim tb As MyTextBox = Me Dim pb As New MyLinkPicBoxVALUE tb.Parent.Controls.Add(pb) pb.Tag = "Heute" @@ -223,7 +223,7 @@ Public Class MyTextBox End Try End Sub Public Sub addPicToGueltigBis() - Dim tb = Me + Dim tb As MyTextBox = Me Dim pb As New MyLinkPicBoxVALUE tb.Parent.Controls.Add(pb) pb.Tag = "Gültig Bis" diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cSendMailAttach.vb b/VERAG_PROG_ALLGEMEIN/Classes/cSendMailAttach.vb index 2ec9b59c..ed3cd074 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cSendMailAttach.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cSendMailAttach.vb @@ -249,7 +249,7 @@ Namespace Fsolutions.Fbase.Common.Mail binaryWriter.Write(System.Text.Encoding.UTF8.GetBytes("X-Unsent: 1" & Environment.NewLine)) End If - Dim assembly = GetType(SmtpClient).Assembly + Dim assembly As Assembly = GetType(SmtpClient).Assembly Dim mailWriterType = assembly.[GetType]("System.Net.Mail.MailWriter") Dim mailWriterContructor = mailWriterType.GetConstructor(BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, {GetType(Stream)}, Nothing) Dim mailWriter = mailWriterContructor.Invoke(New Object() {filestream}) diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb index e2d5c7c1..6a67e9f1 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb @@ -854,7 +854,7 @@ Public Class cFormularManager Try Dim DS As New cDATENSERVER(da_kategorie, da_ordner, da_uOrdner1, da_uOrdner2, da_uOrdner3, da_name) 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 "" 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) 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 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 Try - Dim path_src = "" + Dim path_src As String = "" If vorhandenesLokalesPDF_Path = "" Then Dim DS As New cDATENSERVER(da_kategorie, da_ordner, da_uOrdner1, da_uOrdner2, da_uOrdner3, da_name) 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") - For Each pdfPath In PDFFile + For Each pdfPath As String In PDFFile Dim doc As New Spire.Pdf.PdfDocument(pdfPath) diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb index 6ef058b6..1eb1d352 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb @@ -846,7 +846,7 @@ Public Class cATEZ_NCTS_IN VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_Routen.LOAD_LIST_ByNCTS(Route_LIST, ncts.Id) 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) i = i + 1 Next diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj index 189f5500..a2048990 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj +++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj @@ -38,7 +38,7 @@ Off - On + Off Binary @@ -47,7 +47,7 @@ Off - On + Off true diff --git a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb index 667c058d..cf9c543b 100644 --- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb +++ b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb @@ -246,7 +246,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( wb.Worksheets(0).Tables.FirstOrDefault().ShowAutoFilter = ShowAutoFilter If rangeAsWaehrung IsNot Nothing Then - For Each r In rangeAsWaehrung + For Each r As IXLRangeAddress In rangeAsWaehrung Try wb.Worksheets(0).Range(r).Style.NumberFormat.SetFormat("###,###,##0.00 €") Catch ex As Exception