diff --git a/SDL/Classes/cRKSV.vb b/SDL/Classes/cRKSV.vb index 7ba65c43..26636343 100644 --- a/SDL/Classes/cRKSV.vb +++ b/SDL/Classes/cRKSV.vb @@ -2152,6 +2152,11 @@ Public Class cRKSV rpt.picVERAG.Image = My.Resources.FrontOfficeSUB rpt.lblFirma_Name.Text = "Front-Office Suben eG" rpt.lblFirma_Details.Text = "A 4975 Suben | Suben 14" & vbNewLine & "UID: ATU74813856 " + Case "FT DE-KLIPPHAUSEN" + 'Default Werte: + rpt.picVERAG.Image = My.Resources.Klipphausen_Logo + rpt.lblFirma_Name.Text = "Front-Office Klipphausen GmbH" + rpt.lblFirma_Details.Text = "D 01665 Klipphausen | Am Bahndamm 3" End Select End If diff --git a/SDL/Fakturierung/frmRechnungenSuche.vb b/SDL/Fakturierung/frmRechnungenSuche.vb index 784f118c..96b42760 100644 --- a/SDL/Fakturierung/frmRechnungenSuche.vb +++ b/SDL/Fakturierung/frmRechnungenSuche.vb @@ -1,4 +1,5 @@ -Imports TAlex.WPF.Helpers +Imports java.rmi.dgc +Imports TAlex.WPF.Helpers Public Class frmRechnungenSuche Dim SQL As New SQL @@ -10,7 +11,7 @@ Public Class frmRechnungenSuche Dim sqlstr As String = "" Dim TopMax = If(IsNumeric(txtMaxSrch.Text), " TOP " & txtMaxSrch.Text, "") sqlstr &= "SELECT " & TopMax & " RK_ID,[RechnungsNr],cast([RechnungsDatum] as date) RechnungsDatum, Sammelrechnung, [FilialenNr],[AbfertigungsNr],[UnterNr],cast(Abfertigungsdatum as date) Abfertigungsdatum, isnull(cast(RechnungsKundenNr as nvarchar(10)) + ' ','') + [RechnungsName 1] as [RechnungAn], " & - " /* isnull(cast([AbsenderKundenNr] as nvarchar(10)) + ' ','') + [AbsenderName 1] as Absender,isnull(cast([EmpfängerKundenNr] as nvarchar(10)) + ' ','') + [EmpfängerName 1] as Empfänger,*/ isnull(cast([VermittlerKundenNr] as nvarchar(10)) + ' ','') + [VermittlerName 1] as Vermittler, [LKW Kennzeichen],Sachbearbeiter,[SteuerpflichtigerGesamtbetrag],[SteuerfreierGesamtbetrag], isnull(zugferdcheck,0) as ZUGFeRD " & + " /* isnull(cast([AbsenderKundenNr] as nvarchar(10)) + ' ','') + [AbsenderName 1] as Absender,isnull(cast([EmpfängerKundenNr] as nvarchar(10)) + ' ','') + [EmpfängerName 1] as Empfänger,*/ isnull(cast([VermittlerKundenNr] as nvarchar(10)) + ' ','') + [VermittlerName 1] as Vermittler, [LKW Kennzeichen],Sachbearbeiter,[SteuerpflichtigerGesamtbetrag],[SteuerfreierGesamtbetrag], isnull(zugferdcheck,0) as ZUGFeRD, isnull(DruckDatumZeit,'') as DruckDatumZeit " & " FROM [Rechnungsausgang] WHERE 1=1 " With DataGridView @@ -26,6 +27,7 @@ Public Class frmRechnungenSuche ' .MultiSelect = False .Columns("RK_ID").Visible = False + .Columns("DruckDatumZeit").Visible = False .Columns("RechnungsNr").Width = 70 .Columns("RechnungsNr").HeaderText = "Rechnugs-Nr" @@ -91,6 +93,13 @@ Public Class frmRechnungenSuche lblErgebnis.Text = "Ergebnisse: " & .RowCount lblunterschRe.Text = "Anz. untersch. Belege: " & .Rows.Cast(Of DataGridViewRow)().[Select](Function(r) CInt(IIf(Not IsDBNull(r.Cells("RechnungsNr").Value), r.Cells("RechnungsNr").Value, 0))).Distinct().Count() + For Each r In .Rows + If r.Cells("DruckDatumZeit").ToString = "" Then + r.Cells("RechnungsNr").Style.BackColor = Color.LightYellow + End If + Next + + End With brexitXLS = False cbxMitPositionen.Visible = True @@ -787,8 +796,10 @@ Public Class frmRechnungenSuche If DataGridView.SelectedRows.Count > 0 Then For Each r As DataGridViewRow In DataGridView.SelectedRows If listRgNr.FindIndex((Function(x) x.ToString = r.Cells("RechnungsNr").Value)) < 0 Then - list.Add(r.Cells("RK_ID").Value) - listRgNr.Add(r.Cells("RechnungsNr").Value) + If r.Cells("DruckDatumZeit").ToString <> "" Then + list.Add(r.Cells("RK_ID").Value) + listRgNr.Add(r.Cells("RechnungsNr").Value) + End If End If Next End If diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_AT_EV.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_AT_EV.Designer.vb index c858cffb..94b0091e 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_AT_EV.Designer.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_AT_EV.Designer.vb @@ -70,9 +70,9 @@ Partial Class usrcntlVollmacht_AT_EV Me.lblVollmachtDE.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblVollmachtDE.Location = New System.Drawing.Point(43, 9) Me.lblVollmachtDE.Name = "lblVollmachtDE" - Me.lblVollmachtDE.Size = New System.Drawing.Size(194, 20) + Me.lblVollmachtDE.Size = New System.Drawing.Size(144, 20) Me.lblVollmachtDE.TabIndex = 1 - Me.lblVollmachtDE.Text = "Vollmacht AT 4200 EV " + Me.lblVollmachtDE.Text = "Vollmacht AT EV" ' 'lbl ' @@ -158,7 +158,7 @@ Partial Class usrcntlVollmacht_AT_EV ' 'btn ' - Me.btn.BackgroundImage = Global.SDL.My.Resources.search + Me.btn.BackgroundImage = Global.SDL.My.Resources.Resources.search Me.btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btn.Location = New System.Drawing.Point(937, 34) @@ -181,12 +181,15 @@ Partial Class usrcntlVollmacht_AT_EV Me.txtAnsprechpartner._DateTimeOnly = False Me.txtAnsprechpartner._numbersOnly = False Me.txtAnsprechpartner._numbersOnlyKommastellen = "" + Me.txtAnsprechpartner._numbersOnlyTrennzeichen = True Me.txtAnsprechpartner._Prozent = False Me.txtAnsprechpartner._ShortDateNew = False Me.txtAnsprechpartner._ShortDateOnly = False Me.txtAnsprechpartner._TimeOnly = False + Me.txtAnsprechpartner._TimeOnly_Seconds = False Me.txtAnsprechpartner._value = Nothing Me.txtAnsprechpartner._Waehrung = False + Me.txtAnsprechpartner._WaehrungZeichen = True Me.txtAnsprechpartner.ForeColor = System.Drawing.Color.Black Me.txtAnsprechpartner.Location = New System.Drawing.Point(653, 9) Me.txtAnsprechpartner.MaxLineLength = -1 @@ -201,12 +204,15 @@ Partial Class usrcntlVollmacht_AT_EV Me.txtEinmalig_RgDat._DateTimeOnly = False Me.txtEinmalig_RgDat._numbersOnly = False Me.txtEinmalig_RgDat._numbersOnlyKommastellen = "" + Me.txtEinmalig_RgDat._numbersOnlyTrennzeichen = True Me.txtEinmalig_RgDat._Prozent = False Me.txtEinmalig_RgDat._ShortDateNew = False Me.txtEinmalig_RgDat._ShortDateOnly = False Me.txtEinmalig_RgDat._TimeOnly = False + Me.txtEinmalig_RgDat._TimeOnly_Seconds = False Me.txtEinmalig_RgDat._value = Nothing Me.txtEinmalig_RgDat._Waehrung = False + Me.txtEinmalig_RgDat._WaehrungZeichen = True Me.txtEinmalig_RgDat.Enabled = False Me.txtEinmalig_RgDat.ForeColor = System.Drawing.Color.Black Me.txtEinmalig_RgDat.Location = New System.Drawing.Point(653, 233) @@ -222,12 +228,15 @@ Partial Class usrcntlVollmacht_AT_EV Me.txtEinmalig_RgNr._DateTimeOnly = False Me.txtEinmalig_RgNr._numbersOnly = False Me.txtEinmalig_RgNr._numbersOnlyKommastellen = "" + Me.txtEinmalig_RgNr._numbersOnlyTrennzeichen = True Me.txtEinmalig_RgNr._Prozent = False Me.txtEinmalig_RgNr._ShortDateNew = False Me.txtEinmalig_RgNr._ShortDateOnly = False Me.txtEinmalig_RgNr._TimeOnly = False + Me.txtEinmalig_RgNr._TimeOnly_Seconds = False Me.txtEinmalig_RgNr._value = Nothing Me.txtEinmalig_RgNr._Waehrung = False + Me.txtEinmalig_RgNr._WaehrungZeichen = True Me.txtEinmalig_RgNr.Enabled = False Me.txtEinmalig_RgNr.ForeColor = System.Drawing.Color.Black Me.txtEinmalig_RgNr.Location = New System.Drawing.Point(363, 233) @@ -243,12 +252,15 @@ Partial Class usrcntlVollmacht_AT_EV Me.txtEmail._DateTimeOnly = False Me.txtEmail._numbersOnly = False Me.txtEmail._numbersOnlyKommastellen = "" + Me.txtEmail._numbersOnlyTrennzeichen = True Me.txtEmail._Prozent = False Me.txtEmail._ShortDateNew = False Me.txtEmail._ShortDateOnly = False Me.txtEmail._TimeOnly = False + Me.txtEmail._TimeOnly_Seconds = False Me.txtEmail._value = Nothing Me.txtEmail._Waehrung = False + Me.txtEmail._WaehrungZeichen = True Me.txtEmail.ForeColor = System.Drawing.Color.Black Me.txtEmail.Location = New System.Drawing.Point(254, 165) Me.txtEmail.MaxLineLength = -1 @@ -263,12 +275,15 @@ Partial Class usrcntlVollmacht_AT_EV Me.txtFax._DateTimeOnly = False Me.txtFax._numbersOnly = False Me.txtFax._numbersOnlyKommastellen = "" + Me.txtFax._numbersOnlyTrennzeichen = True Me.txtFax._Prozent = False Me.txtFax._ShortDateNew = False Me.txtFax._ShortDateOnly = False Me.txtFax._TimeOnly = False + Me.txtFax._TimeOnly_Seconds = False Me.txtFax._value = Nothing Me.txtFax._Waehrung = False + Me.txtFax._WaehrungZeichen = True Me.txtFax.ForeColor = System.Drawing.Color.Black Me.txtFax.Location = New System.Drawing.Point(653, 146) Me.txtFax.MaxLineLength = -1 @@ -283,12 +298,15 @@ Partial Class usrcntlVollmacht_AT_EV Me.txtTel._DateTimeOnly = False Me.txtTel._numbersOnly = False Me.txtTel._numbersOnlyKommastellen = "" + Me.txtTel._numbersOnlyTrennzeichen = True Me.txtTel._Prozent = False Me.txtTel._ShortDateNew = False Me.txtTel._ShortDateOnly = False Me.txtTel._TimeOnly = False + Me.txtTel._TimeOnly_Seconds = False Me.txtTel._value = Nothing Me.txtTel._Waehrung = False + Me.txtTel._WaehrungZeichen = True Me.txtTel.ForeColor = System.Drawing.Color.Black Me.txtTel.Location = New System.Drawing.Point(254, 146) Me.txtTel.MaxLineLength = -1 @@ -303,12 +321,15 @@ Partial Class usrcntlVollmacht_AT_EV Me.txtEori._DateTimeOnly = False Me.txtEori._numbersOnly = False Me.txtEori._numbersOnlyKommastellen = "" + Me.txtEori._numbersOnlyTrennzeichen = True Me.txtEori._Prozent = False Me.txtEori._ShortDateNew = False Me.txtEori._ShortDateOnly = False Me.txtEori._TimeOnly = False + Me.txtEori._TimeOnly_Seconds = False Me.txtEori._value = Nothing Me.txtEori._Waehrung = False + Me.txtEori._WaehrungZeichen = True Me.txtEori.ForeColor = System.Drawing.Color.Black Me.txtEori.Location = New System.Drawing.Point(653, 127) Me.txtEori.MaxLineLength = -1 @@ -323,12 +344,15 @@ Partial Class usrcntlVollmacht_AT_EV Me.txtUid._DateTimeOnly = False Me.txtUid._numbersOnly = False Me.txtUid._numbersOnlyKommastellen = "" + Me.txtUid._numbersOnlyTrennzeichen = True Me.txtUid._Prozent = False Me.txtUid._ShortDateNew = False Me.txtUid._ShortDateOnly = False Me.txtUid._TimeOnly = False + Me.txtUid._TimeOnly_Seconds = False Me.txtUid._value = Nothing Me.txtUid._Waehrung = False + Me.txtUid._WaehrungZeichen = True Me.txtUid.ForeColor = System.Drawing.Color.Black Me.txtUid.Location = New System.Drawing.Point(254, 127) Me.txtUid.MaxLineLength = -1 @@ -343,12 +367,15 @@ Partial Class usrcntlVollmacht_AT_EV Me.txtAdresse2._DateTimeOnly = False Me.txtAdresse2._numbersOnly = False Me.txtAdresse2._numbersOnlyKommastellen = "" + Me.txtAdresse2._numbersOnlyTrennzeichen = True Me.txtAdresse2._Prozent = False Me.txtAdresse2._ShortDateNew = False Me.txtAdresse2._ShortDateOnly = False Me.txtAdresse2._TimeOnly = False + Me.txtAdresse2._TimeOnly_Seconds = False Me.txtAdresse2._value = Nothing Me.txtAdresse2._Waehrung = False + Me.txtAdresse2._WaehrungZeichen = True Me.txtAdresse2.ForeColor = System.Drawing.Color.Black Me.txtAdresse2.Location = New System.Drawing.Point(254, 72) Me.txtAdresse2.MaxLineLength = -1 @@ -363,12 +390,15 @@ Partial Class usrcntlVollmacht_AT_EV Me.txtAdresse1._DateTimeOnly = False Me.txtAdresse1._numbersOnly = False Me.txtAdresse1._numbersOnlyKommastellen = "" + Me.txtAdresse1._numbersOnlyTrennzeichen = True Me.txtAdresse1._Prozent = False Me.txtAdresse1._ShortDateNew = False Me.txtAdresse1._ShortDateOnly = False Me.txtAdresse1._TimeOnly = False + Me.txtAdresse1._TimeOnly_Seconds = False Me.txtAdresse1._value = Nothing Me.txtAdresse1._Waehrung = False + Me.txtAdresse1._WaehrungZeichen = True Me.txtAdresse1.ForeColor = System.Drawing.Color.Black Me.txtAdresse1.Location = New System.Drawing.Point(254, 53) Me.txtAdresse1.MaxLineLength = -1 @@ -383,12 +413,15 @@ Partial Class usrcntlVollmacht_AT_EV Me.txtFirma._DateTimeOnly = False Me.txtFirma._numbersOnly = False Me.txtFirma._numbersOnlyKommastellen = "" + Me.txtFirma._numbersOnlyTrennzeichen = True Me.txtFirma._Prozent = False Me.txtFirma._ShortDateNew = False Me.txtFirma._ShortDateOnly = False Me.txtFirma._TimeOnly = False + Me.txtFirma._TimeOnly_Seconds = False Me.txtFirma._value = Nothing Me.txtFirma._Waehrung = False + Me.txtFirma._WaehrungZeichen = True Me.txtFirma.ForeColor = System.Drawing.Color.Black Me.txtFirma.Location = New System.Drawing.Point(254, 34) Me.txtFirma.MaxLineLength = -1 @@ -403,12 +436,15 @@ Partial Class usrcntlVollmacht_AT_EV Me.txtInhaber._DateTimeOnly = False Me.txtInhaber._numbersOnly = False Me.txtInhaber._numbersOnlyKommastellen = "" + Me.txtInhaber._numbersOnlyTrennzeichen = True Me.txtInhaber._Prozent = False Me.txtInhaber._ShortDateNew = False Me.txtInhaber._ShortDateOnly = False Me.txtInhaber._TimeOnly = False + Me.txtInhaber._TimeOnly_Seconds = False Me.txtInhaber._value = Nothing Me.txtInhaber._Waehrung = False + Me.txtInhaber._WaehrungZeichen = True Me.txtInhaber.ForeColor = System.Drawing.Color.Black Me.txtInhaber.Location = New System.Drawing.Point(653, 101) Me.txtInhaber.MaxLineLength = -1 @@ -432,12 +468,15 @@ Partial Class usrcntlVollmacht_AT_EV Me.txtRechtsform._DateTimeOnly = False Me.txtRechtsform._numbersOnly = False Me.txtRechtsform._numbersOnlyKommastellen = "" + Me.txtRechtsform._numbersOnlyTrennzeichen = True Me.txtRechtsform._Prozent = False Me.txtRechtsform._ShortDateNew = False Me.txtRechtsform._ShortDateOnly = False Me.txtRechtsform._TimeOnly = False + Me.txtRechtsform._TimeOnly_Seconds = False Me.txtRechtsform._value = Nothing Me.txtRechtsform._Waehrung = False + Me.txtRechtsform._WaehrungZeichen = True Me.txtRechtsform.ForeColor = System.Drawing.Color.Black Me.txtRechtsform.Location = New System.Drawing.Point(254, 101) Me.txtRechtsform.MaxLineLength = -1 @@ -461,12 +500,15 @@ Partial Class usrcntlVollmacht_AT_EV Me.txtFaStNr._DateTimeOnly = False Me.txtFaStNr._numbersOnly = False Me.txtFaStNr._numbersOnlyKommastellen = "" + Me.txtFaStNr._numbersOnlyTrennzeichen = True Me.txtFaStNr._Prozent = False Me.txtFaStNr._ShortDateNew = False Me.txtFaStNr._ShortDateOnly = False Me.txtFaStNr._TimeOnly = False + Me.txtFaStNr._TimeOnly_Seconds = False Me.txtFaStNr._value = Nothing Me.txtFaStNr._Waehrung = False + Me.txtFaStNr._WaehrungZeichen = True Me.txtFaStNr.ForeColor = System.Drawing.Color.Black Me.txtFaStNr.Location = New System.Drawing.Point(653, 165) Me.txtFaStNr.MaxLineLength = -1 @@ -487,7 +529,7 @@ Partial Class usrcntlVollmacht_AT_EV ' 'pic ' - Me.pic.BackgroundImage = Global.SDL.My.Resources.pdf + Me.pic.BackgroundImage = Global.SDL.My.Resources.Resources.pdf Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch Me.pic.Cursor = System.Windows.Forms.Cursors.Hand Me.pic.Location = New System.Drawing.Point(5, 5) @@ -499,7 +541,7 @@ Partial Class usrcntlVollmacht_AT_EV 'btnDown ' Me.btnDown.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnDown.BackgroundImage = Global.SDL.My.Resources.pfeil_unten + Me.btnDown.BackgroundImage = Global.SDL.My.Resources.Resources.pfeil_unten Me.btnDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.btnDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnDown.Location = New System.Drawing.Point(976, 42) @@ -511,7 +553,7 @@ Partial Class usrcntlVollmacht_AT_EV 'btnUp ' Me.btnUp.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnUp.BackgroundImage = Global.SDL.My.Resources.pfeil_oben + Me.btnUp.BackgroundImage = Global.SDL.My.Resources.Resources.pfeil_oben Me.btnUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.btnUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnUp.Location = New System.Drawing.Point(976, 22) @@ -523,7 +565,7 @@ Partial Class usrcntlVollmacht_AT_EV 'btnDel ' Me.btnDel.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnDel.BackgroundImage = Global.SDL.My.Resources.del + Me.btnDel.BackgroundImage = Global.SDL.My.Resources.Resources.del Me.btnDel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.btnDel.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnDel.Location = New System.Drawing.Point(976, -1) @@ -579,12 +621,15 @@ Partial Class usrcntlVollmacht_AT_EV Me.txtEinmalig_CarnetATA._DateTimeOnly = False Me.txtEinmalig_CarnetATA._numbersOnly = False Me.txtEinmalig_CarnetATA._numbersOnlyKommastellen = "" + Me.txtEinmalig_CarnetATA._numbersOnlyTrennzeichen = True Me.txtEinmalig_CarnetATA._Prozent = False Me.txtEinmalig_CarnetATA._ShortDateNew = False Me.txtEinmalig_CarnetATA._ShortDateOnly = False Me.txtEinmalig_CarnetATA._TimeOnly = False + Me.txtEinmalig_CarnetATA._TimeOnly_Seconds = False Me.txtEinmalig_CarnetATA._value = Nothing Me.txtEinmalig_CarnetATA._Waehrung = False + Me.txtEinmalig_CarnetATA._WaehrungZeichen = True Me.txtEinmalig_CarnetATA.Enabled = False Me.txtEinmalig_CarnetATA.ForeColor = System.Drawing.Color.Black Me.txtEinmalig_CarnetATA.Location = New System.Drawing.Point(390, 252) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index dbd93fec..1e8a13b9 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/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index d143ffa3..9a964a70 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -82,7 +82,18 @@ Public Class frmMDM_USTVAntrag If UStVAn_ID <= 0 Then Exit Sub - .SET_SQL("SELECT [UStVAn_ID] ,[UStVPo_ID] " & IIf(cbxInterneNr.Checked, ",[UStVPo_interneNr] as intNr", "") & " ,[UStVPo_ReDat],[UStVPo_ReNr],[UStVPo_Leistungsbezeichnung],[UStVPo_Nettobetrag],[UStVPo_NettobetragEUR],[UStVPo_Leistender],leist.[UstV_Leistender_Strasse] + ' ' + leist.[UstV_Leistender_StrasseNr] as [UstV_Leistender_Strasse],leist.[UstV_Leistender_Strasse] as StrasseOnly,leist.[UstV_Leistender_StrasseNr] as StrassenNrOnly,leist.[UstV_Leistender_PLZ],leist.[UstV_Leistender_Stadt],leist.[UstV_Leistender_Land],leist.[UstV_Leistender_UstNr],[UStVPo_USteuerbetrag],[UStVPo_Schnittstelle],[UStVPo_SchnittstellenNr],[UStVPo_Umrechnungskurs],[UStVPo_USteuerbetragEUR],[UStVPo_Sachbearbeiter], [UStVPo_daId], [UStVPo_daId_loeschbar] ,[UStVPo_VZ],[UStVPo_VZ_RKID] ,cast(case when isnull([UStVPo_VZ_RKID],0) = 0 then 0 else 1 end as bit) as VZabrechnet + .SET_SQL("SELECT [UStVAn_ID] ,[UStVPo_ID] " & IIf(cbxInterneNr.Checked, ",[UStVPo_interneNr] as intNr", "") & " ,[UStVPo_ReDat],[UStVPo_ReNr],[UStVPo_Leistungsbezeichnung],[UStVPo_Nettobetrag],[UStVPo_NettobetragEUR],[UStVPo_Leistender],leist.[UstV_Leistender_Strasse] + ' ' + leist.[UstV_Leistender_StrasseNr] as [UstV_Leistender_Strasse],leist.[UstV_Leistender_Strasse] as StrasseOnly,leist.[UstV_Leistender_StrasseNr] as StrassenNrOnly,leist.[UstV_Leistender_PLZ],leist.[UstV_Leistender_Stadt],leist.[UstV_Leistender_Land],leist.[UstV_Leistender_UstNr],[UStVPo_USteuerbetrag],[UStVPo_Schnittstelle],[UStVPo_SchnittstellenNr],[UStVPo_Umrechnungskurs],[UStVPo_USteuerbetragEUR],[UStVPo_Sachbearbeiter], [UStVPo_daId], + CAST( + CASE + WHEN NOT EXISTS ( + SELECT 1 + FROM tblDatenarchiv AS da + WHERE da.da_id = tblUStVPositionen.UStVPo_daId + ) + THEN 1 + ELSE 0 + END + AS bit) AS UStVPo_daId_nicht_im_Datenarchiv, [UStVPo_daId_loeschbar] ,[UStVPo_VZ],[UStVPo_VZ_RKID] ,cast(case when isnull([UStVPo_VZ_RKID],0) = 0 then 0 else 1 end as bit) as VZabrechnet FROM [tblUStVPositionen] LEFT JOIN [tblUStVLeistender] as leist ON ([tblUStVPositionen].[UStVPo_LeistenderId] > 0 @@ -101,7 +112,7 @@ Public Class frmMDM_USTVAntrag If .Columns.Count > 0 Then .Columns("UStVAn_ID").Visible = False - + .Columns("UStVPo_daId_nicht_im_Datenarchiv").Visible = False .Columns("StrassenNrOnly").Visible = False .Columns("StrasseOnly").Visible = False @@ -198,17 +209,21 @@ Public Class frmMDM_USTVAntrag If Not IsDBNull(r.Cells("UStVPo_daId").Value) Then da_id = r.Cells("UStVPo_daId").Value + If da_id > 0 AndAlso r.Cells("UStVPo_daId_nicht_im_Datenarchiv").Value IsNot Nothing AndAlso r.Cells("UStVPo_daId_nicht_im_Datenarchiv").Value Then + r.Cells("clmnPDF").Style.BackColor = Color.IndianRed + End If Else da_id = func.getDaID_OLD(r.Cells("UStVPo_SchnittstellenNr").Value, r.Cells("UStVPo_ReDat").Value, r.Cells("UStVPo_ReNr").Value, Antrag_LandKz, USTV_ANTRAG) End If If da_id > 0 Then + DirectCast(r.Cells("clmnPDF"), DataGridViewImageCell).Value = Nothing DirectCast(r.Cells("clmnPDF"), DataGridViewImageCell).Value = My.Resources.pdf End If - If Not (r.Cells("UStVPo_SchnittstellenNr").Value = 4 OrElse r.Cells("UStVPo_SchnittstellenNr").Value = 9) AndAlso Not r.Cells("UStVPo_ReNr").Value.ToString.ToLower.StartsWith("bis") Then 'MSE und "SAMMELBERIFF" ausnehmen + If Not (r.Cells("UStVPo_SchnittstellenNr").Value = 4 OrElse r.Cells("UStVPo_SchnittstellenNr").Value = 9) AndAlso Not r.Cells("UStVPo_ReNr").Value.ToString.ToLower.StartsWith("bis") Then 'MSE und "SAMMELBERIFF" ausnehmen Dim rechnungsNr = CStr(r.Cells("UStVPo_ReNr").Value) If Not String.IsNullOrWhiteSpace(rechnungsNr) Then diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index 8c8f7024..beb32a23 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -766,7 +766,7 @@ Public Class usrCntlUSTV 'INFO -> Schnittstelle beinhaltet ald DA-ID die RK-ID (Feld wird missbraucht!!!) - Dim sqlStr = "select tblUStVAntrag.UStVAn_ID,[Länderverzeichnis für die Außenhandelsstatistik].LandKz,cast(UStVPo_reDat as Date) as Rechnungsdatum, UStVPo_interneNr, UStVPo_ID, UStVPo_SchnittstellenNr, UStVPo_daId, UStVPo_daId_loeschbar + Dim sqlStr = "select tblUStVAntrag.UStVAn_ID,[Länderverzeichnis für die Außenhandelsstatistik].LandKz,cast(UStVPo_reDat as Date) as Rechnungsdatum, UStVPo_interneNr, UStVPo_ID, UStVPo_SchnittstellenNr, UStVPo_daId, UStVPo_daId_loeschbar, UStVPo_Zeitstempel as letzte_Äendunger, UStVPo_Sachbearbeiter from tblUStVAntrag inner join tblUStVPositionen on tblUStVAntrag.UStVAn_ID = tblUStVPositionen.UStVAn_ID inner join [Länderverzeichnis für die Außenhandelsstatistik] on Landnr = tblUStVAntrag.UStVAn_LandNr diff --git a/SDL/kunden/frmKundenUebersichtZOLL.vb b/SDL/kunden/frmKundenUebersichtZOLL.vb index 525df4e6..06a8ef12 100644 --- a/SDL/kunden/frmKundenUebersichtZOLL.vb +++ b/SDL/kunden/frmKundenUebersichtZOLL.vb @@ -565,7 +565,7 @@ Public Class frmKundenUebersichtZOLL sqlStr &= " SELECT TOP 1000 RK_ID,[RechnungsNr],[RechnungsDatum]," sqlStr &= " ( SELECT SUM(isnull([SteuerpflichtigerBetrag],0)+isnull([SteuerfreierBetrag],0)) FROM [RechnungsausgangPositionen] where [RechnungsausgangPositionen].RK_ID=[Rechnungsausgang].RK_ID ) as Rechnungsbetrag," sqlStr &= " Sammelrechnung, [FilialenNr],[AbfertigungsNr],[UnterNr],[Abfertigungsdatum], isnull(cast(RechnungsKundenNr as nvarchar(7)) + ' ','') + [RechnungsName 1] as [RechnungAn], " - sqlStr &= " isnull(cast([VermittlerKundenNr] as nvarchar(7)) + ' ','') + [VermittlerName 1] as Vermittler, [LKW Kennzeichen],Sachbearbeiter " + sqlStr &= " isnull(cast([VermittlerKundenNr] as nvarchar(7)) + ' ','') + [VermittlerName 1] as Vermittler, [LKW Kennzeichen],Sachbearbeiter, isnull(DruckDatumZeit,'') as DruckDatumZeit " sqlStr &= " FROM [Rechnungsausgang] WHERE RechnungsKundenNr=@KundenNr AND RechnungsDatum BETWEEN @RechnungsDatum_Von AND @RechnungsDatum_Bis " Dim SQL_PARAM As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) @@ -578,6 +578,7 @@ Public Class frmKundenUebersichtZOLL '.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells .Columns("RK_ID").Visible = False + .Columns("DruckDatumZeit").Visible = False .Columns("RechnungsNr").Width = 70 .Columns("RechnungsNr").HeaderText = "Rechnugs-Nr" @@ -635,6 +636,13 @@ Public Class frmKundenUebersichtZOLL .Columns("Sachbearbeiter").MinimumWidth = 100 .Columns("Sachbearbeiter").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + + For Each r In .Rows + If Not IsNothing(r.Cells("DruckDatumZeit").value) AndAlso r.Cells("DruckDatumZeit").value.ToString.Contains("1900") Then + r.Cells("RechnungsNr").Style.BackColor = Color.LightYellow + End If + Next + End With End Sub diff --git a/SDL/kunden/frmKundenUebersichtZollRgDetails.vb b/SDL/kunden/frmKundenUebersichtZollRgDetails.vb index 253ecfb6..f558ed3c 100644 --- a/SDL/kunden/frmKundenUebersichtZollRgDetails.vb +++ b/SDL/kunden/frmKundenUebersichtZollRgDetails.vb @@ -32,7 +32,7 @@ Public Class frmKundenUebersichtZollRgDetails Private Sub frmKundenUebersichtZollRg_Load(sender As Object, e As EventArgs) Handles Me.Load - Dim dt As DataRow = SQL.loadDgvBySql("SELECT *, /*[SteuerpflichtigerGesamtbetrag]*[Steuersatz %]*/ SteuerpflichtigerGesamtbetrag/(1+[Steuersatz %])*[Steuersatz %] as ErgSteuerbetrag , [SteuerpflichtigerGesamtbetrag]+[SteuerfreierGesamtbetrag] as RgBetrag,cast(isnull(zugferdcheck,0) as Bit) as zugferdcheck, isnull(zugferdcheck_daid, -1) as zugferdcheck_daid FROM Rechnungsausgang WHERE RK_ID = " & RK_ID & "", "FMZOLL").Rows(0) + Dim dt As DataRow = SQL.loadDgvBySql("SELECT *, /*[SteuerpflichtigerGesamtbetrag]*[Steuersatz %]*/ SteuerpflichtigerGesamtbetrag/(1+[Steuersatz %])*[Steuersatz %] as ErgSteuerbetrag , [SteuerpflichtigerGesamtbetrag]+[SteuerfreierGesamtbetrag] as RgBetrag,cast(isnull(zugferdcheck,0) as Bit) as zugferdcheck, isnull(zugferdcheck_daid, -1) as zugferdcheck_daid, isnull(DruckDatumZeit,'') as DruckDatumZeit FROM Rechnungsausgang WHERE RK_ID = " & RK_ID & "", "FMZOLL").Rows(0) lblRgNr.Text = dt("RechnungsNr").ToString lblRgBetrag.Text = CDbl(dt("RgBetrag")).ToString("N2", CultureInfo.CurrentCulture) @@ -72,6 +72,14 @@ Public Class frmKundenUebersichtZollRgDetails Sammelrechnung = CInt(dt("Sammelrechnung").ToString) + If dt("DruckDatumZeit").ToString = "" Then + Button1.Enabled = False + Button15.Enabled = False + Else + Button1.Enabled = True + Button15.Enabled = True + End If + If RK_ID > 0 Then initDGV() If Environment.MachineName = "H6CCWP3" Then @@ -238,8 +246,9 @@ Public Class frmKundenUebersichtZollRgDetails Dim psi As New ProcessStartInfo() - psi.FileName = "C:\Program Files\Eclipse Adoptium\jre-11.0.28.6-hotspot\bin\java.exe" - psi.Arguments = "-jar ""C:\Users\d.breimaier\Downloads\Mustang-CLI-2.21.0.jar"" --no-notices --action validate --source " & Path_temp & "" + psi.FileName = "C:\Program Files\Eclipse Adoptium\jre-11.0.32.101-hotspot\bin\java.exe" + psi.Arguments = "-jar ""C:\Users\d.breimaier\Downloads\Mustang-CLI-2.21.0.jar"" --no-notices --action validate --source " & Path_temp + psi.RedirectStandardOutput = True psi.RedirectStandardError = True diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index afd1c611..3d0f5c34 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -3,7 +3,6 @@ Imports System.Globalization Imports System.IO Imports SDL.EORI Imports VERAG_PROG_ALLGEMEIN -Imports VERAG_PROG_ALLGEMEIN.TESTJSON Public Class usrCntlKundenuebersicht 'Implements INotifyPropertyChanged diff --git a/SDL/mdm/usrcntlFremdrechnungen.vb b/SDL/mdm/usrcntlFremdrechnungen.vb index bd8bc508..6863aed9 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.vb @@ -1567,7 +1567,11 @@ Public Class usrcntlFremdrechnungen If daId > 0 Then Me.Cursor = Cursors.WaitCursor Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(daId) - DS.OPEN_SINGLE() + If DS.hasITEMS Then + DS.OPEN_SINGLE() + Else + MsgBox("keine Datei gefunden!") + End If End If End If @@ -1579,10 +1583,18 @@ Public Class usrcntlFremdrechnungen If daId > 0 Then Me.Cursor = Cursors.WaitCursor Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(daId) - DS.OPEN_SINGLE() + + If DS.hasITEMS Then + DS.OPEN_SINGLE() + Else + MsgBox("keine Datei gefunden!") + End If + + End If End If + End Select ElseIf e.ColumnIndex = 18 Then diff --git a/SDL/seriendruck/usrCntlFakturierung.vb b/SDL/seriendruck/usrCntlFakturierung.vb index 2c97dc2b..34b60af5 100644 --- a/SDL/seriendruck/usrCntlFakturierung.vb +++ b/SDL/seriendruck/usrCntlFakturierung.vb @@ -2,6 +2,7 @@ Imports System.IO Imports System.Web.UI.WebControls.Expressions Imports com.sun.xml.internal.rngom +Imports io.konik.zugferd.entity Imports VERAG_PROG_ALLGEMEIN Public Class usrcntlFakturierung @@ -222,8 +223,7 @@ Public Class usrcntlFakturierung If Not ok Then Exit Sub - Dim rechnungenMitAbwAbfDat As Integer = CInt((New SQL).getValueTxtBySqlVarList("SELECT COUNT(*) FROM Rechnungsausgang - WHERE [Status] = 0 AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) <> '" & rechnungsdatum & "'", "FMZOLL",, 0)) + Dim rechnungenMitAbwAbfDat As Integer = CInt((New SQL).getValueTxtBySqlVarList("SELECT COUNT(*) FROM Rechnungsausgang WHERE [Status] = 0 AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) <> '" & rechnungsdatum & "'", "FMZOLL",, 0)) If rechnungenMitAbwAbfDat > 0 Then Dim res As MsgBoxResult @@ -242,7 +242,7 @@ Public Class usrcntlFakturierung Dim rechnungenMitRE_KZ As Integer = CInt((New SQL).getValueTxtBySqlVarList("SELECT COUNT(*) FROM Rechnungsausgang WHERE [Status] = 0 AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) = '" & rechnungsdatum & "' AND Rechnungsart <> 'RG' ", "FMZOLL",, 0)) - If rechnungenMitAbwAbfDat > 0 Then + If rechnungenMitRE_KZ > 0 Then Dim res As MsgBoxResult res = MsgBox("Es gibt noch " & rechnungenMitRE_KZ & " Rechnungen deren Rechnungsart nicht auf Standard-Rechnung gesetzt ist" & vbNewLine & "Möchten Sie fortfahren (Rechnungsart wird auf Standard gesetzt) ?", vbYesNoCancel) Select Case res @@ -286,7 +286,7 @@ Public Class usrcntlFakturierung Dim dtREGU As DataTable = SQL.loadDgvBySql("SELECT [Firma_ID], [Status], [Sammelrechnung], [Sachbearbeiter], [RechnungsKundenNr], [Währungscode], isnull([Steuersatz %],0) as [Steuersatz %], cast([Lastschrift] as bit) as Lastschrift, Sum([SteuerpflichtigerGesamtbetrag]+[SteuerfreierGesamtbetrag]) AS Sammelrechnungsbetrag FROM Rechnungsausgang - WHERE [Status] = 0 AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) = '" & rechnungsdatum & "' + WHERE [Status] = 0 AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) = '" & rechnungsdatum & "' And Rechnungsausgang.KundenNrZentrale = 401805 GROUP BY [Firma_ID], [Status], [Sammelrechnung], [Sachbearbeiter], [RechnungsKundenNr], [Währungscode], [Steuersatz %], [Lastschrift]", "FMZOLL") @@ -752,7 +752,7 @@ Public Class usrcntlFakturierung Dim dtSelectedSammelrechnungen As DataTable = (New SQL).loadDgvBySql("SELECT [Firma_ID], [Status],[FilialenNr], [Sammelrechnung], [Sachbearbeiter], [RechnungsKundenNr], [Währungscode], isnull([Steuersatz %],0) as [Steuersatz %], cast([Lastschrift] as bit) as Lastschrift, [RK_ID], [BelegartenNr],cast([Vorkasse] as bit) as Vorkasse, [Nettozahlungsziel], [OffertenNr], [RechnungsLandKz], [Text] FROM Rechnungsausgang - WHERE " & IIf(setTextifNull, "[Status] = 4 AND Text is null", "[Status] = 0") & " AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) = '" & rechnungsdatum & "' + WHERE " & IIf(setTextifNull, "[Status] = 4 AND Text is null", "[Status] = 0") & " AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) = '" & rechnungsdatum & "' And Rechnungsausgang.KundenNrZentrale = 401805 ORDER BY [Firma_ID], [Status], [Sammelrechnung], [Sachbearbeiter], [RechnungsKundenNr], [Währungscode], [Steuersatz %], [Lastschrift], [RK_ID]", "FMZOLL") Try @@ -1158,6 +1158,24 @@ Public Class usrcntlFakturierung Dim dtZNBList = (New SQL).loadDgvBySql("select [id] ,[belegNr] ,[buchungstext] ,[zinssatz] ,[belegZahlungsziel],[ueberschreitungInTagen] ,[zinsbetrag] ,[belegDatum] ,[zahlungsBetrag] ,[zahlungDatum] , [faelligkeitsDatum] from tblMDM_Zinsberechnung where RK_ID =" & RG.RK_ID, "FMZOLL") + 'hier noch Rabattpsitionen einfügen (aus der Rechnung). + + If RG.POSITIONEN.Any(Function(r) r.Preis < 0 AndAlso r.LeistungsBez.Contains("%")) Then + + + For Each POS In RG.POSITIONEN + If POS.Preis < 0 AndAlso POS.LeistungsBez.Contains("%") Then + dtZNBList.Rows.Add("0", "Discount", "", "", "", 0, CDbl(POS.SteuerfreierBetrag) + CDbl(POS.SteuerpflichtigerBetrag), Nothing, 0, Nothing, Nothing) + 'Exit For + End If + + Next + + + + End If + + If dtZNBList.Rows.Count = 0 Then MsgBox("Keine Zinsberechnungsdaten für RK_ID " & RG.RK_ID & " gefunden. Diese Rechnung wird übersprungen.") hatFehler = True diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb b/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb index b2bde650..4ffd3348 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb @@ -424,14 +424,14 @@ Public Class cRMC End If If dt IsNot Nothing Then - Dim SQLstr = "Select rmc_reNr As RechnungsNr,rmc_reDatum As Rechnungsdatum, Adressen.AdressenNr As KundenNr,Adressen.[Name 1] As Kunde, kde_keineMWSt As keineMWST from [tblRMCImport] INNER JOIN Adressen On WölflKundenNr=[rmc_kdNr] Or weitereWölflKundenNr=[rmc_kdNr] INNER JOIN tblKundenErweitert On AdressenNr = kde_KundenNr where rmc_daId Is null " & sqlTime & sqlAdressenNr & " group by rmc_reNr, Adressen.AdressenNr, Adressen.[Name 1],rmc_reDatum, kde_keineMWSt" + Dim SQLstr = "Select rmc_reNr As RechnungsNr,rmc_reDatum As Rechnungsdatum, Adressen.AdressenNr As KundenNr,Adressen.[Name 1] As Kunde, kde_keineMWSt As keineMWST, rmc_pdfFileName as Dateiname from [tblRMCImport] INNER JOIN Adressen On WölflKundenNr=[rmc_kdNr] Or weitereWölflKundenNr=[rmc_kdNr] INNER JOIN tblKundenErweitert On AdressenNr = kde_KundenNr where rmc_daId Is null " & sqlTime & sqlAdressenNr & " group by rmc_reNr, Adressen.AdressenNr, Adressen.[Name 1],rmc_reDatum, kde_keineMWSt, rmc_pdfFileName" dt = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL") dt_missingInvoices = dt Return dt.Rows.Count Else If getDetailsInDatatable Then - Dim SQLstr = "Select rmc_reNr As RechnungsNr,rmc_reDatum As Rechnungsdatum, Adressen.AdressenNr As KundenNr,Adressen.[Name 1] As Kunde, kde_keineMWSt As keineMWST from [tblRMCImport] INNER JOIN Adressen On WölflKundenNr=[rmc_kdNr] Or weitereWölflKundenNr=[rmc_kdNr] INNER JOIN tblKundenErweitert On AdressenNr = kde_KundenNr where rmc_daId Is null " & sqlTime & sqlAdressenNr + Dim SQLstr = "Select rmc_reNr As RechnungsNr,rmc_reDatum As Rechnungsdatum, Adressen.AdressenNr As KundenNr,Adressen.[Name 1] As Kunde, kde_keineMWSt As keineMWST, rmc_pdfFileName as Dateiname from [tblRMCImport] INNER JOIN Adressen On WölflKundenNr=[rmc_kdNr] Or weitereWölflKundenNr=[rmc_kdNr] INNER JOIN tblKundenErweitert On AdressenNr = kde_KundenNr where rmc_daId Is null " & sqlTime & sqlAdressenNr dt_missingInvoices = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL") Return dt_missingInvoices.Rows.Count Else diff --git a/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb b/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb index e9ddc492..92f95114 100644 --- a/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb @@ -94,7 +94,7 @@ Namespace My _ + Global.System.Configuration.DefaultSettingValueAttribute("https://finanzonline.bmf.gv.at:443/fonuid/ws/uidAbfrage/")> _ Public ReadOnly Property VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_uidAbfrageService() As String Get Return CType(Me("VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_uidAbfrageService"),String) @@ -104,7 +104,7 @@ Namespace My _ + Global.System.Configuration.DefaultSettingValueAttribute("https://finanzonline.bmf.gv.at:443/fonws/ws/session/")> _ Public ReadOnly Property VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_session_sessionService() As String Get Return CType(Me("VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_session_sessionService"),String) diff --git a/VERAG_PROG_ALLGEMEIN/My Project/Settings.settings b/VERAG_PROG_ALLGEMEIN/My Project/Settings.settings index 26c5f16b..734e07ac 100644 --- a/VERAG_PROG_ALLGEMEIN/My Project/Settings.settings +++ b/VERAG_PROG_ALLGEMEIN/My Project/Settings.settings @@ -12,10 +12,10 @@ Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=DISPO;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;TransparentNetworkIPResolution=False;Pooling=true;Min Pool Size=20;Max Pool Size=250 - https://finanzonline.bmf.gv.at/fon/ws/uidAbfrage/ + https://finanzonline.bmf.gv.at:443/fonuid/ws/uidAbfrage/ - https://finanzonline.bmf.gv.at:443/fonws/ws/session + https://finanzonline.bmf.gv.at:443/fonws/ws/session/ diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb index 777b0094..22e7f626 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb @@ -1103,7 +1103,7 @@ Public Class cMSEAPI End If - If Not inv.archiv Then inv.SAVE() 'bereits archiverte REchnungen nicht überschreiben!!!! + If Not inv.archiv AndAlso inv.name = "20260815_18273_FR_VAT.pdf" Then inv.SAVE() 'bereits archiverte REchnungen nicht überschreiben!!!! End If j = j + 1 diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb index 91a9b6e3..9731213b 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb @@ -41,7 +41,7 @@ Public Class cSyska_Interface Left Join tblKundenErweitert ON KundenNr=kde_KundenNr Left Join [Länderverzeichnis für die Außenhandelsstatistik] as St ON St.LandKz=Adressen.LandKz Left Join Währungstabelle ON St.LandNr = Währungstabelle.Währungsschlüssel - WHERE FiBuSchnittstelle = 0 And Auswahl ='A' AND FiBuSchnittstelleNr='" & FiBuSchnittstelleNr & "' Order by [Konto-Nr]" + WHERE FiBuSchnittstelle = 1 And Auswahl ='A' AND FiBuSchnittstelleNr='" & FiBuSchnittstelleNr & "' Order by [Konto-Nr]" Return SQL.loadDgvBySql(SQLString, "FMZOLL") End Function