From fbd500c48302a71ffa6f6d6eb984edc0104f1acb Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 21 Apr 2026 16:04:38 +0200 Subject: [PATCH] Spedbuch, etc. --- SDL/Fakturierung/cAutomailversand.vb | 21 +- SDL/Fakturierung/frmAbrechnungsMaske.vb | 8 +- .../Nacherfassung/frmNacherfassungNEU.vb | 2 - .../usrCntlSpeditionsBuchSuche.Designer.vb | 240 ++++++++++-------- .../usrCntlSpeditionsBuchSuche.resx | 6 + .../usrCntlSpeditionsBuchSuche.vb | 12 + VERAG_PROG_ALLGEMEIN/Classes/cAPI.vb | 2 + 7 files changed, 177 insertions(+), 114 deletions(-) diff --git a/SDL/Fakturierung/cAutomailversand.vb b/SDL/Fakturierung/cAutomailversand.vb index 7dac8cd6..b77dda9b 100644 --- a/SDL/Fakturierung/cAutomailversand.vb +++ b/SDL/Fakturierung/cAutomailversand.vb @@ -718,10 +718,24 @@ Public Class cAutomailversand End If End If + Dim cAPIID = -1 + Dim bezAPI As String = "" + + Select Case Sammelrechnungsart + Case 0 + cAPIID = VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_OUT_EINZELRECHNUNG + bezAPI = "EINZELRECHNUNG_" & FirmaID + Case 6 + cAPIID = VERAG_PROG_ALLGEMEIN.cAPI_ART.SDL_OUT_SAMMELRECHNUNG + bezAPI = "MDM_SAMMELRECHNUNG_" & FirmaID + Case Else + cAPIID = VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_OUT_SAMMELRECHNUNG + bezAPI = "SAMMELRECHNUNG_" & FirmaID + + End Select - - Dim API = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.OUT, VERAG_PROG_ALLGEMEIN.cAPI_Type.MAIL, VERAG_PROG_ALLGEMEIN.cAPI_ART.SDL_OUT_SAMMELRECHNUNG, "SAMMELRECHNUNG_" & FirmaID,,, row.Item("RechnungsKundenNr"), , , FilialenNr, AbfertigungsNr) + Dim API = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.OUT, VERAG_PROG_ALLGEMEIN.cAPI_Type.MAIL, cAPIID, bezAPI,,, row.Item("RechnungsKundenNr"), , , FilialenNr, AbfertigungsNr) API.api_EMail = EMails API.api_EMailCC = EMails_CC @@ -1122,8 +1136,9 @@ Public Class cAutomailversand End Function - Private Function setEmpfaengerMail_ER(SPEDBUCH As cSpeditionsbuch, AD As cAdressen, EMAILTMP As String, EMAILTMPCC As String, EMAILTMPBCC As String, email_receipt As String) + Private Function setEmpfaengerMail_ER(ByRef SPEDBUCH As cSpeditionsbuch, ByRef AD As cAdressen, ByRef EMAILTMP As String, ByRef EMAILTMPCC As String, ByRef EMAILTMPBCC As String, ByRef email_receipt As String) + If SPEDBUCH.FilialenNr = "4801" Or SPEDBUCH.FilialenNr = "4802" Then email_receipt = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Rechnung an (ATILLA)") If SPEDBUCH IsNot Nothing Then Dim IMPEXP = (New VERAG_PROG_ALLGEMEIN.SQL).DLookup("isnull(IMEX,'')", "Aviso", "AvisoId='" & SPEDBUCH.AvisoID & "'", "AVISO") diff --git a/SDL/Fakturierung/frmAbrechnungsMaske.vb b/SDL/Fakturierung/frmAbrechnungsMaske.vb index 5c11680b..a2aa7f25 100644 --- a/SDL/Fakturierung/frmAbrechnungsMaske.vb +++ b/SDL/Fakturierung/frmAbrechnungsMaske.vb @@ -1,8 +1,5 @@ Imports System.IO -Imports com.sun.tools.javac.comp Imports Microsoft.Office.Interop -Imports VERAG_PROG_ALLGEMEIN -Imports VERAG_PROG_ALLGEMEIN.TESTJSON Public Class frmAbrechnungsMaske Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -234,7 +231,6 @@ Public Class frmAbrechnungsMaske End If If .Columns.Contains("AUTO_sent") Then - .Columns("AUTO_sent").HeaderText = "gesen." .Columns("AUTO_sent").Width = 40 If cboRechnungsdruck._value <> "6" Then .Columns("AUTO_sent").Visible = False @@ -330,9 +326,9 @@ Public Class frmAbrechnungsMaske If cboRechnungsdruck._value <> "" Then Select Case cboRechnungsdruck._value Case 6 : sqlstr &= " And isnull(Automailversand,0)=1 " : enableAUTOMAIL_BTN = True - Case 2, 5 : sqlstr &= " And Rechnungsdruck='" & cboRechnungsdruck._value & "' " + Case 2, 5 : sqlstr &= " And Rechnungsdruck='" & cboRechnungsdruck._value & "' And isnull(Automailversand,0)=0" : enableAUTOMAIL_BTN = True Case Else - sqlstr &= " And Rechnungsdruck='" & cboRechnungsdruck._value & "' " : enableAUTOMAIL = False + sqlstr &= " And Rechnungsdruck='" & cboRechnungsdruck._value & "' And isnull(Automailversand,0)=0 " : enableAUTOMAIL = False End Select Else enableAUTOMAIL = False diff --git a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb index c8643a5d..78dab95c 100644 --- a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb +++ b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb @@ -1,6 +1,4 @@ Imports GrapeCity.ActiveReports -Imports Gemeinsames -Imports System.Web.UI.WebControls.Expressions Imports VERAG_PROG_ALLGEMEIN Public Class frmNacherfassungNEU diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb index 7dc10fcc..5dec8bf4 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb @@ -23,12 +23,12 @@ Partial Class usrCntlSpeditionsBuchSuche Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() + Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlSpeditionsBuchSuche)) Me.TabPage1 = New System.Windows.Forms.TabPage() Me.cntxtCntxtSpeditionsbuch = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -85,6 +85,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Button21 = New System.Windows.Forms.Button() Me.btnSpedBuchEinnahmen = New System.Windows.Forms.Button() Me.pnlBerichte = New System.Windows.Forms.Panel() + Me.CheckBox4 = New System.Windows.Forms.CheckBox() Me.cbxDetailbericht = New System.Windows.Forms.CheckBox() Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button25 = New System.Windows.Forms.Button() @@ -177,6 +178,8 @@ Partial Class usrCntlSpeditionsBuchSuche Me.lblUnterNr = New System.Windows.Forms.Label() Me.lblSachbearbeiter = New System.Windows.Forms.Label() Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker() + Me.cbxfehlZahlung_SENDUNG = New System.Windows.Forms.CheckBox() + Me.cbxfehlZahlung_AVISOID = New System.Windows.Forms.CheckBox() Me.txtVermerk = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblVermerke = New System.Windows.Forms.Label() Me.txtZollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() @@ -211,7 +214,6 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Label45 = New System.Windows.Forms.Label() Me.cboFilialeHandling = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.SplitContainer = New System.Windows.Forms.SplitContainer() - Me.CheckBox4 = New System.Windows.Forms.CheckBox() Me.cntxtCntxtSpeditionsbuch.SuspendLayout() Me.pnlRechts.SuspendLayout() CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit() @@ -243,7 +245,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.TabPage1.Location = New System.Drawing.Point(4, 25) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(1212, 0) + Me.TabPage1.Size = New System.Drawing.Size(1231, 0) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Abfertigungen" Me.TabPage1.UseVisualStyleBackColor = True @@ -421,7 +423,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.cboVersLand._value = "" Me.cboVersLand.DropDownWidth = 300 Me.cboVersLand.FormattingEnabled = True - Me.cboVersLand.Location = New System.Drawing.Point(738, 69) + Me.cboVersLand.Location = New System.Drawing.Point(758, 69) Me.cboVersLand.Name = "cboVersLand" Me.cboVersLand.Size = New System.Drawing.Size(117, 21) Me.cboVersLand.TabIndex = 24 @@ -433,7 +435,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.cboBestLand._value = "" Me.cboBestLand.DropDownWidth = 300 Me.cboBestLand.FormattingEnabled = True - Me.cboBestLand.Location = New System.Drawing.Point(861, 69) + Me.cboBestLand.Location = New System.Drawing.Point(881, 69) Me.cboBestLand.Name = "cboBestLand" Me.cboBestLand.Size = New System.Drawing.Size(118, 21) Me.cboBestLand.TabIndex = 25 @@ -441,7 +443,7 @@ Partial Class usrCntlSpeditionsBuchSuche 'lblBestimmungsland ' Me.lblBestimmungsland.AutoSize = True - Me.lblBestimmungsland.Location = New System.Drawing.Point(858, 55) + Me.lblBestimmungsland.Location = New System.Drawing.Point(878, 55) Me.lblBestimmungsland.Name = "lblBestimmungsland" Me.lblBestimmungsland.Size = New System.Drawing.Size(92, 13) Me.lblBestimmungsland.TabIndex = 20 @@ -485,11 +487,11 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Button11.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button11.Location = New System.Drawing.Point(826, 164) + Me.Button11.Location = New System.Drawing.Point(846, 164) Me.Button11.Margin = New System.Windows.Forms.Padding(0) Me.Button11.MaximumSize = New System.Drawing.Size(100, 26) Me.Button11.Name = "Button11" - Me.Button11.Size = New System.Drawing.Size(22, 0) + Me.Button11.Size = New System.Drawing.Size(41, 0) Me.Button11.TabIndex = 3 Me.Button11.Text = "Keine" Me.Button11.UseVisualStyleBackColor = True @@ -575,9 +577,9 @@ Partial Class usrCntlSpeditionsBuchSuche Me.pnlRechts.Controls.Add(Me.btnKeine) Me.pnlRechts.Controls.Add(Me.lblAbfertigungsarten) Me.pnlRechts.Dock = System.Windows.Forms.DockStyle.Right - Me.pnlRechts.Location = New System.Drawing.Point(986, 0) + Me.pnlRechts.Location = New System.Drawing.Point(1005, 0) Me.pnlRechts.Name = "pnlRechts" - Me.pnlRechts.Size = New System.Drawing.Size(234, 217) + Me.pnlRechts.Size = New System.Drawing.Size(234, 221) Me.pnlRechts.TabIndex = 35 ' 'btnNurAbf @@ -679,36 +681,36 @@ Partial Class usrCntlSpeditionsBuchSuche Me.DataGridView.AllowUserToDeleteRows = False Me.DataGridView.AllowUserToOrderColumns = True Me.DataGridView.AllowUserToResizeRows = False - DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DataGridView.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DataGridView.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7 Me.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.DataGridView.ContextMenuStrip = Me.cntxtCntxtSpeditionsbuch - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.DataGridView.DefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.DataGridView.DefaultCellStyle = DataGridViewCellStyle8 Me.DataGridView.Dock = System.Windows.Forms.DockStyle.Fill Me.DataGridView.Location = New System.Drawing.Point(450, 0) Me.DataGridView.Name = "DataGridView" - DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DataGridView.RowHeadersDefaultCellStyle = DataGridViewCellStyle3 - Me.DataGridView.Size = New System.Drawing.Size(770, 200) + DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DataGridView.RowHeadersDefaultCellStyle = DataGridViewCellStyle9 + Me.DataGridView.Size = New System.Drawing.Size(789, 262) Me.DataGridView.TabIndex = 0 ' 'pnlAnzeige @@ -723,7 +725,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.pnlAnzeige.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlAnzeige.Location = New System.Drawing.Point(0, 0) Me.pnlAnzeige.Name = "pnlAnzeige" - Me.pnlAnzeige.Size = New System.Drawing.Size(1220, 390) + Me.pnlAnzeige.Size = New System.Drawing.Size(1239, 452) Me.pnlAnzeige.TabIndex = 0 ' 'dgvLKW @@ -734,36 +736,36 @@ Partial Class usrCntlSpeditionsBuchSuche Me.dgvLKW.AllowUserToOrderColumns = True Me.dgvLKW.AllowUserToResizeRows = False Me.dgvLKW.BackgroundColor = System.Drawing.Color.WhiteSmoke - DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 Me.dgvLKW.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvLKW.ContextMenuStrip = Me.cntxtCntxtSpeditionsbuch - DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle2 Me.dgvLKW.Dock = System.Windows.Forms.DockStyle.Left Me.dgvLKW.Location = New System.Drawing.Point(0, 0) Me.dgvLKW.Name = "dgvLKW" - DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle6 - Me.dgvLKW.Size = New System.Drawing.Size(450, 200) + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle3 + Me.dgvLKW.Size = New System.Drawing.Size(450, 262) Me.dgvLKW.TabIndex = 35 Me.dgvLKW.Visible = False ' @@ -779,9 +781,9 @@ Partial Class usrCntlSpeditionsBuchSuche Me.pnlOpt.Controls.Add(Me.txtMaxSrch) Me.pnlOpt.Controls.Add(Me.lblErgebnis) Me.pnlOpt.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlOpt.Location = New System.Drawing.Point(0, 200) + Me.pnlOpt.Location = New System.Drawing.Point(0, 262) Me.pnlOpt.Name = "pnlOpt" - Me.pnlOpt.Size = New System.Drawing.Size(1220, 190) + Me.pnlOpt.Size = New System.Drawing.Size(1239, 190) Me.pnlOpt.TabIndex = 1 ' 'Panel3 @@ -1097,6 +1099,17 @@ Partial Class usrCntlSpeditionsBuchSuche Me.pnlBerichte.TabIndex = 6 Me.pnlBerichte.Visible = False ' + 'CheckBox4 + ' + Me.CheckBox4.AutoSize = True + Me.CheckBox4.BackColor = System.Drawing.Color.WhiteSmoke + Me.CheckBox4.Location = New System.Drawing.Point(413, 141) + Me.CheckBox4.Name = "CheckBox4" + Me.CheckBox4.Size = New System.Drawing.Size(78, 17) + Me.CheckBox4.TabIndex = 95 + Me.CheckBox4.Text = "Detailb.Full" + Me.CheckBox4.UseVisualStyleBackColor = False + ' 'cbxDetailbericht ' Me.cbxDetailbericht.AutoSize = True @@ -1188,7 +1201,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KundenauswertungenToolStripMenuItem1}) Me.MenuStrip1.Location = New System.Drawing.Point(322, 156) Me.MenuStrip1.Name = "MenuStrip1" - Me.MenuStrip1.Size = New System.Drawing.Size(283, 27) + Me.MenuStrip1.Size = New System.Drawing.Size(163, 27) Me.MenuStrip1.TabIndex = 89 Me.MenuStrip1.Text = "Kundenauswertungen" ' @@ -1206,14 +1219,14 @@ Partial Class usrCntlSpeditionsBuchSuche ' Me.ToolStripMenuItem2.Image = CType(resources.GetObject("ToolStripMenuItem2.Image"), System.Drawing.Image) Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2" - Me.ToolStripMenuItem2.Size = New System.Drawing.Size(316, 30) + Me.ToolStripMenuItem2.Size = New System.Drawing.Size(308, 24) Me.ToolStripMenuItem2.Text = "Kanadevia (Zeitraum auswählen)" ' 'ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem ' Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image = CType(resources.GetObject("ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image"), System.Drawing.Image) Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Name = "ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem" - Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(316, 30) + Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(308, 24) Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Text = "ZF Passau (Zeitraum auswählen)" Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Visible = False ' @@ -1221,14 +1234,14 @@ Partial Class usrCntlSpeditionsBuchSuche ' Me.ZFSteyrZeitraumAuswählenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.ZFSteyrZeitraumAuswählenToolStripMenuItem.Name = "ZFSteyrZeitraumAuswählenToolStripMenuItem" - Me.ZFSteyrZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(316, 30) + Me.ZFSteyrZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(308, 24) Me.ZFSteyrZeitraumAuswählenToolStripMenuItem.Text = "ZF Steyr (Zeitraum auswählen)" ' 'ZFThyrnauZeitraumAuswählenToolStripMenuItem ' Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Name = "ZFThyrnauZeitraumAuswählenToolStripMenuItem" - Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(316, 30) + Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(308, 24) Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Text = "ZF Thyrnau (Zeitraum auswählen)" Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Visible = False ' @@ -1236,7 +1249,7 @@ Partial Class usrCntlSpeditionsBuchSuche ' Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem.Name = "AuswertungDiversZeitraumAuswählenToolStripMenuItem" - Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(316, 30) + Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(308, 24) Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem.Text = "Flender Bocholt (Zeitraum auswählen)" Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem.Visible = False ' @@ -1597,7 +1610,7 @@ Partial Class usrCntlSpeditionsBuchSuche 'lblErgebnis ' Me.lblErgebnis.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.lblErgebnis.Location = New System.Drawing.Point(958, 14) + Me.lblErgebnis.Location = New System.Drawing.Point(977, 14) Me.lblErgebnis.Name = "lblErgebnis" Me.lblErgebnis.Size = New System.Drawing.Size(215, 14) Me.lblErgebnis.TabIndex = 2 @@ -1610,7 +1623,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button3.Image = Global.SDL.My.Resources.Resources.plus Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button3.Location = New System.Drawing.Point(112, 180) + Me.Button3.Location = New System.Drawing.Point(112, 242) Me.Button3.Margin = New System.Windows.Forms.Padding(0) Me.Button3.Name = "Button3" Me.Button3.Size = New System.Drawing.Size(138, 31) @@ -1661,7 +1674,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.TabPage2.Location = New System.Drawing.Point(4, 25) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(1212, 0) + Me.TabPage2.Size = New System.Drawing.Size(1231, 0) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "LKWs" Me.TabPage2.UseVisualStyleBackColor = True @@ -1672,10 +1685,10 @@ Partial Class usrCntlSpeditionsBuchSuche Me.tbcntr.Controls.Add(Me.TabPage2) Me.tbcntr.Dock = System.Windows.Forms.DockStyle.Bottom Me.tbcntr.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.tbcntr.Location = New System.Drawing.Point(0, 305) + Me.tbcntr.Location = New System.Drawing.Point(0, 309) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 - Me.tbcntr.Size = New System.Drawing.Size(1220, 25) + Me.tbcntr.Size = New System.Drawing.Size(1239, 21) Me.tbcntr.TabIndex = 36 ' 'Label29 @@ -1700,7 +1713,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.pnlTop.Dock = System.Windows.Forms.DockStyle.Top Me.pnlTop.Location = New System.Drawing.Point(0, 0) Me.pnlTop.Name = "pnlTop" - Me.pnlTop.Size = New System.Drawing.Size(1220, 48) + Me.pnlTop.Size = New System.Drawing.Size(1239, 48) Me.pnlTop.TabIndex = 2 ' 'Label30 @@ -1988,7 +2001,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.btnSuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnSuche.Image = Global.SDL.My.Resources.Resources.search Me.btnSuche.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSuche.Location = New System.Drawing.Point(1053, 6) + Me.btnSuche.Location = New System.Drawing.Point(1072, 6) Me.btnSuche.Name = "btnSuche" Me.btnSuche.Size = New System.Drawing.Size(162, 52) Me.btnSuche.TabIndex = 28 @@ -2005,7 +2018,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.pnlSearch.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlSearch.Location = New System.Drawing.Point(0, 0) Me.pnlSearch.Name = "pnlSearch" - Me.pnlSearch.Size = New System.Drawing.Size(1220, 330) + Me.pnlSearch.Size = New System.Drawing.Size(1239, 330) Me.pnlSearch.TabIndex = 0 ' 'SplitContainer1 @@ -2055,6 +2068,8 @@ Partial Class usrCntlSpeditionsBuchSuche ' 'SplitContainer1.Panel2 ' + Me.SplitContainer1.Panel2.Controls.Add(Me.cbxfehlZahlung_SENDUNG) + Me.SplitContainer1.Panel2.Controls.Add(Me.cbxfehlZahlung_AVISOID) Me.SplitContainer1.Panel2.Controls.Add(Me.txtVermerk) Me.SplitContainer1.Panel2.Controls.Add(Me.lblVermerke) Me.SplitContainer1.Panel2.Controls.Add(Me.txtZollstelle) @@ -2106,7 +2121,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.SplitContainer1.Panel2.Controls.Add(Me.lblErfassungsNr) Me.SplitContainer1.Panel2.Controls.Add(Me.cbxOderEmpfanger) Me.SplitContainer1.Panel2.Controls.Add(Me.Panel2) - Me.SplitContainer1.Size = New System.Drawing.Size(1220, 305) + Me.SplitContainer1.Size = New System.Drawing.Size(1239, 309) Me.SplitContainer1.SplitterDistance = 84 Me.SplitContainer1.TabIndex = 0 ' @@ -2258,7 +2273,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.btnDetailsuche.ForeColor = System.Drawing.Color.White Me.btnDetailsuche.Image = Global.SDL.My.Resources.Resources.pfeil_unten Me.btnDetailsuche.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnDetailsuche.Location = New System.Drawing.Point(1053, 57) + Me.btnDetailsuche.Location = New System.Drawing.Point(1072, 57) Me.btnDetailsuche.Margin = New System.Windows.Forms.Padding(0) Me.btnDetailsuche.Name = "btnDetailsuche" Me.btnDetailsuche.Padding = New System.Windows.Forms.Padding(0, 0, 10, 0) @@ -2366,6 +2381,34 @@ Partial Class usrCntlSpeditionsBuchSuche Me.DateTimePicker1.Size = New System.Drawing.Size(115, 20) Me.DateTimePicker1.TabIndex = 2 ' + 'cbxfehlZahlung_SENDUNG + ' + Me.cbxfehlZahlung_SENDUNG.AutoSize = True + Me.cbxfehlZahlung_SENDUNG.BackColor = System.Drawing.Color.White + Me.cbxfehlZahlung_SENDUNG.Checked = True + Me.cbxfehlZahlung_SENDUNG.CheckState = System.Windows.Forms.CheckState.Indeterminate + Me.cbxfehlZahlung_SENDUNG.Location = New System.Drawing.Point(568, 200) + Me.cbxfehlZahlung_SENDUNG.Name = "cbxfehlZahlung_SENDUNG" + Me.cbxfehlZahlung_SENDUNG.Size = New System.Drawing.Size(75, 17) + Me.cbxfehlZahlung_SENDUNG.TabIndex = 59 + Me.cbxfehlZahlung_SENDUNG.Text = "fehl. Z. (S)" + Me.cbxfehlZahlung_SENDUNG.ThreeState = True + Me.cbxfehlZahlung_SENDUNG.UseVisualStyleBackColor = False + ' + 'cbxfehlZahlung_AVISOID + ' + Me.cbxfehlZahlung_AVISOID.AutoSize = True + Me.cbxfehlZahlung_AVISOID.BackColor = System.Drawing.Color.White + Me.cbxfehlZahlung_AVISOID.Checked = True + Me.cbxfehlZahlung_AVISOID.CheckState = System.Windows.Forms.CheckState.Indeterminate + Me.cbxfehlZahlung_AVISOID.Location = New System.Drawing.Point(490, 200) + Me.cbxfehlZahlung_AVISOID.Name = "cbxfehlZahlung_AVISOID" + Me.cbxfehlZahlung_AVISOID.Size = New System.Drawing.Size(75, 17) + Me.cbxfehlZahlung_AVISOID.TabIndex = 58 + Me.cbxfehlZahlung_AVISOID.Text = "fehl. Z. (A)" + Me.cbxfehlZahlung_AVISOID.ThreeState = True + Me.cbxfehlZahlung_AVISOID.UseVisualStyleBackColor = False + ' 'txtVermerk ' Me.txtVermerk._DateTimeOnly = False @@ -2413,7 +2456,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtZollstelle.INVISIBLE_COLUMNS = Nothing Me.txtZollstelle.key_visible = False Me.txtZollstelle.KEYPARAM = Nothing - Me.txtZollstelle.Location = New System.Drawing.Point(627, 192) + Me.txtZollstelle.Location = New System.Drawing.Point(649, 192) Me.txtZollstelle.MaxLength = 50 Me.txtZollstelle.Name = "txtZollstelle" Me.txtZollstelle.searchActive = True @@ -2446,7 +2489,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.cbxCMR.BackColor = System.Drawing.Color.White Me.cbxCMR.Checked = True Me.cbxCMR.CheckState = System.Windows.Forms.CheckState.Indeterminate - Me.cbxCMR.Location = New System.Drawing.Point(493, 198) + Me.cbxCMR.Location = New System.Drawing.Point(604, 180) Me.cbxCMR.Name = "cbxCMR" Me.cbxCMR.Size = New System.Drawing.Size(50, 17) Me.cbxCMR.TabIndex = 49 @@ -2457,7 +2500,7 @@ Partial Class usrCntlSpeditionsBuchSuche 'Label41 ' Me.Label41.AutoSize = True - Me.Label41.Location = New System.Drawing.Point(624, 93) + Me.Label41.Location = New System.Drawing.Point(644, 93) Me.Label41.Name = "Label41" Me.Label41.Size = New System.Drawing.Size(44, 13) Me.Label41.TabIndex = 48 @@ -2491,7 +2534,7 @@ Partial Class usrCntlSpeditionsBuchSuche ' Me.lstGrenze._value = "" Me.lstGrenze.FormattingEnabled = True - Me.lstGrenze.Location = New System.Drawing.Point(627, 108) + Me.lstGrenze.Location = New System.Drawing.Point(649, 108) Me.lstGrenze.Name = "lstGrenze" Me.lstGrenze.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple Me.lstGrenze.Size = New System.Drawing.Size(105, 82) @@ -2591,7 +2634,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.cbxFakturiert.BackColor = System.Drawing.Color.White Me.cbxFakturiert.Checked = True Me.cbxFakturiert.CheckState = System.Windows.Forms.CheckState.Indeterminate - Me.cbxFakturiert.Location = New System.Drawing.Point(539, 180) + Me.cbxFakturiert.Location = New System.Drawing.Point(532, 180) Me.cbxFakturiert.Name = "cbxFakturiert" Me.cbxFakturiert.Size = New System.Drawing.Size(70, 17) Me.cbxFakturiert.TabIndex = 32 @@ -2668,7 +2711,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.cbxBar.BackColor = System.Drawing.Color.White Me.cbxBar.Checked = True Me.cbxBar.CheckState = System.Windows.Forms.CheckState.Indeterminate - Me.cbxBar.Location = New System.Drawing.Point(493, 180) + Me.cbxBar.Location = New System.Drawing.Point(490, 180) Me.cbxBar.Name = "cbxBar" Me.cbxBar.Size = New System.Drawing.Size(42, 17) Me.cbxBar.TabIndex = 31 @@ -2818,7 +2861,7 @@ Partial Class usrCntlSpeditionsBuchSuche 'lblVersendungsland ' Me.lblVersendungsland.AutoSize = True - Me.lblVersendungsland.Location = New System.Drawing.Point(735, 55) + Me.lblVersendungsland.Location = New System.Drawing.Point(755, 55) Me.lblVersendungsland.Name = "lblVersendungsland" Me.lblVersendungsland.Size = New System.Drawing.Size(92, 13) Me.lblVersendungsland.TabIndex = 19 @@ -2854,9 +2897,9 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Panel2.Controls.Add(Me.Label45) Me.Panel2.Controls.Add(Me.cboFilialeHandling) Me.Panel2.Controls.Add(Me.Label15) - Me.Panel2.Location = New System.Drawing.Point(735, 93) + Me.Panel2.Location = New System.Drawing.Point(758, 93) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(248, 122) + Me.Panel2.Size = New System.Drawing.Size(245, 122) Me.Panel2.TabIndex = 53 ' 'MyComboBox1 @@ -2920,22 +2963,11 @@ Partial Class usrCntlSpeditionsBuchSuche 'SplitContainer.Panel2 ' Me.SplitContainer.Panel2.Controls.Add(Me.pnlAnzeige) - Me.SplitContainer.Size = New System.Drawing.Size(1220, 722) + Me.SplitContainer.Size = New System.Drawing.Size(1239, 784) Me.SplitContainer.SplitterDistance = 330 Me.SplitContainer.SplitterWidth = 2 Me.SplitContainer.TabIndex = 3 ' - 'CheckBox4 - ' - Me.CheckBox4.AutoSize = True - Me.CheckBox4.BackColor = System.Drawing.Color.WhiteSmoke - Me.CheckBox4.Location = New System.Drawing.Point(413, 141) - Me.CheckBox4.Name = "CheckBox4" - Me.CheckBox4.Size = New System.Drawing.Size(78, 17) - Me.CheckBox4.TabIndex = 95 - Me.CheckBox4.Text = "Detailb.Full" - Me.CheckBox4.UseVisualStyleBackColor = False - ' 'usrCntlSpeditionsBuchSuche ' Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None @@ -2943,7 +2975,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Controls.Add(Me.SplitContainer) Me.Controls.Add(Me.pnlTop) Me.Name = "usrCntlSpeditionsBuchSuche" - Me.Size = New System.Drawing.Size(1220, 770) + Me.Size = New System.Drawing.Size(1239, 832) Me.cntxtCntxtSpeditionsbuch.ResumeLayout(False) Me.pnlRechts.ResumeLayout(False) Me.pnlRechts.PerformLayout() @@ -3166,4 +3198,6 @@ Partial Class usrCntlSpeditionsBuchSuche Friend WithEvents Button2 As Button Friend WithEvents ToolStripMenuItem2 As ToolStripMenuItem Friend WithEvents CheckBox4 As CheckBox + Friend WithEvents cbxfehlZahlung_AVISOID As CheckBox + Friend WithEvents cbxfehlZahlung_SENDUNG As CheckBox End Class diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx index 34a80e24..3e1be91e 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx @@ -126,6 +126,9 @@ 431, 17 + + 431, 17 + @@ -296,4 +299,7 @@ 546, 17 + + 546, 17 + \ No newline at end of file diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb index e417bf5a..ed0d1e90 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb @@ -290,6 +290,14 @@ Public Class usrCntlSpeditionsBuchSuche If cbxFakturiert.CheckState = CheckState.Unchecked Then sqlstr &= " AND Fakturiert=0 " If cbxCMR.CheckState = CheckState.Unchecked Then sqlstr &= " AND SB_CMR=0 " + + If cbxfehlZahlung_AVISOID.CheckState = CheckState.Checked Then sqlstr &= " AND NOT EXISTS (select * FROM [Rechnungsausgang] WHERE [Rechnungsausgang].AvisoID=Speditionsbuch.AvisoID) AND NOT EXISTS (select * FROM [tblEABelegnummer] WHERE LKW_id= Speditionsbuch.AvisoID AND storniert=0 and gebuchtstorno=0)" + 'If cbxfehlZahlung_AVISOID.CheckState = CheckState.Unchecked Then sqlstr &= " AND EXISTS (select * FROM [Rechnungsausgang] WHERE [Rechnungsausgang].AvisoID=Speditionsbuch.AvisoID) " + + If cbxfehlZahlung_SENDUNG.CheckState = CheckState.Checked Then sqlstr &= " AND NOT EXISTS (select * FROM [Rechnungsausgang] WHERE [Rechnungsausgang].FilialenNr=Speditionsbuch.FilialenNr and [Rechnungsausgang].AbfertigungsNr=[Speditionsbuch].AbfertigungsNr AND [Rechnungsausgang].[SpeditionsbuchUnterNr]=[Speditionsbuch].UnterNr) AND NOT EXISTS (select * FROM [tblEABelegnummer] WHERE tblEABelegnummer].FilialenNr=[Speditionsbuch].[FilialenNr] and [tblEABelegnummer].AbfertigungsNr=[Speditionsbuch].AbfertigungsNr and [tblEABelegnummer].FilialenNr>0 and [tblEABelegnummer].AbfertigungsNr>0 AND storniert=0 and gebuchtstorno=0) " + 'If cbxfehlZahlung_SENDUNG.CheckState = CheckState.Unchecked Then sqlstr &= " AND EXISTS (select * FROM [Rechnungsausgang] WHERE [Rechnungsausgang].FilialenNr=Speditionsbuch.FilialenNr and [Rechnungsausgang].AbfertigungsNr=[Speditionsbuch].AbfertigungsNr AND [Rechnungsausgang].[SpeditionsbuchUnterNr]=[Speditionsbuch].UnterNr)" + + If cbxEIDR.Visible Then If cbxEIDR.CheckState = CheckState.Checked Then sqlstr &= " AND UK_EIDR_ausstehend=1 " If cbxEIDR.CheckState = CheckState.Unchecked Then sqlstr &= " AND UK_EIDR_ausstehend=0 " @@ -3499,6 +3507,10 @@ Public Class usrCntlSpeditionsBuchSuche End Try Me.Cursor = Cursors.Default End Sub + + Private Sub DataGridView_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) + + End Sub End Class Class cSpeditionsbuchReport diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cAPI.vb b/VERAG_PROG_ALLGEMEIN/Classes/cAPI.vb index 96dd23be..cc9c35fc 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cAPI.vb @@ -28,6 +28,8 @@ Public Enum cAPI_ART SDL_OUT_FA = 81 SDL_OUT_SAMMELRECHNUNG = 82 AVISO_IN_CS = 83 + AVISO_OUT_SAMMELRECHNUNG = 84 + AVISO_OUT_EINZELRECHNUNG = 85 End Enum