diff --git a/SDL/Classes/cEORIWebService.vb b/SDL/Classes/cEORIWebService.vb index 714d4853..e17645a6 100644 --- a/SDL/Classes/cEORIWebService.vb +++ b/SDL/Classes/cEORIWebService.vb @@ -143,7 +143,7 @@ Public Class cEORIWebService Case 1 : msgErgebnis = "EORI-Nr. UNGÜLTIG" End Select - setEORIEntry(KdNr, SendungsId, AvisoId, EORI_ERG, tmp_SESSION_ID, EORI_ERG.Result(0).Eori, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) + setEORIEntry(KdNr, SendungsId, AvisoId, EORI_ERG, tmp_SESSION_ID, EORI_ERG.Result(0).Eori, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA_ID) Dim PdfTmp = SDL.FormularManagerNEU.EORI_PRUEFUNG(msgErgebnis, Firma, tmp_SESSION_ID, txtEORI, AvisoId, SendungsId) diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index 82ff0e90..a20baa7c 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -3282,8 +3282,7 @@ Nächste_Textzeile_lesen: Private Sub btnNeueUnterNR_Click(sender As Object, e As EventArgs) Handles btnNeueUnterNR.Click - saveMe() - newRECHNUNG() + If saveMe() Then newRECHNUNG() End Sub Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click @@ -3380,6 +3379,7 @@ Nächste_Textzeile_lesen: initRECHNUNG() RaiseEvent SOMETHING_CHANGED(-1) End If + End If End If cbxOriginalPrint.Checked = False diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 8ede69ee..5b44b6ab 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index 3bfba146..083549da 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -55,7 +55,7 @@ Public Class usrCntlUSTV .AllowUserToResizeRows = False - btnKundendatenaktualisieren.Enabled = KdSearchBox1.KdNr > 0 AndAlso .RowCount > 0 + btnKundendatenaktualisieren.Enabled = KdSearchBox1.KdNr > 0 'AndAlso .RowCount > 0 @@ -310,9 +310,11 @@ Public Class usrCntlUSTV ' AND cast( [UStVAn_USteuerbetragEUR] as decimal(17,2))-cast( [UStVAn_ErstattungsbetragEUR] as decimal(17,2))<>0 ' AND UStVAn_AntragEingereichtAm is not null ' order by UStVAn_KuNr,UStVAn_Name,datepart(year,[UStVAn_ReDatVon] ) desc,LandKz,[UStVAn_ReDatVon] desc" - Dim sqlStr = "SELECT [UStVAn_ID],[UStVAn_KuNr],[UStVAn_Name],Adressen.LandKz as Land_Kunde, case when UstIdKz is not null and UstIdNr is not null THEN UstIdKz +'' + UstIdNr ELSE isnull(Steuernummer,'') END as SteuerUIDNr, LfdA .LandKz Land_Antrag,[UStVAn_ReDatVon],[UStVAn_ReDatBis] ,UStVAn_AntragEingereichtAm,[UStVAn_3470] ,[UStVAn_Währungscode],[UStVAn_USteuerbetrag],[UStVAn_Erstattungsbetrag],[UStVAn_USteuerbetragEUR],[UStVAn_ErstattungsbetragEUR],(cast([UStVAn_USteuerbetragEUR] as decimal(17,2)) - cast( [UStVAn_ErstattungsbetragEUR] as decimal(17,2))) as Differenzbetrag, [UStVAn_Sachbearbeiter] - FROM [tblUStVAntrag] inner join [Länderverzeichnis für die Außenhandelsstatistik] as LfdA on UStVAn_LandNr=Landnr + Dim sqlStr = "SELECT [UStVAn_ID],[UStVAn_KuNr],[UStVAn_Name],Adressen.LandKz as Land_Kunde, case when UstIdKz is not null and UstIdNr is not null THEN UstIdKz +'' + UstIdNr ELSE isnull(Steuernummer,'') END as SteuerUIDNr, LfdA .LandKz Land_Antrag,[UStVAn_ReDatVon],[UStVAn_ReDatBis] ,UStVAn_AntragEingereichtAm,[UStVAn_3470] ,[UStVAn_Währungscode],[UStVAn_USteuerbetrag],[UStVAn_Erstattungsbetrag],[UStVAn_USteuerbetragEUR],[UStVAn_ErstattungsbetragEUR],(cast([UStVAn_USteuerbetragEUR] as decimal(17,2)) - cast( [UStVAn_ErstattungsbetragEUR] as decimal(17,2))) as Differenzbetrag, [UStVAn_Sachbearbeiter], UStVAn_AntragArt as Art, stnr.[StNrFürRückerstattungUSt] + FROM [tblUStVAntrag] + inner join [Länderverzeichnis für die Außenhandelsstatistik] as LfdA on UStVAn_LandNr=Landnr inner join Adressen on AdressenNr=UStVAn_KuNr + left join [tblSteuernummern] as stnr on stnr.AdressenNr = UStVAn_KuNr and stnr.LandNr=UStVAn_LandNr where 1=1 AND cast( [UStVAn_USteuerbetragEUR] as decimal(17,2))-cast( [UStVAn_ErstattungsbetragEUR] as decimal(17,2))<>0 AND UStVAn_AntragEingereichtAm is not null diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index 41510209..3ce4827e 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -601,6 +601,7 @@ Public Class frmBU_Mahnlauf TextHTML &= r.txt_text Mail_Subject = Mail_Subject.Replace("%KdNr%", KdNr) Mail_Subject = Mail_Subject.Replace("%Mahntext%", MAHNTEXT) + Mail_Subject = Mail_Subject.Replace("%KdName%", AD.Ordnungsbegriff) TextHTML = TextHTML.Replace("%email_mahnung%", emailMahnungen) diff --git a/SDL/frmdynMailvorlage.Designer.vb b/SDL/frmdynMailvorlage.Designer.vb index d88f3373..16d469d1 100644 --- a/SDL/frmdynMailvorlage.Designer.vb +++ b/SDL/frmdynMailvorlage.Designer.vb @@ -65,6 +65,7 @@ Partial Class frmdynMailvorlagen Me.Label3 = New System.Windows.Forms.Label() Me.cbxFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.dgvMailvorlagen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.TextBox2 = New System.Windows.Forms.TextBox() Me.mainPanel.SuspendLayout() Me.pnlTop.SuspendLayout() CType(Me.dgvMailvorlagen, System.ComponentModel.ISupportInitialize).BeginInit() @@ -75,6 +76,7 @@ Partial Class frmdynMailvorlagen Me.mainPanel.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.mainPanel.Controls.Add(Me.TextBox2) Me.mainPanel.Controls.Add(Me.cbxTyp) Me.mainPanel.Controls.Add(Me.Label13) Me.mainPanel.Controls.Add(Me.TextBox1) @@ -137,9 +139,9 @@ Partial Class frmdynMailvorlagen Me.TextBox1.Location = New System.Drawing.Point(10, 395) Me.TextBox1.Multiline = True Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Size = New System.Drawing.Size(109, 18) + Me.TextBox1.Size = New System.Drawing.Size(156, 18) Me.TextBox1.TabIndex = 44 - Me.TextBox1.Text = "* Text-Variablen:" + Me.TextBox1.Text = "* Text-Variablen (Email):" ' 'txtfixeEmail ' @@ -235,7 +237,7 @@ Partial Class frmdynMailvorlagen Me.txtVariablen.Location = New System.Drawing.Point(10, 414) Me.txtVariablen.Multiline = True Me.txtVariablen.Name = "txtVariablen" - Me.txtVariablen.Size = New System.Drawing.Size(576, 31) + Me.txtVariablen.Size = New System.Drawing.Size(498, 40) Me.txtVariablen.TabIndex = 34 Me.txtVariablen.Text = "%VAR-GRENZE%, %LKW%, %LKWKennzeichen%, %Empfaenger%, %voraus-Eintreffen%, %Filial" & "enNr%, %AbfertigungsNr%, %Absender%, %Gewicht%, %ImEx%, %Zollstelle%" @@ -549,6 +551,17 @@ Partial Class frmdynMailvorlagen Me.dgvMailvorlagen.Size = New System.Drawing.Size(1283, 365) Me.dgvMailvorlagen.TabIndex = 104 ' + 'TextBox2 + ' + Me.TextBox2.BackColor = System.Drawing.SystemColors.Control + Me.TextBox2.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.TextBox2.Location = New System.Drawing.Point(469, 3) + Me.TextBox2.Name = "TextBox2" + Me.TextBox2.Size = New System.Drawing.Size(409, 13) + Me.TextBox2.TabIndex = 47 + Me.TextBox2.Text = "* %KdNr%; %Mahntext%; %KdName%" + Me.TextBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'frmdynMailvorlagen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -612,4 +625,5 @@ Partial Class frmdynMailvorlagen Friend WithEvents TextBox1 As TextBox Friend WithEvents cbxTyp As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Label13 As Label + Friend WithEvents TextBox2 As TextBox End Class diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index cff36029..3632b69a 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -649,6 +649,11 @@ Public Class frmKundenblatt End If End If + If checkNullStr(ADRESSE.Steuernummer) <> "" Then + If lblUid.Text <> "" Then lblUid.Text &= " / " + lblUid.Text &= "St-Nr.: " & checkNullStr(ADRESSE.Steuernummer) + End If + End If Catch ex As Exception diff --git a/SDL/kunden/usrCntlCBAM.Designer.vb b/SDL/kunden/usrCntlCBAM.Designer.vb index cd873f34..92d740e5 100644 --- a/SDL/kunden/usrCntlCBAM.Designer.vb +++ b/SDL/kunden/usrCntlCBAM.Designer.vb @@ -67,6 +67,8 @@ Partial Class usrCntlCBAM Me.txtBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtEori = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Button1 = New System.Windows.Forms.Button() + Me.cbxIMEX = New System.Windows.Forms.CheckBox() + Me.cbxUNISPED = New System.Windows.Forms.CheckBox() Me.cntxtAddSdl.SuspendLayout() Me.MyPanel1.SuspendLayout() Me.SuspendLayout() @@ -483,6 +485,8 @@ Partial Class usrCntlCBAM ' 'MyPanel1 ' + Me.MyPanel1.Controls.Add(Me.cbxUNISPED) + Me.MyPanel1.Controls.Add(Me.cbxIMEX) Me.MyPanel1.Controls.Add(Me.cbxVERAG) Me.MyPanel1.Location = New System.Drawing.Point(98, 4) Me.MyPanel1.Name = "MyPanel1" @@ -613,6 +617,26 @@ Partial Class usrCntlCBAM Me.Button1.Text = "XML Datensatz generieren " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(DAKOSY)" Me.Button1.UseVisualStyleBackColor = True ' + 'cbxIMEX + ' + Me.cbxIMEX.AutoSize = True + Me.cbxIMEX.Location = New System.Drawing.Point(90, 6) + Me.cbxIMEX.Name = "cbxIMEX" + Me.cbxIMEX.Size = New System.Drawing.Size(52, 17) + Me.cbxIMEX.TabIndex = 1 + Me.cbxIMEX.Text = "IMEX" + Me.cbxIMEX.UseVisualStyleBackColor = True + ' + 'cbxUNISPED + ' + Me.cbxUNISPED.AutoSize = True + Me.cbxUNISPED.Location = New System.Drawing.Point(159, 6) + Me.cbxUNISPED.Name = "cbxUNISPED" + Me.cbxUNISPED.Size = New System.Drawing.Size(74, 17) + Me.cbxUNISPED.TabIndex = 2 + Me.cbxUNISPED.Text = "UNISPED" + Me.cbxUNISPED.UseVisualStyleBackColor = True + ' 'usrCntlCBAM ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -713,4 +737,6 @@ Partial Class usrCntlCBAM Friend WithEvents btnCBAM_DS_DAKOSY_XML As Button Friend WithEvents Button2 As Button Friend WithEvents Button1 As Button + Friend WithEvents cbxIMEX As CheckBox + Friend WithEvents cbxUNISPED As CheckBox End Class diff --git a/SDL/kunden/usrCntlCBAM.vb b/SDL/kunden/usrCntlCBAM.vb index 170f95dc..93f2a791 100644 --- a/SDL/kunden/usrCntlCBAM.vb +++ b/SDL/kunden/usrCntlCBAM.vb @@ -91,7 +91,7 @@ Public Class usrCntlCBAM txtCBAMPruef_DHF_VERAG.Text = "-" Try Dim EORI = txtEori.Text - If cbxVERAG.Checked Then EORI = "VERAG" + If cbxVERAG.Checked Or cbxUNISPED.Checked Or cbxIMEX.Checked Then EORI = "VERAG" If EORI = "" Then MsgBox("EORI eingeben!") : Exit Sub If txtVon._value = "" Then MsgBox("Datum von eingeben!") : Exit Sub If txtBis._value = "" Then MsgBox("Datum bis eingeben!") : Exit Sub @@ -156,7 +156,7 @@ Public Class usrCntlCBAM txtCBAMPruef_DHF_UNISPED.Text = "-" Try Dim EORI = txtEori.Text - If cbxVERAG.Checked Then EORI = "VERAG" + If cbxVERAG.Checked Or cbxUNISPED.Checked Or cbxIMEX.Checked Then EORI = "VERAG" If EORI = "" Then MsgBox("EORI eingeben!") : Exit Sub If txtVon._value = "" Then MsgBox("Datum von eingeben!") : Exit Sub If txtBis._value = "" Then MsgBox("Datum bis eingeben!") : Exit Sub @@ -192,7 +192,7 @@ Public Class usrCntlCBAM " - If cbxVERAG.Checked Then + If cbxUNISPED.Checked Then SQLSTR &= " and DecRep IN(3) " @@ -219,18 +219,56 @@ Public Class usrCntlCBAM End Sub Private Sub btnCBAMPruef_TELOTEC_Click(sender As Object, e As EventArgs) Handles btnCBAMPruef_TELOTEC.Click - txtCBAMPruef_TELOTEC.Text = "nicht verfügbar" - Exit Sub + txtCBAMPruef_TELOTEC.Text = "-" + + Dim SQLSTR_WHERE_FIRMEN = "" + If cbxVERAG.Checked Then SQLSTR_WHERE_FIRMEN &= "'VERAG'" + If cbxIMEX.Checked Then SQLSTR_WHERE_FIRMEN &= IIf(SQLSTR_WHERE_FIRMEN <> "", ", ", "") & "'IMEX'" + If cbxUNISPED.Checked Then SQLSTR_WHERE_FIRMEN &= IIf(SQLSTR_WHERE_FIRMEN <> "", ", ", "") & "'UNISPED'" + Try Dim EORI = txtEori.Text - If cbxVERAG.Checked Then EORI = "VERAG" + If cbxVERAG.Checked Or cbxUNISPED.Checked Or cbxIMEX.Checked Then EORI = "VERAG" If EORI = "" Then MsgBox("EORI eingeben!") : Exit Sub Me.Cursor = Cursors.WaitCursor Dim SQLSTR = " + SELECT count (*) + + FROM [VERAG].[dbo].[tblTelotec_Anmeldung] + inner join tblTelotec_Positionsdaten on telpos_telanmId=telanm_id + + where 1=1 + + and + ( + left(Item_ComCd,4) IN (2523,2716,2808,2814,3102,3105,7201,7203,7318,7326,7601,7616) + OR left(Item_ComCd,4) between 7301 and 7311 + OR left(Item_ComCd,4) between 7205 and 7229 + OR left(Item_ComCd,4) between 7603 and 7614 + OR Item_ComCd like '25070080%' + OR Item_ComCd like '283421%' + OR Item_ComCd like '260112%' + OR Item_ComCd like '720211%' + OR Item_ComCd like '720219%' + OR Item_ComCd like '720241%' + OR Item_ComCd like '720249%' + OR Item_ComCd like '720260%' + OR Item_ComCd like '280410%' + ) + and Item_ComCd not like '310560%' + + and telnam_aktuellsteNachricht=1 + + and telanm_ART ='EUA' + and dec_CreateDate between '" & txtVon._value & "' and '" & txtBis._value & "'" + + If SQLSTR_WHERE_FIRMEN <> "" Then + SQLSTR &= " and telanm_firma in ( " & SQLSTR_WHERE_FIRMEN & ")" 'nur IMEX???? + Else + SQLSTR &= " and ConeeTra_TIN IN ( '" & EORI & "')" + End If - - " Dim dt = SQL.loadDgvBySql(SQLSTR, "FMZOLL", 600) If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then @@ -290,6 +328,11 @@ Public Class usrCntlCBAM btnCBAM_DS_DAKOSY_Copy.Enabled = False btnCBAM_DS_DAKOSY_Deteil.Tag = "" + Dim SQLSTR_WHERE_FIRMEN = "" + If cbxVERAG.Checked Then SQLSTR_WHERE_FIRMEN &= "'VERAG'" + If cbxIMEX.Checked Then SQLSTR_WHERE_FIRMEN &= IIf(SQLSTR_WHERE_FIRMEN <> "", ", ", "") & "'IMEX'" + If cbxUNISPED.Checked Then SQLSTR_WHERE_FIRMEN &= IIf(SQLSTR_WHERE_FIRMEN <> "", ", ", "") & "'UNISPED'" + Try Dim EORI = txtEori.Text If cbxVERAG.Checked Then EORI = "VERAG" @@ -298,6 +341,7 @@ Public Class usrCntlCBAM If txtBis._value = "" Then MsgBox("Datum bis eingeben!") : Exit Sub Me.Cursor = Cursors.WaitCursor + Dim SQLSTR = " SELECT [eza_ANR] RegistriernummerATLAS @@ -340,16 +384,18 @@ Public Class usrCntlCBAM " - If cbxVERAG.Checked Then + If cbxVERAG.Checked Or cbxIMEX.Checked Or cbxUNISPED.Checked Then SQLSTR &= " and eza_VertretungsVerhaeltnisCode=2 " Else SQLSTR &= " - and (select isnull([ezaAd_NameFirma1],[ezaAd_TeilnehmerEORI]) FROM tblDakosy_EZA_Adressen WHERE ezaAd_EZAId=eza_Id and [ezaAd_AdressTyp]='CN')='" & EORI & "' + and (select isnull([ezaAd_NameFirma1],[ezaAd_TeilnehmerEORI]) FROM tblDakosy_EZA_Adressen WHERE ezaAd_EZAId=eza_Id and [ezaAd_AdressTyp]='CN')='" & EORI & "' " End If + If SQLSTR_WHERE_FIRMEN <> "" Then SQLSTR &= " and EZA_firma in ( " & SQLSTR_WHERE_FIRMEN & ")" + SQLSTR &= " order by Absender,eza_ANR, tblDakosy_EZA_Warenposition.ezaWP_PositionsNummer" @@ -415,7 +461,7 @@ Public Class usrCntlCBAM " - If cbxVERAG.Checked Then + If cbxVERAG.Checked Or cbxIMEX.Checked Or cbxUNISPED.Checked Then SQLSTR &= " and eza_VertretungsVerhaeltnisCode=2 " @@ -425,6 +471,8 @@ Public Class usrCntlCBAM " End If + If SQLSTR_WHERE_FIRMEN <> "" Then SQLSTR &= " and EZA_firma in ( " & SQLSTR_WHERE_FIRMEN & ")" + SQLSTR &= " group by eza_VersendungsLandCode,left(ezaWP_WarennummerEZT,8),ezaWP_AnmeldeVErfahren,ezaWP_VerfahrensCodeVorangegangenesVerfahren" @@ -775,7 +823,7 @@ Public Class usrCntlCBAM " - If cbxVERAG.Checked Then + If cbxVERAG.Checked Or cbxIMEX.Checked Or cbxUNISPED.Checked Then SQLSTR &= " and DecRep IN(3) " @@ -901,8 +949,8 @@ Public Class usrCntlCBAM End Sub - Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles cbxVERAG.CheckedChanged - txtEori.Enabled = Not cbxVERAG.Checked + Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles cbxVERAG.CheckedChanged, cbxUNISPED.CheckedChanged, cbxIMEX.CheckedChanged + txtEori.Enabled = Not (cbxVERAG.Checked Or cbxUNISPED.Checked Or cbxIMEX.Checked) End Sub Private Sub btnCBAM_DS_DAKOSY_XML_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DAKOSY_XML.Click @@ -953,7 +1001,7 @@ Public Class usrCntlCBAM Me.Cursor = Cursors.WaitCursor Dim SQLSTR = " - SELECT + SELECT telanm_CRN Registriernummer ,Pos_ID PositionsNummer ,dec_CreateDate Anmeldedatum @@ -966,9 +1014,9 @@ Public Class usrCntlCBAM ,ValData_InvVal Rechnungspreis ,ValData_InvCurr Rechnungswaehrung ,ConeeTra_TIN as Empfänger - ,ConeeTra_Na as Empfänger + ,ConeeTra_Na as Empfänger_ ,ConorTra_TIN as Absender - ,ConorTra_Na as Absender + ,ConorTra_Na as Absender_ FROM [VERAG].[dbo].[tblTelotec_Anmeldung] inner join tblTelotec_Positionsdaten on telpos_telanmId=telanm_id @@ -1004,7 +1052,7 @@ Public Class usrCntlCBAM " - If cbxVERAG.Checked Then + If cbxVERAG.Checked Or cbxIMEX.Checked Or cbxUNISPED.Checked Then SQLSTR &= " and Declarant_DecRep IN(1,3,5,7) " diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb index 65305b78..f0606694 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb @@ -105,12 +105,21 @@ Public Class cMDMFunctionsAllgemein 'alle Kunden, die eine SteuerNr hinterlegt haben inkl. deren hinterlegte Summen! Dim sqlKunden = "SELECT Kunden.KundenNr as KundenNr, Kunden.UStV_SummeUmsatzsteuerbetragEUR, Kunden.UStV_SummeErstattungsbetragEUR, Kunden.UStV_Summe3470BetragEUR, Kunden.UStV_SummeVZBetragEUR, Kunden.UStV_SummeVorschaubetragEUR_VERAG, Kunden.UStV_SummeVorschaubetragEUR_IDS, Kunden.UStV_SummeVorschaubetragEUR_IT, Kunden.UStV_SummeVorschaubetragEUR_MSE, Kunden.UStV_SummeVorschaubetragEUR_UTA, Kunden.UStV_SummeVorschaubetragEUR, kde_UStV_SummeVorschaubetragEUR_PLOSE as UStV_SummeVorschaubetragEUR_PLOSE FROM Kunden - INNER JOIN [tblKundenErweitert] on [kde_KundenNr] = Kunden.KundenNr + left JOIN [tblKundenErweitert] on [kde_KundenNr] = Kunden.KundenNr WHERE Kunden.KundenNr " & sqlWhere & "order by Kunden.KundenNr" - 'Neuberechnung der Steuerbeträge aus den Anträgen - Dim sqlSummeBilden = "SELECT + + Dim dtKunden As DataTable = sql.loadDgvBySql(sqlKunden, "FMZOLL") + + + + If dtKunden.Rows.Count > 0 Then + For Each r As DataRow In dtKunden.Rows + + + 'Neuberechnung der Steuerbeträge aus den Anträgen + Dim sqlSummeBilden = "SELECT tblUStVAntrag.UStVAn_KuNr, SUM(tblUStVAntrag.UStVAn_USteuerbetragEUR) As UStVKu_SummeUmsatzsteuer, SUM(tblUStVAntrag.UStVAn_ErstattungsbetragEUR) As UStVKu_SummeErstattung, @@ -123,15 +132,10 @@ Public Class cMDMFunctionsAllgemein End ) AS UStVKu_SummeVorauszahlung From tblUStVAntrag - Where tblUStVAntrag.UStVAn_KuNr " & sqlWhere & + Where tblUStVAntrag.UStVAn_KuNr = " & r.Item("KundenNr") & " Group By tblUStVAntrag.UStVAn_KuNr" - Dim dtKunden As DataTable = sql.loadDgvBySql(sqlKunden, "FMZOLL") - - Dim dtKundenSummen As DataTable = sql.loadDgvBySql(sqlSummeBilden, "FMZOLL") - - If dtKunden.Rows.Count > 0 Then - For Each r As DataRow In dtKunden.Rows + Dim dtKundenSummen As DataTable = sql.loadDgvBySql(sqlSummeBilden, "FMZOLL") Dim curUStV_SummeVorschaubetragEUR As Double Dim curUStV_SummeVorschaubetragEUR_VERAG As Double @@ -147,7 +151,7 @@ Public Class cMDMFunctionsAllgemein Dim curUStV_SummeVZBetragEUR As Double Dim invoiceDate = If(Date.Now > New Date(Date.Now.Year, 6, 30), New Date(Date.Now.Year, 1, 1), New Date(Date.Now.Year - 1, 1, 1)) - 'Neuberechnung der Vorschausummen + 'Neuberechnung der Vorschausummen (also alle noch nicht verrechneten Transaktionen) 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) @@ -176,21 +180,22 @@ Public Class cMDMFunctionsAllgemein Dim sumChangedOK As Boolean = False - If Not (CDbl(r.Item("UStV_SummeUmsatzsteuerbetragEUR")) = curUStV_SummeUmsatzsteuerbetragEUR And - CDbl(r.Item("UStV_SummeErstattungsbetragEUR")) = curUStV_SummeErstattungsbetragEUR And - CDbl(r.Item("UStV_Summe3470BetragEUR")) = curUStV_Summe3470BetragEUR And - CDbl(r.Item("UStV_SummeVZBetragEUR")) = curUStV_SummeVZBetragEUR And - CDbl(r.Item("UStV_SummeVorschaubetragEUR_VERAG")) = curUStV_SummeVorschaubetragEUR_VERAG And - CDbl(r.Item("UStV_SummeVorschaubetragEUR_IDS")) = curUStV_SummeVorschaubetragEUR_IDS And - CDbl(r.Item("UStV_SummeVorschaubetragEUR_IT")) = curUStV_SummeVorschaubetragEUR_IT And - CDbl(r.Item("UStV_SummeVorschaubetragEUR_MSE")) = curUStV_SummeVorschaubetragEUR_MSE And - CDbl(r.Item("UStV_SummeVorschaubetragEUR_UTA")) = curUStV_SummeVorschaubetragEUR_UTA And - CDbl(r.Item("UStV_SummeVorschaubetragEUR")) = curUStV_SummeVorschaubetragEUR) Then + If Not ( + Math.Round(CDbl(r.Item("UStV_SummeUmsatzsteuerbetragEUR")), 2) = curUStV_SummeUmsatzsteuerbetragEUR And + Math.Round(CDbl(r.Item("UStV_SummeErstattungsbetragEUR")), 2) = curUStV_SummeErstattungsbetragEUR And + Math.Round(CDbl(r.Item("UStV_Summe3470BetragEUR")), 2) = curUStV_Summe3470BetragEUR And + Math.Round(CDbl(r.Item("UStV_SummeVZBetragEUR")), 2) = curUStV_SummeVZBetragEUR And + Math.Round(CDbl(r.Item("UStV_SummeVorschaubetragEUR_VERAG")), 2) = curUStV_SummeVorschaubetragEUR_VERAG And + Math.Round(CDbl(r.Item("UStV_SummeVorschaubetragEUR_IDS")), 2) = curUStV_SummeVorschaubetragEUR_IDS And + Math.Round(CDbl(r.Item("UStV_SummeVorschaubetragEUR_IT")), 2) = curUStV_SummeVorschaubetragEUR_IT And + Math.Round(CDbl(r.Item("UStV_SummeVorschaubetragEUR_MSE")), 2) = curUStV_SummeVorschaubetragEUR_MSE And + Math.Round(CDbl(r.Item("UStV_SummeVorschaubetragEUR_UTA")), 2) = curUStV_SummeVorschaubetragEUR_UTA And + Math.Round(CDbl(r.Item("UStV_SummeVorschaubetragEUR")), 2) = curUStV_SummeVorschaubetragEUR) Then sumChanged = True sumChangedOK = False End If - If CDbl(r.Item("UStV_SummeVorschaubetragEUR_PLOSE")) = curUStV_SummeVorschaubetragEUR_PLOSE Then + If Not Math.Round(CDbl(r.Item("UStV_SummeVorschaubetragEUR_PLOSE")), 2) = curUStV_SummeVorschaubetragEUR_PLOSE Then sumChangedPLOSE = True sumChangedPLOSEOK = False End If @@ -216,14 +221,6 @@ Public Class cMDMFunctionsAllgemein sumChangedPLOSEOK = sql.doSQL("Update tblKundenErweitert set kde_UStV_SummeVorschaubetragEUR_PLOSE = " & curUStV_SummeVorschaubetragEUR_PLOSE.ToString.Replace(",", ".") & " WHERE kde_KundenNr = " & r.Item("KundenNr"), "FMZOLL") End If - 'UStVKunden_Summen_speichern_Vorschau_VERAG - 'UPDATE Kunden SET Kunden.UStV_SummeVorschaubetragEUR_VERAG = CCur(Nz(DSum("[SteuerbetragEUR]","qryUStVVorschau_VERAG","[RechnungsKundenNr] = " & [Kunden]![KundenNr]),0)) - 'WHERE (((Kunden.KundenNr)=[prmUStVKu_KuNr])); - - 'UStVKunden_Summen_speichern_Vorschau_IDS - 'UPDATE Kunden SET Kunden.UStV_SummeVorschaubetragEUR_IDS = CCur(Nz(DSum("[SteuerbetragEUR]","qryUStVVorschau_IDS","[RechnungsKundenNr] = " & [Kunden]![KundenNr]),0)) - 'WHERE (((Kunden.KundenNr)=[prmUStVKu_KuNr])); - Next End If @@ -352,15 +349,15 @@ Public Class cMDMFunctionsAllgemein Dim sql As New VERAG_PROG_ALLGEMEIN.SQL Dim summeSchnittstelle As Double - Dim sqlPLOSE = "select plose_POLSEKundennummer, sum([plose_MWSTBetrag])[plose_MWSTBetrag] FROM [tblPLOSE_Details] INNER JOIN Adressen on PLOSEKundenNr=plose_POLSEKundennummer - WHERE plose_Archiv = 1 AND plose_LieferantCode IN (0,1,7) AND cast(plose_RechnungsDatum as date) >= '" & invoiceDate.ToShortDateString & "' and plose_POLSEKundennummer = " & varUStVAn_KuNr & " + 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") For Each r As DataRow In dtPLOSE.Rows - Dim UST_org = CDbl(r.Item("plose_MWSTBetrag")) + Dim UST_org = CDbl(r.Item("plose_MWSTBetragWaehrungAbbuchung")) If UST_org <> 0 Then summeSchnittstelle += UST_org End If @@ -369,7 +366,7 @@ Public Class cMDMFunctionsAllgemein Return summeSchnittstelle Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.LOG) Return 0 @@ -438,7 +435,7 @@ Public Class cMDMFunctionsAllgemein Return summechnittstelle Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.LOG) Return 0 @@ -496,7 +493,8 @@ Public Class cMDMFunctionsAllgemein 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 - where bills.invoice_date >= '" & invoiceDate.ToShortDateString & "' and trans.charged = 1 and cust.[partner_customer_number] = " & varUStVAn_KuNr & " + 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 & " 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") @@ -512,7 +510,7 @@ Public Class cMDMFunctionsAllgemein 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.MAIL) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.LOG) Return 0 @@ -620,7 +618,7 @@ Public Class cMDMFunctionsAllgemein 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.MAIL) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.LOG) Return 0 diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cSession.vb b/VERAG_PROG_ALLGEMEIN/Classes/cSession.vb index a984afff..e57d3aaa 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cSession.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cSession.vb @@ -1,5 +1,6 @@ Imports System.Data.SqlClient Imports System.Reflection +Imports com.sun.xml.internal.rngom Public Class cSession @@ -18,10 +19,10 @@ Public Class cSession Property sess_PCName As String = "" Property sess_PCUserName As String = "" - Property sess_login As Object = Nothing = Now Property sess_logout As Object = Nothing Property sess_lastRm As Object = Nothing + Property sess_lastBootUpTime As Object = Nothing Property sess_lastActivity As Object = Nothing Property sess_status As Object = Nothing @@ -53,6 +54,7 @@ Public Class cSession list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sess_lastRm", sess_lastRm)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sess_lastActivity", sess_lastActivity)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sess_status", sess_status)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sess_lastBootUpTime", sess_lastBootUpTime)) Return list End Function @@ -167,6 +169,7 @@ Public Class cSession End Function Public Function LOGIN() As String + Me.sess_system = (If(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "T", "E")) Me.sess_login = Now Me.sess_maId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_id @@ -177,6 +180,8 @@ Public Class cSession Me.sess_ipAddress = System.Net.Dns.GetHostByName(System.Net.Dns.GetHostName()).AddressList(0).ToString() Me.sess_PCName = System.Environment.MachineName Me.sess_PCUserName = My.User.Name.ToString + Me.sess_lastBootUpTime = DateTime.Now - New TimeSpan(0, 0, 0, 0, System.Environment.TickCount) + Catch ex As Exception End Try Me.sess_lastRm = Now