diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 4b3e04ee..1d8f31af 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -744,7 +744,7 @@ Public Class cFakturierung If Rechnugnsdruck <= 0 Then Rechnugnsdruck = 3 ' Default Mail If SPEDBUCH_TMP Is Nothing Then Return False - Dim f As New frmFaktEmail(RG_TMP, SPEDBUCH_TMP, Nothing, Rechnugnsdruck, RechnungsDatum, RG_TMP.Firma_ID) + Dim f As New frmFaktEmail(RG_TMP, SPEDBUCH_TMP, Nothing, Rechnugnsdruck, RG_TMP.Firma_ID, RechnungsDatum) f.Show() Return True ' Return doRechnungsDruck(New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(RK_ID), RechnungsDatum, vorschau, Rechnugnsdruck, Path, PrinterName, SammelrechnungAnlagendruck, printStbVdb) diff --git a/SDL/Fakturierung/frmFaktEmail.vb b/SDL/Fakturierung/frmFaktEmail.vb index 42375ee7..1dd81f84 100644 --- a/SDL/Fakturierung/frmFaktEmail.vb +++ b/SDL/Fakturierung/frmFaktEmail.vb @@ -517,12 +517,12 @@ Public Class frmFaktEmail Mail = outl.CreateItem(0) Mail.Subject = txtSubject.Text - If RECHNUNG.Firma_ID = 24 OrElse RECHNUNG.Firma_ID = 19 Then + If Firma_ID = 24 OrElse Firma_ID = 19 Then Try Dim oAccount As Outlook.Account Dim accountToSent = "" - Select Case RECHNUNG.Firma_ID + Select Case Firma_ID Case 24 accountToSent = SDL.cFakturierung.getDefaultMail("AMBAR",, True) Case Else @@ -653,12 +653,12 @@ Public Class frmFaktEmail Dim Mail As Microsoft.Office.Interop.Outlook.MailItem Mail = outl.CreateItem(0) - If RECHNUNG.Firma_ID = 24 OrElse RECHNUNG.Firma_ID = 19 Then + If Firma_ID = 24 OrElse Firma_ID = 19 Then Try Dim oAccount As Outlook.Account Dim accountToSent = "" - Select Case RECHNUNG.Firma_ID + Select Case Firma_ID Case 24 accountToSent = SDL.cFakturierung.getDefaultMail("AMBAR",, True) Case Else @@ -718,10 +718,10 @@ Public Class frmFaktEmail RichTextBox.Text = RichTextBox.Text.Replace("%RgNr%", RechnungsNr) - txtSubject.Text = txtSubject.Text.Replace("%RgNr%", RechnungsNr) & IIf(RECHNUNG.Firma_ID <> 19, abfNr, "") + txtSubject.Text = txtSubject.Text.Replace("%RgNr%", RechnungsNr) & IIf(Firma_ID <> 19, abfNr, "") - Dim TextHTML = "
" & RichTextBox.Text.Replace(ControlChars.Lf, "
") & cFakturierung.getSignature(RECHNUNG.RechnungsLandKz, RECHNUNG.Firma_ID,,,, additionalLine,, IIf(Firma_ID = "24", True, False)) & "
" + Dim TextHTML = "
" & RichTextBox.Text.Replace(ControlChars.Lf, "
") & cFakturierung.getSignature(RECHNUNG.RechnungsLandKz, Firma_ID,,,, additionalLine,, IIf(Firma_ID = "24", True, False)) & "
" Mail.HTMLBody = TextHTML Mail.Subject = txtSubject.Text @@ -761,7 +761,7 @@ Public Class frmFaktEmail Mail.Display() - If RECHNUNG.FilialenNr = 4817 And RECHNUNG.Firma_ID = 19 And RECHNUNG.DruckDatumZeit IsNot Nothing Then + If Firma_ID = 19 AndAlso RECHNUNG IsNot Nothing AndAlso RECHNUNG.FilialenNr = 4817 AndAlso RECHNUNG.DruckDatumZeit IsNot Nothing Then Dim SPEDBUCH = New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(RECHNUNG.FilialenNr, RECHNUNG.AbfertigungsNr, RECHNUNG.UnterNr) diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index 3b5904da..c5eddf7a 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -51,6 +51,7 @@ Partial Class frmMDM_USTVAntrag Me.cbxLand = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblLand = New System.Windows.Forms.Label() Me.Panel8 = New System.Windows.Forms.Panel() + Me.cbxSicherheit = New System.Windows.Forms.CheckBox() Me.Label16 = New System.Windows.Forms.Label() Me.txtRZam = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label17 = New System.Windows.Forms.Label() @@ -112,6 +113,7 @@ Partial Class frmMDM_USTVAntrag Me.dgvUSTVPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.pnlAntragsPosDetails = New System.Windows.Forms.Panel() Me.Panel2 = New System.Windows.Forms.Panel() + Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() Me.Panel4 = New System.Windows.Forms.Panel() Me.cbxKIUploaddelete = New System.Windows.Forms.CheckBox() Me.scanUSTVA = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() @@ -122,6 +124,7 @@ Partial Class frmMDM_USTVAntrag Me.Panel3 = New System.Windows.Forms.Panel() Me.dgvErstattungspositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.pnlErstattungsdetails = New System.Windows.Forms.Panel() + Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition() Me.Panel1 = New System.Windows.Forms.Panel() Me.Button2 = New System.Windows.Forms.Button() Me.Button3 = New System.Windows.Forms.Button() @@ -136,9 +139,6 @@ Partial Class frmMDM_USTVAntrag Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() - Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() - Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition() - Me.cbxSicherheit = New System.Windows.Forms.CheckBox() Me.pnlBottom.SuspendLayout() CType(Me.pb_Beleg, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picExcel, System.ComponentModel.ISupportInitialize).BeginInit() @@ -558,6 +558,17 @@ Partial Class frmMDM_USTVAntrag Me.Panel8.Size = New System.Drawing.Size(973, 115) Me.Panel8.TabIndex = 19 ' + 'cbxSicherheit + ' + Me.cbxSicherheit.AutoSize = True + Me.cbxSicherheit.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxSicherheit.ForeColor = System.Drawing.Color.White + Me.cbxSicherheit.Location = New System.Drawing.Point(794, 10) + Me.cbxSicherheit.Name = "cbxSicherheit" + Me.cbxSicherheit.Size = New System.Drawing.Size(15, 14) + Me.cbxSicherheit.TabIndex = 53 + Me.cbxSicherheit.UseVisualStyleBackColor = False + ' 'Label16 ' Me.Label16.AutoSize = True @@ -1504,6 +1515,14 @@ Partial Class frmMDM_USTVAntrag Me.Panel2.Size = New System.Drawing.Size(1438, 263) Me.Panel2.TabIndex = 1 ' + 'UstCntlUSTV_AntragPosition1 + ' + Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0) + Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1" + Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1282, 261) + Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 + ' 'Panel4 ' Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke @@ -1649,6 +1668,14 @@ Partial Class frmMDM_USTVAntrag Me.pnlErstattungsdetails.Size = New System.Drawing.Size(1436, 261) Me.pnlErstattungsdetails.TabIndex = 0 ' + 'UstCntlUSTV_AntragErstattungen1 + ' + Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0) + Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1" + Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1280, 259) + Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2 + ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke @@ -1754,33 +1781,6 @@ Partial Class frmMDM_USTVAntrag Me.ToolStripMenuItem3.Size = New System.Drawing.Size(138, 22) Me.ToolStripMenuItem3.Text = "deaktivieren" ' - 'UstCntlUSTV_AntragPosition1 - ' - Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0) - Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1" - Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1282, 261) - Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 - ' - 'UstCntlUSTV_AntragErstattungen1 - ' - Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0) - Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1" - Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1280, 259) - Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2 - ' - 'cbxSicherheit - ' - Me.cbxSicherheit.AutoSize = True - Me.cbxSicherheit.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxSicherheit.ForeColor = System.Drawing.Color.White - Me.cbxSicherheit.Location = New System.Drawing.Point(794, 10) - Me.cbxSicherheit.Name = "cbxSicherheit" - Me.cbxSicherheit.Size = New System.Drawing.Size(15, 14) - Me.cbxSicherheit.TabIndex = 53 - Me.cbxSicherheit.UseVisualStyleBackColor = False - ' 'frmMDM_USTVAntrag ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index f4d6ab55..4629f879 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -2675,6 +2675,28 @@ Public Class frmMDM_USTVAntrag End Sub + Private Sub reorderUSTVAErstattzungen(UStVAn_ID As Integer) + + If UStVAn_ID < 0 Then Exit Sub + + + Dim dtUSTVA As DataTable = SQL.loadDgvBySql("SELECT UStVEr_ID FROM tblUStVErstattung WHERE UStVAn_ID=" & UStVAn_ID & " ORDER BY tblUStVErstattung.UStVEr_ID ", "FMZOLL") + Dim counter As Integer = 0 + + For Each row In dtUSTVA.Rows + + counter = counter + 1 + + Dim USTV_POS = New VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen(UStVAn_ID, row("UStVEr_ID")) + If USTV_POS.UStVEr_ID <> counter Then + SQL.doSQL("UPDATE tblUStVErstattung SET UStVEr_ID = " & counter & " WHERE UStVAn_ID=" & UStVAn_ID & " AND UStVEr_ID=" & USTV_POS.UStVEr_ID, "FMZOLL") + End If + + Next + + End Sub + + Private Sub dgvUSTVPositionen_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles dgvUSTVPositionen.PreviewKeyDown If dgvUSTVPositionen.SelectedRows.Count <> 1 Then Exit Sub @@ -2818,10 +2840,36 @@ Public Class frmMDM_USTVAntrag If dgvErstattungspositionen.Rows.Count = 0 Then Exit Sub If vbYes = MsgBox("Möchten Sie den Erstattungseintrag wirklich löschen?", vbYesNoCancel) Then - If UstCntlUSTV_AntragErstattungen1.UStV_ERS.DELETE(UstCntlUSTV_AntragErstattungen1.UstV_AN.UStVAn_ID, UstCntlUSTV_AntragErstattungen1.UStV_ERS) Then + If UstCntlUSTV_AntragErstattungen1.UStV_ERS.UStVEr_daId IsNot Nothing Then + + If UstCntlUSTV_AntragErstattungen1.UStV_ERS.UStVEr_daId < 0 Then + + Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "MDM", "MDM", "MDM_DATEN", "USTVERS_" & UstCntlUSTV_AntragErstattungen1.UStV_ERS.UStVAn_ID & "_" & UstCntlUSTV_AntragErstattungen1.UStV_ERS.UStVEr_ID, "SONSTIGE", USTV_ANTRAG.UStVAn_KuNr) + + If DS IsNot Nothing Then + DS.DELETE_COMPLETE() + End If + + ElseIf UstCntlUSTV_AntragErstattungen1.UStV_ERS.UStVEr_daId > 0 Then + + Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER(UstCntlUSTV_AntragErstattungen1.UStV_ERS.UStVEr_daId) + + If DS IsNot Nothing AndAlso DS.da_id IsNot Nothing Then + DS.DELETE_COMPLETE() + End If + + End If + + End If + + If UstCntlUSTV_AntragErstattungen1.UStV_ERS.DELETE(UstCntlUSTV_AntragErstattungen1.UstV_AN.UStVAn_ID, UstCntlUSTV_AntragErstattungen1.UStV_ERS.UStVEr_ID) Then + reorderUSTVAErstattzungen(UstCntlUSTV_AntragErstattungen1.UstV_AN.UStVAn_ID) initdgvErstattungen() End If + + End If + End Sub Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click @@ -2991,6 +3039,7 @@ Public Class frmMDM_USTVAntrag End If Else + initErstsattungsPosition(.RowCount) End If diff --git a/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb b/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb index 84997e3e..4f25b91a 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb @@ -56,7 +56,6 @@ Partial Class frmMDMDatenverarbetiung Me.Button10 = New System.Windows.Forms.Button() Me.btnRechenwertesetzen = New System.Windows.Forms.Button() Me.lblTTRSum = New System.Windows.Forms.Label() - Me.txtTTRSum = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblProzPruef = New System.Windows.Forms.Label() Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.pic = New System.Windows.Forms.PictureBox() @@ -64,7 +63,6 @@ Partial Class frmMDMDatenverarbetiung Me.Button1 = New System.Windows.Forms.Button() Me.btnKunde = New System.Windows.Forms.Button() Me.Label4 = New System.Windows.Forms.Label() - Me.txtPruefsummeBrutto = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.cbx = New System.Windows.Forms.CheckBox() Me.Panel2 = New System.Windows.Forms.Panel() Me.cbxKopie = New System.Windows.Forms.CheckBox() @@ -76,13 +74,15 @@ Partial Class frmMDMDatenverarbetiung Me.pbPloseAnh_Proz = New System.Windows.Forms.ProgressBar() Me.lblPloseAnh_Proz = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() - Me.txtPruefsummeNetto = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label2 = New System.Windows.Forms.Label() - Me.txtAnzahl = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Button3 = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button() - Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.txtTTRSum = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtPruefsummeBrutto = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtPruefsummeNetto = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtAnzahl = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.pnl.SuspendLayout() Me.Panel5.SuspendLayout() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() @@ -456,32 +456,6 @@ Partial Class frmMDMDatenverarbetiung Me.lblTTRSum.Text = "Prüfsumme TTR:" Me.lblTTRSum.Visible = False ' - 'txtTTRSum - ' - Me.txtTTRSum._DateTimeOnly = False - Me.txtTTRSum._numbersOnly = False - Me.txtTTRSum._numbersOnlyKommastellen = "" - Me.txtTTRSum._numbersOnlyTrennzeichen = True - Me.txtTTRSum._Prozent = False - Me.txtTTRSum._ShortDateNew = False - Me.txtTTRSum._ShortDateOnly = False - Me.txtTTRSum._TimeOnly = False - Me.txtTTRSum._TimeOnly_Seconds = False - Me.txtTTRSum._value = "" - Me.txtTTRSum._Waehrung = False - Me.txtTTRSum._WaehrungZeichen = True - Me.txtTTRSum.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.txtTTRSum.ForeColor = System.Drawing.Color.Black - Me.txtTTRSum.Location = New System.Drawing.Point(1051, 124) - Me.txtTTRSum.MaxLineLength = -1 - Me.txtTTRSum.MaxLines_Warning = "" - Me.txtTTRSum.MaxLines_Warning_Label = Nothing - Me.txtTTRSum.Name = "txtTTRSum" - Me.txtTTRSum.Size = New System.Drawing.Size(100, 20) - Me.txtTTRSum.TabIndex = 51 - Me.txtTTRSum.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - Me.txtTTRSum.Visible = False - ' 'lblProzPruef ' Me.lblProzPruef.Location = New System.Drawing.Point(63, 97) @@ -558,31 +532,6 @@ Partial Class frmMDMDatenverarbetiung Me.Label4.TabIndex = 44 Me.Label4.Text = "Prüfsumme brutto:" ' - 'txtPruefsummeBrutto - ' - Me.txtPruefsummeBrutto._DateTimeOnly = False - Me.txtPruefsummeBrutto._numbersOnly = False - Me.txtPruefsummeBrutto._numbersOnlyKommastellen = "" - Me.txtPruefsummeBrutto._numbersOnlyTrennzeichen = True - Me.txtPruefsummeBrutto._Prozent = False - Me.txtPruefsummeBrutto._ShortDateNew = False - Me.txtPruefsummeBrutto._ShortDateOnly = False - Me.txtPruefsummeBrutto._TimeOnly = False - Me.txtPruefsummeBrutto._TimeOnly_Seconds = False - Me.txtPruefsummeBrutto._value = "" - Me.txtPruefsummeBrutto._Waehrung = False - Me.txtPruefsummeBrutto._WaehrungZeichen = True - Me.txtPruefsummeBrutto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.txtPruefsummeBrutto.ForeColor = System.Drawing.Color.Black - Me.txtPruefsummeBrutto.Location = New System.Drawing.Point(1051, 101) - Me.txtPruefsummeBrutto.MaxLineLength = -1 - Me.txtPruefsummeBrutto.MaxLines_Warning = "" - Me.txtPruefsummeBrutto.MaxLines_Warning_Label = Nothing - Me.txtPruefsummeBrutto.Name = "txtPruefsummeBrutto" - Me.txtPruefsummeBrutto.Size = New System.Drawing.Size(100, 20) - Me.txtPruefsummeBrutto.TabIndex = 43 - Me.txtPruefsummeBrutto.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' 'cbx ' Me.cbx.AutoSize = True @@ -693,6 +642,109 @@ Partial Class frmMDMDatenverarbetiung Me.Label3.TabIndex = 38 Me.Label3.Text = "Prüfsumme netto:" ' + 'Label2 + ' + Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(953, 51) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(42, 13) + Me.Label2.TabIndex = 36 + Me.Label2.Text = "Anzahl:" + ' + 'Button3 + ' + Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button3.Location = New System.Drawing.Point(12, 13) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(120, 23) + Me.Button3.TabIndex = 29 + Me.Button3.Text = "Daten prüfen" + Me.Button3.UseVisualStyleBackColor = True + ' + 'Button2 + ' + Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button2.Location = New System.Drawing.Point(12, 42) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(120, 23) + Me.Button2.TabIndex = 28 + Me.Button2.Text = "Summenbericht" + Me.Button2.UseVisualStyleBackColor = True + ' + 'ContextMenuStrip1 + ' + Me.ContextMenuStrip1.Name = "ContextMenuStrip1" + Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4) + ' + 'MyDatagridview1 + ' + Me.MyDatagridview1.AKTUALISIERUNGS_INTERVALL = -1 + Me.MyDatagridview1.AllowUserToAddRows = False + Me.MyDatagridview1.AllowUserToDeleteRows = False + Me.MyDatagridview1.AllowUserToResizeColumns = False + Me.MyDatagridview1.AllowUserToResizeRows = False + Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.MyDatagridview1.Dock = System.Windows.Forms.DockStyle.Fill + Me.MyDatagridview1.Location = New System.Drawing.Point(0, 100) + Me.MyDatagridview1.Name = "MyDatagridview1" + Me.MyDatagridview1.ReadOnly = True + Me.MyDatagridview1.RowHeadersWidth = 62 + Me.MyDatagridview1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.MyDatagridview1.Size = New System.Drawing.Size(1163, 547) + Me.MyDatagridview1.TabIndex = 0 + ' + 'txtTTRSum + ' + Me.txtTTRSum._DateTimeOnly = False + Me.txtTTRSum._numbersOnly = False + Me.txtTTRSum._numbersOnlyKommastellen = "" + Me.txtTTRSum._numbersOnlyTrennzeichen = True + Me.txtTTRSum._Prozent = False + Me.txtTTRSum._ShortDateNew = False + Me.txtTTRSum._ShortDateOnly = False + Me.txtTTRSum._TimeOnly = False + Me.txtTTRSum._TimeOnly_Seconds = False + Me.txtTTRSum._value = "" + Me.txtTTRSum._Waehrung = False + Me.txtTTRSum._WaehrungZeichen = True + Me.txtTTRSum.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtTTRSum.ForeColor = System.Drawing.Color.Black + Me.txtTTRSum.Location = New System.Drawing.Point(1051, 124) + Me.txtTTRSum.MaxLineLength = -1 + Me.txtTTRSum.MaxLines_Warning = "" + Me.txtTTRSum.MaxLines_Warning_Label = Nothing + Me.txtTTRSum.Name = "txtTTRSum" + Me.txtTTRSum.Size = New System.Drawing.Size(100, 20) + Me.txtTTRSum.TabIndex = 51 + Me.txtTTRSum.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + Me.txtTTRSum.Visible = False + ' + 'txtPruefsummeBrutto + ' + Me.txtPruefsummeBrutto._DateTimeOnly = False + Me.txtPruefsummeBrutto._numbersOnly = False + Me.txtPruefsummeBrutto._numbersOnlyKommastellen = "" + Me.txtPruefsummeBrutto._numbersOnlyTrennzeichen = True + Me.txtPruefsummeBrutto._Prozent = False + Me.txtPruefsummeBrutto._ShortDateNew = False + Me.txtPruefsummeBrutto._ShortDateOnly = False + Me.txtPruefsummeBrutto._TimeOnly = False + Me.txtPruefsummeBrutto._TimeOnly_Seconds = False + Me.txtPruefsummeBrutto._value = "" + Me.txtPruefsummeBrutto._Waehrung = False + Me.txtPruefsummeBrutto._WaehrungZeichen = True + Me.txtPruefsummeBrutto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtPruefsummeBrutto.ForeColor = System.Drawing.Color.Black + Me.txtPruefsummeBrutto.Location = New System.Drawing.Point(1051, 101) + Me.txtPruefsummeBrutto.MaxLineLength = -1 + Me.txtPruefsummeBrutto.MaxLines_Warning = "" + Me.txtPruefsummeBrutto.MaxLines_Warning_Label = Nothing + Me.txtPruefsummeBrutto.Name = "txtPruefsummeBrutto" + Me.txtPruefsummeBrutto.Size = New System.Drawing.Size(100, 20) + Me.txtPruefsummeBrutto.TabIndex = 43 + Me.txtPruefsummeBrutto.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'txtPruefsummeNetto ' Me.txtPruefsummeNetto._DateTimeOnly = False @@ -718,16 +770,6 @@ Partial Class frmMDMDatenverarbetiung Me.txtPruefsummeNetto.TabIndex = 37 Me.txtPruefsummeNetto.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' - 'Label2 - ' - Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(953, 51) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(42, 13) - Me.Label2.TabIndex = 36 - Me.Label2.Text = "Anzahl:" - ' 'txtAnzahl ' Me.txtAnzahl._DateTimeOnly = False @@ -753,48 +795,6 @@ Partial Class frmMDMDatenverarbetiung Me.txtAnzahl.TabIndex = 35 Me.txtAnzahl.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' - 'Button3 - ' - Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button3.Location = New System.Drawing.Point(12, 13) - Me.Button3.Name = "Button3" - Me.Button3.Size = New System.Drawing.Size(120, 23) - Me.Button3.TabIndex = 29 - Me.Button3.Text = "Daten prüfen" - Me.Button3.UseVisualStyleBackColor = True - ' - 'Button2 - ' - Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button2.Location = New System.Drawing.Point(12, 42) - Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(120, 23) - Me.Button2.TabIndex = 28 - Me.Button2.Text = "Summenbericht" - Me.Button2.UseVisualStyleBackColor = True - ' - 'MyDatagridview1 - ' - Me.MyDatagridview1.AKTUALISIERUNGS_INTERVALL = -1 - Me.MyDatagridview1.AllowUserToAddRows = False - Me.MyDatagridview1.AllowUserToDeleteRows = False - Me.MyDatagridview1.AllowUserToResizeColumns = False - Me.MyDatagridview1.AllowUserToResizeRows = False - Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.MyDatagridview1.Dock = System.Windows.Forms.DockStyle.Fill - Me.MyDatagridview1.Location = New System.Drawing.Point(0, 100) - Me.MyDatagridview1.Name = "MyDatagridview1" - Me.MyDatagridview1.ReadOnly = True - Me.MyDatagridview1.RowHeadersWidth = 62 - Me.MyDatagridview1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.MyDatagridview1.Size = New System.Drawing.Size(1163, 547) - Me.MyDatagridview1.TabIndex = 0 - ' - 'ContextMenuStrip1 - ' - Me.ContextMenuStrip1.Name = "ContextMenuStrip1" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4) - ' 'frmMDMDatenverarbetiung ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SDL/mdm/frmMDMDatenverarbetiung.resx b/SDL/mdm/frmMDMDatenverarbetiung.resx index c477c7b6..217e10c3 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.resx +++ b/SDL/mdm/frmMDMDatenverarbetiung.resx @@ -120,6 +120,9 @@ 17, 17 + + 25 + diff --git a/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.vb b/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.vb index 57c26dd7..736f032c 100644 --- a/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.vb +++ b/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.vb @@ -323,8 +323,7 @@ Public Class usrCntlMDMDatenverarbeitungAuswertungen_divers Case "KDNR" sqlstr = "SELECT tblUTAImportNew.Kundennummer as 'fehlende UTA-Kundennummer' - FROM tblUTAImportNew LEFT JOIN Adressen ON tblUTAImportNew.Kundennummer = Adressen.UTAKundenNr - Where UTAKundenNr <> 868070 + FROM tblUTAImportNew LEFT JOIN Adressen ON tblUTAImportNew.Kundennummer = Adressen.UTAKundenNr WHERE cast(tblUTAImportNew.Rechnungsdatum as Date) = '" & MAIN.DateTimePicker2.Text & "' GROUP BY tblUTAImportNew.Kundennummer, Adressen.UTAKundenNr HAVING (((Adressen.UTAKundenNr) Is Null))" diff --git a/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb b/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb index 977db24d..6f5a622d 100644 --- a/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb +++ b/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb @@ -1204,7 +1204,6 @@ Public Class cAvisoDAL daten.Warenort = If(dr.Item("Warenort") Is DBNull.Value, Nothing, dr.Item("Warenort")) daten.ZOLLDigitalEingereicht = If(dr.Item("ZOLLDigitalEingereicht") Is DBNull.Value, Nothing, dr.Item("ZOLLDigitalEingereicht")) daten.Transportmittelart = If(dr.Item("Transportmittelart") Is DBNull.Value, Nothing, dr.Item("Transportmittelart")) - daten.WeiterleitungTextTV = VarToStr(dr.Item("WeiterleitungTextTV")) daten.VerwahrungStatus = VarToInt(dr.Item("VerwahrungStatus")) daten.VerwahrungStatusDate = If(dr.Item("VerwahrungStatusDate") Is DBNull.Value, Nothing, dr.Item("VerwahrungStatusDate")) diff --git a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/usrcntlPDFScanList.vb b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/usrcntlPDFScanList.vb index 65db7f12..2fefa1f4 100644 --- a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/usrcntlPDFScanList.vb +++ b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/usrcntlPDFScanList.vb @@ -396,6 +396,7 @@ Public Class usrcntlPDFScanList End If End If + initPdf() Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cEmailBenachrichtigung.vb b/VERAG_PROG_ALLGEMEIN/Classes/cEmailBenachrichtigung.vb index 8cdbb74a..f3d6dbe8 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cEmailBenachrichtigung.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cEmailBenachrichtigung.vb @@ -125,12 +125,15 @@ Public Class cEmailBenachrichtigung 'Prüfen, ob die Art für den Kunden im Kundenstamm aktiviert ist: If art = 3 Then '> Ankunft Export - If (New VERAG_PROG_ALLGEMEIN.SQL).DLookup("isnull(EmailAnkunft_Export,0)", "[tblKundenErweitert]", "kde_KundenNr=" & Kdnr, "FMZOLL", "0") = 0 Then + Dim AnkungMail = IIf((New VERAG_PROG_ALLGEMEIN.SQL).DLookup("isnull(EmailAnkunft_Export,0)", "[tblKundenErweitert]", "kde_KundenNr=" & Kdnr, "FMZOLL", "0") = "False", "0", (New VERAG_PROG_ALLGEMEIN.SQL).DLookup("isnull(EmailAnkunft_Export,0)", "[tblKundenErweitert]", "kde_KundenNr=" & Kdnr, "FMZOLL", "0")) + If AnkungMail = 0 Then art = 1 End If End If + If art = 4 Then '> Freigabe Export - If (New VERAG_PROG_ALLGEMEIN.SQL).DLookup("isnull(EmailFreigabe_Export,0)", "[tblKundenErweitert]", "kde_KundenNr=" & Kdnr, "FMZOLL", "0") = 0 Then + Dim FreigabeMail = IIf((New VERAG_PROG_ALLGEMEIN.SQL).DLookup("isnull(EmailFreigabe_Export,0)", "[tblKundenErweitert]", "kde_KundenNr=" & Kdnr, "FMZOLL", "0") = "False", "0", (New VERAG_PROG_ALLGEMEIN.SQL).DLookup("isnull(EmailAnkunft_Export,0)", "[tblKundenErweitert]", "kde_KundenNr=" & Kdnr, "FMZOLL", "0")) + If FreigabeMail = 0 Then art = 2 End If End If