diff --git a/SDL/Fakturierung/cAutomailversand.vb b/SDL/Fakturierung/cAutomailversand.vb index b315795f..a3fce594 100644 --- a/SDL/Fakturierung/cAutomailversand.vb +++ b/SDL/Fakturierung/cAutomailversand.vb @@ -106,10 +106,13 @@ Public Class cAutomailversand End If 'TODO: nach TEST deaktivieren! - If True Then - MailTo = "d.breimaier@verag.ag" + If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then + MailTo = "" MailtoCC = "" - MailtoBCC = "" + MailtoBCC = "mmdabrechnung@verag.ag" + + Else + MailtoBCC = "mmdabrechnung@verag.ag" End If @@ -326,7 +329,7 @@ Public Class cAutomailversand Next - If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, EMail_subject, EMail_HTML, "noreply@verag.ag", False, False, EMails_CC, EMails_BCC, attachList) Then + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, EMail_subject, EMail_HTML, "mmdabrechnung@verag.ag", False, False, EMails_CC, EMails_BCC, attachList) Then API.UPDTAE_OK() mailcreated = True Else diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 01ca297a..a7884f1c 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/USTV/usrCntlUSTV.Designer.vb b/SDL/USTV/usrCntlUSTV.Designer.vb index 15f4e73e..6b637879 100644 --- a/SDL/USTV/usrCntlUSTV.Designer.vb +++ b/SDL/USTV/usrCntlUSTV.Designer.vb @@ -71,6 +71,7 @@ Partial Class usrCntlUSTV Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.btnWikiStatusmails = New System.Windows.Forms.Button() CType(Me.dgvUSTV, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.Panel2.SuspendLayout() @@ -118,6 +119,7 @@ Partial Class usrCntlUSTV 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.Panel1.Controls.Add(Me.btnWikiStatusmails) Me.Panel1.Controls.Add(Me.lblVZhint) Me.Panel1.Controls.Add(Me.lblVZKunde) Me.Panel1.Controls.Add(Me.txtRisiko) @@ -782,6 +784,18 @@ Partial Class usrCntlUSTV Me.ContextMenuStrip3.Name = "ContextMenuStrip1" Me.ContextMenuStrip3.Size = New System.Drawing.Size(61, 4) ' + 'btnWikiStatusmails + ' + Me.btnWikiStatusmails.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen + Me.btnWikiStatusmails.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnWikiStatusmails.FlatAppearance.BorderSize = 0 + Me.btnWikiStatusmails.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnWikiStatusmails.Location = New System.Drawing.Point(65, 6) + Me.btnWikiStatusmails.Name = "btnWikiStatusmails" + Me.btnWikiStatusmails.Size = New System.Drawing.Size(25, 20) + Me.btnWikiStatusmails.TabIndex = 71 + Me.btnWikiStatusmails.UseVisualStyleBackColor = True + ' 'usrCntlUSTV ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -847,4 +861,5 @@ Partial Class usrCntlUSTV Friend WithEvents lblVZhint As Label Friend WithEvents lblVZKunde As Label Friend WithEvents ContextMenuStrip3 As ContextMenuStrip + Friend WithEvents btnWikiStatusmails As Button End Class diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index e447be26..396b9c6b 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -43,7 +43,7 @@ Public Class usrCntlUSTV End If End If - .SET_SQL("SELECT " & topMax & " [UStVAn_ID],UStVAn_AntragArt,[UStVAn_KuNr],[UStVAn_Name],LandKz, UStVAn_BezugsNr, [UStVAn_ReDatVon], [UStVAn_ReDatBis] ,UStVAn_AntragEingereichtAm,[UStVAn_3470] ,[UStVAn_Währungscode],[UStVAn_USteuerbetrag],[UStVAn_Erstattungsbetrag],([UStVAn_USteuerbetrag] - [UStVAn_Erstattungsbetrag]) as UStVAn_Differenzbetrag,[UStVAn_USteuerbetragEUR],[UStVAn_ErstattungsbetragEUR],([UStVAn_USteuerbetragEUR] - [UStVAn_ErstattungsbetragEUR]) as UStVAn_DifferenzbetragEUR,[UStVAn_VZBetrag],[UStVAn_VZDatum],[UStVAn_Sachbearbeiter] + .SET_SQL("SELECT " & topMax & " [UStVAn_ID],UStVAn_AntragArt,[UStVAn_KuNr],[UStVAn_Name],[UStVAn_LandKz],LandKz, UStVAn_BezugsNr, [UStVAn_ReDatVon], [UStVAn_ReDatBis] ,UStVAn_AntragEingereichtAm,[UStVAn_3470] ,[UStVAn_Währungscode],[UStVAn_USteuerbetrag],[UStVAn_Erstattungsbetrag],([UStVAn_USteuerbetrag] - [UStVAn_Erstattungsbetrag]) as UStVAn_Differenzbetrag,[UStVAn_USteuerbetragEUR],[UStVAn_ErstattungsbetragEUR],([UStVAn_USteuerbetragEUR] - [UStVAn_ErstattungsbetragEUR]) as UStVAn_DifferenzbetragEUR,[UStVAn_VZBetrag],[UStVAn_VZDatum],[UStVAn_Sachbearbeiter] FROM [tblUStVAntrag] inner join [Länderverzeichnis für die Außenhandelsstatistik] on UStVAn_LandNr=Landnr where 1=1 " & getWhere() & " order by UStVAn_KuNr,UStVAn_Name,datepart(year,[UStVAn_ReDatVon] ) desc,LandKz,[UStVAn_ReDatVon] desc", "FMZOLL") @@ -74,12 +74,14 @@ Public Class usrCntlUSTV .Columns("UStVAn_KuNr").HeaderText = "KundenNr" .Columns("UStVAn_Name").MinimumWidth = 70 - .Columns("UStVAn_Name").HeaderText = "Firma" .Columns("UStVAn_Name").Width = 200 ' .Columns("UStVAn_Name").MinimumWidth = 150 ' .Columns("UStVAn_Name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("UStVAn_LandKz").HeaderText = "Land" + .Columns("UStVAn_LandKz").Width = 60 + .Columns("LandKz").Width = 60 .Columns("UStVAn_ReDatVon").HeaderText = "Von" @@ -1242,5 +1244,12 @@ Public Class usrCntlUSTV + End Sub + + Private Sub btnWikiStatusmails_Click(sender As Object, e As EventArgs) Handles btnWikiStatusmails.Click + + Dim webAddress As String = "https://wiki.verag.ag/software/sdl/ustva" + Process.Start(webAddress) + End Sub End Class diff --git a/SDL/kunden/usrCntlKundenAvisoMailBenachrichtigung.Designer.vb b/SDL/kunden/usrCntlKundenAvisoMailBenachrichtigung.Designer.vb index 66a84066..fdcff50e 100644 --- a/SDL/kunden/usrCntlKundenAvisoMailBenachrichtigung.Designer.vb +++ b/SDL/kunden/usrCntlKundenAvisoMailBenachrichtigung.Designer.vb @@ -371,7 +371,6 @@ Partial Class usrCntlKundenAvisoMailBenachrichtigung Me.btnWikiStatusmails.Size = New System.Drawing.Size(25, 20) Me.btnWikiStatusmails.TabIndex = 70 Me.btnWikiStatusmails.UseVisualStyleBackColor = True - Me.btnWikiStatusmails.Visible = False ' 'usrCntlKundenAvisoMailBenachrichtigung ' diff --git a/SDL/seriendruck/usrCntlFakturierung.Designer.vb b/SDL/seriendruck/usrCntlFakturierung.Designer.vb index c2c7f2e1..cb6ea5e3 100644 --- a/SDL/seriendruck/usrCntlFakturierung.Designer.vb +++ b/SDL/seriendruck/usrCntlFakturierung.Designer.vb @@ -46,6 +46,12 @@ Partial Class usrcntlFakturierung Me.Button18 = New System.Windows.Forms.Button() Me.Label44 = New System.Windows.Forms.Label() Me.GBSammelrechnung = New System.Windows.Forms.GroupBox() + Me.Label9 = New System.Windows.Forms.Label() + Me.Label8 = New System.Windows.Forms.Label() + Me.PictureBox9 = New System.Windows.Forms.PictureBox() + Me.cbxStatusAUTOMAIL = New System.Windows.Forms.CheckBox() + Me.Label7 = New System.Windows.Forms.Label() + Me.Label6 = New System.Windows.Forms.Label() Me.btnAbfdruck = New System.Windows.Forms.Button() Me.btnREJdruck = New System.Windows.Forms.Button() Me.PictureBox8 = New System.Windows.Forms.PictureBox() @@ -87,16 +93,12 @@ Partial Class usrcntlFakturierung Me.Label45 = New System.Windows.Forms.Label() Me.btnRePos = New System.Windows.Forms.Button() Me.Validation1 = New SDL.EORI.validation() - Me.Label6 = New System.Windows.Forms.Label() - Me.Label7 = New System.Windows.Forms.Label() - Me.cbxStatusAUTOMAIL = New System.Windows.Forms.CheckBox() - Me.PictureBox9 = New System.Windows.Forms.PictureBox() - Me.Label8 = New System.Windows.Forms.Label() - Me.Label9 = New System.Windows.Forms.Label() + Me.btnWikiStatusmails = New System.Windows.Forms.Button() Me.GroupBox1.SuspendLayout() Me.GBMautberichte.SuspendLayout() CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit() Me.GBSammelrechnung.SuspendLayout() + CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit() @@ -105,7 +107,6 @@ Partial Class usrcntlFakturierung CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'GroupBox1 @@ -389,6 +390,59 @@ Partial Class usrcntlFakturierung Me.GBSammelrechnung.TabIndex = 14 Me.GBSammelrechnung.TabStop = False ' + 'Label9 + ' + Me.Label9.Location = New System.Drawing.Point(13, 307) + Me.Label9.Name = "Label9" + Me.Label9.Size = New System.Drawing.Size(149, 19) + Me.Label9.TabIndex = 121 + Me.Label9.Text = "* wird im Nachtlauf versendet!" + ' + 'Label8 + ' + Me.Label8.Location = New System.Drawing.Point(168, 230) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(151, 16) + Me.Label8.TabIndex = 120 + Me.Label8.Text = "3. Status Autoversand setzen" + ' + 'PictureBox9 + ' + Me.PictureBox9.BackgroundImage = Global.SDL.My.Resources.Resources.ok + Me.PictureBox9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox9.Location = New System.Drawing.Point(148, 230) + Me.PictureBox9.Name = "PictureBox9" + Me.PictureBox9.Size = New System.Drawing.Size(14, 14) + Me.PictureBox9.TabIndex = 119 + Me.PictureBox9.TabStop = False + Me.PictureBox9.Visible = False + ' + 'cbxStatusAUTOMAIL + ' + Me.cbxStatusAUTOMAIL.AutoSize = True + Me.cbxStatusAUTOMAIL.Location = New System.Drawing.Point(15, 287) + Me.cbxStatusAUTOMAIL.Name = "cbxStatusAUTOMAIL" + Me.cbxStatusAUTOMAIL.Size = New System.Drawing.Size(143, 17) + Me.cbxStatusAUTOMAIL.TabIndex = 118 + Me.cbxStatusAUTOMAIL.Text = "Email autom. versenden*" + Me.cbxStatusAUTOMAIL.UseVisualStyleBackColor = True + ' + 'Label7 + ' + Me.Label7.Location = New System.Drawing.Point(13, 265) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(48, 19) + Me.Label7.TabIndex = 117 + Me.Label7.Text = "AUTO:" + ' + 'Label6 + ' + Me.Label6.Location = New System.Drawing.Point(304, 265) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(48, 19) + Me.Label6.TabIndex = 116 + Me.Label6.Text = "Anzeige:" + ' 'btnAbfdruck ' Me.btnAbfdruck.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -816,64 +870,24 @@ Partial Class usrcntlFakturierung Me.Validation1.Url = "http://ec.europa.eu/taxation_customs/dds2/eos/validation/services/validation" Me.Validation1.UseDefaultCredentials = False ' - 'Label6 + 'btnWikiStatusmails ' - Me.Label6.Location = New System.Drawing.Point(304, 265) - Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(48, 19) - Me.Label6.TabIndex = 116 - Me.Label6.Text = "Anzeige:" - ' - 'Label7 - ' - Me.Label7.Location = New System.Drawing.Point(13, 265) - Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(48, 19) - Me.Label7.TabIndex = 117 - Me.Label7.Text = "AUTO:" - ' - 'cbxStatusAUTOMAIL - ' - Me.cbxStatusAUTOMAIL.AutoSize = True - Me.cbxStatusAUTOMAIL.Location = New System.Drawing.Point(15, 287) - Me.cbxStatusAUTOMAIL.Name = "cbxStatusAUTOMAIL" - Me.cbxStatusAUTOMAIL.Size = New System.Drawing.Size(143, 17) - Me.cbxStatusAUTOMAIL.TabIndex = 118 - Me.cbxStatusAUTOMAIL.Text = "Email autom. versenden*" - Me.cbxStatusAUTOMAIL.UseVisualStyleBackColor = True - ' - 'PictureBox9 - ' - Me.PictureBox9.BackgroundImage = Global.SDL.My.Resources.Resources.ok - Me.PictureBox9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox9.Location = New System.Drawing.Point(148, 230) - Me.PictureBox9.Name = "PictureBox9" - Me.PictureBox9.Size = New System.Drawing.Size(14, 14) - Me.PictureBox9.TabIndex = 119 - Me.PictureBox9.TabStop = False - Me.PictureBox9.Visible = False - ' - 'Label8 - ' - Me.Label8.Location = New System.Drawing.Point(168, 230) - Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(151, 16) - Me.Label8.TabIndex = 120 - Me.Label8.Text = "3. Status Autoversand setzen" - ' - 'Label9 - ' - Me.Label9.Location = New System.Drawing.Point(13, 307) - Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(149, 19) - Me.Label9.TabIndex = 121 - Me.Label9.Text = "* wird im Nachtlauf versendet!" + Me.btnWikiStatusmails.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen + Me.btnWikiStatusmails.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnWikiStatusmails.FlatAppearance.BorderSize = 0 + Me.btnWikiStatusmails.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnWikiStatusmails.Location = New System.Drawing.Point(121, 0) + Me.btnWikiStatusmails.Name = "btnWikiStatusmails" + Me.btnWikiStatusmails.Size = New System.Drawing.Size(25, 20) + Me.btnWikiStatusmails.TabIndex = 72 + Me.btnWikiStatusmails.UseVisualStyleBackColor = True ' 'usrcntlFakturierung ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White + Me.Controls.Add(Me.btnWikiStatusmails) Me.Controls.Add(Me.Label61) Me.Controls.Add(Me.GBMautberichte) Me.Controls.Add(Me.Label44) @@ -888,6 +902,7 @@ Partial Class usrcntlFakturierung CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit() Me.GBSammelrechnung.ResumeLayout(False) Me.GBSammelrechnung.PerformLayout() + CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit() @@ -896,7 +911,6 @@ Partial Class usrcntlFakturierung CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -970,4 +984,5 @@ Partial Class usrcntlFakturierung Friend WithEvents Label7 As Label Friend WithEvents Label6 As Label Friend WithEvents Label9 As Label + Friend WithEvents btnWikiStatusmails As Button End Class diff --git a/SDL/seriendruck/usrCntlFakturierung.vb b/SDL/seriendruck/usrCntlFakturierung.vb index 137ec858..34d35507 100644 --- a/SDL/seriendruck/usrCntlFakturierung.vb +++ b/SDL/seriendruck/usrCntlFakturierung.vb @@ -1995,5 +1995,8 @@ Public Class usrcntlFakturierung Return False End Function - + Private Sub btnWikiStatusmails_Click(sender As Object, e As EventArgs) Handles btnWikiStatusmails.Click + Dim webAddress As String = "https://wiki.verag.ag/software/sdl/sammelrechnung" + Process.Start(webAddress) + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb b/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb index 88eb32cb..bba20655 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb @@ -1391,7 +1391,7 @@ Public Class cUTA End Function - Public Shared Function UPDATE_ARCHIV(reDat As Date, reNr As Single, uta_kdNr As String, ustvaId As Integer) As Boolean + Public Shared Function UPDATE_ARCHIV(reDat As Date, reNr As String, uta_kdNr As String, ustvaId As Integer) As Boolean Try Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL