From 45a5bf57b5c46569b0043b258858a70f8b0ce3ea Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 10 Jun 2026 11:40:50 +0200 Subject: [PATCH] fakt, etc. --- SDL/Fakturierung/frmAbrechnungsMaske.vb | 2 +- SDL/Fakturierung/frmFaktSammelRgDrucken.vb | 4 +- .../usrCntlSpeditionsBuchSuche.vb | 2 - SDL/mdm/usrcntlFremdrechnungen.Designer.vb | 55 ++++++++++--------- 4 files changed, 31 insertions(+), 32 deletions(-) diff --git a/SDL/Fakturierung/frmAbrechnungsMaske.vb b/SDL/Fakturierung/frmAbrechnungsMaske.vb index 1d92fd4a..e299e7a6 100644 --- a/SDL/Fakturierung/frmAbrechnungsMaske.vb +++ b/SDL/Fakturierung/frmAbrechnungsMaske.vb @@ -331,7 +331,7 @@ Public Class frmAbrechnungsMaske Select Case cboRechnungsdruck._value Case 6 : sqlstr &= " And Rechnungsdruck='2' And isnull(Automailversand,0)=1 " : enableAUTOMAIL_BTN = True Case 7 : sqlstr &= " And Rechnungsdruck='5' And isnull(Automailversand,0)=1 " : enableAUTOMAIL_BTN = True - Case 2 : sqlstr &= " And Rechnungsdruck='" & cboRechnungsdruck._value & "' And isnull(Automailversand,0)=0" : enableAUTOMAIL_BTN = True + Case 2 : sqlstr &= " And Rechnungsdruck='" & cboRechnungsdruck._value & "' And isnull(Automailversand,0)=0" : enableAUTOMAIL_BTN = False Case 5 : sqlstr &= " And Rechnungsdruck='" & cboRechnungsdruck._value & "' And isnull(Automailversand,0)=0" : enableAUTOMAIL_BTN = False Case Else sqlstr &= " And Rechnungsdruck='" & cboRechnungsdruck._value & "' And isnull(Automailversand,0)=0 " : enableAUTOMAIL = False diff --git a/SDL/Fakturierung/frmFaktSammelRgDrucken.vb b/SDL/Fakturierung/frmFaktSammelRgDrucken.vb index 4fded175..c4b107f1 100644 --- a/SDL/Fakturierung/frmFaktSammelRgDrucken.vb +++ b/SDL/Fakturierung/frmFaktSammelRgDrucken.vb @@ -672,10 +672,10 @@ Public Class frmFaktSammelRgDrucken Dim abfertigungsarten = getValues() Dim IM_EX As Boolean = False - IM_EX = r.Cells("IM_EX").Value IsNot Nothing AndAlso Not IsDBNull(r.Cells("IM_EX").Value) AndAlso r.Cells("RENR").Value = True + IM_EX = r.Cells("IM_EX").Value IsNot Nothing AndAlso Not IsDBNull(r.Cells("IM_EX").Value) AndAlso Not IsDBNull(r.Cells("RENR").Value) AndAlso r.Cells("RENR").Value <> "" If abfertigungsarten = "" AndAlso IM_EX Then - + MsgBox("Achtung, Rechnung für Kunde " & r.Cells("RechnungsKundenNr").Value & " wurde nicht gesetzt, weil keine Abfertigungsart ausgewählt wurde!") Else RechnungsNrisSet = cFakturierung.doSAMMELRechnungsDruck(cboFirma._value, Sammelrechung, CDate(txtZeitraumBis.Text), CDate(txtRechnungsdatum.Text), cboPrinter.Text, cbxEinzelAnlagen.Checked, cbxSammelbericht.Checked, getSelectionKdNr, 7, listPDFs, cboSB._value,,, getAvisoIds, cbxEVOLOG.Checked, SonstAnlagen, , cbxTransFerry.Checked, cboFaktGrp._value, abfertigungsarten,,, True) If Not RechnungsNrisSet Then diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb index 9a6605dd..4d6dbd8b 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb @@ -3238,8 +3238,6 @@ Public Class usrCntlSpeditionsBuchSuche If RG.SAVE Then RK_ID = RG.RK_ID - - Return True Else Return False diff --git a/SDL/mdm/usrcntlFremdrechnungen.Designer.vb b/SDL/mdm/usrcntlFremdrechnungen.Designer.vb index 3ce1c404..4db66d63 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.Designer.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.Designer.vb @@ -22,7 +22,6 @@ Partial Class usrcntlFremdrechnungen 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.PDFHochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -36,11 +35,13 @@ Partial Class usrcntlFremdrechnungen Me.btnVERAGCardNew = New System.Windows.Forms.Button() Me.btnSDL_PLOSE = New System.Windows.Forms.Button() Me.btnSDL_RMC = New System.Windows.Forms.Button() - Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip() Me.PDFLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.RechnungsanhangHochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.RechnungsanhangloeschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Panel1 = New System.Windows.Forms.Panel() + Me.lblmissingPDFs = New System.Windows.Forms.Label() + Me.Label10 = New System.Windows.Forms.Label() Me.lblCountMissingInvoices = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() @@ -69,11 +70,9 @@ Partial Class usrcntlFremdrechnungen Me.Button8 = New System.Windows.Forms.Button() Me.Panel3 = New System.Windows.Forms.Panel() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() - Me.dgvLFRechnung = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.dgvDetails = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.dgvLFRechnung = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.dgvDetails = New VERAG_PROG_ALLGEMEIN.MyDatagridview() Me.Panel4 = New System.Windows.Forms.Panel() - Me.Label10 = New System.Windows.Forms.Label() - Me.lblmissingPDFs = New System.Windows.Forms.Label() Me.FlowLayoutPanel.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() Me.Panel1.SuspendLayout() @@ -336,6 +335,29 @@ Partial Class usrcntlFremdrechnungen Me.Panel1.Size = New System.Drawing.Size(260, 907) Me.Panel1.TabIndex = 23 ' + 'lblmissingPDFs + ' + Me.lblmissingPDFs.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblmissingPDFs.BackColor = System.Drawing.Color.White + Me.lblmissingPDFs.Location = New System.Drawing.Point(173, 88) + Me.lblmissingPDFs.Name = "lblmissingPDFs" + Me.lblmissingPDFs.RightToLeft = System.Windows.Forms.RightToLeft.Yes + Me.lblmissingPDFs.Size = New System.Drawing.Size(74, 13) + Me.lblmissingPDFs.TabIndex = 69 + Me.lblmissingPDFs.Text = "0" + Me.lblmissingPDFs.TextAlign = System.Drawing.ContentAlignment.TopRight + Me.lblmissingPDFs.Visible = False + ' + 'Label10 + ' + Me.Label10.AutoSize = True + Me.Label10.Location = New System.Drawing.Point(4, 88) + Me.Label10.Name = "Label10" + Me.Label10.Size = New System.Drawing.Size(80, 13) + Me.Label10.TabIndex = 68 + Me.Label10.Text = "fehlende PDFs:" + Me.Label10.Visible = False + ' 'lblCountMissingInvoices ' Me.lblCountMissingInvoices.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -716,27 +738,6 @@ Partial Class usrcntlFremdrechnungen Me.Panel4.Size = New System.Drawing.Size(1356, 108) Me.Panel4.TabIndex = 11 ' - 'Label10 - ' - Me.Label10.AutoSize = True - Me.Label10.Location = New System.Drawing.Point(4, 88) - Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(80, 13) - Me.Label10.TabIndex = 68 - Me.Label10.Text = "fehlende PDFs:" - ' - 'lblmissingPDFs - ' - Me.lblmissingPDFs.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.lblmissingPDFs.BackColor = System.Drawing.Color.White - Me.lblmissingPDFs.Location = New System.Drawing.Point(173, 88) - Me.lblmissingPDFs.Name = "lblmissingPDFs" - Me.lblmissingPDFs.RightToLeft = System.Windows.Forms.RightToLeft.Yes - Me.lblmissingPDFs.Size = New System.Drawing.Size(74, 13) - Me.lblmissingPDFs.TabIndex = 69 - Me.lblmissingPDFs.Text = "0" - Me.lblmissingPDFs.TextAlign = System.Drawing.ContentAlignment.TopRight - ' 'usrcntlFremdrechnungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)