diff --git a/MailSender/MAILSender.vb b/MailSender/MAILSender.vb index 154a91b..2bd1f37 100644 --- a/MailSender/MAILSender.vb +++ b/MailSender/MAILSender.vb @@ -5,6 +5,7 @@ Imports ClosedXML.Excel Imports DocumentFormat Imports System.Net Imports DAKOSY_Worker +Imports System.Reflection Module Mail Dim sPath As String = System.AppDomain.CurrentDomain.BaseDirectory @@ -70,7 +71,7 @@ Module Mail 'PARAM = "THYSSENKRUPP_AUSWERTUNG" 'PARAM = "JAHRESABRECHNUNG AG-ZS" - 'PARAM = "ZF" + 'PARAM = "AMBAR_Datev_Mailversand_to_HK" '------------------------------------------------------------------------------------ ' PARAM = "NCTSLIST_TOBB" @@ -277,11 +278,14 @@ Module Mail End If System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") + Case "AMBAR_Datev_Mailversand_to_HK" + System.Console.WriteLine("OPTION erkannt: AMBAR-Datev Versand") + System.Console.WriteLine("Vorgang gestartet...") + SendEmail_AMBARTOHKT() + System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") + Case Else System.Console.WriteLine("OPTION nicht erkannt!") - - - End Select End If @@ -1217,6 +1221,80 @@ Module Mail Return False End Function + Private Function SendEmail_AMBARTOHKT() As Boolean + + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + + Dim Msg As New MailMessage + Dim myCredentials As New System.Net.NetworkCredential + myCredentials.UserName = "support@verag.ag" + myCredentials.Password = supportPWD + + Msg.IsBodyHtml = False + Dim mySmtpsvr As New SmtpClient() + + mySmtpsvr.Host = "owa.verag.ag" + mySmtpsvr.Port = 587 '25 '587 '25 + mySmtpsvr.UseDefaultCredentials = False + mySmtpsvr.Credentials = myCredentials + System.Console.WriteLine("E-Mail Daten initialisiert...") + + + Try + System.Console.WriteLine("Erstelle Buchungsdateien...") + Dim Pathlist As New List(Of String) + If VERAG_PROG_ALLGEMEIN.cDatev_Interface.genDatensatzCSV_ALL("AMBAR", False, True, True,, Pathlist) Then + System.Console.WriteLine("Buchungsdateien erstellt...") + Else + System.Console.WriteLine("Keine Buchungsdaten vorhanden...") + Return False + End If + + System.Console.WriteLine("Sende E-Mail...") + + Msg.To.Add("T.Wesolowski@hkt-tax.de") + Msg.CC.Add("C.Tuendermann@hkt-tax.de") + Msg.CC.Add("D.Horneber@hkt-tax.de") + Msg.CC.Add("IO@ambarlog.de") + + Msg.From = New MailAddress("support@verag.ag") + + Msg.Body = "Sehr geehrte Damen und Herren," & vbNewLine & vbNewLine & " im Anhang befinden sich die Exportdaten für die Buchhaltung!" & vbNewLine & vbNewLine & "Mit freundlichen Grüßen" & vbNewLine & "automatisch generiertes E-Mail" + + Msg.Subject = "DATEV-Buchungsdaten AMBAR " & Now.Date.ToShortDateString + + For Each path In Pathlist + Dim attachment As Attachment = New Attachment(path) + Msg.Attachments.Add(attachment) + Next + + mySmtpsvr.Send(Msg) + System.Console.WriteLine("E-Mail gesendet.") + System.Console.WriteLine("Erfolgreich!") + Return True + + Catch ex As Exception + Try + mySmtpsvr.Port = 25 + mySmtpsvr.Send(Msg) + + Catch ex2 As Exception + Try + mySmtpsvr.Host = "192.168.0.107" + mySmtpsvr.Port = 25 + mySmtpsvr.Send(Msg) + + Catch ex3 As Exception + MsgBox(ex3.Message & ex3.StackTrace) + Return False + End Try + End Try + + + End Try + Return False + End Function + Function getDateFromFile() As String Try diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index 551633e..e4becd5 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -25,6 +25,11 @@ Partial Class frmStartOptions Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStartOptions)) Me.pnl = New System.Windows.Forms.Panel() + Me.buchungenAMBAR = New System.Windows.Forms.Button() + Me.PictureBox23 = New System.Windows.Forms.PictureBox() + Me.Label27 = New System.Windows.Forms.Label() + Me.MyTextBox3 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.LinkLabel51 = New System.Windows.Forms.LinkLabel() Me.PictureBox22 = New System.Windows.Forms.PictureBox() Me.Button22 = New System.Windows.Forms.Button() Me.LinkLabel48 = New System.Windows.Forms.LinkLabel() @@ -138,6 +143,8 @@ Partial Class frmStartOptions Me.Label7 = New System.Windows.Forms.Label() Me.LinkLabel27 = New System.Windows.Forms.LinkLabel() Me.Label6 = New System.Windows.Forms.Label() + Me.PictureBox15 = New System.Windows.Forms.PictureBox() + Me.PictureBox14 = New System.Windows.Forms.PictureBox() Me.dgvMRN = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.clmnMRN = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.txtVRGOut_MRN = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -147,8 +154,6 @@ Partial Class frmStartOptions Me.txtVRGOutEZA_BezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.txtVRGOut_BezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.PictureBox15 = New System.Windows.Forms.PictureBox() - Me.PictureBox14 = New System.Windows.Forms.PictureBox() Me.TabPage3 = New System.Windows.Forms.TabPage() Me.LinkLabel50 = New System.Windows.Forms.LinkLabel() Me.Label26 = New System.Windows.Forms.Label() @@ -166,8 +171,6 @@ Partial Class frmStartOptions Me.TabPage4 = New System.Windows.Forms.TabPage() Me.LinkLabel49 = New System.Windows.Forms.LinkLabel() Me.Label25 = New System.Windows.Forms.Label() - Me.txtTBLNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtTWLNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.cbxTestFTP = New System.Windows.Forms.CheckBox() Me.cbxTestsystem = New System.Windows.Forms.CheckBox() Me.PictureBox21 = New System.Windows.Forms.PictureBox() @@ -181,6 +184,8 @@ Partial Class frmStartOptions Me.LinkLabel43 = New System.Windows.Forms.LinkLabel() Me.LinkLabel44 = New System.Windows.Forms.LinkLabel() Me.Label24 = New System.Windows.Forms.Label() + Me.txtTBLNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtTWLNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.CheckBox2 = New System.Windows.Forms.CheckBox() Me.LinkLabel25 = New System.Windows.Forms.LinkLabel() Me.CheckBox1 = New System.Windows.Forms.CheckBox() @@ -206,11 +211,8 @@ Partial Class frmStartOptions Me.lblRoutineManager = New System.Windows.Forms.Label() Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Button21 = New System.Windows.Forms.Button() - Me.Label27 = New System.Windows.Forms.Label() - Me.MyTextBox3 = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.LinkLabel51 = New System.Windows.Forms.LinkLabel() - Me.PictureBox23 = New System.Windows.Forms.PictureBox() Me.pnl.SuspendLayout() + CType(Me.PictureBox23, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox22, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbcntr.SuspendLayout() @@ -230,9 +232,9 @@ Partial Class frmStartOptions CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPage2.SuspendLayout() - CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox15, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox14, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPage3.SuspendLayout() Me.TabPage4.SuspendLayout() CType(Me.PictureBox21, System.ComponentModel.ISupportInitialize).BeginInit() @@ -242,13 +244,13 @@ Partial Class frmStartOptions CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBox23, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'pnl ' Me.pnl.BackColor = System.Drawing.Color.White Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnl.Controls.Add(Me.buchungenAMBAR) Me.pnl.Controls.Add(Me.PictureBox23) Me.pnl.Controls.Add(Me.Label27) Me.pnl.Controls.Add(Me.MyTextBox3) @@ -323,14 +325,80 @@ Partial Class frmStartOptions Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(861, 827) + Me.pnl.Size = New System.Drawing.Size(861, 948) Me.pnl.TabIndex = 0 ' + 'buchungenAMBAR + ' + Me.buchungenAMBAR.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.buchungenAMBAR.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.buchungenAMBAR.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.buchungenAMBAR.Location = New System.Drawing.Point(564, 253) + Me.buchungenAMBAR.Name = "buchungenAMBAR" + Me.buchungenAMBAR.Size = New System.Drawing.Size(129, 24) + Me.buchungenAMBAR.TabIndex = 89 + Me.buchungenAMBAR.Text = "AMB GU --> Syska" + Me.buchungenAMBAR.UseVisualStyleBackColor = True + ' + 'PictureBox23 + ' + Me.PictureBox23.BackgroundImage = CType(resources.GetObject("PictureBox23.BackgroundImage"), System.Drawing.Image) + Me.PictureBox23.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox23.Location = New System.Drawing.Point(104, 210) + Me.PictureBox23.Name = "PictureBox23" + Me.PictureBox23.Size = New System.Drawing.Size(18, 18) + Me.PictureBox23.TabIndex = 88 + Me.PictureBox23.TabStop = False + Me.PictureBox23.Visible = False + ' + 'Label27 + ' + Me.Label27.AutoSize = True + Me.Label27.Location = New System.Drawing.Point(181, 211) + Me.Label27.Name = "Label27" + Me.Label27.Size = New System.Drawing.Size(71, 13) + Me.Label27.TabIndex = 87 + Me.Label27.Text = "älter als Tage" + ' + 'MyTextBox3 + ' + Me.MyTextBox3._DateTimeOnly = False + Me.MyTextBox3._numbersOnly = True + Me.MyTextBox3._numbersOnlyKommastellen = "" + Me.MyTextBox3._numbersOnlyTrennzeichen = True + Me.MyTextBox3._Prozent = False + Me.MyTextBox3._ShortDateNew = False + Me.MyTextBox3._ShortDateOnly = False + Me.MyTextBox3._TimeOnly = False + Me.MyTextBox3._TimeOnly_Seconds = False + Me.MyTextBox3._value = "" + Me.MyTextBox3._Waehrung = False + Me.MyTextBox3._WaehrungZeichen = True + Me.MyTextBox3.ForeColor = System.Drawing.Color.Red + Me.MyTextBox3.Location = New System.Drawing.Point(127, 208) + Me.MyTextBox3.MaxLineLength = -1 + Me.MyTextBox3.MaxLines_Warning = "" + Me.MyTextBox3.MaxLines_Warning_Label = Nothing + Me.MyTextBox3.Name = "MyTextBox3" + Me.MyTextBox3.Size = New System.Drawing.Size(53, 20) + Me.MyTextBox3.TabIndex = 86 + ' + 'LinkLabel51 + ' + Me.LinkLabel51.AutoSize = True + Me.LinkLabel51.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.LinkLabel51.Location = New System.Drawing.Point(17, 211) + Me.LinkLabel51.Name = "LinkLabel51" + Me.LinkLabel51.Size = New System.Drawing.Size(88, 13) + Me.LinkLabel51.TabIndex = 85 + Me.LinkLabel51.TabStop = True + Me.LinkLabel51.Text = "alte Chats inaktiv" + ' 'PictureBox22 ' Me.PictureBox22.BackgroundImage = CType(resources.GetObject("PictureBox22.BackgroundImage"), System.Drawing.Image) Me.PictureBox22.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox22.Location = New System.Drawing.Point(830, 344) + Me.PictureBox22.Location = New System.Drawing.Point(676, 431) Me.PictureBox22.Name = "PictureBox22" Me.PictureBox22.Size = New System.Drawing.Size(18, 18) Me.PictureBox22.TabIndex = 84 @@ -342,7 +410,7 @@ Partial Class frmStartOptions Me.Button22.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button22.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.Button22.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button22.Location = New System.Drawing.Point(718, 342) + Me.Button22.Location = New System.Drawing.Point(564, 429) Me.Button22.Name = "Button22" Me.Button22.Size = New System.Drawing.Size(105, 24) Me.Button22.TabIndex = 78 @@ -543,7 +611,7 @@ Partial Class frmStartOptions Me.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button13.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.Button13.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button13.Location = New System.Drawing.Point(509, 344) + Me.Button13.Location = New System.Drawing.Point(564, 370) Me.Button13.Name = "Button13" Me.Button13.Size = New System.Drawing.Size(197, 22) Me.Button13.TabIndex = 61 @@ -555,7 +623,7 @@ Partial Class frmStartOptions Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button12.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.Button12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button12.Location = New System.Drawing.Point(509, 321) + Me.Button12.Location = New System.Drawing.Point(564, 347) Me.Button12.Name = "Button12" Me.Button12.Size = New System.Drawing.Size(197, 22) Me.Button12.TabIndex = 60 @@ -566,7 +634,7 @@ Partial Class frmStartOptions ' Me.cbxSyskaWdh.AutoSize = True Me.cbxSyskaWdh.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxSyskaWdh.Location = New System.Drawing.Point(559, 297) + Me.cbxSyskaWdh.Location = New System.Drawing.Point(564, 320) Me.cbxSyskaWdh.Name = "cbxSyskaWdh" Me.cbxSyskaWdh.Size = New System.Drawing.Size(124, 17) Me.cbxSyskaWdh.TabIndex = 59 @@ -588,7 +656,7 @@ Partial Class frmStartOptions Me.txtSyskaWdhDateiname._Waehrung = False Me.txtSyskaWdhDateiname._WaehrungZeichen = True Me.txtSyskaWdhDateiname.ForeColor = System.Drawing.Color.Black - Me.txtSyskaWdhDateiname.Location = New System.Drawing.Point(687, 295) + Me.txtSyskaWdhDateiname.Location = New System.Drawing.Point(692, 318) Me.txtSyskaWdhDateiname.MaxLength = 50 Me.txtSyskaWdhDateiname.MaxLineLength = -1 Me.txtSyskaWdhDateiname.MaxLines_Warning = "" @@ -602,7 +670,7 @@ Partial Class frmStartOptions Me.Button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button10.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.Button10.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button10.Location = New System.Drawing.Point(509, 375) + Me.Button10.Location = New System.Drawing.Point(564, 401) Me.Button10.Name = "Button10" Me.Button10.Size = New System.Drawing.Size(197, 22) Me.Button10.TabIndex = 57 @@ -661,7 +729,7 @@ Partial Class frmStartOptions Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button6.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.Button6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button6.Location = New System.Drawing.Point(687, 253) + Me.Button6.Location = New System.Drawing.Point(692, 276) Me.Button6.Name = "Button6" Me.Button6.Size = New System.Drawing.Size(136, 24) Me.Button6.TabIndex = 53 @@ -674,7 +742,7 @@ Partial Class frmStartOptions Me.CheckBox6.Checked = True Me.CheckBox6.CheckState = System.Windows.Forms.CheckState.Checked Me.CheckBox6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CheckBox6.Location = New System.Drawing.Point(745, 280) + Me.CheckBox6.Location = New System.Drawing.Point(750, 303) Me.CheckBox6.Name = "CheckBox6" Me.CheckBox6.Size = New System.Drawing.Size(79, 17) Me.CheckBox6.TabIndex = 52 @@ -686,7 +754,7 @@ Partial Class frmStartOptions Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button7.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.Button7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button7.Location = New System.Drawing.Point(559, 253) + Me.Button7.Location = New System.Drawing.Point(564, 276) Me.Button7.Name = "Button7" Me.Button7.Size = New System.Drawing.Size(129, 24) Me.Button7.TabIndex = 49 @@ -699,7 +767,7 @@ Partial Class frmStartOptions Me.cboSYSKAFirma._allowFreiText = False Me.cboSYSKAFirma._value = "" Me.cboSYSKAFirma.FormattingEnabled = True - Me.cboSYSKAFirma.Location = New System.Drawing.Point(559, 276) + Me.cboSYSKAFirma.Location = New System.Drawing.Point(564, 299) Me.cboSYSKAFirma.Name = "cboSYSKAFirma" Me.cboSYSKAFirma.Size = New System.Drawing.Size(129, 21) Me.cboSYSKAFirma.TabIndex = 51 @@ -708,7 +776,7 @@ Partial Class frmStartOptions ' Me.CheckBox7.AutoSize = True Me.CheckBox7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CheckBox7.Location = New System.Drawing.Point(690, 280) + Me.CheckBox7.Location = New System.Drawing.Point(695, 303) Me.CheckBox7.Name = "CheckBox7" Me.CheckBox7.Size = New System.Drawing.Size(56, 17) Me.CheckBox7.TabIndex = 50 @@ -845,7 +913,7 @@ Partial Class frmStartOptions Me.tbcntr.Controls.Add(Me.TabPage3) Me.tbcntr.Controls.Add(Me.TabPage4) Me.tbcntr.Dock = System.Windows.Forms.DockStyle.Bottom - Me.tbcntr.Location = New System.Drawing.Point(0, 404) + Me.tbcntr.Location = New System.Drawing.Point(0, 525) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 Me.tbcntr.Size = New System.Drawing.Size(859, 421) @@ -1473,6 +1541,8 @@ Partial Class frmStartOptions Me.TabPage2.Controls.Add(Me.Label7) Me.TabPage2.Controls.Add(Me.LinkLabel27) Me.TabPage2.Controls.Add(Me.Label6) + Me.TabPage2.Controls.Add(Me.PictureBox15) + Me.TabPage2.Controls.Add(Me.PictureBox14) Me.TabPage2.Controls.Add(Me.dgvMRN) Me.TabPage2.Controls.Add(Me.txtVRGOut_MRN) Me.TabPage2.Controls.Add(Me.txtVRGOut_FilialenNr) @@ -1481,8 +1551,6 @@ Partial Class frmStartOptions Me.TabPage2.Controls.Add(Me.txtVRGOutEZA_BezugsNr) Me.TabPage2.Controls.Add(Me.MyComboBox1) Me.TabPage2.Controls.Add(Me.txtVRGOut_BezugsNr) - Me.TabPage2.Controls.Add(Me.PictureBox15) - Me.TabPage2.Controls.Add(Me.PictureBox14) Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) @@ -1704,6 +1772,28 @@ Partial Class frmStartOptions Me.Label6.TabIndex = 0 Me.Label6.Text = "VERAG IN" ' + 'PictureBox15 + ' + Me.PictureBox15.BackgroundImage = CType(resources.GetObject("PictureBox15.BackgroundImage"), System.Drawing.Image) + Me.PictureBox15.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox15.Location = New System.Drawing.Point(596, 255) + Me.PictureBox15.Name = "PictureBox15" + Me.PictureBox15.Size = New System.Drawing.Size(18, 18) + Me.PictureBox15.TabIndex = 67 + Me.PictureBox15.TabStop = False + Me.PictureBox15.Visible = False + ' + 'PictureBox14 + ' + Me.PictureBox14.BackgroundImage = CType(resources.GetObject("PictureBox14.BackgroundImage"), System.Drawing.Image) + Me.PictureBox14.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox14.Location = New System.Drawing.Point(596, 65) + Me.PictureBox14.Name = "PictureBox14" + Me.PictureBox14.Size = New System.Drawing.Size(18, 18) + Me.PictureBox14.TabIndex = 56 + Me.PictureBox14.TabStop = False + Me.PictureBox14.Visible = False + ' 'dgvMRN ' Me.dgvMRN.AKTUALISIERUNGS_INTERVALL = -1 @@ -1863,28 +1953,6 @@ Partial Class frmStartOptions Me.txtVRGOut_BezugsNr.Size = New System.Drawing.Size(153, 20) Me.txtVRGOut_BezugsNr.TabIndex = 5 ' - 'PictureBox15 - ' - Me.PictureBox15.BackgroundImage = CType(resources.GetObject("PictureBox15.BackgroundImage"), System.Drawing.Image) - Me.PictureBox15.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox15.Location = New System.Drawing.Point(596, 255) - Me.PictureBox15.Name = "PictureBox15" - Me.PictureBox15.Size = New System.Drawing.Size(18, 18) - Me.PictureBox15.TabIndex = 67 - Me.PictureBox15.TabStop = False - Me.PictureBox15.Visible = False - ' - 'PictureBox14 - ' - Me.PictureBox14.BackgroundImage = CType(resources.GetObject("PictureBox14.BackgroundImage"), System.Drawing.Image) - Me.PictureBox14.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox14.Location = New System.Drawing.Point(596, 65) - Me.PictureBox14.Name = "PictureBox14" - Me.PictureBox14.Size = New System.Drawing.Size(18, 18) - Me.PictureBox14.TabIndex = 56 - Me.PictureBox14.TabStop = False - Me.PictureBox14.Visible = False - ' 'TabPage3 ' Me.TabPage3.Controls.Add(Me.LinkLabel50) @@ -2047,8 +2115,6 @@ Partial Class frmStartOptions ' Me.TabPage4.Controls.Add(Me.LinkLabel49) Me.TabPage4.Controls.Add(Me.Label25) - Me.TabPage4.Controls.Add(Me.txtTBLNr) - Me.TabPage4.Controls.Add(Me.txtTWLNr) Me.TabPage4.Controls.Add(Me.cbxTestFTP) Me.TabPage4.Controls.Add(Me.cbxTestsystem) Me.TabPage4.Controls.Add(Me.PictureBox21) @@ -2062,6 +2128,8 @@ Partial Class frmStartOptions Me.TabPage4.Controls.Add(Me.LinkLabel43) Me.TabPage4.Controls.Add(Me.LinkLabel44) Me.TabPage4.Controls.Add(Me.Label24) + Me.TabPage4.Controls.Add(Me.txtTBLNr) + Me.TabPage4.Controls.Add(Me.txtTWLNr) Me.TabPage4.Location = New System.Drawing.Point(4, 22) Me.TabPage4.Name = "TabPage4" Me.TabPage4.Size = New System.Drawing.Size(851, 395) @@ -2089,54 +2157,6 @@ Partial Class frmStartOptions Me.Label25.TabIndex = 78 Me.Label25.Text = "lfd Nr" ' - 'txtTBLNr - ' - Me.txtTBLNr._DateTimeOnly = False - Me.txtTBLNr._numbersOnly = True - Me.txtTBLNr._numbersOnlyKommastellen = "" - Me.txtTBLNr._numbersOnlyTrennzeichen = False - Me.txtTBLNr._Prozent = False - Me.txtTBLNr._ShortDateNew = False - Me.txtTBLNr._ShortDateOnly = False - Me.txtTBLNr._TimeOnly = False - Me.txtTBLNr._TimeOnly_Seconds = False - Me.txtTBLNr._value = "" - Me.txtTBLNr._Waehrung = False - Me.txtTBLNr._WaehrungZeichen = True - Me.txtTBLNr.ForeColor = System.Drawing.Color.Red - Me.txtTBLNr.Location = New System.Drawing.Point(166, 250) - Me.txtTBLNr.MaxLineLength = -1 - Me.txtTBLNr.MaxLines_Warning = "" - Me.txtTBLNr.MaxLines_Warning_Label = Nothing - Me.txtTBLNr.Name = "txtTBLNr" - Me.txtTBLNr.ReadOnly = True - Me.txtTBLNr.Size = New System.Drawing.Size(53, 20) - Me.txtTBLNr.TabIndex = 79 - ' - 'txtTWLNr - ' - Me.txtTWLNr._DateTimeOnly = False - Me.txtTWLNr._numbersOnly = True - Me.txtTWLNr._numbersOnlyKommastellen = "" - Me.txtTWLNr._numbersOnlyTrennzeichen = False - Me.txtTWLNr._Prozent = False - Me.txtTWLNr._ShortDateNew = False - Me.txtTWLNr._ShortDateOnly = False - Me.txtTWLNr._TimeOnly = False - Me.txtTWLNr._TimeOnly_Seconds = False - Me.txtTWLNr._value = "" - Me.txtTWLNr._Waehrung = False - Me.txtTWLNr._WaehrungZeichen = True - Me.txtTWLNr.ForeColor = System.Drawing.Color.Red - Me.txtTWLNr.Location = New System.Drawing.Point(166, 222) - Me.txtTWLNr.MaxLineLength = -1 - Me.txtTWLNr.MaxLines_Warning = "" - Me.txtTWLNr.MaxLines_Warning_Label = Nothing - Me.txtTWLNr.Name = "txtTWLNr" - Me.txtTWLNr.ReadOnly = True - Me.txtTWLNr.Size = New System.Drawing.Size(53, 20) - Me.txtTWLNr.TabIndex = 78 - ' 'cbxTestFTP ' Me.cbxTestFTP.AutoSize = True @@ -2281,6 +2301,54 @@ Partial Class frmStartOptions Me.Label24.TabIndex = 30 Me.Label24.Text = "Import" ' + 'txtTBLNr + ' + Me.txtTBLNr._DateTimeOnly = False + Me.txtTBLNr._numbersOnly = True + Me.txtTBLNr._numbersOnlyKommastellen = "" + Me.txtTBLNr._numbersOnlyTrennzeichen = False + Me.txtTBLNr._Prozent = False + Me.txtTBLNr._ShortDateNew = False + Me.txtTBLNr._ShortDateOnly = False + Me.txtTBLNr._TimeOnly = False + Me.txtTBLNr._TimeOnly_Seconds = False + Me.txtTBLNr._value = "" + Me.txtTBLNr._Waehrung = False + Me.txtTBLNr._WaehrungZeichen = True + Me.txtTBLNr.ForeColor = System.Drawing.Color.Red + Me.txtTBLNr.Location = New System.Drawing.Point(166, 250) + Me.txtTBLNr.MaxLineLength = -1 + Me.txtTBLNr.MaxLines_Warning = "" + Me.txtTBLNr.MaxLines_Warning_Label = Nothing + Me.txtTBLNr.Name = "txtTBLNr" + Me.txtTBLNr.ReadOnly = True + Me.txtTBLNr.Size = New System.Drawing.Size(53, 20) + Me.txtTBLNr.TabIndex = 79 + ' + 'txtTWLNr + ' + Me.txtTWLNr._DateTimeOnly = False + Me.txtTWLNr._numbersOnly = True + Me.txtTWLNr._numbersOnlyKommastellen = "" + Me.txtTWLNr._numbersOnlyTrennzeichen = False + Me.txtTWLNr._Prozent = False + Me.txtTWLNr._ShortDateNew = False + Me.txtTWLNr._ShortDateOnly = False + Me.txtTWLNr._TimeOnly = False + Me.txtTWLNr._TimeOnly_Seconds = False + Me.txtTWLNr._value = "" + Me.txtTWLNr._Waehrung = False + Me.txtTWLNr._WaehrungZeichen = True + Me.txtTWLNr.ForeColor = System.Drawing.Color.Red + Me.txtTWLNr.Location = New System.Drawing.Point(166, 222) + Me.txtTWLNr.MaxLineLength = -1 + Me.txtTWLNr.MaxLines_Warning = "" + Me.txtTWLNr.MaxLines_Warning_Label = Nothing + Me.txtTWLNr.Name = "txtTWLNr" + Me.txtTWLNr.ReadOnly = True + Me.txtTWLNr.Size = New System.Drawing.Size(53, 20) + Me.txtTWLNr.TabIndex = 78 + ' 'CheckBox2 ' Me.CheckBox2.AutoSize = True @@ -2587,66 +2655,12 @@ Partial Class frmStartOptions Me.Button21.Text = "AAS Sendung 24h" Me.Button21.UseVisualStyleBackColor = True ' - 'Label27 - ' - Me.Label27.AutoSize = True - Me.Label27.Location = New System.Drawing.Point(181, 211) - Me.Label27.Name = "Label27" - Me.Label27.Size = New System.Drawing.Size(71, 13) - Me.Label27.TabIndex = 87 - Me.Label27.Text = "älter als Tage" - ' - 'MyTextBox3 - ' - Me.MyTextBox3._DateTimeOnly = False - Me.MyTextBox3._numbersOnly = True - Me.MyTextBox3._numbersOnlyKommastellen = "" - Me.MyTextBox3._numbersOnlyTrennzeichen = True - Me.MyTextBox3._Prozent = False - Me.MyTextBox3._ShortDateNew = False - Me.MyTextBox3._ShortDateOnly = False - Me.MyTextBox3._TimeOnly = False - Me.MyTextBox3._TimeOnly_Seconds = False - Me.MyTextBox3._value = "" - Me.MyTextBox3._Waehrung = False - Me.MyTextBox3._WaehrungZeichen = True - Me.MyTextBox3.ForeColor = System.Drawing.Color.Red - Me.MyTextBox3.Location = New System.Drawing.Point(127, 208) - Me.MyTextBox3.MaxLineLength = -1 - Me.MyTextBox3.MaxLines_Warning = "" - Me.MyTextBox3.MaxLines_Warning_Label = Nothing - Me.MyTextBox3.Name = "MyTextBox3" - Me.MyTextBox3.Size = New System.Drawing.Size(53, 20) - Me.MyTextBox3.TabIndex = 86 - ' - 'LinkLabel51 - ' - Me.LinkLabel51.AutoSize = True - Me.LinkLabel51.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel51.Location = New System.Drawing.Point(17, 211) - Me.LinkLabel51.Name = "LinkLabel51" - Me.LinkLabel51.Size = New System.Drawing.Size(88, 13) - Me.LinkLabel51.TabIndex = 85 - Me.LinkLabel51.TabStop = True - Me.LinkLabel51.Text = "alte Chats inaktiv" - ' - 'PictureBox23 - ' - Me.PictureBox23.BackgroundImage = CType(resources.GetObject("PictureBox23.BackgroundImage"), System.Drawing.Image) - Me.PictureBox23.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox23.Location = New System.Drawing.Point(104, 210) - Me.PictureBox23.Name = "PictureBox23" - Me.PictureBox23.Size = New System.Drawing.Size(18, 18) - Me.PictureBox23.TabIndex = 88 - Me.PictureBox23.TabStop = False - Me.PictureBox23.Visible = False - ' 'frmStartOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(861, 827) + Me.ClientSize = New System.Drawing.Size(861, 948) Me.Controls.Add(Me.pnl) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) @@ -2656,6 +2670,7 @@ Partial Class frmStartOptions Me.WindowState = System.Windows.Forms.FormWindowState.Minimized Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() + CType(Me.PictureBox23, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox22, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).EndInit() Me.tbcntr.ResumeLayout(False) @@ -2677,9 +2692,9 @@ Partial Class frmStartOptions CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPage2.ResumeLayout(False) Me.TabPage2.PerformLayout() - CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox15, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox14, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPage3.ResumeLayout(False) Me.TabPage3.PerformLayout() Me.TabPage4.ResumeLayout(False) @@ -2691,7 +2706,6 @@ Partial Class frmStartOptions CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBox23, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -2881,4 +2895,5 @@ Partial Class frmStartOptions Friend WithEvents Label27 As Label Friend WithEvents MyTextBox3 As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents LinkLabel51 As LinkLabel + Friend WithEvents buchungenAMBAR As Button End Class diff --git a/initATLASAufschubkonten/frmStartOptions.resx b/initATLASAufschubkonten/frmStartOptions.resx index 71b5714..8d1e514 100644 --- a/initATLASAufschubkonten/frmStartOptions.resx +++ b/initATLASAufschubkonten/frmStartOptions.resx @@ -526,9 +526,6 @@ CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - True - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj @@ -577,6 +574,9 @@ CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + True + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 132d58f..cc04719 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -96,7 +96,7 @@ Public Class frmStartOptions 'doIDSPlatts() 'Exit Sub - 'PARAM="" + 'PARAM = "AMBAR_VERAG_BUCHUNGEN" 'Standart-Errorverhalten ist MAIL VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL If PARAM <> "" Then @@ -512,6 +512,13 @@ Public Class frmStartOptions If DELETE_Kundenumsaetze(lastyears) Then INSERT_Kundenumsaetze(lastyears) End If + + Case "AMBAR_VERAG_BUCHUNGEN" + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + Dim f As New frmInfo(PARAM) + f.Show() + VERAG_PROG_ALLGEMEIN.cSyska_Interface.genDatensatz_Buchungen(24,, "", True) + closeMe() '------------------------------ Case Else 'Nur bei manuellem Start wird der fehler ausgegeben @@ -3154,7 +3161,7 @@ Public Class frmStartOptions Private Sub LinkLabel20_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel20.LinkClicked VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False - Dim bool = getUID_Pruefung(MyTextBox1.Text, "VERAG", "UID Prüfung VERAG", "as@verag.ag;ih@verag.ag;kb@verag.ag", "al@verag.ag",, MyTextBox2._value, cbxVermerk.Checked) + Dim bool = getUID_Pruefung(MyTextBox1.Text, "VERAG", "UID Prüfung VERAG", "as@verag.ag;ih@verag.ag;kb@verag.ag", "al@verag.ag;d.breimaier@verag.ag",, MyTextBox2._value, cbxVermerk.Checked) 'bool = getUID_Pruefung(MyTextBox1.Text, "VERAG", "UID Prüfung VERAG", "d.breimaier@verag.ag",,, MyTextBox2._value, cbxVermerk.Checked) 'Dim bool = getUID_PruefungVERAG(MyTextBox1.Text) showPic(bool, PictureBox12) @@ -3671,17 +3678,28 @@ Public Class frmStartOptions End Try End Function - Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click + Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click, buchungenAMBAR.Click If cbxSyskaWdh.Checked And txtSyskaWdhDateiname.Text = "" Then MsgBox("Dateiname angeben!") : Exit Sub End If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox6.Checked 'False - If cboSYSKAFirma._value = "" Then - VERAG_PROG_ALLGEMEIN.cSyska_Interface.genDatensatz_ALL(CheckBox7.Checked, False, If(cbxSyskaWdh.Checked, txtSyskaWdhDateiname.Text, "")) - Else - VERAG_PROG_ALLGEMEIN.cSyska_Interface.genDatensatz_Buchungen(cboSYSKAFirma._value, CheckBox7.Checked, If(cbxSyskaWdh.Checked, txtSyskaWdhDateiname.Text, "")) - End If + + Select Case sender.name + Case "Button7" ' + If cboSYSKAFirma._value = "" Then + VERAG_PROG_ALLGEMEIN.cSyska_Interface.genDatensatz_ALL(CheckBox7.Checked, False, If(cbxSyskaWdh.Checked, txtSyskaWdhDateiname.Text, "")) + Else + VERAG_PROG_ALLGEMEIN.cSyska_Interface.genDatensatz_Buchungen(cboSYSKAFirma._value, CheckBox7.Checked, If(cbxSyskaWdh.Checked, txtSyskaWdhDateiname.Text, "")) + End If + + Case "buchungenAMBAR" + VERAG_PROG_ALLGEMEIN.cSyska_Interface.genDatensatz_Buchungen(24, CheckBox7.Checked, If(cbxSyskaWdh.Checked, txtSyskaWdhDateiname.Text, ""), True) + End Select + + + + End Sub Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click @@ -4325,10 +4343,11 @@ Public Class frmStartOptions End Sub Private Sub LinkLabel51_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel51.LinkClicked - + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False Dim CHAT As New cMessenger.cMessenger_Chat - showPic(CHAT.setOldChatsInactiv(MyTextBox3.Text), PictureBox23) End Sub + + End Class \ No newline at end of file