From 93d5306dd073e169c1c9ebd566c455a68e729944 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 10 Aug 2026 13:59:14 +0200 Subject: [PATCH] Update Sammelrechnung , etc. --- SDL/Fakturierung/frmFaktSammelRgDrucken.vb | 7 +- SDL/My Project/AssemblyInfo.vb | 4 +- SDL/SMS/frmSendSMS.Designer.vb | 200 ++++++++++++++++++++- SDL/SMS/frmSendSMS.vb | 57 ++++++ SDL/mdm/frmMDMDatenverarbetiung.vb | 4 +- SDL/mdm/usrCntlMDMAuswertungen.vb | 2 +- 6 files changed, 264 insertions(+), 10 deletions(-) diff --git a/SDL/Fakturierung/frmFaktSammelRgDrucken.vb b/SDL/Fakturierung/frmFaktSammelRgDrucken.vb index 8e95ca4c..33e948ea 100644 --- a/SDL/Fakturierung/frmFaktSammelRgDrucken.vb +++ b/SDL/Fakturierung/frmFaktSammelRgDrucken.vb @@ -201,9 +201,10 @@ Public Class frmFaktSammelRgDrucken If .Columns.Contains("LKW") And .Columns.Count >= 8 Then .Columns("LKW").Width = 80 End If - - If .Columns("RENR").Visible = Visible Then - .Columns("RENR").Width = 60 + If .Columns.Contains("RENR") Then + If .Columns("RENR").Visible = Visible Then + .Columns("RENR").Width = 60 + End If End If If .Columns.Contains("IM_EX") And .Columns.Count >= 8 Then diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index cf7e96af..4fee548b 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/SMS/frmSendSMS.Designer.vb b/SDL/SMS/frmSendSMS.Designer.vb index 388c96d2..bfc1a9ea 100644 --- a/SDL/SMS/frmSendSMS.Designer.vb +++ b/SDL/SMS/frmSendSMS.Designer.vb @@ -85,6 +85,20 @@ Partial Class frmSendSMS Me.Button40 = New System.Windows.Forms.Button() Me.Button41 = New System.Windows.Forms.Button() Me.Button42 = New System.Windows.Forms.Button() + Me.Button44 = New System.Windows.Forms.Button() + Me.Button45 = New System.Windows.Forms.Button() + Me.Button46 = New System.Windows.Forms.Button() + Me.Button47 = New System.Windows.Forms.Button() + Me.Button48 = New System.Windows.Forms.Button() + Me.Button49 = New System.Windows.Forms.Button() + Me.Button50 = New System.Windows.Forms.Button() + Me.Button51 = New System.Windows.Forms.Button() + Me.Button52 = New System.Windows.Forms.Button() + Me.Button53 = New System.Windows.Forms.Button() + Me.Button54 = New System.Windows.Forms.Button() + Me.Button55 = New System.Windows.Forms.Button() + Me.Button56 = New System.Windows.Forms.Button() + Me.Button57 = New System.Windows.Forms.Button() Me.pnl.SuspendLayout() Me.SuspendLayout() ' @@ -657,6 +671,8 @@ Partial Class frmSendSMS ' 'pnl ' + Me.pnl.Controls.Add(Me.Button57) + Me.pnl.Controls.Add(Me.Button56) Me.pnl.Controls.Add(Me.Button43) Me.pnl.Controls.Add(Me.Label6) Me.pnl.Controls.Add(Me.Button31) @@ -668,7 +684,7 @@ Partial Class frmSendSMS Me.pnl.Dock = System.Windows.Forms.DockStyle.Bottom Me.pnl.Location = New System.Drawing.Point(0, 492) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(494, 108) + Me.pnl.Size = New System.Drawing.Size(563, 108) Me.pnl.TabIndex = 54 ' 'Button43 @@ -803,12 +819,178 @@ Partial Class frmSendSMS Me.Button42.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button42.UseVisualStyleBackColor = True ' + 'Button44 + ' + Me.Button44.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button44.Location = New System.Drawing.Point(489, 331) + Me.Button44.Name = "Button44" + Me.Button44.Size = New System.Drawing.Size(35, 25) + Me.Button44.TabIndex = 66 + Me.Button44.Text = "EN" + Me.Button44.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button44.UseVisualStyleBackColor = True + ' + 'Button45 + ' + Me.Button45.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button45.Location = New System.Drawing.Point(523, 331) + Me.Button45.Name = "Button45" + Me.Button45.Size = New System.Drawing.Size(28, 25) + Me.Button45.TabIndex = 67 + Me.Button45.Text = "IT" + Me.Button45.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button45.UseVisualStyleBackColor = True + ' + 'Button46 + ' + Me.Button46.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button46.Location = New System.Drawing.Point(523, 355) + Me.Button46.Name = "Button46" + Me.Button46.Size = New System.Drawing.Size(28, 25) + Me.Button46.TabIndex = 69 + Me.Button46.Text = "IT" + Me.Button46.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button46.UseVisualStyleBackColor = True + ' + 'Button47 + ' + Me.Button47.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button47.Location = New System.Drawing.Point(489, 355) + Me.Button47.Name = "Button47" + Me.Button47.Size = New System.Drawing.Size(35, 25) + Me.Button47.TabIndex = 68 + Me.Button47.Text = "EN" + Me.Button47.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button47.UseVisualStyleBackColor = True + ' + 'Button48 + ' + Me.Button48.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button48.Location = New System.Drawing.Point(523, 379) + Me.Button48.Name = "Button48" + Me.Button48.Size = New System.Drawing.Size(28, 25) + Me.Button48.TabIndex = 71 + Me.Button48.Text = "IT" + Me.Button48.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button48.UseVisualStyleBackColor = True + ' + 'Button49 + ' + Me.Button49.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button49.Location = New System.Drawing.Point(489, 379) + Me.Button49.Name = "Button49" + Me.Button49.Size = New System.Drawing.Size(35, 25) + Me.Button49.TabIndex = 70 + Me.Button49.Text = "EN" + Me.Button49.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button49.UseVisualStyleBackColor = True + ' + 'Button50 + ' + Me.Button50.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button50.Location = New System.Drawing.Point(523, 403) + Me.Button50.Name = "Button50" + Me.Button50.Size = New System.Drawing.Size(28, 25) + Me.Button50.TabIndex = 73 + Me.Button50.Text = "IT" + Me.Button50.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button50.UseVisualStyleBackColor = True + ' + 'Button51 + ' + Me.Button51.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button51.Location = New System.Drawing.Point(489, 403) + Me.Button51.Name = "Button51" + Me.Button51.Size = New System.Drawing.Size(35, 25) + Me.Button51.TabIndex = 72 + Me.Button51.Text = "EN" + Me.Button51.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button51.UseVisualStyleBackColor = True + ' + 'Button52 + ' + Me.Button52.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button52.Location = New System.Drawing.Point(523, 427) + Me.Button52.Name = "Button52" + Me.Button52.Size = New System.Drawing.Size(28, 25) + Me.Button52.TabIndex = 75 + Me.Button52.Text = "IT" + Me.Button52.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button52.UseVisualStyleBackColor = True + ' + 'Button53 + ' + Me.Button53.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button53.Location = New System.Drawing.Point(489, 427) + Me.Button53.Name = "Button53" + Me.Button53.Size = New System.Drawing.Size(35, 25) + Me.Button53.TabIndex = 74 + Me.Button53.Text = "EN" + Me.Button53.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button53.UseVisualStyleBackColor = True + ' + 'Button54 + ' + Me.Button54.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button54.Location = New System.Drawing.Point(523, 451) + Me.Button54.Name = "Button54" + Me.Button54.Size = New System.Drawing.Size(28, 25) + Me.Button54.TabIndex = 77 + Me.Button54.Text = "IT" + Me.Button54.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button54.UseVisualStyleBackColor = True + ' + 'Button55 + ' + Me.Button55.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button55.Location = New System.Drawing.Point(489, 451) + Me.Button55.Name = "Button55" + Me.Button55.Size = New System.Drawing.Size(35, 25) + Me.Button55.TabIndex = 76 + Me.Button55.Text = "EN" + Me.Button55.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button55.UseVisualStyleBackColor = True + ' + 'Button56 + ' + Me.Button56.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button56.Location = New System.Drawing.Point(489, 28) + Me.Button56.Name = "Button56" + Me.Button56.Size = New System.Drawing.Size(35, 44) + Me.Button56.TabIndex = 55 + Me.Button56.Text = "EN" + Me.Button56.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button56.UseVisualStyleBackColor = True + ' + 'Button57 + ' + Me.Button57.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button57.Location = New System.Drawing.Point(523, 28) + Me.Button57.Name = "Button57" + Me.Button57.Size = New System.Drawing.Size(35, 44) + Me.Button57.TabIndex = 56 + Me.Button57.Text = "IT" + Me.Button57.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button57.UseVisualStyleBackColor = True + ' 'frmSendSMS ' 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(494, 600) + Me.ClientSize = New System.Drawing.Size(563, 600) + Me.Controls.Add(Me.Button54) + Me.Controls.Add(Me.Button55) + Me.Controls.Add(Me.Button52) + Me.Controls.Add(Me.Button53) + Me.Controls.Add(Me.Button50) + Me.Controls.Add(Me.Button51) + Me.Controls.Add(Me.Button48) + Me.Controls.Add(Me.Button49) + Me.Controls.Add(Me.Button46) + Me.Controls.Add(Me.Button47) + Me.Controls.Add(Me.Button45) + Me.Controls.Add(Me.Button44) Me.Controls.Add(Me.Button42) Me.Controls.Add(Me.Button41) Me.Controls.Add(Me.Button40) @@ -935,4 +1117,18 @@ Partial Class frmSendSMS Friend WithEvents Button40 As Button Friend WithEvents Button41 As Button Friend WithEvents Button42 As Button + Friend WithEvents Button44 As Button + Friend WithEvents Button45 As Button + Friend WithEvents Button46 As Button + Friend WithEvents Button47 As Button + Friend WithEvents Button48 As Button + Friend WithEvents Button49 As Button + Friend WithEvents Button50 As Button + Friend WithEvents Button51 As Button + Friend WithEvents Button52 As Button + Friend WithEvents Button53 As Button + Friend WithEvents Button54 As Button + Friend WithEvents Button55 As Button + Friend WithEvents Button56 As Button + Friend WithEvents Button57 As Button End Class diff --git a/SDL/SMS/frmSendSMS.vb b/SDL/SMS/frmSendSMS.vb index 1ec2f4ba..b4ce29d4 100644 --- a/SDL/SMS/frmSendSMS.vb +++ b/SDL/SMS/frmSendSMS.vb @@ -257,6 +257,7 @@ Public Class frmSendSMS Dim template_EN = "20b1379c-6d2d-4577-a524-ddccf2e8ab59" Dim template_YU = "08ef1aec-5b02-47c1-98bb-1d50ed3bfc1a" Dim template_MK = "01e9cca5-f8a5-461e-93e8-ab321d41f99d" + Dim template_IT = "01e9cca5-f8a5-461e-93e8-ab321d41f99d" Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click fillTXT("Bitte zu VERAG kommen!", "LKW: ", "e5c1ce77-31a0-4663-9576-be340f73ac1c") @@ -479,6 +480,62 @@ Public Class frmSendSMS Private Sub Button43_Click(sender As Object, e As EventArgs) Handles Button43.Click If MyRichTextBox1.Text <> "" Then fillTXT("Ве молиме дојдете во VERAG " & MyRichTextBox1.Text, "", template_DE, MyRichTextBox1.Text) End Sub + + Private Sub Button44_Click(sender As Object, e As EventArgs) Handles Button44.Click + fillTXT("Please come to VERAG!", "LKW: ", template_EN) + End Sub + + Private Sub Button47_Click(sender As Object, e As EventArgs) Handles Button47.Click + fillTXT("Please come to VERAG and bring your passport!", "LKW: ", template_EN, " and bring your passport!") + End Sub + + Private Sub Button49_Click(sender As Object, e As EventArgs) Handles Button49.Click + fillTXT("Please come to VERAG and collect the STAMP!", "LKW: ", template_EN, " and collect the STAMP!") + End Sub + + Private Sub Button51_Click(sender As Object, e As EventArgs) Handles Button51.Click + fillTXT("Please come to VERAG and bring cash with you: € ", "LKW: ", template_EN, " and bring cash with you: € ") + End Sub + + Private Sub Button53_Click(sender As Object, e As EventArgs) Handles Button53.Click + fillTXT("Please collect the envelope from customs and come to VERAG!", "LKW: ", template_EN, "Please collect the envelope from customs!") + End Sub + + Private Sub Button55_Click(sender As Object, e As EventArgs) Handles Button55.Click + fillTXT("Please remove the seal(s) and take them to the VERAG office!", "LKW: ", template_EN, "Please remove the seal(s) and take them to the VERAG office!") + End Sub + + Private Sub Button56_Click(sender As Object, e As EventArgs) Handles Button56.Click + If MyRichTextBox1.Text <> "" Then fillTXT("Please come to VERAG " & MyRichTextBox1.Text, "", template_EN, MyRichTextBox1.Text) + End Sub + + Private Sub Button57_Click(sender As Object, e As EventArgs) Handles Button57.Click + If MyRichTextBox1.Text <> "" Then fillTXT("Si prega di recarsi presso VERAG " & MyRichTextBox1.Text, "", template_EN, MyRichTextBox1.Text) + End Sub + + Private Sub Button45_Click(sender As Object, e As EventArgs) Handles Button45.Click + fillTXT("Si prega di recarsi presso VERAG!", "LKW: ", template_IT) + End Sub + + Private Sub Button46_Click(sender As Object, e As EventArgs) Handles Button46.Click + fillTXT("Ti preghiamo di recarti presso VERAG e di portare con te il passaporto!", "LKW: ", template_IT, " e porta con te il passaporto!") + End Sub + + Private Sub Button48_Click(sender As Object, e As EventArgs) Handles Button48.Click + fillTXT("Ti preghiamo di recarti presso VERAG e ritirare il TIMBRO!", "LKW: ", template_IT, " e ritira il TIMBRO!") + End Sub + + Private Sub Button50_Click(sender As Object, e As EventArgs) Handles Button50.Click + fillTXT("Ti preghiamo di venire da VERAG e di portare con te dei contanti: € ", "LKW: ", template_IT, " e portate con voi dei contanti: € ") + End Sub + + Private Sub Button52_Click(sender As Object, e As EventArgs) Handles Button52.Click + fillTXT("Ti preghiamo di ritirare la busta presso la dogana e di recarti presso VERAG!", "LKW: ", template_IT, "Si prega di ritirare la busta presso la dogana!") + End Sub + + Private Sub Button54_Click(sender As Object, e As EventArgs) Handles Button54.Click + fillTXT("Si prega di rimuovere i sigilli e di consegnarli all'ufficio VERAG!", "LKW: ", template_IT, "Si prega di rimuovere i sigilli e di consegnarli all'ufficio VERAG!") + End Sub End Class Public Class cSMSOptions diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 376573b2..b148f700 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -4868,14 +4868,14 @@ LEFT JOIN VERAG.dbo.tbl_IDS_Länder land Select Case Lieferant Case "PLOSE" - If SQL.doSQL("UPDATE tblPLOSE_Details SET plose_Fakturiert=1 WHERE plose_Fakturiert = 0 AND plose_DatumTransaktion between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "' ", "FMZOLL") Then + If SQL.doSQL("UPDATE tblPLOSE_Details SET plose_Fakturiert=1 WHERE plose_Fakturiert = 0 AND plose_DatumTransaktion between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "' ", "FMZOLL",,,, 60) Then setBillingDateCompleted(Lieferant, datPloseAnhang.Value) PictureBox1.Visible = True End If Case "UTA" - If SQL.doSQL("UPDATE [tblUTAImportNew] set charged=1 where chargedDatetime is not null and isnull(charged,0) = 0 And tblUTAImportNew.Rechnungsdatum = '" & DateTimePicker2.Text & "'", "FMZOLL") Then + If SQL.doSQL("UPDATE [tblUTAImportNew] set charged=1 where chargedDatetime is not null and isnull(charged,0) = 0 And tblUTAImportNew.Rechnungsdatum = '" & DateTimePicker2.Text & "'", "FMZOLL",,,, 60) Then setBillingDateCompleted(Lieferant, datPloseAnhang.Value) setBillingDateCompleted("UTA_VERAG", datPloseAnhang.Value) diff --git a/SDL/mdm/usrCntlMDMAuswertungen.vb b/SDL/mdm/usrCntlMDMAuswertungen.vb index d060fa7d..095552dd 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.vb @@ -1592,7 +1592,7 @@ Public Class usrCntlMDMAuswertungen END + ISNULL(CAST(weitereWölflKundenNr AS nvarchar(50)), '') AS RMC_KundenNr, isnull(kde_VZ,0) as VZ_Kunde, - isnull(kde_AnmerkungVZ,'') as VZ_Intervall + isnull(kde_AnmerkungVZ,'') as VZ_Intervall, case when isnull(KD.[Bankspesen %],0) > 0 then 1 else 0 end as BS, kde_merge_pdf as RE_Anhang_zusammenfassen FROM Adressen AD INNER JOIN Kunden KD ON KD.KundenNr = AD.AdressenNr