edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

Browse Source
This commit is contained in:
Andreas Luxbauer
2024-06-05 13:54:31 +02:00
parent 119dc1a6a2 2ac6eed7ae
commit 12a4d9f852
17 changed files with 277 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERAG_PROG_ALLGEMEIN/Classes/cFirmen.vb
View File

@@ -25,6 +25,7 @@ Public Class cFirmen
Property Firma_Telefon As Object = Nothing ' NVARCHAR (40) NULL,
Property Firma_Telefax As Object = Nothing ' NVARCHAR (40) NULL,
Property Firma_E_Mail As Object = Nothing ' NVARCHAR (40) NULL, -----
Property Firma_E_Mail_Mahnungen As Object = Nothing
Property Firma_Webadresse As Object = Nothing ' NVARCHAR (40) NULL,
Property Firma_LandKz As Object = Nothing ' NVARCHAR (40) NULL,
@@ -66,6 +67,7 @@ Public Class cFirmen
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_Telefon", Firma_Telefon))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_Telefax", Firma_Telefax))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_E-Mail", Firma_E_Mail, "Firma_E_Mail"))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_E_Mail_Mahnungen", Firma_E_Mail_Mahnungen, "Firma_E_Mail_Mahnungen"))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_Webadresse", Firma_Webadresse))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_LandKz", Firma_LandKz))

14
VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb
View File

@@ -163,11 +163,11 @@ Public Class cRMC
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand(" SELECT rmc_reDatum,[rmc_reNr],sum([rmc_betragNetto])[rmc_betragNetto],sum([rmc_betragMWST])[rmc_betragMWST] ,sum([rmc_betragBrutto] )[rmc_betragBrutto], [rmc_waehrung], sum([rmc_euroBrutto])[rmc_euroBrutto] FROM [tblRMCImport]
Using cmd As New SqlCommand(" SELECT rmc_reDatum,rmc_kdNr,[rmc_reNr],sum([rmc_betragNetto])[rmc_betragNetto],sum([rmc_betragMWST])[rmc_betragMWST] ,sum([rmc_betragBrutto] )[rmc_betragBrutto], [rmc_waehrung], sum([rmc_euroBrutto])[rmc_euroBrutto] FROM [tblRMCImport]
INNER JOIN Adressen as adr on rmc_kdNr=adr.[WölflKundenNr]
where cast(rmc_reDatum as date) between @von and @bis and AdressenNr=@AdressenNr
AND rmc_landKZ ='" & LandKZ & "'" & If(Archiv, " And rmc_archiv =@Archiv ", "") & "
group by rmc_reDatum,[rmc_reNr],[rmc_waehrung]
group by rmc_reDatum,rmc_kdNr,[rmc_reNr],[rmc_waehrung]
having sum([rmc_betragMWST])>0
order by rmc_reDatum", conn)
@@ -194,20 +194,20 @@ Public Class cRMC
End Function
Public Shared Function UPDATE_ARCHIV(von As Date, bis As Date, KundenNr As Integer) As Boolean
Public Shared Function UPDATE_ARCHIV(reDat As Date, reNr As Integer, rmc_kdNr As Integer) As Boolean
Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("von", von))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("bis", bis))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KundenNr", KundenNr))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("reDat", reDat))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("reNr", reNr))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_kdNr", rmc_kdNr))
Return SQL.doSQLVarList("
UPDATE [tblRMCImport] set rmc_archiv=1, [rmc_archiviertDatum]=GETDATE()
WHERE cast(rmc_reDatum as date) between @von and @bis and rmc_kdNr=@KundenNr
WHERE cast(rmc_reDatum as date) = @reDat and rmc_reNr = @reNr and rmc_kdNr=@rmc_kdNr
", "FMZOLL",, list)
Catch ex As Exception

13
VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb generated
View File

@@ -24,6 +24,7 @@ Partial Class frmMessenger
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
@@ -38,12 +39,12 @@ Partial Class frmMessenger
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMessenger))
Me.SplitContainer = New System.Windows.Forms.SplitContainer()
Me.SplitContainer2 = New System.Windows.Forms.SplitContainer()
Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.Panel6 = New System.Windows.Forms.Panel()
Me.Label3 = New System.Windows.Forms.Label()
Me.lblLKWChat_MsgCntInaktiv = New System.Windows.Forms.Label()
Me.cbxInaktiveChats = New System.Windows.Forms.CheckBox()
Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.Panel5 = New System.Windows.Forms.Panel()
Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.PictureBox2 = New System.Windows.Forms.PictureBox()
@@ -64,7 +65,7 @@ Partial Class frmMessenger
Me.btnNeu = New System.Windows.Forms.Button()
Me.Button1 = New System.Windows.Forms.Button()
Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel()
Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components)
Me.UsrCntlMessenger_ChatElement1 = New VERAG_PROG_ALLGEMEIN.usrCntlMessenger_ChatElement()
Me.Panel3 = New System.Windows.Forms.Panel()
Me.btnTeilnehmer = New System.Windows.Forms.Button()
@@ -92,9 +93,9 @@ Partial Class frmMessenger
Me.btnSendAtt = New System.Windows.Forms.Button()
Me.btnSenden = New System.Windows.Forms.Button()
Me.rtbChatMessage = New System.Windows.Forms.RichTextBox()
Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer()
Me.Timer_REFRESH = New System.Windows.Forms.Timer()
Me.cntxt = New System.Windows.Forms.ContextMenuStrip()
Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer(Me.components)
Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components)
Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.ChatDeaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.toolChatReminder = New System.Windows.Forms.ToolStripMenuItem()
Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()