From 53f4ec87bd4fe13cfdb4ea220cae35907f6153e2 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Tue, 21 Mar 2023 09:33:14 +0100 Subject: [PATCH] SDL Brief BugFix --- SDL/Fakturierung/cFakturierung.vb | 9 +++++++++ SDL/My Project/AssemblyInfo.vb | 4 ++-- SDL/Reports/MDM/BriefSDl/rptSDLBrief.vb | 2 -- SDL/cProgramFunctions.vb | 2 +- .../Messenger/frmMessenger_NeuerChat.vb | 17 +++++++++++------ 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 43eb5539..36346116 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -1318,6 +1318,15 @@ Public Class cFakturierung ' Dim RG_Bezeichnung = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "_Rechnung_" & If(RECHNUNG.RechnungsNr, "") & ".pdf" Dim RG_Bezeichnung = If(RECHNUNG.[BelegartenKz] = "AR", "Rechnung_", "Gutschrift_") & If(RECHNUNG.RechnungsNr, "") & ".pdf" + '-------------------------------- + ' --> TEST wegen Size Problem + '-------------------------------- + If PrinterName <> "" Then + rpt.Document.Printer.PrinterName = PrinterName + End If + rpt.Document.Printer.PaperSize = rpt.Document.Printer.PrinterSettings.DefaultPageSettings.PaperSize + '-------------------------------- + 'Immer Exportieren, da in Therefore speichern Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(RG_Bezeichnung, ".pdf", , False) Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 6f99ee49..72971dfc 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/Reports/MDM/BriefSDl/rptSDLBrief.vb b/SDL/Reports/MDM/BriefSDl/rptSDLBrief.vb index 403fa3c1..64dd26b2 100644 --- a/SDL/Reports/MDM/BriefSDl/rptSDLBrief.vb +++ b/SDL/Reports/MDM/BriefSDl/rptSDLBrief.vb @@ -39,8 +39,6 @@ Public Class rptSDLBrief Dim order As String = " ORDER BY SDLNr, Bestelldatum, BestellNr,Ausstellungsdatum,KartenNr,OBUID" - MsgBox(sqlStr) - MsgBox(sdlNr) Select Case sdlNr Case 200 : SubReport.Report = New subrptBriefSDL_AT(sqlStr & " AND SDLNr=" & sdlNr & " " & order) Case 203 : SubReport.Report = New subrptBriefSDL_CZ(sqlStr & " AND SDLNr=" & sdlNr & " " & order) diff --git a/SDL/cProgramFunctions.vb b/SDL/cProgramFunctions.vb index ba7f0392..090f8903 100644 --- a/SDL/cProgramFunctions.vb +++ b/SDL/cProgramFunctions.vb @@ -45,7 +45,6 @@ Public Class cProgramFunctions ' System.Diagnostics.Debug.WriteLine("Hier 3: " & Now.ToString("HH:mm:ss.ffff")) If runReport Then rpt.Run(False) ' System.Diagnostics.Debug.WriteLine("Hier 4: " & Now.ToString("HH:mm:ss.ffff")) - rpt.Document.Printer.PrinterSettings.Copies = 1 If printername <> "" Then rpt.Document.Printer.PrinterName = printername Else @@ -60,6 +59,7 @@ Public Class cProgramFunctions 'Test rpt.Document.Printer.PaperSize = rpt.Document.Printer.PrinterSettings.DefaultPageSettings.PaperSize + rpt.Document.Printer.PrinterSettings.Copies = 1 Dim dt1 = Now System.Diagnostics.Debug.WriteLine("Report START: " & dt1.ToString("HH:mm:ss.ffff")) diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger_NeuerChat.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger_NeuerChat.vb index 9822625f..4659566c 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger_NeuerChat.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger_NeuerChat.vb @@ -56,13 +56,8 @@ Public Class frmMessenger_NeuerChat dgvChatgruppe.Rows.Clear() dgvChatgruppe.Rows.Add({"BUCHHALTUNG", "BUCHHALTUNG"}) - dgvChatgruppe.ClearSelection() - Select Case CHAT.chat_art - Case "SND_CHAT", "LKW_CHAT" - Label3.Visible = True - dgvChatgruppe.Visible = True - End Select + loaded = True initDGV() @@ -71,6 +66,12 @@ Public Class frmMessenger_NeuerChat Me.MyTextBox2.Text = CHAT.chat_name Me.MyTextBox2.Enabled = False btn.Text = "Hinzufügen" + + Select Case CHAT.chat_art + Case "SND_CHAT", "LKW_CHAT" + Label3.Visible = True + dgvChatgruppe.Visible = True + End Select End If End Sub @@ -209,4 +210,8 @@ Public Class frmMessenger_NeuerChat Private Sub dgvChatMembers_RowsRemoved(sender As Object, e As DataGridViewRowsRemovedEventArgs) Handles dgvChatMembers.RowsRemoved initAddRemoveDGV() End Sub + + Private Sub frmMessenger_NeuerChat_Shown(sender As Object, e As EventArgs) Handles Me.Shown + dgvChatgruppe.ClearSelection() + End Sub End Class \ No newline at end of file