diff --git a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb index d1f6744a..4be3c91c 100644 --- a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb +++ b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb @@ -362,7 +362,7 @@ Public Class frmNacherfassungNEU sqlStr &= " ( SELECT SUM(isnull([SteuerpflichtigerBetrag],0)+isnull([SteuerfreierBetrag],0)) FROM [RechnungsausgangPositionen] where [RechnungsausgangPositionen].RK_ID=[Rechnungsausgang].RK_ID ) as Rechnungsbetrag," sqlStr &= " Sammelrechnung, isnull(cast(RechnungsKundenNr as nvarchar(7)) + ' ','') + [RechnungsName 1] as [RechnungAn] " ' sqlStr &= "Sachbearbeiter " - sqlStr &= " FROM [Rechnungsausgang] WHERE FilialenNr='" & SPEDITIONSBUCH.FilialenNr & "' and AbfertigungsNr='" & SPEDITIONSBUCH.AbfertigungsNr & "' AND [SpeditionsbuchUnterNr]='" & SPEDITIONSBUCH.UnterNr & "' AND [RechnungsNr] is not null" + sqlStr &= " FROM [Rechnungsausgang] WHERE FilialenNr='" & SPEDITIONSBUCH.FilialenNr & "' and AbfertigungsNr='" & SPEDITIONSBUCH.AbfertigungsNr & "' AND [SpeditionsbuchUnterNr]='" & SPEDITIONSBUCH.UnterNr & "'" sqlStr &= " order by RechnungsDatum" .DataSource = SQL.loadDgvBySql(sqlStr, "FMZOLL") diff --git a/SDL/USTV/usrCntlUSTV.Designer.vb b/SDL/USTV/usrCntlUSTV.Designer.vb index b28249f2..e9c1304a 100644 --- a/SDL/USTV/usrCntlUSTV.Designer.vb +++ b/SDL/USTV/usrCntlUSTV.Designer.vb @@ -28,6 +28,7 @@ Partial Class usrCntlUSTV Me.dgvUSTV = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Label1 = New System.Windows.Forms.Label() Me.Panel1 = New System.Windows.Forms.Panel() + Me.Label9 = New System.Windows.Forms.Label() Me.txtSumDiff = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.btnKundendatenaktualisieren = New System.Windows.Forms.Button() Me.txtSumErst = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -61,7 +62,10 @@ Partial Class usrCntlUSTV Me.Button8 = New System.Windows.Forms.Button() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.Label9 = New System.Windows.Forms.Label() + Me.txtRisiko = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label10 = New System.Windows.Forms.Label() + Me.txtOPSaldo = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label11 = New System.Windows.Forms.Label() CType(Me.dgvUSTV, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.Panel2.SuspendLayout() @@ -109,6 +113,10 @@ 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.txtRisiko) + Me.Panel1.Controls.Add(Me.Label10) + Me.Panel1.Controls.Add(Me.txtOPSaldo) + Me.Panel1.Controls.Add(Me.Label11) Me.Panel1.Controls.Add(Me.Label9) Me.Panel1.Controls.Add(Me.txtSumDiff) Me.Panel1.Controls.Add(Me.btnKundendatenaktualisieren) @@ -140,6 +148,16 @@ Partial Class usrCntlUSTV Me.Panel1.Size = New System.Drawing.Size(1627, 108) Me.Panel1.TabIndex = 0 ' + 'Label9 + ' + Me.Label9.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label9.AutoSize = True + Me.Label9.Location = New System.Drawing.Point(1483, 52) + Me.Label9.Name = "Label9" + Me.Label9.Size = New System.Drawing.Size(102, 13) + Me.Label9.TabIndex = 52 + Me.Label9.Text = "*bis 30.06 -> Vorjahr" + ' 'txtSumDiff ' Me.txtSumDiff._DateTimeOnly = False @@ -634,15 +652,75 @@ Partial Class usrCntlUSTV Me.ContextMenuStrip2.Name = "ContextMenuStrip1" Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4) ' - 'Label9 + 'txtRisiko ' - Me.Label9.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(1483, 52) - Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(102, 13) - Me.Label9.TabIndex = 52 - Me.Label9.Text = "*bis 30.06 -> Vorjahr" + Me.txtRisiko._DateTimeOnly = False + Me.txtRisiko._numbersOnly = False + Me.txtRisiko._numbersOnlyKommastellen = "" + Me.txtRisiko._numbersOnlyTrennzeichen = True + Me.txtRisiko._Prozent = False + Me.txtRisiko._ShortDateNew = False + Me.txtRisiko._ShortDateOnly = False + Me.txtRisiko._TimeOnly = False + Me.txtRisiko._TimeOnly_Seconds = False + Me.txtRisiko._value = "" + Me.txtRisiko._Waehrung = True + Me.txtRisiko._WaehrungZeichen = True + Me.txtRisiko.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtRisiko.ForeColor = System.Drawing.Color.Black + Me.txtRisiko.Location = New System.Drawing.Point(882, 45) + Me.txtRisiko.MaxLineLength = -1 + Me.txtRisiko.MaxLines_Warning = "" + Me.txtRisiko.MaxLines_Warning_Label = Nothing + Me.txtRisiko.Name = "txtRisiko" + Me.txtRisiko.ReadOnly = True + Me.txtRisiko.Size = New System.Drawing.Size(91, 20) + Me.txtRisiko.TabIndex = 56 + ' + 'Label10 + ' + Me.Label10.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label10.AutoSize = True + Me.Label10.Location = New System.Drawing.Point(821, 48) + Me.Label10.Name = "Label10" + Me.Label10.Size = New System.Drawing.Size(36, 13) + Me.Label10.TabIndex = 55 + Me.Label10.Text = "Risiko" + ' + 'txtOPSaldo + ' + Me.txtOPSaldo._DateTimeOnly = False + Me.txtOPSaldo._numbersOnly = False + Me.txtOPSaldo._numbersOnlyKommastellen = "" + Me.txtOPSaldo._numbersOnlyTrennzeichen = True + Me.txtOPSaldo._Prozent = False + Me.txtOPSaldo._ShortDateNew = False + Me.txtOPSaldo._ShortDateOnly = False + Me.txtOPSaldo._TimeOnly = False + Me.txtOPSaldo._TimeOnly_Seconds = False + Me.txtOPSaldo._value = "" + Me.txtOPSaldo._Waehrung = True + Me.txtOPSaldo._WaehrungZeichen = True + Me.txtOPSaldo.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtOPSaldo.ForeColor = System.Drawing.Color.Black + Me.txtOPSaldo.Location = New System.Drawing.Point(882, 25) + Me.txtOPSaldo.MaxLineLength = -1 + Me.txtOPSaldo.MaxLines_Warning = "" + Me.txtOPSaldo.MaxLines_Warning_Label = Nothing + Me.txtOPSaldo.Name = "txtOPSaldo" + Me.txtOPSaldo.ReadOnly = True + Me.txtOPSaldo.Size = New System.Drawing.Size(91, 20) + Me.txtOPSaldo.TabIndex = 54 + ' + 'Label11 + ' + Me.Label11.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label11.AutoSize = True + Me.Label11.Location = New System.Drawing.Point(824, 32) + Me.Label11.Name = "Label11" + Me.Label11.Size = New System.Drawing.Size(52, 13) + Me.Label11.TabIndex = 53 + Me.Label11.Text = "OP-Saldo" ' 'usrCntlUSTV ' @@ -700,4 +778,8 @@ Partial Class usrCntlUSTV Friend WithEvents ContextMenuStrip2 As ContextMenuStrip Friend WithEvents btnKundendatenaktualisieren As Button Friend WithEvents Label9 As Label + Friend WithEvents txtRisiko As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label10 As Label + Friend WithEvents txtOPSaldo As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label11 As Label End Class diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index 083549da..a0df8629 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -153,13 +153,20 @@ Public Class usrCntlUSTV Dim Gesamt3470 As Double = 0 Dim GesamtVZBetrag As Double = 0 Dim VorschaubetrGes As Double = 0 + Dim OPSaldo As Double = 0 + Dim Risiko As Double = 0 + Dim calcRisiko As Boolean = False If KdSearchBox1.KdNr > 0 Then Dim dt As New DataTable + dt = SQL.loadDgvBySql("SELECT Kunden.KundenNr as KundenNr, Kunden.UStV_SummeUmsatzsteuerbetragEUR, Kunden.UStV_SummeErstattungsbetragEUR, Kunden.UStV_Summe3470BetragEUR, Kunden.UStV_SummeVZBetragEUR, Kunden.UStV_SummeVorschaubetragEUR FROM Kunden WHERE Kunden.KundenNr = " & KdSearchBox1.KdNr, "FMZOLL") + + OPSaldo = CInt((New SQL).getValueTxtBySql("SELECT sum(Gesamtausstand) FROM [Offene Posten] WHERE [Kontonummer]='" & KdSearchBox1.KdNr & "'", "FMZOLL")) + calcRisiko = True If dt.Rows.Count = 1 Then GesamtUSteuer = dt.Rows(0).Item("UStV_SummeUmsatzsteuerbetragEUR") GesamtErstattung = dt.Rows(0).Item("UStV_SummeErstattungsbetragEUR") @@ -188,17 +195,25 @@ Public Class usrCntlUSTV If IsNumeric(rows.Cells("UStVAn_VZBetrag").Value) Then GesamtVZBetrag += rows.Cells("UStVAn_VZBetrag").Value Next VorschaubetrGes = 0 + Risiko = 0 End If Differnezbetrag = GesamtUSteuer - GesamtErstattung + + If calcRisiko Then + Risiko = OPSaldo - Differnezbetrag - Gesamt3470 + GesamtVZBetrag - VorschaubetrGes + End If + txtSumUst.Text = GesamtUSteuer.ToString("C2") txtSumErst.Text = GesamtErstattung.ToString("C2") txtSumDiff.Text = Differnezbetrag.ToString("C2") txt3470Betrag.Text = Gesamt3470.ToString("C2") txtVZBetrag.Text = GesamtVZBetrag.ToString("C2") txtVorschaubetrGes.Text = VorschaubetrGes.ToString("C2") + txtOPSaldo.Text = OPSaldo.ToString("C2") + txtRisiko.Text = Risiko.ToString("C2") End With diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb b/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb index 2b7f142e..9e7cbc09 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb @@ -40,7 +40,6 @@ Partial Class frmBU_Mahnlauf Me.Panel2 = New System.Windows.Forms.Panel() Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel3 = New System.Windows.Forms.Panel() - Me.Button7 = New System.Windows.Forms.Button() Me.cbxMahnstufeErh = New System.Windows.Forms.CheckBox() Me.Label8 = New System.Windows.Forms.Label() Me.Button6 = New System.Windows.Forms.Button() @@ -55,6 +54,7 @@ Partial Class frmBU_Mahnlauf Me.Button2 = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button() Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.btnKunde = New System.Windows.Forms.Button() Me.Panel1.SuspendLayout() Me.pnlTop.SuspendLayout() Me.Panel2.SuspendLayout() @@ -267,7 +267,7 @@ Partial Class frmBU_Mahnlauf ' 'Panel3 ' - Me.Panel3.Controls.Add(Me.Button7) + Me.Panel3.Controls.Add(Me.btnKunde) Me.Panel3.Controls.Add(Me.cbxMahnstufeErh) Me.Panel3.Controls.Add(Me.Label8) Me.Panel3.Controls.Add(Me.Button6) @@ -288,18 +288,6 @@ Partial Class frmBU_Mahnlauf Me.Panel3.Size = New System.Drawing.Size(1287, 147) Me.Panel3.TabIndex = 1 ' - 'Button7 - ' - Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.Button7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button7.Location = New System.Drawing.Point(38, 89) - Me.Button7.Name = "Button7" - Me.Button7.Size = New System.Drawing.Size(123, 23) - Me.Button7.TabIndex = 45 - Me.Button7.Text = "Übersetzungen" - Me.Button7.UseVisualStyleBackColor = True - ' 'cbxMahnstufeErh ' Me.cbxMahnstufeErh.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -485,6 +473,21 @@ Partial Class frmBU_Mahnlauf Me.MyTextBox2.TabIndex = 39 Me.MyTextBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' + 'btnKunde + ' + Me.btnKunde.Enabled = False + Me.btnKunde.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnKunde.Image = Global.SDL.My.Resources.Resources.person1 + Me.btnKunde.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnKunde.Location = New System.Drawing.Point(38, 87) + Me.btnKunde.Name = "btnKunde" + Me.btnKunde.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0) + Me.btnKunde.Size = New System.Drawing.Size(123, 32) + Me.btnKunde.TabIndex = 46 + Me.btnKunde.Text = "zum Kundenblatt" + Me.btnKunde.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnKunde.UseVisualStyleBackColor = True + ' 'frmBU_Mahnlauf ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -540,5 +543,5 @@ Partial Class frmBU_Mahnlauf Friend WithEvents Label8 As Label Friend WithEvents Button6 As Button Friend WithEvents cbxMahnstufeErh As CheckBox - Friend WithEvents Button7 As Button + Friend WithEvents btnKunde As Button End Class diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index 3ce4827e..bb956ad3 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -1007,6 +1007,10 @@ Public Class frmBU_Mahnlauf Private Sub MyDatagridview1_SelectionChanged(sender As Object, e As EventArgs) Handles MyDatagridview1.SelectionChanged 'MyComboBox1.changeItem("") + If MyDatagridview1.SelectedRows.Count > 0 Then + btnKunde.Enabled = True + End If + End Sub @@ -1233,4 +1237,15 @@ Public Class frmBU_Mahnlauf End If End Sub + Private Sub btnKunde_Click(sender As Object, e As EventArgs) Handles btnKunde.Click + + If MyDatagridview1.SelectedRows.Count > 0 Then + If MyDatagridview1.Columns("Konto") IsNot Nothing Then + If IsNumeric(MyDatagridview1.SelectedRows(0).Cells("Konto").Value) AndAlso MyDatagridview1.SelectedRows(0).Cells("Konto").Value > 0 Then + cProgramFunctions.openKundenblatt(MyDatagridview1.SelectedRows(0).Cells("Konto").Value, Me.FindForm) + End If + End If + End If + End Sub + End Class \ No newline at end of file diff --git a/SDL/buchhaltung/frmLeistundenFIBUKonten.Designer.vb b/SDL/buchhaltung/frmLeistundenFIBUKonten.Designer.vb index 9e0c5027..6857ea40 100644 --- a/SDL/buchhaltung/frmLeistundenFIBUKonten.Designer.vb +++ b/SDL/buchhaltung/frmLeistundenFIBUKonten.Designer.vb @@ -287,6 +287,7 @@ Partial Class frmLeistundenFIBUKonten Me.btnAdd.Size = New System.Drawing.Size(24, 20) Me.btnAdd.TabIndex = 103 Me.btnAdd.UseVisualStyleBackColor = True + Me.btnAdd.Visible = False ' 'btnDelete ' diff --git a/SDL/buchhaltung/frmLeistundenFIBUKonten.vb b/SDL/buchhaltung/frmLeistundenFIBUKonten.vb index 15f9261b..959187cc 100644 --- a/SDL/buchhaltung/frmLeistundenFIBUKonten.vb +++ b/SDL/buchhaltung/frmLeistundenFIBUKonten.vb @@ -115,8 +115,6 @@ Public Class frmLeistundenFIBUKonten If checkIfFirmaIsFilled(True) = False Then Exit Sub - - If Not mainPanel.Enabled Then mainPanel.Enabled = True For Each contr As Windows.Forms.Control In mainPanel.Controls diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index ee6dadad..8520a63b 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -2241,7 +2241,7 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" - Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8 + Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4 Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index e8976ba1..b0eb29c1 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -2823,10 +2823,11 @@ Public Class usrCntlKundenuebersicht Dim lastChecked As Date = Date.ParseExact(lblBonitaetsdatum._value, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo) - company.lastChecked = lastChecked + company.lastChecked = IIf(IsDate(lastChecked), lastChecked, Today().AddDays(-1)) - If lastChecked = Today Then - Dim bonaus = VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft.LOADByKdNrDate(kdNr, Today) + If lastChecked = Today Then + Dim bonaus = VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft.LOADByKdNrDate(kdNr, Today) + If bonaus IsNot Nothing Then If bonaus.ba_Pruefungstool = "creditsafe API" AndAlso bonaus.ba_datenarchivId > -1 Then MsgBox("Heute wurde bereits eine erfolgreiche Abfrage durchgeführt" & vbNewLine & "Vorgang wird abgebrochen!") Cursor = Cursors.Default @@ -2834,11 +2835,13 @@ Public Class usrCntlKundenuebersicht Exit Sub End If End If + End If - If cs.checkDateOfLastRequest(company) < lastChecked Then + + If cs.checkDateOfLastRequest(company) < lastChecked Then Dim a As MsgBoxResult = MsgBox("Seit der letzen Abfrage (" & lastChecked.ToShortDateString & ") wurde bei Creditsafe keine Änderung gemacht!" & vbNewLine & "Trotzdem Creditreport-Daten aktualisieren?", vbYesNo) If a = vbYes Then diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index 972a25f0..e63614bf 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -52,9 +52,11 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboFremdspedition = New System.Windows.Forms.ComboBox() Me.cbxVerzolltBei = New System.Windows.Forms.CheckBox() Me.cbxBesonderheitenNEU = New System.Windows.Forms.CheckBox() + Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten() Me.tbcntrAbf = New System.Windows.Forms.TabControl() Me.TabPage4 = New System.Windows.Forms.TabPage() Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel() + Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung() Me.rtbLKWFreigabeSenden = New System.Windows.Forms.RichTextBox() Me.Label18 = New System.Windows.Forms.Label() Me.TabPage3 = New System.Windows.Forms.TabPage() @@ -68,6 +70,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboAbfVerb_Abfertigungsverbot = New System.Windows.Forms.CheckBox() Me.txtAbfVerb_AbfertigungsverbotSeit = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.tbAufschub = New System.Windows.Forms.TabPage() + Me.usrCntlAufschubkonten = New SDL.usrCntlAufschubkonten() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.Label78 = New System.Windows.Forms.Label() Me.cbxAbf_ZollVM = New System.Windows.Forms.CheckBox() @@ -92,6 +95,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.rtbAbf_Besonderheiten = New System.Windows.Forms.RichTextBox() Me.Panel1 = New System.Windows.Forms.Panel() Me.tbFiskal = New System.Windows.Forms.TabPage() + Me.UsrCntlKundeFiskaldaten1 = New SDL.usrCntlKundeFiskaldaten() Me.tbVerrechnung = New System.Windows.Forms.TabPage() Me.cbxKapitalWaehrung = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label103 = New System.Windows.Forms.Label() @@ -240,6 +244,11 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtUSt_GVAusgestelltAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtUSt_GVAngefordertAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.tbSonstiges = New System.Windows.Forms.TabPage() + Me.txtSumPLOSE = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtSumUTA = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtSumMSE = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtSumIDS = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label109 = New System.Windows.Forms.Label() Me.Label99 = New System.Windows.Forms.Label() Me.txtCreditsafe = New System.Windows.Forms.TextBox() Me.txtSonst_KdNrTOBB = New System.Windows.Forms.TextBox() @@ -341,6 +350,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbKontakt = New System.Windows.Forms.TabControl() Me.TabPage10 = New System.Windows.Forms.TabPage() Me.TabPage11 = New System.Windows.Forms.TabPage() + Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte() Me.Label50 = New System.Windows.Forms.Label() Me.Label68 = New System.Windows.Forms.Label() Me.pnlNeukunde = New System.Windows.Forms.Panel() @@ -366,11 +376,9 @@ Partial Class usrcntlKundeBearbeitenFull Me.ArchivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DokumentHinzufügenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DokumentLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte() - Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten() - Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung() - Me.usrCntlAufschubkonten = New SDL.usrCntlAufschubkonten() - Me.UsrCntlKundeFiskaldaten1 = New SDL.usrCntlKundeFiskaldaten() + Me.Label110 = New System.Windows.Forms.Label() + Me.txtSonst_KdNrVerag = New System.Windows.Forms.TextBox() + Me.txtSumVerag = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.tbcntrDetails.SuspendLayout() Me.tbAbfertigung.SuspendLayout() Me.tbcntrAbf.SuspendLayout() @@ -552,6 +560,16 @@ Partial Class usrcntlKundeBearbeitenFull Me.cbxBesonderheitenNEU.Text = "Besonderheiten NEU" Me.cbxBesonderheitenNEU.UseVisualStyleBackColor = True ' + 'UsrCntlKundenBesonderheiten1 + ' + Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White + Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UsrCntlKundenBesonderheiten1.Location = New System.Drawing.Point(6, 25) + Me.UsrCntlKundenBesonderheiten1.Name = "UsrCntlKundenBesonderheiten1" + Me.UsrCntlKundenBesonderheiten1.Size = New System.Drawing.Size(107, 52) + Me.UsrCntlKundenBesonderheiten1.TabIndex = 235 + Me.UsrCntlKundenBesonderheiten1.Visible = False + ' 'tbcntrAbf ' Me.tbcntrAbf.Controls.Add(Me.TabPage4) @@ -586,6 +604,15 @@ Partial Class usrcntlKundeBearbeitenFull Me.FlowLayoutPanel1.Size = New System.Drawing.Size(200, 100) Me.FlowLayoutPanel1.TabIndex = 7 ' + 'UsrCntlKundenAvisoMailBenachrichtigung1 + ' + Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True + Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(0, 6) + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1" + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(479, 172) + Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 6 + ' 'rtbLKWFreigabeSenden ' Me.rtbLKWFreigabeSenden.Location = New System.Drawing.Point(485, 33) @@ -754,6 +781,14 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbAufschub.Text = "Aufschubkonten" Me.tbAufschub.UseVisualStyleBackColor = True ' + 'usrCntlAufschubkonten + ' + Me.usrCntlAufschubkonten.Dock = System.Windows.Forms.DockStyle.Fill + Me.usrCntlAufschubkonten.Location = New System.Drawing.Point(3, 3) + Me.usrCntlAufschubkonten.Name = "usrCntlAufschubkonten" + Me.usrCntlAufschubkonten.Size = New System.Drawing.Size(652, 172) + Me.usrCntlAufschubkonten.TabIndex = 0 + ' 'TabPage1 ' Me.TabPage1.Controls.Add(Me.Label78) @@ -1059,6 +1094,15 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbFiskal.Text = "Fiskal" Me.tbFiskal.UseVisualStyleBackColor = True ' + 'UsrCntlKundeFiskaldaten1 + ' + Me.UsrCntlKundeFiskaldaten1.BackColor = System.Drawing.Color.White + Me.UsrCntlKundeFiskaldaten1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlKundeFiskaldaten1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlKundeFiskaldaten1.Name = "UsrCntlKundeFiskaldaten1" + Me.UsrCntlKundeFiskaldaten1.Size = New System.Drawing.Size(672, 495) + Me.UsrCntlKundeFiskaldaten1.TabIndex = 0 + ' 'tbVerrechnung ' Me.tbVerrechnung.Controls.Add(Me.cbxKapitalWaehrung) @@ -3429,6 +3473,14 @@ Partial Class usrcntlKundeBearbeitenFull ' 'tbSonstiges ' + Me.tbSonstiges.Controls.Add(Me.txtSumVerag) + Me.tbSonstiges.Controls.Add(Me.txtSonst_KdNrVerag) + Me.tbSonstiges.Controls.Add(Me.Label110) + Me.tbSonstiges.Controls.Add(Me.txtSumPLOSE) + Me.tbSonstiges.Controls.Add(Me.txtSumUTA) + Me.tbSonstiges.Controls.Add(Me.txtSumMSE) + Me.tbSonstiges.Controls.Add(Me.txtSumIDS) + Me.tbSonstiges.Controls.Add(Me.Label109) Me.tbSonstiges.Controls.Add(Me.Label99) Me.tbSonstiges.Controls.Add(Me.txtCreditsafe) Me.tbSonstiges.Controls.Add(Me.txtSonst_KdNrTOBB) @@ -3462,15 +3514,117 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbSonstiges.Text = "Sonstiges" Me.tbSonstiges.UseVisualStyleBackColor = True ' + 'txtSumPLOSE + ' + Me.txtSumPLOSE._DateTimeOnly = False + Me.txtSumPLOSE._numbersOnly = True + Me.txtSumPLOSE._numbersOnlyKommastellen = "" + Me.txtSumPLOSE._numbersOnlyTrennzeichen = True + Me.txtSumPLOSE._Prozent = False + Me.txtSumPLOSE._ShortDateNew = False + Me.txtSumPLOSE._ShortDateOnly = False + Me.txtSumPLOSE._TimeOnly = False + Me.txtSumPLOSE._TimeOnly_Seconds = False + Me.txtSumPLOSE._value = "" + Me.txtSumPLOSE._Waehrung = False + Me.txtSumPLOSE._WaehrungZeichen = True + Me.txtSumPLOSE.ForeColor = System.Drawing.Color.Black + Me.txtSumPLOSE.Location = New System.Drawing.Point(254, 182) + Me.txtSumPLOSE.MaxLineLength = -1 + Me.txtSumPLOSE.MaxLines_Warning = "" + Me.txtSumPLOSE.MaxLines_Warning_Label = Nothing + Me.txtSumPLOSE.Name = "txtSumPLOSE" + Me.txtSumPLOSE.Size = New System.Drawing.Size(100, 20) + Me.txtSumPLOSE.TabIndex = 29 + ' + 'txtSumUTA + ' + Me.txtSumUTA._DateTimeOnly = False + Me.txtSumUTA._numbersOnly = True + Me.txtSumUTA._numbersOnlyKommastellen = "" + Me.txtSumUTA._numbersOnlyTrennzeichen = True + Me.txtSumUTA._Prozent = False + Me.txtSumUTA._ShortDateNew = False + Me.txtSumUTA._ShortDateOnly = False + Me.txtSumUTA._TimeOnly = False + Me.txtSumUTA._TimeOnly_Seconds = False + Me.txtSumUTA._value = "" + Me.txtSumUTA._Waehrung = False + Me.txtSumUTA._WaehrungZeichen = True + Me.txtSumUTA.ForeColor = System.Drawing.Color.Black + Me.txtSumUTA.Location = New System.Drawing.Point(254, 159) + Me.txtSumUTA.MaxLineLength = -1 + Me.txtSumUTA.MaxLines_Warning = "" + Me.txtSumUTA.MaxLines_Warning_Label = Nothing + Me.txtSumUTA.Name = "txtSumUTA" + Me.txtSumUTA.Size = New System.Drawing.Size(100, 20) + Me.txtSumUTA.TabIndex = 28 + ' + 'txtSumMSE + ' + Me.txtSumMSE._DateTimeOnly = False + Me.txtSumMSE._numbersOnly = True + Me.txtSumMSE._numbersOnlyKommastellen = "" + Me.txtSumMSE._numbersOnlyTrennzeichen = True + Me.txtSumMSE._Prozent = False + Me.txtSumMSE._ShortDateNew = False + Me.txtSumMSE._ShortDateOnly = False + Me.txtSumMSE._TimeOnly = False + Me.txtSumMSE._TimeOnly_Seconds = False + Me.txtSumMSE._value = "" + Me.txtSumMSE._Waehrung = False + Me.txtSumMSE._WaehrungZeichen = True + Me.txtSumMSE.ForeColor = System.Drawing.Color.Black + Me.txtSumMSE.Location = New System.Drawing.Point(254, 104) + Me.txtSumMSE.MaxLineLength = -1 + Me.txtSumMSE.MaxLines_Warning = "" + Me.txtSumMSE.MaxLines_Warning_Label = Nothing + Me.txtSumMSE.Name = "txtSumMSE" + Me.txtSumMSE.Size = New System.Drawing.Size(100, 20) + Me.txtSumMSE.TabIndex = 27 + ' + 'txtSumIDS + ' + Me.txtSumIDS._DateTimeOnly = False + Me.txtSumIDS._numbersOnly = True + Me.txtSumIDS._numbersOnlyKommastellen = "" + Me.txtSumIDS._numbersOnlyTrennzeichen = True + Me.txtSumIDS._Prozent = False + Me.txtSumIDS._ShortDateNew = False + Me.txtSumIDS._ShortDateOnly = False + Me.txtSumIDS._TimeOnly = False + Me.txtSumIDS._TimeOnly_Seconds = False + Me.txtSumIDS._value = "" + Me.txtSumIDS._Waehrung = False + Me.txtSumIDS._WaehrungZeichen = True + Me.txtSumIDS.ForeColor = System.Drawing.Color.Black + Me.txtSumIDS.Location = New System.Drawing.Point(254, 52) + Me.txtSumIDS.MaxLineLength = -1 + Me.txtSumIDS.MaxLines_Warning = "" + Me.txtSumIDS.MaxLines_Warning_Label = Nothing + Me.txtSumIDS.Name = "txtSumIDS" + Me.txtSumIDS.Size = New System.Drawing.Size(100, 20) + Me.txtSumIDS.TabIndex = 26 + ' + 'Label109 + ' + Me.Label109.AutoSize = True + Me.Label109.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label109.Location = New System.Drawing.Point(262, 9) + Me.Label109.Name = "Label109" + Me.Label109.Size = New System.Drawing.Size(94, 13) + Me.Label109.TabIndex = 25 + Me.Label109.Text = "Vorschausummen:" + ' 'Label99 ' Me.Label99.AutoSize = True Me.Label99.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label99.Location = New System.Drawing.Point(6, 34) Me.Label99.Name = "Label99" - Me.Label99.Size = New System.Drawing.Size(68, 13) + Me.Label99.Size = New System.Drawing.Size(71, 13) Me.Label99.TabIndex = 24 - Me.Label99.Text = "ID Creditsafe" + Me.Label99.Text = "ID Creditsafe:" ' 'txtCreditsafe ' @@ -3521,7 +3675,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.Label76.AutoSize = True Me.Label76.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label76.Location = New System.Drawing.Point(9, 235) + Me.Label76.Location = New System.Drawing.Point(4, 262) Me.Label76.Name = "Label76" Me.Label76.Size = New System.Drawing.Size(65, 13) Me.Label76.TabIndex = 17 @@ -3550,16 +3704,16 @@ Partial Class usrcntlKundeBearbeitenFull DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle13 - Me.dgvSonst_IDSKunden.Location = New System.Drawing.Point(9, 251) + Me.dgvSonst_IDSKunden.Location = New System.Drawing.Point(9, 308) Me.dgvSonst_IDSKunden.MultiSelect = False Me.dgvSonst_IDSKunden.Name = "dgvSonst_IDSKunden" - Me.dgvSonst_IDSKunden.Size = New System.Drawing.Size(657, 201) + Me.dgvSonst_IDSKunden.Size = New System.Drawing.Size(657, 144) Me.dgvSonst_IDSKunden.TabIndex = 18 ' 'cbxSonst_CsvAsfinag ' Me.cbxSonst_CsvAsfinag.AutoSize = True - Me.cbxSonst_CsvAsfinag.Location = New System.Drawing.Point(119, 230) + Me.cbxSonst_CsvAsfinag.Location = New System.Drawing.Point(114, 261) Me.cbxSonst_CsvAsfinag.Name = "cbxSonst_CsvAsfinag" Me.cbxSonst_CsvAsfinag.Size = New System.Drawing.Size(264, 17) Me.cbxSonst_CsvAsfinag.TabIndex = 15 @@ -3569,7 +3723,7 @@ Partial Class usrcntlKundeBearbeitenFull 'cbxSonst_CsvUTA ' Me.cbxSonst_CsvUTA.AutoSize = True - Me.cbxSonst_CsvUTA.Location = New System.Drawing.Point(274, 156) + Me.cbxSonst_CsvUTA.Location = New System.Drawing.Point(429, 155) Me.cbxSonst_CsvUTA.Name = "cbxSonst_CsvUTA" Me.cbxSonst_CsvUTA.Size = New System.Drawing.Size(240, 17) Me.cbxSonst_CsvUTA.TabIndex = 14 @@ -3579,7 +3733,7 @@ Partial Class usrcntlKundeBearbeitenFull 'cbxSonst_CsvMSE ' Me.cbxSonst_CsvMSE.AutoSize = True - Me.cbxSonst_CsvMSE.Location = New System.Drawing.Point(274, 104) + Me.cbxSonst_CsvMSE.Location = New System.Drawing.Point(429, 103) Me.cbxSonst_CsvMSE.Name = "cbxSonst_CsvMSE" Me.cbxSonst_CsvMSE.Size = New System.Drawing.Size(241, 17) Me.cbxSonst_CsvMSE.TabIndex = 9 @@ -3589,7 +3743,7 @@ Partial Class usrcntlKundeBearbeitenFull 'cbxSonst_CsvMautbericht ' Me.cbxSonst_CsvMautbericht.AutoSize = True - Me.cbxSonst_CsvMautbericht.Location = New System.Drawing.Point(274, 8) + Me.cbxSonst_CsvMautbericht.Location = New System.Drawing.Point(429, 7) Me.cbxSonst_CsvMautbericht.Name = "cbxSonst_CsvMautbericht" Me.cbxSonst_CsvMautbericht.Size = New System.Drawing.Size(181, 17) Me.cbxSonst_CsvMautbericht.TabIndex = 2 @@ -4687,6 +4841,14 @@ Partial Class usrcntlKundeBearbeitenFull Me.TabPage11.Text = "Spezifisch" Me.TabPage11.UseVisualStyleBackColor = True ' + 'ucKundenKontakte + ' + Me.ucKundenKontakte.Dock = System.Windows.Forms.DockStyle.Fill + Me.ucKundenKontakte.Location = New System.Drawing.Point(3, 3) + Me.ucKundenKontakte.Name = "ucKundenKontakte" + Me.ucKundenKontakte.Size = New System.Drawing.Size(439, 169) + Me.ucKundenKontakte.TabIndex = 0 + ' 'Label50 ' Me.Label50.AutoSize = True @@ -4967,49 +5129,47 @@ Partial Class usrcntlKundeBearbeitenFull Me.DokumentLöschenToolStripMenuItem.Size = New System.Drawing.Size(193, 22) Me.DokumentLöschenToolStripMenuItem.Text = "Dokument löschen" ' - 'ucKundenKontakte + 'Label110 ' - Me.ucKundenKontakte.Dock = System.Windows.Forms.DockStyle.Fill - Me.ucKundenKontakte.Location = New System.Drawing.Point(3, 3) - Me.ucKundenKontakte.Name = "ucKundenKontakte" - Me.ucKundenKontakte.Size = New System.Drawing.Size(439, 169) - Me.ucKundenKontakte.TabIndex = 0 + Me.Label110.AutoSize = True + Me.Label110.Enabled = False + Me.Label110.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label110.Location = New System.Drawing.Point(6, 233) + Me.Label110.Name = "Label110" + Me.Label110.Size = New System.Drawing.Size(82, 13) + Me.Label110.TabIndex = 30 + Me.Label110.Text = "KdNr bei Verag:" ' - 'UsrCntlKundenBesonderheiten1 + 'txtSonst_KdNrVerag ' - Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White - Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.UsrCntlKundenBesonderheiten1.Location = New System.Drawing.Point(6, 25) - Me.UsrCntlKundenBesonderheiten1.Name = "UsrCntlKundenBesonderheiten1" - Me.UsrCntlKundenBesonderheiten1.Size = New System.Drawing.Size(107, 52) - Me.UsrCntlKundenBesonderheiten1.TabIndex = 235 - Me.UsrCntlKundenBesonderheiten1.Visible = False + Me.txtSonst_KdNrVerag.Location = New System.Drawing.Point(119, 231) + Me.txtSonst_KdNrVerag.MaxLength = 20 + Me.txtSonst_KdNrVerag.Name = "txtSonst_KdNrVerag" + Me.txtSonst_KdNrVerag.Size = New System.Drawing.Size(122, 20) + Me.txtSonst_KdNrVerag.TabIndex = 31 ' - 'UsrCntlKundenAvisoMailBenachrichtigung1 + 'txtSumVerag ' - Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True - Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(0, 6) - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1" - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(479, 172) - Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 6 - ' - 'usrCntlAufschubkonten - ' - Me.usrCntlAufschubkonten.Dock = System.Windows.Forms.DockStyle.Fill - Me.usrCntlAufschubkonten.Location = New System.Drawing.Point(3, 3) - Me.usrCntlAufschubkonten.Name = "usrCntlAufschubkonten" - Me.usrCntlAufschubkonten.Size = New System.Drawing.Size(652, 172) - Me.usrCntlAufschubkonten.TabIndex = 0 - ' - 'UsrCntlKundeFiskaldaten1 - ' - Me.UsrCntlKundeFiskaldaten1.BackColor = System.Drawing.Color.White - Me.UsrCntlKundeFiskaldaten1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlKundeFiskaldaten1.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlKundeFiskaldaten1.Name = "UsrCntlKundeFiskaldaten1" - Me.UsrCntlKundeFiskaldaten1.Size = New System.Drawing.Size(672, 495) - Me.UsrCntlKundeFiskaldaten1.TabIndex = 0 + Me.txtSumVerag._DateTimeOnly = False + Me.txtSumVerag._numbersOnly = True + Me.txtSumVerag._numbersOnlyKommastellen = "" + Me.txtSumVerag._numbersOnlyTrennzeichen = True + Me.txtSumVerag._Prozent = False + Me.txtSumVerag._ShortDateNew = False + Me.txtSumVerag._ShortDateOnly = False + Me.txtSumVerag._TimeOnly = False + Me.txtSumVerag._TimeOnly_Seconds = False + Me.txtSumVerag._value = "" + Me.txtSumVerag._Waehrung = False + Me.txtSumVerag._WaehrungZeichen = True + Me.txtSumVerag.ForeColor = System.Drawing.Color.Black + Me.txtSumVerag.Location = New System.Drawing.Point(254, 230) + Me.txtSumVerag.MaxLineLength = -1 + Me.txtSumVerag.MaxLines_Warning = "" + Me.txtSumVerag.MaxLines_Warning_Label = Nothing + Me.txtSumVerag.Name = "txtSumVerag" + Me.txtSumVerag.Size = New System.Drawing.Size(100, 20) + Me.txtSumVerag.TabIndex = 32 ' 'usrcntlKundeBearbeitenFull ' @@ -5435,4 +5595,12 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents ArchivierenToolStripMenuItem As ToolStripMenuItem Friend WithEvents DokumentLöschenToolStripMenuItem As ToolStripMenuItem Friend WithEvents DokumentHinzufügenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents txtSumPLOSE As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtSumUTA As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtSumMSE As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtSumIDS As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label109 As Label + Friend WithEvents txtSumVerag As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtSonst_KdNrVerag As TextBox + Friend WithEvents Label110 As Label End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index a49cf83f..af1af926 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -336,6 +336,14 @@ Public Class usrcntlKundeBearbeitenFull txtUSt_GVAusgestelltAm._value = loadValue(ADRESSE.UStV_GVAusDat, "") initUStID() + ' ----- Vorschausummen ----- + + txtSumIDS._value = loadValue(KUNDE.UStV_SummeVorschaubetragEUR_IDS, 0) + txtSumPLOSE._value = loadValue(KUNDE_ERW.kde_UStV_SummeVorschaubetragEUR_PLOSE, 0) + txtSumMSE._value = loadValue(KUNDE.UStV_SummeVorschaubetragEUR_MSE, 0) + txtSumUTA._value = loadValue(KUNDE.UStV_SummeVorschaubetragEUR_UTA, 0) + txtSumVerag._value = loadValue(KUNDE.UStV_SummeVorschaubetragEUR_VERAG, 0) + ' ----- Sonstiges ----- cboSonst_Rechnungsdruck._value = loadValue(ADRESSE.Rechnungsdruck, "") txtSonst_KdNrIDS.Text = loadValue(ADRESSE.IDSKundenNr, "") @@ -345,6 +353,7 @@ Public Class usrcntlKundeBearbeitenFull txtSonst_KdNrPLOSE.Text = loadValue(ADRESSE.PLOSEKundenNr, "") txtSonst_KdNrUTA.Text = loadValue(ADRESSE.UTAKundenNr, "") txtSonst_KdNrTOBB.Text = loadValue(KUNDE_ERW.kde_TOBB_KundenNr, "") + txtSonst_KdNrVerag.Text = loadValue(KUNDE.KundenNr, "") cbxSonst_CsvAsfinag.Checked = loadValue(ADRESSE.ASFINAGExportCSV, False) cbxSonst_CsvMautbericht.Checked = loadValue(ADRESSE.ExportMautberichtCSV, False) diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 20b0cda6..f85d673e 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -1,5 +1,7 @@ Imports System.Data.OleDb Imports System.IO +Imports Challenge +Imports TAlex.WPF.Helpers Imports VERAG_PROG_ALLGEMEIN Public Class frmMDMDatenverarbetiung @@ -387,7 +389,7 @@ Public Class frmMDMDatenverarbetiung AND (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart) as temp - where temp.abgerechnet <> 1 + where temp.abgerechnet <> 1 and cast(Rechnungsdatum as Date) = '" & DateTimePicker2.Text & "' GROUP BY Kundennummer, KundenNr, [Name 1], LandKz, Ort, Lieferland, Kartennummer" Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL") @@ -631,17 +633,17 @@ Public Class frmMDMDatenverarbetiung rpt.lblKartennr.Text = "VERAG-KdNr: " & SQL.isDbnullEmpty(rpt.Fields.Item("AdressenNr").Value, "") & IIf(SQL.isDbnullEmpty(rpt.Fields.Item("Rabatt").Value, "") <> "", " abgezogener Rabatt:" & SQL.isDbnullEmpty(rpt.Fields.Item("Rabatt").Value & "", ""), "") rpt.lblNetto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Liter").Value, 2, "") - rpt.lblMWST.Text = SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("Netto").Value) - CDbl(rpt.Fields.Item("Rabatt").Value) / CDbl(rpt.Fields.Item("Liter").Value), 2, "") - rpt.lblBrutto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Brutto").Value, 2, "") + rpt.lblMWST.Text = SQL.isDbnullEmptyDbl((CDbl(rpt.Fields.Item("Netto").Value) - CDbl(rpt.Fields.Item("Rabatt").Value)) / CDbl(rpt.Fields.Item("Liter").Value), 4, "") + rpt.lblBrutto.Text = SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("Brutto").Value) - CDbl(rpt.Fields.Item("Rabatt").Value), 2, "") rpt.lblSumNet.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Liter").Value, 2, "") - rpt.lblSumVat.Text = SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("Netto").Value) - CDbl(rpt.Fields.Item("Rabatt").Value) / CDbl(rpt.Fields.Item("Liter").Value), 2, "") - rpt.lblSumBrt.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Brutto").Value, 2, "") + rpt.lblSumVat.Text = SQL.isDbnullEmptyDbl((CDbl(rpt.Fields.Item("Netto").Value) - CDbl(rpt.Fields.Item("Rabatt").Value)) / CDbl(rpt.Fields.Item("Liter").Value), 4, "") + rpt.lblSumBrt.Text = SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("Brutto").Value) - CDbl(rpt.Fields.Item("Rabatt").Value), 2, "") sumNetto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Liter").Value, 4, 0) - sumMWST += SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("Netto").Value) - CDbl(rpt.Fields.Item("Rabatt").Value) / CDbl(rpt.Fields.Item("Liter").Value), 4, 0) - sumBrutto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Brutto").Value, 4, 0) + 'sumMWST += SQL.isDbnullEmptyDbl((CDbl(rpt.Fields.Item("Netto").Value) - CDbl(rpt.Fields.Item("Rabatt").Value)) / CDbl(rpt.Fields.Item("Liter").Value), 4, 0) + sumBrutto += SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("Brutto").Value) - CDbl(rpt.Fields.Item("Rabatt").Value), 4, 0) End Sub @@ -650,7 +652,7 @@ Public Class frmMDMDatenverarbetiung AddHandler rpt.ReportFooter1.Format, Sub() rpt.lblSumNetto.Text = sumNetto.ToString("N2") - rpt.lblSumMwst.Text = sumMWST.ToString("N2") + 'rpt.lblSumMwst.Text = sumMWST.ToString("N2") rpt.lblSumBrutto.Text = sumBrutto.ToString("N2") End Sub @@ -763,7 +765,7 @@ Public Class frmMDMDatenverarbetiung AND (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart) as temp - where temp.abgerechnet <> 1 + where temp.abgerechnet <> 1 and [Rechnungsdatum] = '" & DateTimePicker2.Text & "' GROUP BY Kundennummer, KundenNr, [Name 1], LandKz, Ort", "FMZOLL") .LOAD() 'MsgBox(.GET_SQL()) @@ -878,6 +880,7 @@ Public Class frmMDMDatenverarbetiung lblTTRSum.Visible = True txtTTRSum.Visible = True + txtTTRSum._WaehrungZeichen = True lblTTRSum.Text = "Tr-Kosten" @@ -1012,12 +1015,13 @@ Public Class frmMDMDatenverarbetiung Next txtAnzahl.Text = .Rows.Count - txtPruefsummeNetto.Text = CDbl(sumTr).ToString("C2") + txtPruefsummeNetto.Text = CDbl(sumFee).ToString("C2") txtPruefsummeBrutto.Text = CDbl(sumGes).ToString("C2") - txtTTRSum.Text = CDbl(sumFee).ToString("C2") + txtTTRSum.Text = CDbl(sumTr).ToString("C2") lblTTRSum.Visible = True txtTTRSum.Visible = True + txtTTRSum._WaehrungZeichen = False lblTTRSum.Text = "Liter" @@ -1112,6 +1116,7 @@ Public Class frmMDMDatenverarbetiung Panel3.Controls.Add(c) c.Dock = DockStyle.Fill Case "UTA" + Panel5.Visible = True Dim c As New usrCntlMDMDatenverarbeitungAuswertungen_divers(Me, Me.LIEFERANT) Panel3.Controls.Add(c) c.Dock = DockStyle.Fill @@ -1211,7 +1216,7 @@ Public Class frmMDMDatenverarbetiung INNER JOIN (((Adressen INNER JOIN tblUTAImportNew ON Adressen.UTAKundenNr = tblUTAImportNew.Kundennummer) INNER JOIN Offertenpositionen ON Adressen.AdressenNr = Offertenpositionen.KundenNr) INNER JOIN tblUTALeistungen ON (tblUTALeistungen.VERAG_LeistungsNr = Offertenpositionen.LeistungsNr) AND (tblUTALeistungen.VERAG_OffertenNr = Offertenpositionen.OffertenNr) AND (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart - where abgerechnet <> 1 + where abgerechnet <> 1 and [Rechnungsdatum] = '" & DateTimePicker2.Text & "' group by Kundennummer, KundenNr, UTAExportCSV,Rechnungsdruck" Dim dt_Main As DataTable = SQL.loadDgvBySql_Param(SQLStr, "FMZOLL", 1200) @@ -1235,11 +1240,15 @@ Public Class frmMDMDatenverarbetiung For Each csv As DataRow In distinctDT_CSV.Rows - Dim dt_CSV_selected = SQL.loadDgvBySql_Param("SELECT * FROM tblUTAImportNew where Kundennummer = " & csv.Item("Customer ID"), "FMZOLL") + Dim dt_CSV_selected = SQL.loadDgvBySql_Param("SELECT * FROM tblUTAImportNew where [Rechnungsdatum] = '" & DateTimePicker2.Text & "' and Kundennummer = " & csv.Item("Customer ID"), "FMZOLL") dt_CSV_selected.ParentRelations.Clear() dt_CSV_selected.ChildRelations.Clear() dt_CSV_selected.Constraints.Clear() - dt_CSV_selected.Columns.Remove("upsize_ts") + If dt_CSV_selected.Columns.Contains("upsize_ts") Then dt_CSV_selected.Columns.Remove("upsize_ts") + If dt_CSV_selected.Columns.Contains("archiv") Then dt_CSV_selected.Columns.Remove("archiv") + If dt_CSV_selected.Columns.Contains("daId") Then dt_CSV_selected.Columns.Remove("daId") + If dt_CSV_selected.Columns.Contains("abgerechnetDatum") Then dt_CSV_selected.Columns.Remove("abgerechnetDatum") + If dt_CSV_selected.Columns.Contains("abgerechnet") Then dt_CSV_selected.Columns.Remove("abgerechnet") Dim fn As String = dir & "\" & csv.Item(1) & "_Maut_UTA.csv" @@ -1266,14 +1275,14 @@ Public Class frmMDMDatenverarbetiung Dim SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch = Nothing Dim verarbOK = True - If Not gen_SPEDBUCH_ByKdNr(UTA("Customer ID"), SPEDBUCH, "UTA") Then verarbOK = False - If Not gen_RECHNUNG_BySPEDBUCH(UTA("Customer ID"), SPEDBUCH, "UTA") Then verarbOK = False + If Not gen_SPEDBUCH_ByKdNr(UTA("Customer Nr"), SPEDBUCH, "UTA") Then verarbOK = False + If Not gen_RECHNUNG_BySPEDBUCH(UTA("Customer Nr"), SPEDBUCH, "UTA") Then verarbOK = False genUTAAttachmentByKdNr(UTA("Customer Nr"), UTA("Customer ID"), dir, datPloseAnhang.Value) If verarbOK Then 'UPDATE Fakturiert - SQL.doSQL("UPDATE [tblUTAImportNew] set abgerechnetDatum=GETDATE() where abgerechnetDatum is null and Kundennummer = " & UTA("Customer ID"), "FMZOLL") + SQL.doSQL("UPDATE [tblUTAImportNew] set abgerechnetDatum=GETDATE() where abgerechnetDatum is null and [Rechnungsdatum] = '" & DateTimePicker2.Text & "' and Kundennummer = " & UTA("Customer ID"), "FMZOLL") End If @@ -2290,9 +2299,9 @@ Public Class frmMDMDatenverarbetiung FROM (SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.LandKz, Adressen.Ort, Adressen.UTAExportCSV, Adressen.Rechnungsdruck, Offertenpositionen.KundenNr, Offertenpositionen.OffertenNr, Offertenpositionen.LeistungsNr, Offertenpositionen.LeistungsBez, tblUTAFakturierwarenarten.Warenart, tblUTAImportNew.* FROM tblUTAFakturierwarenarten INNER JOIN (((Adressen INNER JOIN tblUTAImportNew ON Adressen.UTAKundenNr = tblUTAImportNew.Kundennummer) INNER JOIN Offertenpositionen ON Adressen.AdressenNr = Offertenpositionen.KundenNr) INNER JOIN tblUTALeistungen ON (tblUTALeistungen.VERAG_LeistungsNr = Offertenpositionen.LeistungsNr) AND (tblUTALeistungen.VERAG_OffertenNr = Offertenpositionen.OffertenNr) AND (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart - WHERE Offertenpositionen.KundenNr='" & KdNr & "' + WHERE Offertenpositionen.KundenNr='" & KdNr & "' and tblUTAImportNew.Rechnungsdatum = '" & DateTimePicker2.Text & "' ) as qryUTA_Fakturierungspositionen - WHERE (((qryUTA_Fakturierungspositionen.Gesamtbetrag_Brutto_in_Darstellwährung)<>0)) + WHERE (((qryUTA_Fakturierungspositionen.Gesamtbetrag_Brutto_in_Darstellwährung)<>0)) order by LicencePlateNumber, [Card Type] " @@ -3707,13 +3716,20 @@ Public Class frmMDMDatenverarbetiung pruefData_UTA = False - If dtUTAKundennummern.Rows.Count = 1 AndAlso dtUTAKundennummern.Rows(0).Item("Kundennummer") = 868070 Then pruefData_UTA = True 'ist VERAG -> OK + If dtUTAKundennummern.Rows.Count = 1 AndAlso dtUTAKundennummern.Rows(0).Item("Kundennummer") = 868070 Then 'ist VERAG -> OK + pruefData_UTA = True + Else + MsgBox(dtUTAKundennummern.Rows.Count & " fehlende Kundennummern") + End If + + End If Dim dtUTAFakturierwarenarten As DataTable = SQL.loadDgvBySql("SELECT tblUTAImportNew.Fakturierwarenart, tblUTAImportNew.Lieferland FROM tblUTAImportNew LEFT JOIN tblUTALeistungen ON (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart) AND (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland) + WHERE cast(tblUTAImportNew.Rechnungsdatum as Date) = '" & DateTimePicker2.Text & "' GROUP BY tblUTAImportNew.Fakturierwarenart, tblUTAImportNew.Lieferland, tblUTALeistungen.Fakturierwarenart, tblUTALeistungen.Lieferland HAVING (((tblUTALeistungen.Fakturierwarenart) Is Null) AND ((tblUTALeistungen.Lieferland) Is Null))", "FMZOLL") @@ -3721,17 +3737,34 @@ Public Class frmMDMDatenverarbetiung If dtUTAFakturierwarenarten.Rows.Count > 0 Then pruefData_UTA = False + MsgBox(dtUTAFakturierwarenarten.Rows.Count & " Fakturwarenarten in tblUTALeistung nicht hinterlegt") End If Dim dtUTAOffertenPositionen As DataTable = SQL.loadDgvBySql("SELECT * FROM vwUTA_PrüfungInkonsistenzVERAGOffertenpositionen2_new", "FMZOLL") If dtUTAOffertenPositionen.Rows.Count > 0 Then - pruefData_UTA = False + MsgBox(dtUTAOffertenPositionen.Rows.Count & " fehlende Offertenpostionen") End If + + Dim fehlendeRechnungen As Integer = 0 + + fehlendeRechnungen = CInt((New SQL).getValueTxtBySql("select count(*) from tblUTAImportNew where daId is null and cast([Rechnungsdatum] as Date) = '" & DateTimePicker2.Text & "'", "FMZOLL")) + + If fehlendeRechnungen > 0 Then + pruefData_UTA = False + Dim hint As String = "" + If fehlendeRechnungen < 10 Then + hint &= SQL.getValueTxtBySql("select distinct(Rechnungsnummer_pro_Lieferland) from tblUTAImportNew where daId is null and cast(Rechnungsdatum as Date) = '" & DateTimePicker2.Text & "'", "FMZOLL") + End If + MsgBox("Es fehlen " & fehlendeRechnungen & " PDF-Rechnungen in der Datenbank!" & vbNewLine & "Diese Dokumente (von Rechnung " & DateTimePicker2.Text & ") müssen nachgeladen werden (bitte an Administrator wenden)." & IIf(hint <> "", vbNewLine & hint, "")) + End If + + + Catch ex As Exception MsgBox(ex.Message & ex.StackTrace) pruefData_UTA = False @@ -4154,6 +4187,7 @@ Public Class frmMDMDatenverarbetiung lblTTRSum.Visible = True txtTTRSum.Visible = True lblTTRSum.Text = "Prüfsumme TTR:" + txtTTRSum._WaehrungZeichen = True Else lblTTRSum.Visible = False txtTTRSum.Visible = False @@ -4174,11 +4208,6 @@ Public Class frmMDMDatenverarbetiung End Function Private Function setRechenwerteIDS() As Boolean - 'Abrechnungsdatum setzen - - 'Return False - - If Not LIEFERANT = "IDS" Then Return False @@ -4195,6 +4224,7 @@ Public Class frmMDMDatenverarbetiung For Each row In MyDatagridview1.Rows Dim kundeOhneRabatt = True + Dim seachedCustomer = False Dim trans As New VERAG_PROG_ALLGEMEIN.cIDS(row.Cells("transaction_id").value) trans.Rechenwert = 0 @@ -4204,6 +4234,11 @@ Public Class frmMDMDatenverarbetiung If trans.KdNrVERAG Is Nothing Then + 'If trans.CustomerCode = 60003513 And trans.OutletCountry = "France" Then + ' seachedCustomer = True + 'End If + + If trans.TransactionVolume <> 0 Then trans.avpriceexclVAT = trans.TotalNetAmount / trans.TransactionVolume End If @@ -4230,7 +4265,7 @@ Public Class frmMDMDatenverarbetiung 'Rechenwert für Land/Kunde/Produkt ermittteln Dim sqlStringLandKundeProdukt = "Select Top(1) Rechenwert, Kz, KategorieNr FROM tbl_IDS_Rechenwerte WHERE OutletCountryCode=" & row.Cells("OutletCountryCode").Value & " And OutletCode Is Null AND CustomerCode=" & row.Cells("KundeCustomerCode").Value & " And ProductTypeCode=" & row.Cells("ProductTypeCode").Value & " ORDER BY Zeitstempel DESC" - Dim dtLandKundeProdukt As DataTable = SQL.loadDgvBySql(sqlStringLandStationKundeProdukt, "FMZOLL") + Dim dtLandKundeProdukt As DataTable = SQL.loadDgvBySql(sqlStringLandKundeProdukt, "FMZOLL") If dtLandKundeProdukt.Rows.Count > 0 Then For Each r In dtLandKundeProdukt.Rows @@ -4249,7 +4284,7 @@ Public Class frmMDMDatenverarbetiung ' Rechenwert für Land/Station/Produkt ermitteln - Dim sqlStringLandStationProdukt = "select Top(1) Rechenwert, Kz, KategorieNr FROM tbl_IDS_Rechenwerte WHERE OutletCountryCode=" & row.Cells("OutletCountryCode").Value & " AND OutletCode=" & row.Cells("OutletCode").Value & " AND ProductTypeCode=" & row.Cells("ProductTypeCode").Value & " ORDER BY Zeitstempel DESC" + Dim sqlStringLandStationProdukt = "select Top(1) Rechenwert, Kz, KategorieNr FROM tbl_IDS_Rechenwerte WHERE OutletCountryCode=" & row.Cells("OutletCountryCode").Value & " AND OutletCode=" & row.Cells("OutletCode").Value & " AND ProductTypeCode=" & row.Cells("ProductTypeCode").Value & " AND CustomerCode is null ORDER BY Zeitstempel DESC" Dim dtLandStationProdukt As DataTable = SQL.loadDgvBySql(sqlStringLandStationProdukt, "FMZOLL") If dtLandStationProdukt.Rows.Count > 0 Then For Each r In dtLandStationProdukt.Rows @@ -4264,7 +4299,7 @@ Public Class frmMDMDatenverarbetiung ' Rechenwert für Land/Produkt ermitteln - Dim sqlStringLandProdukt = "Select Top(1) Rechenwert, Kz, KategorieNr FROM tbl_IDS_Rechenwerte WHERE OutletCountryCode=" & row.Cells("OutletCountryCode").Value & " And OutletCode Is Null And ProductTypeCode=" & row.Cells("ProductTypeCode").Value & " ORDER BY Zeitstempel DESC" + Dim sqlStringLandProdukt = "Select Top(1) Rechenwert, Kz, KategorieNr FROM tbl_IDS_Rechenwerte WHERE OutletCountryCode=" & row.Cells("OutletCountryCode").Value & " And OutletCode Is Null And ProductTypeCode=" & row.Cells("ProductTypeCode").Value & " AND CustomerCode is null ORDER BY Zeitstempel DESC" Dim dtLandProdukt As DataTable = SQL.loadDgvBySql(sqlStringLandProdukt, "FMZOLL") If dtLandProdukt.Rows.Count > 0 Then For Each r In dtLandProdukt.Rows @@ -4315,14 +4350,21 @@ RechenwertBerechnen: End If + + RabattBerechnen: Select Case trans.Kz Case "P" 'Rechenwert ist Preis pro Liter - trans.Rabattbetrag = trans.TotalNetAmount - (trans.Rechenwert * trans.TransactionVolume * 100 + 0.5) / 100 + + trans.Rabattbetrag = trans.TotalNetAmount - Math.Floor(trans.Rechenwert * trans.TransactionVolume * 100 + 0.5) / 100 + trans.RabattbetragOrig = trans.Rabattbetrag + trans.Rabattbetrag = trans.Rabattbetrag Case "R" 'Rechenwert ist Rabatt pro Liter - trans.Rabattbetrag = (trans.Rechenwert * trans.TransactionVolume * 100 + 0.5) / 100 + trans.Rabattbetrag = Math.Floor(trans.Rechenwert * trans.TransactionVolume * 100 + 0.5) / 100 + trans.RabattbetragOrig = trans.Rabattbetrag + trans.Rabattbetrag = trans.Rabattbetrag End Select @@ -4333,6 +4375,8 @@ RabattBerechnen: If trans.TransactionVolume <> 0 Then trans.RabattbetragProLiter = trans.Rabattbetrag / trans.TransactionVolume + trans.RabattbetragProLiterOrig = trans.RabattbetragProLiter + trans.RabattbetragProLiter = trans.RabattbetragProLiter End If trans.Zeitstempel = Now() @@ -4623,19 +4667,24 @@ RabattBerechnen: Exit Sub End If - If vbYes = MsgBox("Wollen Sie die Rechenwerte in der IDS-Tabelle zurücksetzen?", vbYesNoCancel) Then + If vbYes = MsgBox("Wollen Sie die Rechenwerte und Rabattbeträge in der IDS-Tabelle zurücksetzen?", vbYesNoCancel) Then + Me.Cursor = Cursors.WaitCursor Dim i As Integer = 0 For Each row In MyDatagridview1.Rows Dim trans As New VERAG_PROG_ALLGEMEIN.cIDS(row.Cells("transaction_id").Value) trans.Rechenwert = 0 + trans.Rabattbetrag = 0 + trans.RabattbetragProLiter = 0 trans.Kz = "R" trans.Zeitstempel = Now() trans.KdNrVERAG = Nothing trans.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME If trans.SAVE() Then i += 1 Next + initDgv_IDS() + Me.Cursor = Cursors.Default + MsgBox(i & " Rechenwerte und Rabattbeträge wurden zurückgesetzt!") - MsgBox(i & " Rechenwerte wurden zurückgesetzt!") End If End Sub diff --git a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb index fcdf236f..6faf0fc5 100644 --- a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb +++ b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb @@ -65,7 +65,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label19 = New System.Windows.Forms.Label() Me.cboEZOLLMandant = New System.Windows.Forms.ComboBox() Me.Label29 = New System.Windows.Forms.Label() - Me.cboEZOLLBrg = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboEZOLLStatus = New System.Windows.Forms.ComboBox() Me.Label20 = New System.Windows.Forms.Label() Me.datEZOLLBis = New System.Windows.Forms.DateTimePicker() @@ -78,7 +77,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label17 = New System.Windows.Forms.Label() Me.GroupBox4 = New System.Windows.Forms.GroupBox() Me.Label36 = New System.Windows.Forms.Label() - Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button20 = New System.Windows.Forms.Button() Me.Button7 = New System.Windows.Forms.Button() Me.Button3 = New System.Windows.Forms.Button() @@ -94,9 +92,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Label28 = New System.Windows.Forms.Label() Me.Label30 = New System.Windows.Forms.Label() Me.GroupBox5 = New System.Windows.Forms.GroupBox() - Me.cboDYDatumArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label95 = New System.Windows.Forms.Label() - Me.cboDY_NCTS = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cbxSplittungNachPos = New System.Windows.Forms.CheckBox() Me.cbxAnrechnungRefBetrag = New System.Windows.Forms.CheckBox() Me.Button8 = New System.Windows.Forms.Button() @@ -117,7 +113,6 @@ Partial Class usrCntlZOLLAuswertungen Me.tbcntr = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.Label98 = New System.Windows.Forms.Label() - Me.cboNCTSSystemDY = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Panel1 = New System.Windows.Forms.Panel() Me.pic = New System.Windows.Forms.PictureBox() Me.Label88 = New System.Windows.Forms.Label() @@ -150,7 +145,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label76 = New System.Windows.Forms.Label() Me.grpVERIMEX = New System.Windows.Forms.GroupBox() Me.Label94 = New System.Windows.Forms.Label() - Me.cboBRG_Verimex = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button22 = New System.Windows.Forms.Button() Me.Button19 = New System.Windows.Forms.Button() Me.Button18 = New System.Windows.Forms.Button() @@ -193,7 +187,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label56 = New System.Windows.Forms.Label() Me.Button12 = New System.Windows.Forms.Button() Me.Label53 = New System.Windows.Forms.Label() - Me.cboBrgEZollTC = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label55 = New System.Windows.Forms.Label() Me.datEZOLL_TC_Bis = New System.Windows.Forms.DateTimePicker() Me.Label57 = New System.Windows.Forms.Label() @@ -231,15 +224,8 @@ Partial Class usrCntlZOLLAuswertungen Me.PictureBox3 = New System.Windows.Forms.PictureBox() Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.TabPage2 = New System.Windows.Forms.TabPage() - Me.UsrCntlAuswertungenUIDPruefung1 = New SDL.usrCntlAuswertungenUIDPruefung() - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1 = New SDL.usrCntlAuswertungenKunden_Auftragsrueckgang() Me.TabPage3 = New System.Windows.Forms.TabPage() - Me.UsrCntlAuswertungenEV_Veranlagungen1 = New SDL.usrCntlAuswertungenEV_Veranlagungen() - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1 = New SDL.usrCntlAuswertungenFiskal_IntrastatMeldung() - Me.UsrCntlAuswertungenFiskalvertretung_42001 = New SDL.usrCntlAuswertungenFiskalvertretung_4200() Me.TabPage4 = New System.Windows.Forms.TabPage() - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1 = New SDL.usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER() - Me.UsrCntlAuswertungenAufschub_Abgabenliste1 = New SDL.usrCntlAuswertungenAufschub_Abgabenliste() Me.TabPage5 = New System.Windows.Forms.TabPage() Me.Label60 = New System.Windows.Forms.Label() Me.GroupBox9 = New System.Windows.Forms.GroupBox() @@ -261,6 +247,20 @@ Partial Class usrCntlZOLLAuswertungen Me.Button14 = New System.Windows.Forms.Button() Me.PictureBox8 = New System.Windows.Forms.PictureBox() Me.pnl = New System.Windows.Forms.Panel() + Me.cboNCTSSystemDY = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboBRG_Verimex = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboBrgEZollTC = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboDYDatumArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboDY_NCTS = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboEZOLLBrg = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.UsrCntlAuswertungenUIDPruefung1 = New SDL.usrCntlAuswertungenUIDPruefung() + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1 = New SDL.usrCntlAuswertungenKunden_Auftragsrueckgang() + Me.UsrCntlAuswertungenEV_Veranlagungen1 = New SDL.usrCntlAuswertungenEV_Veranlagungen() + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1 = New SDL.usrCntlAuswertungenFiskal_IntrastatMeldung() + Me.UsrCntlAuswertungenFiskalvertretung_42001 = New SDL.usrCntlAuswertungenFiskalvertretung_4200() + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1 = New SDL.usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER() + Me.UsrCntlAuswertungenAufschub_Abgabenliste1 = New SDL.usrCntlAuswertungenAufschub_Abgabenliste() Me.GroupBox1.SuspendLayout() Me.grpDurmaz.SuspendLayout() CType(Me.picDurmaz, System.ComponentModel.ISupportInitialize).BeginInit() @@ -776,20 +776,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label29.TabIndex = 19 Me.Label29.Text = "Mandant:" ' - 'cboEZOLLBrg - ' - Me.cboEZOLLBrg._allowedValuesFreiText = Nothing - Me.cboEZOLLBrg._allowFreiText = False - Me.cboEZOLLBrg._value = "" - Me.cboEZOLLBrg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboEZOLLBrg.DropDownWidth = 350 - Me.cboEZOLLBrg.FormattingEnabled = True - Me.cboEZOLLBrg.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) - Me.cboEZOLLBrg.Location = New System.Drawing.Point(223, 69) - Me.cboEZOLLBrg.Name = "cboEZOLLBrg" - Me.cboEZOLLBrg.Size = New System.Drawing.Size(201, 21) - Me.cboEZOLLBrg.TabIndex = 12 - ' 'cboEZOLLStatus ' Me.cboEZOLLStatus.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList @@ -916,19 +902,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label36.TabIndex = 20 Me.Label36.Text = "Bürgschaft (keine Auswahl = Standard):" ' - 'MyComboBox1 - ' - Me.MyComboBox1._allowedValuesFreiText = Nothing - Me.MyComboBox1._allowFreiText = False - Me.MyComboBox1._value = "" - Me.MyComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.MyComboBox1.DropDownWidth = 350 - Me.MyComboBox1.FormattingEnabled = True - Me.MyComboBox1.Location = New System.Drawing.Point(186, 112) - Me.MyComboBox1.Name = "MyComboBox1" - Me.MyComboBox1.Size = New System.Drawing.Size(221, 21) - Me.MyComboBox1.TabIndex = 19 - ' 'Button20 ' Me.Button20.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -1092,19 +1065,6 @@ Partial Class usrCntlZOLLAuswertungen Me.GroupBox5.TabIndex = 19 Me.GroupBox5.TabStop = False ' - 'cboDYDatumArt - ' - Me.cboDYDatumArt._allowedValuesFreiText = Nothing - Me.cboDYDatumArt._allowFreiText = False - Me.cboDYDatumArt._value = "" - Me.cboDYDatumArt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboDYDatumArt.DropDownWidth = 350 - Me.cboDYDatumArt.FormattingEnabled = True - Me.cboDYDatumArt.Location = New System.Drawing.Point(439, 9) - Me.cboDYDatumArt.Name = "cboDYDatumArt" - Me.cboDYDatumArt.Size = New System.Drawing.Size(234, 21) - Me.cboDYDatumArt.TabIndex = 39 - ' 'Label95 ' Me.Label95.AutoSize = True @@ -1114,19 +1074,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label95.TabIndex = 23 Me.Label95.Text = "NCTS-SYSTEM:" ' - 'cboDY_NCTS - ' - Me.cboDY_NCTS._allowedValuesFreiText = Nothing - Me.cboDY_NCTS._allowFreiText = False - Me.cboDY_NCTS._value = "" - Me.cboDY_NCTS.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboDY_NCTS.DropDownWidth = 350 - Me.cboDY_NCTS.FormattingEnabled = True - Me.cboDY_NCTS.Location = New System.Drawing.Point(148, 117) - Me.cboDY_NCTS.Name = "cboDY_NCTS" - Me.cboDY_NCTS.Size = New System.Drawing.Size(252, 21) - Me.cboDY_NCTS.TabIndex = 22 - ' 'cbxSplittungNachPos ' Me.cbxSplittungNachPos.AutoSize = True @@ -1302,7 +1249,7 @@ Partial Class usrCntlZOLLAuswertungen Me.tbcntr.Location = New System.Drawing.Point(0, 57) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 - Me.tbcntr.Size = New System.Drawing.Size(1296, 1829) + Me.tbcntr.Size = New System.Drawing.Size(1262, 1829) Me.tbcntr.TabIndex = 22 ' 'TabPage1 @@ -1345,7 +1292,7 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(1288, 1803) + Me.TabPage1.Size = New System.Drawing.Size(1254, 1803) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Bürgschaften" Me.TabPage1.UseVisualStyleBackColor = True @@ -1359,19 +1306,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label98.TabIndex = 39 Me.Label98.Text = "NCTS-SYSTEM (DAKOSY):" ' - 'cboNCTSSystemDY - ' - Me.cboNCTSSystemDY._allowedValuesFreiText = Nothing - Me.cboNCTSSystemDY._allowFreiText = False - Me.cboNCTSSystemDY._value = "" - Me.cboNCTSSystemDY.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboNCTSSystemDY.DropDownWidth = 350 - Me.cboNCTSSystemDY.FormattingEnabled = True - Me.cboNCTSSystemDY.Location = New System.Drawing.Point(448, 706) - Me.cboNCTSSystemDY.Name = "cboNCTSSystemDY" - Me.cboNCTSSystemDY.Size = New System.Drawing.Size(252, 21) - Me.cboNCTSSystemDY.TabIndex = 38 - ' 'Panel1 ' Me.Panel1.Controls.Add(Me.Label3) @@ -1712,19 +1646,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label94.TabIndex = 18 Me.Label94.Text = "Bürgschaft (keine Auswahl = alle):" ' - 'cboBRG_Verimex - ' - Me.cboBRG_Verimex._allowedValuesFreiText = Nothing - Me.cboBRG_Verimex._allowFreiText = False - Me.cboBRG_Verimex._value = "" - Me.cboBRG_Verimex.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboBRG_Verimex.DropDownWidth = 350 - Me.cboBRG_Verimex.FormattingEnabled = True - Me.cboBRG_Verimex.Location = New System.Drawing.Point(184, 120) - Me.cboBRG_Verimex.Name = "cboBRG_Verimex" - Me.cboBRG_Verimex.Size = New System.Drawing.Size(221, 21) - Me.cboBRG_Verimex.TabIndex = 17 - ' 'Button22 ' Me.Button22.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -2158,20 +2079,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label53.TabIndex = 13 Me.Label53.Text = "Bürgschaft (keine Auswahl = alle):" ' - 'cboBrgEZollTC - ' - Me.cboBrgEZollTC._allowedValuesFreiText = Nothing - Me.cboBrgEZollTC._allowFreiText = False - Me.cboBrgEZollTC._value = "" - Me.cboBrgEZollTC.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboBrgEZollTC.DropDownWidth = 350 - Me.cboBrgEZollTC.FormattingEnabled = True - Me.cboBrgEZollTC.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) - Me.cboBrgEZollTC.Location = New System.Drawing.Point(437, 68) - Me.cboBrgEZollTC.Name = "cboBrgEZollTC" - Me.cboBrgEZollTC.Size = New System.Drawing.Size(201, 21) - Me.cboBrgEZollTC.TabIndex = 12 - ' 'Label55 ' Me.Label55.AutoSize = True @@ -2542,29 +2449,11 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(1305, 1803) + Me.TabPage2.Size = New System.Drawing.Size(1271, 1803) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Kunden" Me.TabPage2.UseVisualStyleBackColor = True ' - 'UsrCntlAuswertungenUIDPruefung1 - ' - Me.UsrCntlAuswertungenUIDPruefung1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenUIDPruefung1.Location = New System.Drawing.Point(6, 259) - Me.UsrCntlAuswertungenUIDPruefung1.Name = "UsrCntlAuswertungenUIDPruefung1" - Me.UsrCntlAuswertungenUIDPruefung1.Size = New System.Drawing.Size(708, 176) - Me.UsrCntlAuswertungenUIDPruefung1.TabIndex = 1 - ' - 'UsrCntlAuswertungenKunden_Auftragsrueckgang1 - ' - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Location = New System.Drawing.Point(6, 18) - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Name = "UsrCntlAuswertungenKunden_Auftragsrueckgang1" - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Size = New System.Drawing.Size(0, 235) - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.TabIndex = 0 - ' 'TabPage3 ' Me.TabPage3.Controls.Add(Me.UsrCntlAuswertungenEV_Veranlagungen1) @@ -2573,62 +2462,22 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage3.Location = New System.Drawing.Point(4, 22) Me.TabPage3.Name = "TabPage3" Me.TabPage3.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage3.Size = New System.Drawing.Size(1305, 1803) + Me.TabPage3.Size = New System.Drawing.Size(1271, 1803) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Fiskalvertretung / EV-Veranlagung" Me.TabPage3.UseVisualStyleBackColor = True ' - 'UsrCntlAuswertungenEV_Veranlagungen1 - ' - Me.UsrCntlAuswertungenEV_Veranlagungen1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenEV_Veranlagungen1.Location = New System.Drawing.Point(3, 568) - Me.UsrCntlAuswertungenEV_Veranlagungen1.Name = "UsrCntlAuswertungenEV_Veranlagungen1" - Me.UsrCntlAuswertungenEV_Veranlagungen1.Size = New System.Drawing.Size(708, 105) - Me.UsrCntlAuswertungenEV_Veranlagungen1.TabIndex = 2 - ' - 'UsrCntlAuswertungenFiskal_IntrastatMeldung1 - ' - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Location = New System.Drawing.Point(3, 327) - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Name = "UsrCntlAuswertungenFiskal_IntrastatMeldung1" - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Size = New System.Drawing.Size(708, 235) - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.TabIndex = 1 - ' - 'UsrCntlAuswertungenFiskalvertretung_42001 - ' - Me.UsrCntlAuswertungenFiskalvertretung_42001.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenFiskalvertretung_42001.Location = New System.Drawing.Point(3, 22) - Me.UsrCntlAuswertungenFiskalvertretung_42001.Name = "UsrCntlAuswertungenFiskalvertretung_42001" - Me.UsrCntlAuswertungenFiskalvertretung_42001.Size = New System.Drawing.Size(708, 234) - Me.UsrCntlAuswertungenFiskalvertretung_42001.TabIndex = 0 - ' 'TabPage4 ' Me.TabPage4.Controls.Add(Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1) Me.TabPage4.Controls.Add(Me.UsrCntlAuswertungenAufschub_Abgabenliste1) Me.TabPage4.Location = New System.Drawing.Point(4, 22) Me.TabPage4.Name = "TabPage4" - Me.TabPage4.Size = New System.Drawing.Size(1288, 1803) + Me.TabPage4.Size = New System.Drawing.Size(1271, 1803) Me.TabPage4.TabIndex = 3 Me.TabPage4.Text = "Aufschubdaten" Me.TabPage4.UseVisualStyleBackColor = True ' - 'UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1 - ' - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Location = New System.Drawing.Point(3, 149) - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Name = "UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1" - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Size = New System.Drawing.Size(708, 120) - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.TabIndex = 1 - ' - 'UsrCntlAuswertungenAufschub_Abgabenliste1 - ' - Me.UsrCntlAuswertungenAufschub_Abgabenliste1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Location = New System.Drawing.Point(3, 22) - Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Name = "UsrCntlAuswertungenAufschub_Abgabenliste1" - Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Size = New System.Drawing.Size(708, 180) - Me.UsrCntlAuswertungenAufschub_Abgabenliste1.TabIndex = 0 - ' 'TabPage5 ' Me.TabPage5.Controls.Add(Me.Label60) @@ -2637,7 +2486,7 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage5.Location = New System.Drawing.Point(4, 22) Me.TabPage5.Name = "TabPage5" Me.TabPage5.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage5.Size = New System.Drawing.Size(1305, 1803) + Me.TabPage5.Size = New System.Drawing.Size(1271, 1803) Me.TabPage5.TabIndex = 4 Me.TabPage5.Text = "UNISPED" Me.TabPage5.UseVisualStyleBackColor = True @@ -2845,9 +2694,160 @@ Partial Class usrCntlZOLLAuswertungen Me.pnl.Dock = System.Windows.Forms.DockStyle.Top Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(1296, 57) + Me.pnl.Size = New System.Drawing.Size(1262, 57) Me.pnl.TabIndex = 23 ' + 'cboNCTSSystemDY + ' + Me.cboNCTSSystemDY._allowedValuesFreiText = Nothing + Me.cboNCTSSystemDY._allowFreiText = False + Me.cboNCTSSystemDY._value = "" + Me.cboNCTSSystemDY.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboNCTSSystemDY.DropDownWidth = 350 + Me.cboNCTSSystemDY.FormattingEnabled = True + Me.cboNCTSSystemDY.Location = New System.Drawing.Point(448, 706) + Me.cboNCTSSystemDY.Name = "cboNCTSSystemDY" + Me.cboNCTSSystemDY.Size = New System.Drawing.Size(252, 21) + Me.cboNCTSSystemDY.TabIndex = 38 + ' + 'cboBRG_Verimex + ' + Me.cboBRG_Verimex._allowedValuesFreiText = Nothing + Me.cboBRG_Verimex._allowFreiText = False + Me.cboBRG_Verimex._value = "" + Me.cboBRG_Verimex.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboBRG_Verimex.DropDownWidth = 350 + Me.cboBRG_Verimex.FormattingEnabled = True + Me.cboBRG_Verimex.Location = New System.Drawing.Point(184, 120) + Me.cboBRG_Verimex.Name = "cboBRG_Verimex" + Me.cboBRG_Verimex.Size = New System.Drawing.Size(221, 21) + Me.cboBRG_Verimex.TabIndex = 17 + ' + 'cboBrgEZollTC + ' + Me.cboBrgEZollTC._allowedValuesFreiText = Nothing + Me.cboBrgEZollTC._allowFreiText = False + Me.cboBrgEZollTC._value = "" + Me.cboBrgEZollTC.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboBrgEZollTC.DropDownWidth = 350 + Me.cboBrgEZollTC.FormattingEnabled = True + Me.cboBrgEZollTC.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) + Me.cboBrgEZollTC.Location = New System.Drawing.Point(437, 68) + Me.cboBrgEZollTC.Name = "cboBrgEZollTC" + Me.cboBrgEZollTC.Size = New System.Drawing.Size(201, 21) + Me.cboBrgEZollTC.TabIndex = 12 + ' + 'cboDYDatumArt + ' + Me.cboDYDatumArt._allowedValuesFreiText = Nothing + Me.cboDYDatumArt._allowFreiText = False + Me.cboDYDatumArt._value = "" + Me.cboDYDatumArt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboDYDatumArt.DropDownWidth = 350 + Me.cboDYDatumArt.FormattingEnabled = True + Me.cboDYDatumArt.Location = New System.Drawing.Point(439, 9) + Me.cboDYDatumArt.Name = "cboDYDatumArt" + Me.cboDYDatumArt.Size = New System.Drawing.Size(234, 21) + Me.cboDYDatumArt.TabIndex = 39 + ' + 'cboDY_NCTS + ' + Me.cboDY_NCTS._allowedValuesFreiText = Nothing + Me.cboDY_NCTS._allowFreiText = False + Me.cboDY_NCTS._value = "" + Me.cboDY_NCTS.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboDY_NCTS.DropDownWidth = 350 + Me.cboDY_NCTS.FormattingEnabled = True + Me.cboDY_NCTS.Location = New System.Drawing.Point(148, 117) + Me.cboDY_NCTS.Name = "cboDY_NCTS" + Me.cboDY_NCTS.Size = New System.Drawing.Size(252, 21) + Me.cboDY_NCTS.TabIndex = 22 + ' + 'cboEZOLLBrg + ' + Me.cboEZOLLBrg._allowedValuesFreiText = Nothing + Me.cboEZOLLBrg._allowFreiText = False + Me.cboEZOLLBrg._value = "" + Me.cboEZOLLBrg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboEZOLLBrg.DropDownWidth = 350 + Me.cboEZOLLBrg.FormattingEnabled = True + Me.cboEZOLLBrg.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) + Me.cboEZOLLBrg.Location = New System.Drawing.Point(223, 69) + Me.cboEZOLLBrg.Name = "cboEZOLLBrg" + Me.cboEZOLLBrg.Size = New System.Drawing.Size(201, 21) + Me.cboEZOLLBrg.TabIndex = 12 + ' + 'MyComboBox1 + ' + Me.MyComboBox1._allowedValuesFreiText = Nothing + Me.MyComboBox1._allowFreiText = False + Me.MyComboBox1._value = "" + Me.MyComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.MyComboBox1.DropDownWidth = 350 + Me.MyComboBox1.FormattingEnabled = True + Me.MyComboBox1.Location = New System.Drawing.Point(186, 112) + Me.MyComboBox1.Name = "MyComboBox1" + Me.MyComboBox1.Size = New System.Drawing.Size(221, 21) + Me.MyComboBox1.TabIndex = 19 + ' + 'UsrCntlAuswertungenUIDPruefung1 + ' + Me.UsrCntlAuswertungenUIDPruefung1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenUIDPruefung1.Location = New System.Drawing.Point(6, 259) + Me.UsrCntlAuswertungenUIDPruefung1.Name = "UsrCntlAuswertungenUIDPruefung1" + Me.UsrCntlAuswertungenUIDPruefung1.Size = New System.Drawing.Size(708, 176) + Me.UsrCntlAuswertungenUIDPruefung1.TabIndex = 1 + ' + 'UsrCntlAuswertungenKunden_Auftragsrueckgang1 + ' + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Location = New System.Drawing.Point(6, 18) + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Name = "UsrCntlAuswertungenKunden_Auftragsrueckgang1" + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Size = New System.Drawing.Size(0, 235) + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.TabIndex = 0 + ' + 'UsrCntlAuswertungenEV_Veranlagungen1 + ' + Me.UsrCntlAuswertungenEV_Veranlagungen1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenEV_Veranlagungen1.Location = New System.Drawing.Point(3, 568) + Me.UsrCntlAuswertungenEV_Veranlagungen1.Name = "UsrCntlAuswertungenEV_Veranlagungen1" + Me.UsrCntlAuswertungenEV_Veranlagungen1.Size = New System.Drawing.Size(708, 105) + Me.UsrCntlAuswertungenEV_Veranlagungen1.TabIndex = 2 + ' + 'UsrCntlAuswertungenFiskal_IntrastatMeldung1 + ' + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Location = New System.Drawing.Point(3, 327) + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Name = "UsrCntlAuswertungenFiskal_IntrastatMeldung1" + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Size = New System.Drawing.Size(708, 235) + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.TabIndex = 1 + ' + 'UsrCntlAuswertungenFiskalvertretung_42001 + ' + Me.UsrCntlAuswertungenFiskalvertretung_42001.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenFiskalvertretung_42001.Location = New System.Drawing.Point(3, 22) + Me.UsrCntlAuswertungenFiskalvertretung_42001.Name = "UsrCntlAuswertungenFiskalvertretung_42001" + Me.UsrCntlAuswertungenFiskalvertretung_42001.Size = New System.Drawing.Size(708, 234) + Me.UsrCntlAuswertungenFiskalvertretung_42001.TabIndex = 0 + ' + 'UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1 + ' + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Location = New System.Drawing.Point(3, 149) + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Name = "UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1" + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Size = New System.Drawing.Size(708, 120) + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.TabIndex = 1 + ' + 'UsrCntlAuswertungenAufschub_Abgabenliste1 + ' + Me.UsrCntlAuswertungenAufschub_Abgabenliste1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Location = New System.Drawing.Point(3, 22) + Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Name = "UsrCntlAuswertungenAufschub_Abgabenliste1" + Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Size = New System.Drawing.Size(708, 180) + Me.UsrCntlAuswertungenAufschub_Abgabenliste1.TabIndex = 0 + ' 'usrCntlZOLLAuswertungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2857,7 +2857,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Controls.Add(Me.tbcntr) Me.Controls.Add(Me.pnl) Me.Name = "usrCntlZOLLAuswertungen" - Me.Size = New System.Drawing.Size(1296, 1174) + Me.Size = New System.Drawing.Size(1262, 1174) Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() Me.grpDurmaz.ResumeLayout(False) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb b/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb index 1d75baaa..d38c220c 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb @@ -31,6 +31,8 @@ Public Class cIDS Property Kz As Object = Nothing Property Rabattbetrag As Object = Nothing Property RabattbetragProLiter As Object = Nothing + Property RabattbetragOrig As Object = Nothing + Property RabattbetragProLiterOrig As Object = Nothing Property Zeitstempel As Object = Nothing Property Sachbearbeiter As Object = Nothing Property KdNrVERAG As Object = Nothing @@ -90,6 +92,8 @@ Public Class cIDS list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Kz", Kz)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Rabattbetrag", Rabattbetrag)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RabattbetragProLiter", RabattbetragProLiter)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RabattbetragOrig", RabattbetragOrig)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RabattbetragProLiterOrig", RabattbetragProLiterOrig)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Zeitstempel", Zeitstempel)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Sachbearbeiter", Sachbearbeiter)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KdNrVERAG", KdNrVERAG)) @@ -238,7 +242,7 @@ Public Class cIDS lngRecordCount = lngRecordCount + 1 If lngRecordCount = 1 Then - If Not isleernothing((currentRow(0))) = "Year Month Day" Then + If Not (isleernothing((currentRow(0))) = "Year Month Day" AndAlso isleernothing((currentRow(14))) = "OBO Number") Then Return False End If diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKunde.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKunde.vb index 608c90cf..32fb37f1 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cKunde.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cKunde.vb @@ -67,6 +67,9 @@ Public Class cKunde Property UStV_SummeVorschaubetragEUR As Object = Nothing Property UStV_SummeVorschaubetragEUR_VERAG As Object = Nothing Property UStV_SummeVorschaubetragEUR_IDS As Object = Nothing + Property UStV_SummeVorschaubetragEUR_MSE As Object = Nothing + Property UStV_SummeVorschaubetragEUR_UTA As Object = Nothing + Property UStV_SummeVorschaubetragEUR_IT As Object = Nothing Property Fiskal As Boolean = False Property Ausfuhr As Boolean = False Property BankgarantieBetrag As Object = Nothing @@ -184,6 +187,10 @@ Public Class cKunde list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Höchstkredit", Höchstkredit)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DakosyExport", DakosyExport)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStV_SummeVorschaubetragEUR_MSE", UStV_SummeVorschaubetragEUR_MSE)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStV_SummeVorschaubetragEUR_UTA", UStV_SummeVorschaubetragEUR_UTA)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStV_SummeVorschaubetragEUR_IT", UStV_SummeVorschaubetragEUR_IT)) + Return list End Function diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb index 0de93ba5..c9b7a231 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb @@ -2,6 +2,30 @@ Public Class cMDMFunctionsAllgemein + Public Shared ploseSchnittstelle As Boolean = False + Public Shared ITSchnittstelle As Boolean = False + Public Shared MSEAlteSchnittstelle As Boolean = False + Public Shared MSENeueSchnittstelle As Boolean = False + Public Shared IDSAlteSchnittstelle As Boolean = False + Public Shared IDSNeueSchnittstelle As Boolean = False + Public Shared UTAAlteSchnittstelle As Boolean = False + Public Shared UTANeueSchnittstelle As Boolean = False + + Shared Function setSchnittstellen(plose As Boolean, IT As Boolean, MSEalt As Boolean, MSENeu As Boolean, IDSAlt As Boolean, IDSNeu As Boolean, UTAAlt As Boolean, UTANeu As Boolean) + + ploseSchnittstelle = plose + ITSchnittstelle = IT + MSEAlteSchnittstelle = MSEalt + MSENeueSchnittstelle = MSENeu + IDSAlteSchnittstelle = IDSAlt + IDSNeueSchnittstelle = IDSNeu + UTAAlteSchnittstelle = UTAAlt + UTANeueSchnittstelle = UTANeu + + End Function + + + Shared Function Update_UStVASummenNeuBerechnen(KundenNr As Integer) As Boolean Try @@ -153,11 +177,12 @@ Public Class cMDMFunctionsAllgemein 'Neuberechnung der Vorschausummen (also alle noch nicht verrechneten Transaktionen , die aber schon eingelesen wurden) curUStV_SummeVorschaubetragEUR_VERAG = UStVKunden_Summen_lesen_Vorschau_VERAG(r.Item("KundenNr"), invoiceDate) - curUStV_SummeVorschaubetragEUR_IDS = UStVKunden_Summen_lesen_Vorschau_IDS(r.Item("KundenNr"), invoiceDate) - curUStV_SummeVorschaubetragEUR_IT = UStVKunden_Summen_lesen_Vorschau_IT(r.Item("KundenNr"), invoiceDate) - curUStV_SummeVorschaubetragEUR_MSE = UStVKunden_Summen_lesen_Vorschau_MSE(r.Item("KundenNr"), invoiceDate) - curUStV_SummeVorschaubetragEUR_UTA = UStVKunden_Summen_lesen_Vorschau_UTA(r.Item("KundenNr"), invoiceDate) - curUStV_SummeVorschaubetragEUR_PLOSE = UStVKunden_Summen_lesen_Vorschau_PLOSE(r.Item("KundenNr"), invoiceDate) + curUStV_SummeVorschaubetragEUR_IDS = UStVKunden_Summen_lesen_Vorschau_IDS(r.Item("KundenNr"), invoiceDate, IDSAlteSchnittstelle, IDSNeueSchnittstelle) + curUStV_SummeVorschaubetragEUR_IT = UStVKunden_Summen_lesen_Vorschau_IT(r.Item("KundenNr"), invoiceDate, ITSchnittstelle) + curUStV_SummeVorschaubetragEUR_MSE = UStVKunden_Summen_lesen_Vorschau_MSE(r.Item("KundenNr"), invoiceDate, MSEAlteSchnittstelle, MSENeueSchnittstelle) + curUStV_SummeVorschaubetragEUR_UTA = UStVKunden_Summen_lesen_Vorschau_UTA(r.Item("KundenNr"), invoiceDate, UTAAlteSchnittstelle, UTANeueSchnittstelle) + + curUStV_SummeVorschaubetragEUR_PLOSE = UStVKunden_Summen_lesen_Vorschau_PLOSE(r.Item("KundenNr"), invoiceDate, ploseSchnittstelle) curUStV_SummeVorschaubetragEUR += curUStV_SummeVorschaubetragEUR_VERAG curUStV_SummeVorschaubetragEUR += curUStV_SummeVorschaubetragEUR_IDS @@ -249,20 +274,20 @@ Public Class cMDMFunctionsAllgemein Dim ro As DataRow = dt.NewRow - ro("KundenNr") = IIf(KundenNr > 0, KundenNr, r.Item("KundenNr")) - ro("VorschaubetragEUR") = curUStV_SummeVorschaubetragEUR - ro("VorschaubetragEUR_VERAG") = curUStV_SummeVorschaubetragEUR_VERAG - ro("VorschaubetragEUR_IDS") = curUStV_SummeVorschaubetragEUR_IDS - ro("VorschaubetragEUR_IT") = curUStV_SummeVorschaubetragEUR_IT - ro("VorschaubetragEUR_MSE") = curUStV_SummeVorschaubetragEUR_MSE - ro("VorschaubetragEUR_UTA") = curUStV_SummeVorschaubetragEUR_UTA - ro("VorschaubetragEUR_PLOSE") = curUStV_SummeVorschaubetragEUR_PLOSE - ro("UmsatzsteuerbetragEUR") = curUStV_SummeUmsatzsteuerbetragEUR - ro("ErstattungsbetragEUR") = curUStV_SummeErstattungsbetragEUR - ro("3470BetragEUR") = curUStV_Summe3470BetragEUR - ro("VZBetragEUR") = curUStV_SummeVZBetragEUR - dt.Rows.Add(ro) - End If + ro("KundenNr") = IIf(KundenNr > 0, KundenNr, r.Item("KundenNr")) + ro("VorschaubetragEUR") = curUStV_SummeVorschaubetragEUR + ro("VorschaubetragEUR_VERAG") = curUStV_SummeVorschaubetragEUR_VERAG + ro("VorschaubetragEUR_IDS") = curUStV_SummeVorschaubetragEUR_IDS + ro("VorschaubetragEUR_IT") = curUStV_SummeVorschaubetragEUR_IT + ro("VorschaubetragEUR_MSE") = curUStV_SummeVorschaubetragEUR_MSE + ro("VorschaubetragEUR_UTA") = curUStV_SummeVorschaubetragEUR_UTA + ro("VorschaubetragEUR_PLOSE") = curUStV_SummeVorschaubetragEUR_PLOSE + ro("UmsatzsteuerbetragEUR") = curUStV_SummeUmsatzsteuerbetragEUR + ro("ErstattungsbetragEUR") = curUStV_SummeErstattungsbetragEUR + ro("3470BetragEUR") = curUStV_Summe3470BetragEUR + ro("VZBetragEUR") = curUStV_SummeVZBetragEUR + dt.Rows.Add(ro) + End If Next End If @@ -323,7 +348,7 @@ Public Class cMDMFunctionsAllgemein End Function - Shared Function UStVKunden_Summen_lesen_Vorschau_IDS(varUStVAn_KuNr As Integer, invoiceDate As Date) As Double + Shared Function UStVKunden_Summen_lesen_Vorschau_IDS(varUStVAn_KuNr As Integer, invoiceDate As Date, calcSummeAlteSchnittstelle As Boolean, calcSummeNeueSchnittstelle As Boolean) As Double '1300 dtmRechnungsdatum = IIf(Date > DateSerial(Year(Date), 6, 30), DateSerial(Year(Date), 1, 1), DateSerial(Year(Date) - 1, 1, 1)) '1310 strParameter = ParameterBereitstellen(varUStVAn_KuNr, dtmRechnungsdatum) @@ -343,7 +368,8 @@ Public Class cMDMFunctionsAllgemein Dim sql As New VERAG_PROG_ALLGEMEIN.SQL Dim summeAlteSchnittstelle As Double = 0 Dim summeNeueSchnittstelle As Double = 0 - Dim sqlFMZollDaten = "SELECT dbo.tblDieselArchiv.KdNrVERAG AS AdressenNr, dbo.tblSteuernummern.LandNr, SUM(dbo.tblDieselArchiv.[VAT Amount]) AS Vorschaubetrag + If calcSummeAlteSchnittstelle Then + Dim sqlFMZollDaten = "SELECT dbo.tblDieselArchiv.KdNrVERAG AS AdressenNr, dbo.tblSteuernummern.LandNr, SUM(dbo.tblDieselArchiv.[VAT Amount]) AS Vorschaubetrag FROM dbo.tblDieselArchiv INNER JOIN dbo.tblSteuernummern ON dbo.tblDieselArchiv.KdNrVERAG = dbo.tblSteuernummern.AdressenNr INNER JOIN dbo.tbl_IDS_Länder ON dbo.tblSteuernummern.LandNr = dbo.tbl_IDS_Länder.LandNr AND dbo.tblDieselArchiv.[Outlet Country Code] = dbo.tbl_IDS_Länder.OutletCountryCode @@ -353,16 +379,18 @@ Public Class cMDMFunctionsAllgemein ORDER BY dbo.tblDieselArchiv.KdNrVERAG, dbo.tblSteuernummern.LandNr" - Dim dtIT As DataTable = sql.loadDgvBySql(sqlFMZollDaten, "FMZOLL") + Dim dtIT As DataTable = sql.loadDgvBySql(sqlFMZollDaten, "FMZOLL") - For Each r As DataRow In dtIT.Rows - Dim UST_org = CDbl(r.Item("Vorschaubetrag")) - If UST_org <> 0 Then - summeAlteSchnittstelle += UST_org - End If - Next + For Each r As DataRow In dtIT.Rows + Dim UST_org = CDbl(r.Item("Vorschaubetrag")) + If UST_org <> 0 Then + summeAlteSchnittstelle += UST_org + End If + Next + End If - If False Then + + If calcSummeNeueSchnittstelle Then Dim sqlFMZollDatenNEU = "SELECT [tblIDSTransactionsNew].KdNrVERAG AS AdressenNr, dbo.tblSteuernummern.LandNr, SUM([tblIDSTransactionsNew].[VAT Amount]) AS Vorschaubetrag FROM tblIDSTransactionsNew INNER JOIN dbo.tblSteuernummern ON [tblIDSTransactionsNew].KdNrVERAG = dbo.tblSteuernummern.AdressenNr INNER JOIN @@ -393,7 +421,7 @@ Public Class cMDMFunctionsAllgemein End Function - Shared Function UStVKunden_Summen_lesen_Vorschau_PLOSE(varUStVAn_KuNr As Integer, invoiceDate As Date) As Double + Shared Function UStVKunden_Summen_lesen_Vorschau_PLOSE(varUStVAn_KuNr As Integer, invoiceDate As Date, calcSumme As Boolean) As Double '1300 dtmRechnungsdatum = IIf(Date > DateSerial(Year(Date), 6, 30), DateSerial(Year(Date), 1, 1), DateSerial(Year(Date) - 1, 1, 1)) '1310 strParameter = ParameterBereitstellen(varUStVAn_KuNr, dtmRechnungsdatum) @@ -408,24 +436,29 @@ Public Class cMDMFunctionsAllgemein '1400 UStVKunden_Summen_lesen_Vorschau_IDS = UStVKunden_Summen_lesen_Vorschau_IDS + rst![Vorschaubetrag] '1410 rst.MoveNext '1420 Loop + Try Dim sql As New VERAG_PROG_ALLGEMEIN.SQL Dim summeSchnittstelle As Double = 0 - Dim sqlPLOSE = "select plose_POLSEKundennummer, sum([plose_MWSTBetragWaehrungAbbuchung])[plose_MWSTBetragWaehrungAbbuchung] FROM [tblPLOSE_Details] INNER JOIN Adressen on PLOSEKundenNr=plose_POLSEKundennummer + If calcSumme Then + + Dim sqlPLOSE = "select plose_POLSEKundennummer, sum([plose_MWSTBetragWaehrungAbbuchung])[plose_MWSTBetragWaehrungAbbuchung] FROM [tblPLOSE_Details] INNER JOIN Adressen on PLOSEKundenNr=plose_POLSEKundennummer WHERE plose_Archiv <> 1 AND plose_Fakturiert = 1 AND plose_LieferantCode IN (0,1,7) AND cast(plose_RechnungsDatum as date) >= '" & invoiceDate.ToShortDateString & "' and AdressenNr = " & varUStVAn_KuNr & " group by plose_POLSEKundennummer" - Dim dtPLOSE As DataTable = sql.loadDgvBySql(sqlPLOSE, "FMZOLL") + Dim dtPLOSE As DataTable = sql.loadDgvBySql(sqlPLOSE, "FMZOLL") + + For Each r As DataRow In dtPLOSE.Rows + Dim UST_org = CDbl(r.Item("plose_MWSTBetragWaehrungAbbuchung")) + If UST_org <> 0 Then + summeSchnittstelle += UST_org + End If + Next + End If - For Each r As DataRow In dtPLOSE.Rows - Dim UST_org = CDbl(r.Item("plose_MWSTBetragWaehrungAbbuchung")) - If UST_org <> 0 Then - summeSchnittstelle += UST_org - End If - Next Return summeSchnittstelle @@ -438,7 +471,7 @@ Public Class cMDMFunctionsAllgemein End Function - Shared Function UStVKunden_Summen_lesen_Vorschau_IT(varUStVAn_KuNr As Integer, invoiceDate As Date) As Double + Shared Function UStVKunden_Summen_lesen_Vorschau_IT(varUStVAn_KuNr As Integer, invoiceDate As Date, calcSum As Boolean) As Double ' Dim qdf As DAO.QueryDef ' Dim rst As DAO.Recordset @@ -475,7 +508,10 @@ Public Class cMDMFunctionsAllgemein Try Dim summechnittstelle As Double = 0 Dim sql As New VERAG_PROG_ALLGEMEIN.SQL - Dim sqlITSumme = "SELECT dbo.tblSteuernummern.AdressenNr, dbo.tblSteuernummern.LandNr, dbo.tblMautITArchiv.Verrechnungsdatum AS Rechnungsdatum, + + If calcSum Then + + Dim sqlITSumme = "SELECT dbo.tblSteuernummern.AdressenNr, dbo.tblSteuernummern.LandNr, dbo.tblMautITArchiv.Verrechnungsdatum AS Rechnungsdatum, dbo.tblMautITArchiv.Code_Adressat_des_Kontoauszugs AS Rechnungsnummer, SUM(CAST(ROUND((dbo.tblMautITArchiv.Betrag_mit_Preisnachlass_oder_Preisnachlass - dbo.tblMautITArchiv.Nicht_mehrwertsteuerpflichtiger_Betrag) / 1.22 * 0.22, 2) AS money)) AS Vorschaubetrag @@ -486,15 +522,16 @@ Public Class cMDMFunctionsAllgemein AND (dbo.tblMautITArchiv.Verrechnungsdatum >= '" & invoiceDate.ToShortDateString & "') GROUP BY dbo.tblSteuernummern.AdressenNr, dbo.tblSteuernummern.LandNr, dbo.tblMautITArchiv.Verrechnungsdatum, dbo.tblMautITArchiv.Code_Adressat_des_Kontoauszugs" - Dim dtIT As DataTable = sql.loadDgvBySql(sqlITSumme, "FMZOLL") + Dim dtIT As DataTable = sql.loadDgvBySql(sqlITSumme, "FMZOLL") - For Each r As DataRow In dtIT.Rows - Dim UST_org = CDbl(r.Item("Vorschaubetrag")) - If UST_org <> 0 Then - Dim WaehrungsCode As String = r.Item("Währungscode") - summechnittstelle += VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(UST_org, WaehrungsCode, "EUR") - End If - Next + For Each r As DataRow In dtIT.Rows + Dim UST_org = CDbl(r.Item("Vorschaubetrag")) + If UST_org <> 0 Then + Dim WaehrungsCode As String = r.Item("Währungscode") + summechnittstelle += VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(UST_org, WaehrungsCode, "EUR") + End If + Next + End If Return summechnittstelle @@ -507,7 +544,7 @@ Public Class cMDMFunctionsAllgemein End Function - Shared Function UStVKunden_Summen_lesen_Vorschau_MSE(varUStVAn_KuNr As Integer, invoiceDate As Date) As Double + Shared Function UStVKunden_Summen_lesen_Vorschau_MSE(varUStVAn_KuNr As Integer, invoiceDate As Date, calcSumalteSchnittstelle As Boolean, calcSumneueSchnittstelle As Boolean) As Double 'Return 0 ' dtmRechnungsdatum = IIf(Date > DateSerial(Year(Of Date), 6, 30), DateSerial(Year(Of Date), 1, 1), DateSerial(Year(Of Date)() - 1, 1, 1)) '1850 strParameter = ParameterBereitstellen(varUStVAn_KuNr, dtmRechnungsdatum) @@ -531,7 +568,8 @@ Public Class cMDMFunctionsAllgemein Dim sql As New VERAG_PROG_ALLGEMEIN.SQL Dim summeNeueSchnittstelle As Double = 0 Dim summeAlteSchnittstelle As Double = 0 - Dim sqlFMZollDatenALT = "SELECT dbo.tblSteuernummern.AdressenNr, dbo.tblSteuernummern.LandNr, dbo.tblMSETransactionsArchiv.[Invoice Date] AS Rechnungsdatum, SUM(dbo.tblMSETransactionsArchiv.[Original VAT Amount]) AS Vorschaubetrag, dbo.tblMSETransactionsArchiv.[Original Currency] AS Währungscode + If calcSumalteSchnittstelle Then + Dim sqlFMZollDatenALT = "SELECT dbo.tblSteuernummern.AdressenNr, dbo.tblSteuernummern.LandNr, dbo.tblMSETransactionsArchiv.[Invoice Date] AS Rechnungsdatum, SUM(dbo.tblMSETransactionsArchiv.[Original VAT Amount]) AS Vorschaubetrag, dbo.tblMSETransactionsArchiv.[Original Currency] AS Währungscode FROM dbo.tblSteuernummern INNER JOIN dbo.Adressen ON dbo.tblSteuernummern.AdressenNr = dbo.Adressen.AdressenNr INNER JOIN dbo.tblMSETransactionsArchiv ON dbo.Adressen.MSEKundenNr = dbo.tblMSETransactionsArchiv.[Customer ID] INNER JOIN @@ -542,37 +580,41 @@ Public Class cMDMFunctionsAllgemein GROUP BY dbo.tblSteuernummern.AdressenNr, dbo.tblSteuernummern.LandNr, dbo.tblMSETransactionsArchiv.[Invoice Date], dbo.tblMSETransactionsArchiv.[Original Currency] ORDER BY dbo.tblSteuernummern.AdressenNr, dbo.tblSteuernummern.LandNr, dbo.tblMSETransactionsArchiv.[Invoice Date], dbo.tblMSETransactionsArchiv.[Original Currency] " - Dim dtMSEAlt As DataTable = sql.loadDgvBySql(sqlFMZollDatenALT, "FMZOLL") + Dim dtMSEAlt As DataTable = sql.loadDgvBySql(sqlFMZollDatenALT, "FMZOLL") - For Each r As DataRow In dtMSEAlt.Rows - Dim UST_org = CDbl(r.Item("Vorschaubetrag")) - If UST_org <> 0 Then - Dim WaehrungsCode As String = r.Item("Währungscode") - summeAlteSchnittstelle += VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(UST_org, WaehrungsCode, "EUR") - End If - Next + For Each r As DataRow In dtMSEAlt.Rows + Dim UST_org = CDbl(r.Item("Vorschaubetrag")) + If UST_org <> 0 Then + Dim WaehrungsCode As String = r.Item("Währungscode") + summeAlteSchnittstelle += VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(UST_org, WaehrungsCode, "EUR") + End If + Next + End If - Dim sqlFMZollDatenNEU = "select * from ( select cust.[customer_id],bills.invoice_date, bills.invoice_number, bills.specification_page_name, trans.transaction_country, trans.original_currency ,sum(USteuer_EUR) as UST_EUR, sum(original_vat_amount) as UST + If calcSumneueSchnittstelle Then + Dim sqlFMZollDatenNEU = "select * from ( select cust.[customer_id],bills.invoice_date, bills.invoice_number, bills.specification_page_name, trans.transaction_country, trans.original_currency ,sum(USteuer_EUR) as UST_EUR, sum(original_vat_amount) as UST FROM [VERAG].[dbo].[tblMSESettlements] as bills left join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id] left join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id left join [VERAG].[dbo].[tblMSEInvoices] as inv on inv.invoice_id = bills.invoice_number - where bills.invoice_date >= '" & invoiceDate.ToShortDateString & "' and inv.archiv <> 1 and trans.charged = 1 and cust.[partner_customer_number] = " & varUStVAn_KuNr & " + left join dbo.tblSteuernummern on dbo.tblSteuernummern.AdressenNr = trans.partner_haulier_id + where bills.invoice_date >= '" & invoiceDate.ToShortDateString & "' and inv.archiv <> 1 and dbo.tblSteuernummern.UStV = 1 and trans.charged = 1 and cust.[partner_customer_number] = " & varUStVAn_KuNr & " group by bills.invoice_date, bills.invoice_number, cust.[customer_id], bills.specification_page_name, trans.transaction_country,trans.original_currency) as temp" - Dim dtMSENeut As DataTable = sql.loadDgvBySql(sqlFMZollDatenNEU, "FMZOLL") - - For Each r As DataRow In dtMSENeut.Rows - Dim UST_org = CDbl(r.Item("UST_EUR")) - If UST_org <> 0 Then - summeNeueSchnittstelle += UST_org - End If - Next + Dim dtMSENeut As DataTable = sql.loadDgvBySql(sqlFMZollDatenNEU, "FMZOLL") + For Each r As DataRow In dtMSENeut.Rows + Dim UST_org = CDbl(r.Item("UST_EUR")) + If UST_org <> 0 Then + summeNeueSchnittstelle += UST_org + End If + Next + End If Return summeAlteSchnittstelle + summeNeueSchnittstelle + Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.LOG) @@ -584,7 +626,7 @@ Public Class cMDMFunctionsAllgemein End Function - Shared Function UStVKunden_Summen_lesen_Vorschau_UTA(varUStVAn_KuNr As Integer, invoiceDate As Date) As Double + Shared Function UStVKunden_Summen_lesen_Vorschau_UTA(varUStVAn_KuNr As Integer, invoiceDate As Date, calcSumalteSchnittstelle As Boolean, calcSumneueSchnittstelle As Boolean) As Double 'Return 0 ' Dim qdf As DAO.QueryDef ' Dim rst As DAO.Recordset @@ -629,8 +671,8 @@ Public Class cMDMFunctionsAllgemein Dim sql As New VERAG_PROG_ALLGEMEIN.SQL Dim summeAlteSchnittstelle As Double = 0 Dim summeNeueSchnittstelle As Double = 0 - - Dim sqlFMZollDaten = "SELECT dbo.tblSteuernummern.AdressenNr, dbo.tblSteuernummern.LandNr, SUM(dbo.tblUTAArchiv.Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) AS Vorschaubetrag + If calcSumalteSchnittstelle Then + Dim sqlFMZollDaten = "SELECT dbo.tblSteuernummern.AdressenNr, dbo.tblSteuernummern.LandNr, SUM(dbo.tblUTAArchiv.Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) AS Vorschaubetrag FROM dbo.tblSteuernummern INNER JOIN dbo.Adressen ON dbo.tblSteuernummern.AdressenNr = dbo.Adressen.AdressenNr INNER JOIN dbo.tblUTAArchiv ON dbo.Adressen.UTAKundenNr = dbo.tblUTAArchiv.Kundennummer INNER JOIN @@ -641,19 +683,20 @@ Public Class cMDMFunctionsAllgemein GROUP BY dbo.tblSteuernummern.AdressenNr, dbo.tblSteuernummern.LandNr ORDER BY dbo.tblSteuernummern.AdressenNr, dbo.tblSteuernummern.LandNr" - Dim dtUTAAlt As DataTable = sql.loadDgvBySql(sqlFMZollDaten, "FMZOLL") + Dim dtUTAAlt As DataTable = sql.loadDgvBySql(sqlFMZollDaten, "FMZOLL") - For Each r As DataRow In dtUTAAlt.Rows - Dim UST_org = CDbl(r.Item("Vorschaubetrag")) - If UST_org <> 0 Then - summeAlteSchnittstelle += UST_org - End If + For Each r As DataRow In dtUTAAlt.Rows + Dim UST_org = CDbl(r.Item("Vorschaubetrag")) + If UST_org <> 0 Then + summeAlteSchnittstelle += UST_org + End If - Next + Next + End If + If calcSumneueSchnittstelle Then - - Dim sqlNeueSchnittstelle = "SELECT dbo.tblSteuernummern.AdressenNr, dbo.tblSteuernummern.LandNr, SUM(dbo.tblUTAImportNew.Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) AS Vorschaubetrag + Dim sqlNeueSchnittstelle = "SELECT dbo.tblSteuernummern.AdressenNr, dbo.tblSteuernummern.LandNr, SUM(dbo.tblUTAImportNew.Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) AS Vorschaubetrag FROM dbo.tblSteuernummern INNER JOIN dbo.Adressen ON dbo.tblSteuernummern.AdressenNr = dbo.Adressen.AdressenNr INNER JOIN dbo.tblUTAImportNew ON dbo.Adressen.UTAKundenNr = dbo.tblUTAImportNew.Kundennummer INNER JOIN @@ -665,15 +708,17 @@ Public Class cMDMFunctionsAllgemein ORDER BY dbo.tblSteuernummern.AdressenNr, dbo.tblSteuernummern.LandNr" - Dim dtUTANeut As DataTable = sql.loadDgvBySql(sqlFMZollDaten, "FMZOLL") + Dim dtUTANeut As DataTable = sql.loadDgvBySql(sqlNeueSchnittstelle, "FMZOLL") - For Each r As DataRow In dtUTANeut.Rows + For Each r As DataRow In dtUTANeut.Rows - Dim UST_org = CDbl(r.Item("Vorschaubetrag")) - If UST_org <> 0 Then - summeNeueSchnittstelle += UST_org - End If - Next + Dim UST_org = CDbl(r.Item("Vorschaubetrag")) + If UST_org <> 0 Then + summeNeueSchnittstelle += UST_org + End If + Next + + End If If Math.Round(summeAlteSchnittstelle, 2) = Math.Round(summeNeueSchnittstelle, 2) Then Return summeNeueSchnittstelle diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cParameter.vb b/VERAG_PROG_ALLGEMEIN/Classes/cParameter.vb index f59f5ba2..be9a9f95 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cParameter.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cParameter.vb @@ -32,13 +32,13 @@ Public Class cParameterList 'LIST.Add(l) End Sub - Public Sub LOAD_LIST(KundenNr, Optional firma = Nothing) + Public Sub LOAD_LIST(ProgId, Optional firma = Nothing) Try LIST.Clear() Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN Using cmd As New SqlCommand("SELECT * FROM [tblParameter] WHERE progId IN (0,@ProgId) " & If(firma IsNot Nothing, " AND firma=@firma", ""), conn) cmd.Parameters.AddWithValue("@ProgId", ProgId) - cmd.Parameters.AddWithValue("@firma", firma) + If firma IsNot Nothing Then cmd.Parameters.AddWithValue("@firma", firma) ' cmd.Parameters.AddWithValue("@OffertenNr", OffertenNr) Dim dr = cmd.ExecuteReader() While dr.Read diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb b/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb index b84fdc15..a2c531be 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb @@ -833,7 +833,7 @@ Public Class cUTA End Class - Public Function readAndSaveUTA(objFileRead As StreamReader, fi As FileInfo, cnt As Integer) As Boolean + Public Function readAndSaveUTA(objFileRead As StreamReader, fi As FileInfo, cnt As Integer, Optional onlyTestkunedn As Boolean = False) As Boolean Dim booHeaderVorhanden = False @@ -1052,14 +1052,17 @@ Public Class cUTA .[Gesamtbetrag_in_Lieferlandwährung_Umsatzsteuer_informativ] = 0 - .[Gesamtbetrag_in_Lieferlandwährung_Umsatzsteuer_informativ] End Select - 'nur KundenNr 100964 und 825040 speichern: - If .[Kundennummer] = 100964 Or .[Kundennummer] = 825040 Then + If onlyTestkunedn Then + 'nur KundenNr 100964 und 825040 speichern: + If .[Kundennummer] = 100964 Or .[Kundennummer] = 825040 Then + .SAVE() + End If + Else .SAVE() End If - 'Dim clfArchiv As New cUTA.UTAArchiv(.Belegdatum, .UTA_Beleg_ID) 'clfArchiv.Übertragungsnummer = .Übertragungsnummer 'clfArchiv.ErstellDatumUhrzeit = .ErstellDatumUhrzeit