diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index c653a361..2c705cfc 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/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index d430cb13..ccb98db9 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -913,7 +913,7 @@ Public Class frmBU_Mahnlauf If Firma_ID = 19 Then Select Case AD.LandKz Case "RO" : Mail_BCC &= "alex@verag.ag;maut.ro@verag.ag;ma@verag.ag;" 'immer an alle bei RO! - Case "AT", "BA", "BG", "CZ", "DE", "HU", "LU", "SRB", "BIH", "HR", "ME", "MKD", "SK", "SI", "RS" + Case Else If KD_ERW IsNot Nothing AndAlso Not IsDBNull(KD_ERW.kde_betreuer) Then Select Case KD_ERW.kde_betreuer diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index 40ef6a29..6fefa980 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -45,6 +45,7 @@ Public Class frmKundenblatt Dim RG_MONAT As Date = CDate("01." & Now.Month & "." & Now.Year) '.AddMonths(-1) ' INFO: Private InfoDauer As Integer = 3 + Private WithEvents timShow As New Timer With {.Interval = 10} Private WithEvents timHide As New Timer With {.Interval = 10} Dim isVerag360 As Boolean = False @@ -636,7 +637,7 @@ Public Class frmKundenblatt Sub initStat() lblStat_Lkws.Text = SQL.getSqlCount("SELECT Count(KfzKennzeichen) FROM LKW WHERE KundenNr=" & kdNr & " and isnull(Verkauft,0) <> 1 and isnull(Abgemeldet,0) <> 1 ") & " aktive LKWs registriert" 'OK - Dim dt = SQL.loadDgvBySql("SELECT Kunden.KundenNr as KundenNr, Kunden.UStV_SummeUmsatzsteuerbetragEUR, Kunden.UStV_SummeErstattungsbetragEUR, Kunden.UStV_Summe3470BetragEUR, Kunden.UStV_SummeVZBetragEUR, Kunden.UStV_SummeVorschaubetragEUR + Dim dt = SQL.loadDgvBySql("SELECT Kunden.KundenNr as KundenNr, Kunden.UStV_SummeUmsatzsteuerbetragEUR, Kunden.UStV_SummeErstattungsbetragEUR, Kunden.UStV_Summe3470BetragEUR, Kunden.UStV_SummeVZBetragEUR, Kunden.UStV_SummeVorschaubetragEUR,isnull(BankgarantieBetrag,0) as BankgarantieBetrag , BankgarantieGültigBis FROM Kunden WHERE Kunden.KundenNr = " & kdNr, "FMZOLL") @@ -649,6 +650,7 @@ Public Class frmKundenblatt Dim VorschaubetrGes As Double = 0 Dim OPSaldo As Double = 0 Dim Risiko As Double = 0 + Dim Bankgarantie As Double = 0 OPSaldo = CDbl((New SQL).getValueTxtBySql("SELECT isnull(sum(Gesamtausstand),0) FROM [Offene Posten] WHERE [Kontonummer]=" & kdNr, "FMZOLL")) @@ -659,11 +661,21 @@ Public Class frmKundenblatt Gesamt3470 = dt.Rows(0).Item("UStV_Summe3470BetragEUR") GesamtVZBetrag = dt.Rows(0).Item("UStV_SummeVZBetragEUR") VorschaubetrGes = dt.Rows(0).Item("UStV_SummeVorschaubetragEUR") + + If Not IsDBNull(dt.Rows(0).Item("BankgarantieGültigBis")) AndAlso IsDate(dt.Rows(0).Item("BankgarantieGültigBis")) AndAlso CDate(dt.Rows(0).Item("BankgarantieGültigBis")) < Today() Then 'wenn abgelaufen! + + Bankgarantie = 0 + + Else + Bankgarantie = dt.Rows(0).Item("BankgarantieBetrag") + + End If + End If Differnezbetrag = GesamtUSteuer - GesamtErstattung - Risiko = OPSaldo - Differnezbetrag - Gesamt3470 + GesamtVZBetrag - VorschaubetrGes + Risiko = OPSaldo - Differnezbetrag - Gesamt3470 + GesamtVZBetrag - VorschaubetrGes - Bankgarantie txt3470Betrag.Text = Gesamt3470.ToString("C2") txtRisiko.Text = Risiko.ToString("C2") @@ -1165,7 +1177,7 @@ Public Class frmKundenblatt Sub initDgvSperrliste() With dgvSperrliste ' .DataSource = SQL.loadDgvBySql("SELECT Speditionsdienstleistungen.SDLNr,Speditionsdienstleistungen.SDLBez,Sperrnummernverzeichnis.SperrNr,Sperrnummernverzeichnis.SperrBez,KundenSDL.Sperrdatum FROM Speditionsdienstleistungen,KundenSDL,Sperrnummernverzeichnis WHERE KundenSDL.KundenNr=" & kdNr & " AND Speditionsdienstleistungen.SDLNr=KundenSDL.SDLNr AND Sperrnummernverzeichnis.SperrNr=KundenSDL.Sperre /*AND KundenSDL.Sperrdatum IS NOT NULL*/ ORDER BY SperrNr") - .DataSource = SQL.loadDgvBySql(" SELECT KundenSDL.SDLNr, Speditionsdienstleistungen.SDLBez,Sperrnummernverzeichnis.SperrNr,Sperrnummernverzeichnis.SperrBez, [Sperrdatum] " & + .DataSource = SQL.loadDgvBySql(" SELECT KundenSDL.SDLNr, Speditionsdienstleistungen.SDLBez,Sperrnummernverzeichnis.SperrNr,Sperrnummernverzeichnis.SperrBez, [Sperrdatum], Vermerk " & " FROM KundenSDL INNER JOIN Speditionsdienstleistungen ON Speditionsdienstleistungen.SDLNr=KundenSDL.SDLNr INNER JOIN Sperrnummernverzeichnis ON Sperrnummernverzeichnis.SperrNr=KundenSDL.Sperre " & " WHERE KundenSDL.KundenNr='" & kdNr & "' AND KundenSDL.SDLNr in (select distinct(SDL.SDLNr) from SDL where SDL.SDLNr=KundenSDL.SDLNr AND SDL.KundenNr = KundenSDL.KundenNr) and SDLTypNr IN (1,2) ORDER BY Sperre,Speditionsdienstleistungen.SDLBez") .RowTemplate.Height = 20 @@ -1195,10 +1207,13 @@ Public Class frmKundenblatt .Columns(3).Width = 110 .Columns(3).HeaderText = "Sperr-Bezeichnung" - .Columns(4).Width = 75 + .Columns(4).Width = 90 .Columns(4).HeaderText = "Sperrdatum" .Columns(4).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter + .Columns(5).Width = 350 + .Columns(5).HeaderText = "Vermerk" + initSDLListeRed() End With End Sub diff --git a/SDL/seriendruck/usrCntlFakturierung.Designer.vb b/SDL/seriendruck/usrCntlFakturierung.Designer.vb index 59e714af..59d539fb 100644 --- a/SDL/seriendruck/usrCntlFakturierung.Designer.vb +++ b/SDL/seriendruck/usrCntlFakturierung.Designer.vb @@ -46,6 +46,11 @@ 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.PictureBox12 = New System.Windows.Forms.PictureBox() + Me.Label13 = New System.Windows.Forms.Label() + Me.PictureBox11 = New System.Windows.Forms.PictureBox() + Me.Label12 = New System.Windows.Forms.Label() + Me.brnSR_abgeschlossen = New System.Windows.Forms.Button() Me.btnRE_Text = New System.Windows.Forms.Button() Me.btnFixeTaxe = New System.Windows.Forms.Button() Me.Label11 = New System.Windows.Forms.Label() @@ -100,15 +105,12 @@ Partial Class usrcntlFakturierung Me.btnRePos = New System.Windows.Forms.Button() Me.Validation1 = New SDL.EORI.validation() Me.btnWikiStatusmails = New System.Windows.Forms.Button() - Me.brnSR_abgeschlossen = New System.Windows.Forms.Button() - Me.PictureBox11 = New System.Windows.Forms.PictureBox() - Me.Label12 = New System.Windows.Forms.Label() - Me.Label13 = New System.Windows.Forms.Label() - Me.PictureBox12 = New System.Windows.Forms.PictureBox() Me.GroupBox1.SuspendLayout() Me.GBMautberichte.SuspendLayout() CType(Me.dgvMautbericht, System.ComponentModel.ISupportInitialize).BeginInit() Me.GBSammelrechnung.SuspendLayout() + CType(Me.PictureBox12, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit() @@ -119,8 +121,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.PictureBox11, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBox12, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'GroupBox1 @@ -131,7 +131,7 @@ Partial Class usrcntlFakturierung Me.GroupBox1.Controls.Add(Me.btnRechnugnsdaten) Me.GroupBox1.Location = New System.Drawing.Point(14, 20) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(876, 86) + Me.GroupBox1.Size = New System.Drawing.Size(876, 69) Me.GroupBox1.TabIndex = 0 Me.GroupBox1.TabStop = False ' @@ -140,7 +140,7 @@ Partial Class usrcntlFakturierung Me.btnLieferantenrechnungen.Enabled = False Me.btnLieferantenrechnungen.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnLieferantenrechnungen.ForeColor = System.Drawing.Color.Black - Me.btnLieferantenrechnungen.Location = New System.Drawing.Point(679, 18) + Me.btnLieferantenrechnungen.Location = New System.Drawing.Point(708, 17) Me.btnLieferantenrechnungen.Name = "btnLieferantenrechnungen" Me.btnLieferantenrechnungen.Size = New System.Drawing.Size(139, 44) Me.btnLieferantenrechnungen.TabIndex = 52 @@ -152,7 +152,7 @@ Partial Class usrcntlFakturierung Me.btnMDMSammelrechnung.Enabled = False Me.btnMDMSammelrechnung.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnMDMSammelrechnung.ForeColor = System.Drawing.Color.Black - Me.btnMDMSammelrechnung.Location = New System.Drawing.Point(475, 19) + Me.btnMDMSammelrechnung.Location = New System.Drawing.Point(442, 18) Me.btnMDMSammelrechnung.Name = "btnMDMSammelrechnung" Me.btnMDMSammelrechnung.Size = New System.Drawing.Size(121, 44) Me.btnMDMSammelrechnung.TabIndex = 51 @@ -164,7 +164,7 @@ Partial Class usrcntlFakturierung Me.btnFakturierung.Enabled = False Me.btnFakturierung.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnFakturierung.ForeColor = System.Drawing.Color.Black - Me.btnFakturierung.Location = New System.Drawing.Point(6, 19) + Me.btnFakturierung.Location = New System.Drawing.Point(6, 18) Me.btnFakturierung.Name = "btnFakturierung" Me.btnFakturierung.Size = New System.Drawing.Size(121, 43) Me.btnFakturierung.TabIndex = 6 @@ -176,7 +176,7 @@ Partial Class usrcntlFakturierung Me.btnRechnugnsdaten.Enabled = False Me.btnRechnugnsdaten.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnRechnugnsdaten.ForeColor = System.Drawing.Color.Black - Me.btnRechnugnsdaten.Location = New System.Drawing.Point(267, 18) + Me.btnRechnugnsdaten.Location = New System.Drawing.Point(227, 17) Me.btnRechnugnsdaten.Name = "btnRechnugnsdaten" Me.btnRechnugnsdaten.Size = New System.Drawing.Size(121, 44) Me.btnRechnugnsdaten.TabIndex = 4 @@ -199,7 +199,7 @@ Partial Class usrcntlFakturierung Me.Label61.AutoSize = True Me.Label61.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label61.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Label61.Location = New System.Drawing.Point(11, 120) + Me.Label61.Location = New System.Drawing.Point(15, 98) Me.Label61.Name = "Label61" Me.Label61.Size = New System.Drawing.Size(310, 17) Me.Label61.TabIndex = 17 @@ -220,7 +220,7 @@ Partial Class usrcntlFakturierung Me.GBMautberichte.Controls.Add(Me.Label62) Me.GBMautberichte.Controls.Add(Me.Button18) Me.GBMautberichte.Enabled = False - Me.GBMautberichte.Location = New System.Drawing.Point(10, 131) + Me.GBMautberichte.Location = New System.Drawing.Point(14, 104) Me.GBMautberichte.Name = "GBMautberichte" Me.GBMautberichte.Size = New System.Drawing.Size(880, 211) Me.GBMautberichte.TabIndex = 16 @@ -343,7 +343,7 @@ Partial Class usrcntlFakturierung Me.Label44.AutoSize = True Me.Label44.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label44.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Label44.Location = New System.Drawing.Point(11, 345) + Me.Label44.Location = New System.Drawing.Point(15, 320) Me.Label44.Name = "Label44" Me.Label44.Size = New System.Drawing.Size(436, 17) Me.Label44.TabIndex = 15 @@ -409,12 +409,61 @@ Partial Class usrcntlFakturierung Me.GBSammelrechnung.Controls.Add(Me.Label45) Me.GBSammelrechnung.Controls.Add(Me.btnRePos) Me.GBSammelrechnung.Enabled = False - Me.GBSammelrechnung.Location = New System.Drawing.Point(10, 356) + Me.GBSammelrechnung.Location = New System.Drawing.Point(14, 331) Me.GBSammelrechnung.Name = "GBSammelrechnung" - Me.GBSammelrechnung.Size = New System.Drawing.Size(880, 456) + Me.GBSammelrechnung.Size = New System.Drawing.Size(880, 440) Me.GBSammelrechnung.TabIndex = 14 Me.GBSammelrechnung.TabStop = False ' + 'PictureBox12 + ' + Me.PictureBox12.BackgroundImage = Global.SDL.My.Resources.Resources.ok + Me.PictureBox12.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox12.Location = New System.Drawing.Point(857, 378) + Me.PictureBox12.Name = "PictureBox12" + Me.PictureBox12.Size = New System.Drawing.Size(10, 13) + Me.PictureBox12.TabIndex = 132 + Me.PictureBox12.TabStop = False + Me.PictureBox12.Visible = False + ' + 'Label13 + ' + Me.Label13.Location = New System.Drawing.Point(596, 378) + Me.Label13.Name = "Label13" + Me.Label13.Size = New System.Drawing.Size(255, 16) + Me.Label13.TabIndex = 131 + Me.Label13.Text = "Auswertung per Mail geschickt (nur Montasende)" + ' + 'PictureBox11 + ' + Me.PictureBox11.BackgroundImage = Global.SDL.My.Resources.Resources.ok + Me.PictureBox11.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox11.Location = New System.Drawing.Point(857, 362) + Me.PictureBox11.Name = "PictureBox11" + Me.PictureBox11.Size = New System.Drawing.Size(10, 13) + Me.PictureBox11.TabIndex = 130 + Me.PictureBox11.TabStop = False + Me.PictureBox11.Visible = False + ' + 'Label12 + ' + Me.Label12.Location = New System.Drawing.Point(673, 361) + Me.Label12.Name = "Label12" + Me.Label12.Size = New System.Drawing.Size(164, 16) + Me.Label12.TabIndex = 129 + Me.Label12.Text = "Sammelrechnung abgeschlossen" + ' + 'brnSR_abgeschlossen + ' + Me.brnSR_abgeschlossen.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.brnSR_abgeschlossen.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.brnSR_abgeschlossen.Location = New System.Drawing.Point(730, 306) + Me.brnSR_abgeschlossen.Name = "brnSR_abgeschlossen" + Me.brnSR_abgeschlossen.Size = New System.Drawing.Size(121, 49) + Me.brnSR_abgeschlossen.TabIndex = 128 + Me.brnSR_abgeschlossen.Text = "SR abschliesen" + Me.brnSR_abgeschlossen.UseVisualStyleBackColor = True + ' 'btnRE_Text ' Me.btnRE_Text.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -967,55 +1016,6 @@ Partial Class usrcntlFakturierung Me.btnWikiStatusmails.TabIndex = 72 Me.btnWikiStatusmails.UseVisualStyleBackColor = True ' - 'brnSR_abgeschlossen - ' - Me.brnSR_abgeschlossen.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.brnSR_abgeschlossen.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.brnSR_abgeschlossen.Location = New System.Drawing.Point(10, 388) - Me.brnSR_abgeschlossen.Name = "brnSR_abgeschlossen" - Me.brnSR_abgeschlossen.Size = New System.Drawing.Size(121, 49) - Me.brnSR_abgeschlossen.TabIndex = 128 - Me.brnSR_abgeschlossen.Text = "SR abschliesen" - Me.brnSR_abgeschlossen.UseVisualStyleBackColor = True - ' - 'PictureBox11 - ' - Me.PictureBox11.BackgroundImage = Global.SDL.My.Resources.Resources.ok - Me.PictureBox11.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox11.Location = New System.Drawing.Point(148, 398) - Me.PictureBox11.Name = "PictureBox11" - Me.PictureBox11.Size = New System.Drawing.Size(14, 14) - Me.PictureBox11.TabIndex = 130 - Me.PictureBox11.TabStop = False - Me.PictureBox11.Visible = False - ' - 'Label12 - ' - Me.Label12.Location = New System.Drawing.Point(168, 398) - Me.Label12.Name = "Label12" - Me.Label12.Size = New System.Drawing.Size(224, 17) - Me.Label12.TabIndex = 129 - Me.Label12.Text = "Sammelrechnung abgeschlossen" - ' - 'Label13 - ' - Me.Label13.Location = New System.Drawing.Point(168, 412) - Me.Label13.Name = "Label13" - Me.Label13.Size = New System.Drawing.Size(224, 17) - Me.Label13.TabIndex = 131 - Me.Label13.Text = "Auswertung per Mail geschickt" - ' - 'PictureBox12 - ' - Me.PictureBox12.BackgroundImage = Global.SDL.My.Resources.Resources.ok - Me.PictureBox12.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox12.Location = New System.Drawing.Point(148, 414) - Me.PictureBox12.Name = "PictureBox12" - Me.PictureBox12.Size = New System.Drawing.Size(14, 14) - Me.PictureBox12.TabIndex = 132 - Me.PictureBox12.TabStop = False - Me.PictureBox12.Visible = False - ' 'usrcntlFakturierung ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1029,13 +1029,15 @@ Partial Class usrcntlFakturierung Me.Controls.Add(Me.Label3) Me.Controls.Add(Me.GroupBox1) Me.Name = "usrcntlFakturierung" - Me.Size = New System.Drawing.Size(1149, 815) + Me.Size = New System.Drawing.Size(1149, 774) Me.GroupBox1.ResumeLayout(False) Me.GBMautberichte.ResumeLayout(False) Me.GBMautberichte.PerformLayout() CType(Me.dgvMautbericht, System.ComponentModel.ISupportInitialize).EndInit() Me.GBSammelrechnung.ResumeLayout(False) Me.GBSammelrechnung.PerformLayout() + CType(Me.PictureBox12, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit() @@ -1046,8 +1048,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.PictureBox11, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBox12, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout()