diff --git a/SDL/Classes/cEABeleg.vb b/SDL/Classes/cEABeleg.vb index 7d978815..0a463382 100644 --- a/SDL/Classes/cEABeleg.vb +++ b/SDL/Classes/cEABeleg.vb @@ -22,7 +22,6 @@ Public Class EABelegPositionen Property Betrag As Double = 0 Property Preisbindung As Integer = 0 Property EABPo_Zeitstempel As DateTime = Now - Property FilialenNr As Integer = -1 Property AbfertigungsNr As Integer = -1 @@ -275,10 +274,14 @@ Public Class EABeleg Property Beleg_TYP As String = Nothing Property Auftraggeber_KdAuftragsnummer As Object = Nothing Property Auftraggeber_Provision As Object = Nothing - Property LKW_Id As Object = Nothing Property LKW_Beleg As Object = Nothing Property Benutzer_LG As Object = Nothing + Property durchfuehrender_Benutzer As Object = Nothing + Property ECZahlungsNr As Object = Nothing + Property ECZahlungsPerAPI As Boolean = False + Property ECTerminalreturnCode As Object = Nothing + Property EC_daid As Integer = 0 Property POS As New List(Of EABelegPositionen) @@ -354,6 +357,11 @@ Public Class EABeleg Me.LKW_Id = cSqlDb.checkNullReturnValue(dr.Item("LKW_Id"), Nothing) Me.LKW_Beleg = cSqlDb.checkNullReturnValue(dr.Item("LKW_Beleg"), Nothing) Me.Benutzer_LG = cSqlDb.checkNullReturnValue(dr.Item("Benutzer_LG"), Nothing) + Me.durchfuehrender_Benutzer = cSqlDb.checkNullReturnValue(dr.Item("durchfuehrender_Benutzer"), -1) + Me.ECZahlungsNr = cSqlDb.checkNullReturnValue(dr.Item("ECZahlungsNr"), Nothing) + Me.ECZahlungsPerAPI = cSqlDb.checkNullReturnValue(dr.Item("ECZahlungsPerAPI"), Nothing) + Me.ECTerminalreturnCode = cSqlDb.checkNullReturnValue(dr.Item("ECTerminalreturnCode"), Nothing) + Me.EC_daid = cSqlDb.checkNullReturnValue(dr.Item("EC_daid"), Nothing) If loadPosAswell Then POS = LOAD_POS_List(Mandant, Niederlassung, Benutzer, BelegNr, BelegDat) ' MsgBox(POS.Count) @@ -534,6 +542,12 @@ Public Class EABeleg list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("LKW_Beleg", LKW_Beleg)) list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("Benutzer_LG", Benutzer_LG)) + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("durchfuehrender_Benutzer", durchfuehrender_Benutzer)) + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("ECZahlungsNr", ECZahlungsNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("ECZahlungsPerAPI", ECZahlungsPerAPI)) + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("ECTerminalreturnCode", ECTerminalreturnCode)) + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("EC_daid", EC_daid)) + 'For Each p As System.Reflection.PropertyInfo In Me.GetType().GetProperties() 'If p.CanRead Then 'Dim name = p.Name diff --git a/SDL/Classes/cKassenbuch.vb b/SDL/Classes/cKassenbuch.vb index 6845702d..da483bba 100644 --- a/SDL/Classes/cKassenbuch.vb +++ b/SDL/Classes/cKassenbuch.vb @@ -27,6 +27,7 @@ Public Class cKassenbuch Property rksv_id As Object = Nothing Property rksv_BelegId As Object = Nothing Property rksv_aktiv As Boolean = False + Property durchfuehrender_Benutzer As Integer = -1 Dim SQL As New SQL @@ -102,6 +103,7 @@ Public Class cKassenbuch Me.rksv_id = cSqlDb.checkNullReturnValue(dr.Item("rksv_id"), Nothing) Me.rksv_BelegId = cSqlDb.checkNullReturnValue(dr.Item("rksv_BelegId"), Nothing) Me.rksv_aktiv = cSqlDb.checkNullReturnValue(dr.Item("rksv_aktiv"), False) + Me.durchfuehrender_Benutzer = cSqlDb.checkNullInteger(dr.Item("durchfuehrender_Benutzer")) @@ -147,6 +149,7 @@ Public Class cKassenbuch list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_id", rksv_id)) list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_BelegId", rksv_BelegId)) list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_aktiv", rksv_aktiv)) + list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("durchfuehrender_Benutzer", durchfuehrender_Benutzer)) Return list End Function diff --git a/SDL/Classes/cRKSV.vb b/SDL/Classes/cRKSV.vb index 5fef969e..77c8f400 100644 --- a/SDL/Classes/cRKSV.vb +++ b/SDL/Classes/cRKSV.vb @@ -2234,6 +2234,7 @@ Public Class cRKSV KBEntry.Belegverbuchung = True KBEntry.gebucht = True KBEntry.Finanzwege = Finanzwege + KBEntry.durchfuehrender_Benutzer = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID If Not KBEntry.INSERT() Then Return False @@ -2288,6 +2289,7 @@ Public Class cRKSV KBEntryGB.Belegverbuchung = True KBEntryGB.gebucht = True KBEntryGB.Finanzwege = Finanzwege + KBEntryGB.durchfuehrender_Benutzer = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID If Not KBEntryGB.INSERT() Then Return False @@ -2322,6 +2324,7 @@ Public Class cRKSV KBEntryST.Belegverbuchung = True KBEntryST.gebucht = True + KBEntryST.durchfuehrender_Benutzer = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID If Not KBEntryST.INSERT() Then Return False @@ -2350,7 +2353,12 @@ Public Class cRKSV KBEntryEC.Konto = PERSONAL.KassenbuchNr End If - KBEntryEC.Buchungstext = "Umb. BK/KASSA" + Dim Buchungstext As String = "Umb.BK / KASSA" + if BELEG.ECZahlungsNr IsNot Nothing AndAlso BELEG.ECZahlungsNr <> "" Then + Buchungstext &= " " & BELEG.ECZahlungsNr + End If + + KBEntryEC.Buchungstext = Buchungstext KBEntryEC.Buchungsdatum = Now.ToShortDateString KBEntryEC.BelegDat = BELEG.BelegDat.ToShortDateString @@ -2378,6 +2386,7 @@ Public Class cRKSV KBEntryEC.Belegverbuchung = True KBEntryEC.gebucht = True KBEntryEC.Finanzwege = Finanzwege + KBEntryEC.durchfuehrender_Benutzer = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID If Not KBEntryEC.INSERT() Then Return False @@ -2469,7 +2478,7 @@ Public Class cRKSV End If - End Sub + End Sub Private Shared Sub getDEBDaten(ByRef Mandant As String, ByRef DebKonto As Integer, ByRef c_sprache As String, ByRef c_ustidnr As String, ByRef c_zahlziel As String, ByRef si_tage As Integer, ByRef dec_skonto As Integer, ByRef si_ntage As Integer, ByRef SkontoDatum As Date, ByRef Nettodatum As Date) diff --git a/SDL/Classes/cSDL.vb b/SDL/Classes/cSDL.vb index 5ab9bb6c..16899af8 100644 --- a/SDL/Classes/cSDL.vb +++ b/SDL/Classes/cSDL.vb @@ -1,8 +1,5 @@  Imports System.Data.SqlClient -Imports System.Reflection - - Public Class cSDLLeistung diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index 09464dcf..26f8aed2 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -1,4 +1,5 @@ -Imports System.Web.UI.WebControls.Expressions +Imports System.IO +Imports System.Web.UI.WebControls.Expressions Imports VERAG_PROG_ALLGEMEIN Public Class usrCntlFaktAbrechnung @@ -1906,130 +1907,147 @@ Public Class usrCntlFaktAbrechnung Dim Antrag_LandKz = "" If USTV.UStVAn_ID > 0 Then Antrag_LandKz = SQL.DLookup("LandKz", "[Länderverzeichnis für die Außenhandelsstatistik]", "Landnr='" & USTV.UStVAn_LandNr & "'", "FMZOLL") + + 'soll immer alle POS bekommen! laut Lidya! 28.04.2025 - aber nicht im Excel-Format sondern als PDF-Batinic 15.05.2025 Dim dtPOSList As New DataTable - Dim prt As String = func.generatePosList(USTV, "", "", "", False, "prt", dtPOSList, isVZ, IIf(RECHNUNG IsNot Nothing, RECHNUNG.RK_ID, -1)) - If prt <> "" Then + Dim prt As String = func.generatePosList(USTV, "", "", "", False, "prt", dtPOSList, isVZ, IIf(RECHNUNG IsNot Nothing, RECHNUNG.RK_ID, -1)) + If prt <> "" Then - Try + Try - Dim rpt As New rptMWSTListe + Dim rpt As New rptMWSTListe - rpt.DataSource = dtPOSList + rpt.DataSource = dtPOSList - rpt.GroupHeader1.DataField = "Firma_ID" 'Gruppierung + rpt.GroupHeader1.DataField = "Firma_ID" 'Gruppierung - If rpt.DataSource.rows.count > 0 Then + If rpt.DataSource.rows.count > 0 Then - Dim AD As New cAdressen(USTV.UStVAn_KuNr) - Dim sum As Double = 0 + Dim AD As New cAdressen(USTV.UStVAn_KuNr) + Dim sum As Double = 0 - rpt.lblVatNo.Text = USTV.UStVAn_Steuernummer - rpt.lblCompanyname.Text = AD.Name_1 & " " & AD.Name_2 - rpt.lblDat.Text = Now.ToShortDateString + rpt.lblVatNo.Text = USTV.UStVAn_Steuernummer + rpt.lblCompanyname.Text = AD.Name_1 & " " & AD.Name_2 + rpt.lblDat.Text = Now.ToShortDateString - AddHandler rpt.Detail.Format, Sub() + AddHandler rpt.Detail.Format, Sub() - rpt.lblNumber.Text = rpt.Fields.Item("Number").Value() - rpt.lblGoods.Text = rpt.Fields.Item("Name of service").Value() - rpt.lblName.Text = rpt.Fields.Item("Name of supplier").Value() - rpt.lblTax.Text = CDbl(rpt.Fields.Item("Amount of tax refund").Value()).ToString("N2") - rpt.lblDate.Text = CDate((rpt.Fields.Item("Date of Invoice").Value())).ToShortDateString - rpt.lblInvoiceNo.Text = rpt.Fields.Item("Number of invoice").Value() + rpt.lblNumber.Text = rpt.Fields.Item("Number").Value() + rpt.lblGoods.Text = rpt.Fields.Item("Name of service").Value() + rpt.lblName.Text = rpt.Fields.Item("Name of supplier").Value() + rpt.lblTax.Text = CDbl(rpt.Fields.Item("Amount of tax refund").Value()).ToString("N2") + rpt.lblDate.Text = CDate((rpt.Fields.Item("Date of Invoice").Value())).ToShortDateString + rpt.lblInvoiceNo.Text = rpt.Fields.Item("Number of invoice").Value() - sum += CDbl(rpt.Fields.Item("Amount of tax refund").Value()).ToString("N2") - End Sub + sum += CDbl(rpt.Fields.Item("Amount of tax refund").Value()).ToString("N2") + End Sub - AddHandler rpt.GroupFooter1.Format, Sub() - rpt.lblSumme.Text = sum.ToString("N2") - rpt.lblWahrung.Text = USTV.UStVAn_Währungscode + AddHandler rpt.GroupFooter1.Format, Sub() + rpt.lblSumme.Text = sum.ToString("N2") + rpt.lblWahrung.Text = USTV.UStVAn_Währungscode - End Sub + End Sub - Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(SPEDBUCH.AbfertigungsNr, ".pdf", , False) - Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport - rpt.Run(False) - p.NeverEmbedFonts = "" - p.Export(rpt.Document, tmpPath) - rpt.Dispose() + Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(SPEDBUCH.AbfertigungsNr, ".pdf", , False) + Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport + rpt.Run(False) + p.NeverEmbedFonts = "" + p.Export(rpt.Document, tmpPath) + rpt.Dispose() Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "MDM", "POS_LISTE", "", "", SPEDBUCH.AbfertigungsNr & ".pdf", USTV.UStVAn_KuNr, False) - DS.uploadDataToDATENSERVER(tmpPath,,, False,,, True) + 'If Not DS.hasITEMS Then 'immer neu generieren, falls der Antrag geändert wurde, muss der die neue POS-Liste geladen werden!!!! + DS.uploadDataToDATENSERVER(tmpPath,,, False,, True, True) + 'End If + If .Rows.Count > 0 Then - For Each r As DataGridViewRow In .Rows - If .Columns.Contains("clmnBezeichnung") AndAlso r.Cells("clmnBezeichnung").Value = DS.da_name AndAlso RECHNUNG.DruckDatumZeit Is Nothing Then - .Rows.Remove(r) - For Each ATT As cRechnungsausgangAnhaenge In RECHNUNG.ANHAENGE - If ATT.Bezeichnung = DS.da_name AndAlso RECHNUNG.DruckDatumZeit Is Nothing Then - Dim ANH_DEL As New VERAG_PROG_ALLGEMEIN.cRechnungsausgangAnhaenge() - ANH_DEL.DELETE(ATT.RK_ID, ATT.dsId) - End If - Next + For Each r As DataGridViewRow In .Rows + If .Columns.Contains("clmnBezeichnung") AndAlso r.Cells("clmnBezeichnung").Value = DS.da_name AndAlso RECHNUNG.DruckDatumZeit Is Nothing Then + .Rows.Remove(r) + For Each ATT As cRechnungsausgangAnhaenge In RECHNUNG.ANHAENGE + If ATT.Bezeichnung = DS.da_name AndAlso RECHNUNG.DruckDatumZeit Is Nothing Then + Dim ANH_DEL As New VERAG_PROG_ALLGEMEIN.cRechnungsausgangAnhaenge() + ANH_DEL.DELETE(ATT.RK_ID, ATT.dsId) + End If + Next + End If + + Next + + End If + If RECHNUNG.ANHAENGE.Count > 0 Then + If RECHNUNG.DruckDatumZeit IsNot Nothing AndAlso Not RECHNUNG.ANHAENGE.Exists(Function(c) c.Bezeichnung = DS.da_name) Or RECHNUNG.DruckDatumZeit Is Nothing Then + .Rows.Add(-1, "POS-LIST", DS.da_name, DS.da_id, -1) End If - - Next - - End If - If RECHNUNG.ANHAENGE.Count > 0 Then - If RECHNUNG.DruckDatumZeit IsNot Nothing AndAlso Not RECHNUNG.ANHAENGE.Exists(Function(c) c.Bezeichnung = DS.da_name) Or RECHNUNG.DruckDatumZeit Is Nothing Then + Else .Rows.Add(-1, "POS-LIST", DS.da_name, DS.da_id, -1) End If - Else - .Rows.Add(-1, "POS-LIST", DS.da_name, DS.da_id, -1) End If - End If - Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) - End Try - End If + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + End Try - If dt IsNot Nothing Then - For Each r In dt.Rows + End If - 'WARUM NOCHMAL not null??? -> weil laut lydia erst ab 2025 (und ab diesem Datum wird die daid in der USTVA_POS befüllt) die Dokumente digital mitgeschickt werden, vorher noch alles per POST!!!!!!!!!!!!!!!!!! - If Not IsDBNull(r("UStVPo_daId")) Then + If dt IsNot Nothing Then + For Each r In dt.Rows - If RECHNUNG.ANHAENGE IsNot Nothing AndAlso Not RECHNUNG.ANHAENGE.Exists(Function(c) c.dsId = r("UStVPo_daId")) Then 'wenn der Anhang schon existiert! + 'WARUM NOCHMAL not null??? -> weil laut lydia erst ab 2025 (und ab diesem Datum wird die daid in der USTVA_POS befüllt) die Dokumente digital mitgeschickt werden, vorher noch alles per POST!!!!!!!!!!!!!!!!!! + If Not IsDBNull(r("UStVPo_daId")) Then - Dim DAID As String = "" - DAID = func.getPDF(r("UStVPo_SchnittstellenNr"), r("UStVPo_ReNr"), r("UStVPo_ReDat"), r("UStVPo_daId"), False, True, Antrag_LandKz, USTV, New cFakturierung, True) + If RECHNUNG.ANHAENGE IsNot Nothing AndAlso Not RECHNUNG.ANHAENGE.Exists(Function(c) c.dsId = r("UStVPo_daId")) Then 'wenn der Anhang schon existiert! - Dim nameLief As String = "" + Dim DAID As String = "" + DAID = func.getPDF(r("UStVPo_SchnittstellenNr"), r("UStVPo_ReNr"), r("UStVPo_ReDat"), r("UStVPo_daId"), False, True, Antrag_LandKz, USTV, New cFakturierung, True) - Select Case r("UStVPo_SchnittstellenNr") - Case 1 : nameLief = "VERAG-" 'Verag360 - Case 2, 8, 12 : nameLief = "IDS-" - Case 3 : nameLief = "IT-" - Case 4, 9 : nameLief = "MSE-" - Case 5, 10 : nameLief = "UTA-" - Case 6, 11 : nameLief = "PLOSE-" - Case 7 : nameLief = "RMC-" - End Select + Dim nameLief As String = "" + + Select Case r("UStVPo_SchnittstellenNr") + Case 1 : nameLief = "VERAG-" 'Verag360 + Case 2, 8, 12 : nameLief = "IDS-" + Case 3 : nameLief = "IT-" + Case 4, 9 : nameLief = "MSE-" + Case 5, 10 : nameLief = "UTA-" + Case 6, 11 : nameLief = "PLOSE-" + Case 7 : nameLief = "RMC-" + End Select + + nameLief &= "RE" + + If DAID <> "" AndAlso IsNumeric(DAID) AndAlso r("UStVPo_SchnittstellenNr") <> 1 Then + Dim daidno As Integer = CInt(DAID) + Dim ds As New cDATENSERVER(daidno) + .Rows.Add(-1, nameLief, ds.da_name, ds.da_id, -1) + + ElseIf DAID <> "" AndAlso r("UStVPo_SchnittstellenNr") = 1 Then + + Dim DS_Eigenrechnungen As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "MDM", "VERAG-RECHNUNGEN", "", "", USTV.UStVAn_KuNr & "_" & r("UStVPo_ReNr") & ".pdf", USTV.UStVAn_KuNr, False) + + If Not DS_Eigenrechnungen.hasITEMS Then 'falls bereits vorhanden, nicht nochmals erstellen! + DS_Eigenrechnungen.uploadDataToDATENSERVER(DAID, USTV.UStVAn_KuNr & "_" & r("UStVPo_ReNr") & ".pdf",, False,, True, True) + End If + .Rows.Add(-1, nameLief, DS_Eigenrechnungen.da_name, DS_Eigenrechnungen.da_id, -1) - nameLief &= "RE" - If DAID <> "" AndAlso IsNumeric(DAID) Then - Dim daidno As Integer = CInt(DAID) - Dim ds As New cDATENSERVER(daidno) - .Rows.Add(-1, nameLief, ds.da_name, ds.da_id, -1) End If + End If End If - End If - Next + Next + End If End If End If - End If End If diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.Designer.vb index a6d83b1d..365d1634 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.Designer.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.Designer.vb @@ -47,7 +47,7 @@ Partial Class usrcntlVerzollungspreise Me.ZPreis = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.cbxZollpflichtigeAbfertigung = New System.Windows.Forms.CheckBox() Me.Label1 = New System.Windows.Forms.Label() - Me.MyComboBoxSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cbxAusDB = New System.Windows.Forms.CheckBox() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit() @@ -299,16 +299,16 @@ Partial Class usrcntlVerzollungspreise Me.Label1.TabIndex = 38 Me.Label1.Text = "Sprache:" ' - 'MyComboBoxSprache + 'cboSprache ' - Me.MyComboBoxSprache._allowedValuesFreiText = Nothing - Me.MyComboBoxSprache._allowFreiText = False - Me.MyComboBoxSprache._value = "" - Me.MyComboBoxSprache.FormattingEnabled = True - Me.MyComboBoxSprache.Location = New System.Drawing.Point(72, 89) - Me.MyComboBoxSprache.Name = "MyComboBoxSprache" - Me.MyComboBoxSprache.Size = New System.Drawing.Size(144, 21) - Me.MyComboBoxSprache.TabIndex = 39 + Me.cboSprache._allowedValuesFreiText = Nothing + Me.cboSprache._allowFreiText = False + Me.cboSprache._value = "" + Me.cboSprache.FormattingEnabled = True + Me.cboSprache.Location = New System.Drawing.Point(72, 89) + Me.cboSprache.Name = "cboSprache" + Me.cboSprache.Size = New System.Drawing.Size(144, 21) + Me.cboSprache.TabIndex = 39 ' 'cbxAusDB ' @@ -330,7 +330,7 @@ Partial Class usrcntlVerzollungspreise Me.BackColor = System.Drawing.Color.WhiteSmoke Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.Controls.Add(Me.cbxAusDB) - Me.Controls.Add(Me.MyComboBoxSprache) + Me.Controls.Add(Me.cboSprache) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.cbxZollpflichtigeAbfertigung) Me.Controls.Add(Me.dgvZusatzleistung) @@ -382,6 +382,6 @@ Partial Class usrcntlVerzollungspreise Friend WithEvents ZPreis As System.Windows.Forms.DataGridViewTextBoxColumn Friend WithEvents cbxZollpflichtigeAbfertigung As CheckBox Friend WithEvents Label1 As Label - Friend WithEvents MyComboBoxSprache As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents cboSprache As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents cbxAusDB As CheckBox End Class diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb index 09007a01..fa764bbd 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb @@ -258,7 +258,7 @@ Dim dtHaupt As DataTable = (New SQL).loadDgvBySql(sqlstrHauptleistungen, "FMZOLL") Dim dtZusatz As DataTable = (New SQL).loadDgvBySql(sqlstrZusatzleistungen, "FMZOLL") - loadDGV(dtHaupt, dtZusatz, MyComboBoxSprache._value) + loadDGV(dtHaupt, dtZusatz, cboSprache._value) Else @@ -266,7 +266,7 @@ DataGridView.Rows.Clear() dgvZusatzleistung.Rows.Clear() - Select Case MyComboBoxSprache._value + Select Case cboSprache._value Case "EN" Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Case "IMEX" @@ -2387,7 +2387,7 @@ btnStandardPreiseLaden.PerformClick() End Sub - Private Sub MyComboBoxSprache_SelectedIndexChanged(sender As Object, e As EventArgs) Handles MyComboBoxSprache.SelectedIndexChanged + Private Sub MyComboBoxSprache_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboSprache.SelectedIndexChanged initPreisliste() End Sub End Class diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.vb index 4c87beaa..d4c7005c 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.vb @@ -1,4 +1,6 @@ -Public Class usrcntlVerzollungsunterlagen +Imports VERAG_PROG_ALLGEMEIN + +Public Class usrcntlVerzollungsunterlagen Implements FormualrInterface Public Event CHANGED(name, value) @@ -96,14 +98,31 @@ If txtFirma.KdNr_value > 0 Then If txtFirma.KdData_ADRESSEN IsNot Nothing Then Dim ADRESSE = txtFirma.KdData_ADRESSEN - ' txtFirma.Text = If(ADRESSE.Name_1, ADRESSE.Ordnungsbegriff) + Dim KUNDE_ERW As New cKundenErweitert(txtFirma.KdNr_value) + Dim zusatzAdr As String = "" + If KUNDE_ERW IsNot Nothing AndAlso KUNDE_ERW.kde_AdressZusatz IsNot Nothing AndAlso KUNDE_ERW.kde_AdressZusatz <> "" Then + zusatzAdr = KUNDE_ERW.kde_AdressZusatz & " " + End If + txtFirma2.Text = If(ADRESSE.Name_2, "") - txtAdresse1.Text = If(ADRESSE.Straße, "") - txtAdresse2.Text = (If(ADRESSE.LandKz, "") & " " & If(ADRESSE.PLZ, "") & " " & If(ADRESSE.Ort, "")).ToString.Trim - Dim sql As New VERAG_PROG_ALLGEMEIN.SQL - txtAdresse3.Text = If(ADRESSE.LandKz IsNot Nothing, sql.getValueTxtBySql("SELECT isnull([Land],'') FROM [Währungstabelle] WHERE [LandKz]='" & ADRESSE.LandKz & "'", "FMZOLL"), "") + + If zusatzAdr <> "" Then + txtAdresse1.MaxLength = 100 + txtAdresse1.Text = zusatzAdr + txtAdresse2.Text = If(ADRESSE.Straße, "") + txtAdresse3.Text = (If(ADRESSE.LandKz, "") & " " & If(ADRESSE.PLZ, "") & " " & If(ADRESSE.Ort, "")).ToString.Trim + Else + txtAdresse1.MaxLength = 40 + txtAdresse1.Text = If(ADRESSE.Straße, "") + txtAdresse2.Text = (If(ADRESSE.LandKz, "") & " " & If(ADRESSE.PLZ, "") & " " & If(ADRESSE.Ort, "")).ToString.Trim + Dim sql As New VERAG_PROG_ALLGEMEIN.SQL + txtAdresse3.Text = If(ADRESSE.LandKz IsNot Nothing, sql.getValueTxtBySql("SELECT isnull([Land],'') FROM [Währungstabelle] WHERE [LandKz]='" & ADRESSE.LandKz & "'", "FMZOLL"), "") + + End If + + + End If End If - End If RaiseEvent KDNR_CHANGED(KdNR) End Sub initControlsHandler() diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 7283f981..86e7171c 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -8,7 +8,6 @@ Imports System.Reflection Imports System.Text.RegularExpressions Imports System.Windows.Documents Imports VERAG_PROG_ALLGEMEIN -Imports System.Security.Authentication.ExtendedProtection Public Class frmFormulare Dim isSingleForm = False @@ -279,7 +278,7 @@ Public Class frmFormulare MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DE Vollmacht", FormularManagerArten.DE_Vollmacht)) MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AT Vollmacht (EV)", FormularManagerArten.AT_Vollmacht_EV)) MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Export Vollmacht", FormularManagerArten.VERAG_EXPORT)) - MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("(indirekt) DE VM", FormularManagerArten.DE_Vollmacht_indirekt)) + 'MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("(indirekt) DE VM", FormularManagerArten.DE_Vollmacht_indirekt)) -> nicht mehr laut Math. Lux (16.02.2026) MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DE Fiskal-Vollmacht", FormularManagerArten.DE_Fiskal)) MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VUB", FormularManagerArten.VUB)) MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Importaviso Vorauskasse", FormularManagerArten.Importaviso_VK)) @@ -692,15 +691,16 @@ Public Class frmFormulare AddHandler c.MOVE_DOWN, AddressOf ControlMoveDown AddHandler c.LOADED, Sub() If param IsNot Nothing Then - c.MyComboBox1.changeItem(param(0)) + c.cboSprache.changeItem(param(0)) c.btnStandardPreiseLaden.PerformClick() End If End Sub MyFlowLayoutPanel1.Controls.Add(c) - Dim sprachen() As String = {"DE", "EN"} - c.MyComboBoxSprache.Items.Clear() - c.MyComboBoxSprache.Items.AddRange(sprachen) + + c.cboSprache.Items.Clear() + c.cboSprache.Items.Add(New MyListItem("Deutsch", "DE")) + c.cboSprache.Items.Add(New MyListItem("Englisch", "EN")) End If Case FormularManagerArten.Boniteatsauskunft Dim c As New usrcntlCreditreformBoniAuskunft @@ -1986,9 +1986,9 @@ Public Class FormularManagerNEU End If If usrCntl.cbxEinmaligeVollmacht.Checked Then - listTowrite = addEinmaligeVM(listTowrite, 0, top + 220, usrCntl.cboSprache._value, usrCntl.txtEinmalig_RgNr.Text, usrCntl.txtEinmalig_RgDat.Text) + listTowrite = addEinmaligeVM(listTowrite, 0, top + 250, usrCntl.cboSprache._value, usrCntl.txtEinmalig_RgNr.Text, usrCntl.txtEinmalig_RgDat.Text) ElseIf usrCntl.cbxEinmaligeVollmachtCarnetATA.Checked Then - listTowrite = addEinmaligeVMCarnetATA(listTowrite, 0, top + 220, usrCntl.cboSprache._value, usrCntl.txtEinmalig_CarnetATA.Text, "") + listTowrite = addEinmaligeVMCarnetATA(listTowrite, 0, top + 250, usrCntl.cboSprache._value, usrCntl.txtEinmalig_CarnetATA.Text, "") End If @@ -5158,9 +5158,9 @@ Public Class FormularManagerNEU dict("ZAHLUNGSZIEL") = usrCntl.txtZahlunsziel.Text dict("POSKREDIT") = PosKredit - Dim rpt As New rptPreislisten(usrCntl.MyComboBoxSprache._value, Nothing, -1, dict) - Dim subRpt As New subrptPreislisten(usrCntl.MyComboBoxSprache._value, Nothing, -1) - Dim subRpt_Zoll As New subrptPreislisten_Zoll(usrCntl.MyComboBoxSprache._value, Nothing, -1) + Dim rpt As New rptPreislisten(usrCntl.cboSprache._value, Nothing, -1, dict) + Dim subRpt As New subrptPreislisten(usrCntl.cboSprache._value, Nothing, -1) + Dim subRpt_Zoll As New subrptPreislisten_Zoll(usrCntl.cboSprache._value, Nothing, -1) rpt.SubReport.Report = subRpt Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA @@ -5273,7 +5273,7 @@ Public Class FormularManagerNEU End If - If usrCntl.MyComboBoxSprache._value = "DE" Then 'weil DE nicht übersetzt wird!!! + If usrCntl.cboSprache._value = "DE" Or usrCntl.cboSprache._value = "" Then 'weil DE nicht übersetzt wird!!! For Each pair In dict rpt.txtZahlungsziel.Text = rpt.txtZahlungsziel.Text.ToString.Replace("%" & pair.Key & "%", pair.Value) rpt.txtZahlungsziel2.Text = rpt.txtZahlungsziel2.Text.ToString.Replace("%" & pair.Key & "%", pair.Value) diff --git a/SDL/My Project/Application.Designer.vb b/SDL/My Project/Application.Designer.vb index 8215d5b6..87f5c1df 100644 --- a/SDL/My Project/Application.Designer.vb +++ b/SDL/My Project/Application.Designer.vb @@ -24,7 +24,7 @@ Namespace My _ Public Sub New() MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows) - Me.IsSingleInstance = true + Me.IsSingleInstance = false Me.EnableVisualStyles = true Me.SaveMySettingsOnExit = true Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses diff --git a/SDL/My Project/Application.myapp b/SDL/My Project/Application.myapp index 83f43142..68944da5 100644 --- a/SDL/My Project/Application.myapp +++ b/SDL/My Project/Application.myapp @@ -2,7 +2,7 @@ true frmLogin - true + false 0 true 0 diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 955ccb10..90685699 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/SDL.vbproj b/SDL/SDL.vbproj index 8fd1cd32..1e8bd8ae 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -927,6 +927,12 @@ Form + + rptZahlungsbeleg.vb + + + Component + frmPOSTerminal.vb @@ -3632,6 +3638,9 @@ frmEssensbestellungenAdministration.vb Designer + + rptZahlungsbeleg.vb + frmPOSTerminal.vb diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index ef4c0465..3ad7b23a 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -24,8 +24,8 @@ Partial Class frmMDM_USTVAntrag Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMDM_USTVAntrag)) - Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnlBottom = New System.Windows.Forms.Panel() Me.pbXMLExport = New System.Windows.Forms.PictureBox() Me.btnRMCQuartal = New System.Windows.Forms.Button() @@ -118,7 +118,6 @@ Partial Class frmMDM_USTVAntrag Me.dgvUSTVPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.pnlAntragsPosDetails = New System.Windows.Forms.Panel() Me.Panel2 = New System.Windows.Forms.Panel() - Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() Me.Panel4 = New System.Windows.Forms.Panel() Me.cbxKIUploaddelete = New System.Windows.Forms.CheckBox() Me.scanUSTVA = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() @@ -129,7 +128,6 @@ Partial Class frmMDM_USTVAntrag Me.Panel3 = New System.Windows.Forms.Panel() Me.dgvErstattungspositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.pnlErstattungsdetails = New System.Windows.Forms.Panel() - Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition() Me.Panel1 = New System.Windows.Forms.Panel() Me.Button2 = New System.Windows.Forms.Button() Me.Button3 = New System.Windows.Forms.Button() @@ -146,6 +144,8 @@ Partial Class frmMDM_USTVAntrag Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() Me.FakturiertToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() + Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition() Me.pnlBottom.SuspendLayout() CType(Me.pbXMLExport, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.pbMail, System.ComponentModel.ISupportInitialize).BeginInit() @@ -210,7 +210,6 @@ Partial Class frmMDM_USTVAntrag Me.pbXMLExport.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom Me.pbXMLExport.TabIndex = 56 Me.pbXMLExport.TabStop = False - Me.pbXMLExport.Visible = False ' 'btnRMCQuartal ' @@ -1561,8 +1560,8 @@ Partial Class frmMDM_USTVAntrag Me.dgvUSTVPositionen.AKTUALISIERUNGS_INTERVALL = 500 Me.dgvUSTVPositionen.AllowUserToAddRows = False Me.dgvUSTVPositionen.AllowUserToDeleteRows = False - DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUSTVPositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUSTVPositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvUSTVPositionen.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) @@ -1598,14 +1597,6 @@ Partial Class frmMDM_USTVAntrag Me.Panel2.Size = New System.Drawing.Size(1428, 263) Me.Panel2.TabIndex = 1 ' - 'UstCntlUSTV_AntragPosition1 - ' - Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0) - Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1" - Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1272, 261) - Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 - ' 'Panel4 ' Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke @@ -1723,8 +1714,8 @@ Partial Class frmMDM_USTVAntrag Me.dgvErstattungspositionen.AKTUALISIERUNGS_INTERVALL = 500 Me.dgvErstattungspositionen.AllowUserToAddRows = False Me.dgvErstattungspositionen.AllowUserToDeleteRows = False - DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvErstattungspositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvErstattungspositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.dgvErstattungspositionen.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) @@ -1751,14 +1742,6 @@ Partial Class frmMDM_USTVAntrag Me.pnlErstattungsdetails.Size = New System.Drawing.Size(1426, 261) Me.pnlErstattungsdetails.TabIndex = 0 ' - 'UstCntlUSTV_AntragErstattungen1 - ' - Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0) - Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1" - Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1270, 259) - Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2 - ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke @@ -1877,6 +1860,22 @@ Partial Class frmMDM_USTVAntrag Me.FakturiertToolStripMenuItem.Text = "Fakturiert zurücksetzen" Me.FakturiertToolStripMenuItem.Visible = False ' + 'UstCntlUSTV_AntragPosition1 + ' + Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0) + Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1" + Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1272, 261) + Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 + ' + 'UstCntlUSTV_AntragErstattungen1 + ' + Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0) + Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1" + Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1270, 259) + Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2 + ' 'frmMDM_USTVAntrag ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 60ce4eb5..0090532c 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -542,7 +542,9 @@ Public Class frmMDM_USTVAntrag btnRMCQuartal.Visible = False End If - If USTV_ANTRAG.UStVAn_LandKz IsNot Nothing Then pbXMLExport.Visible = setXMLExportVisible(USTV_ANTRAG.UStVAn_LandKz) + 'If USTV_ANTRAG.UStVAn_LandKz IsNot Nothing Then + ' pbXMLExport.Visible = setXMLExportVisible(USTV_ANTRAG.UStVAn_LandKz) + 'End If Else Dim sqlWhere As String = "" @@ -611,8 +613,6 @@ Public Class frmMDM_USTVAntrag End If - pbXMLExport.Visible = False - If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_USTVA_bearbeiten", Me.FindForm) Then btnAntrageeinarbeiten.Enabled = False FlowLayoutPanel.Enabled = False @@ -4281,7 +4281,7 @@ Public Class frmMDM_USTVAntrag .ReferenceNumber = row.Cells("UStVPo_ReNr").Value, ' "25/000616354/987", .IssuingDate = CDate(row.Cells("UStVPo_ReDat").Value).ToString("yyyy-MM-dd"),'"2025-11-30", .GoodsDescription = goods, - .TransactionDescription = New TransactionDescription With {.TaxableAmount = Nettobetrag.ToString.Replace(",", "."), .VATAmount = row.Cells("UStVPo_USteuerbetrag").Value.ToString.Replace(",", ".")}, + .TransactionDescription = New TransactionDescription With {.TaxableAmount = Nothing, .VATAmount = row.Cells("UStVPo_USteuerbetrag").Value.ToString.Replace(",", ".")}, .Deduction = New Deduction With {.ProRataRate = "", .DeductibleVATAmount = row.Cells("UStVPo_USteuerbetrag").Value.ToString.Replace(",", ".")}, .EUSupplier = New Party With { .NameFree = LeistenderName,'"DKV EURO SERVICE GMBH + CO KG", @@ -4472,7 +4472,7 @@ Public Class frmMDM_USTVAntrag Private Function setXMLExportVisible(ISOLand As String) - Dim valid As Boolean = False + Dim valid As Boolean = True If ISOLand = "" Then Return valid diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.vb index f9eb6fe8..ed325d98 100644 --- a/SDL/USTV/ustCntlUSTV_AntragPosition.vb +++ b/SDL/USTV/ustCntlUSTV_AntragPosition.vb @@ -96,6 +96,10 @@ Public Class ustCntlUSTV_AntragPosition Else + '-------------------------------------------------------------------------------------------- + 'Bei SchnittstelleNr 1 wird die interne RK_ID der Rechnung im Feld DA_ID gespeichert, wenn es dann "aus Zufall" eine echte DA_ID mit dieser RK_ID-Nr gibt, wird dieser Name angezeigt (aber geladen wird die korrekte Rechnung)!!!!!!!!!!!!!! + '-------------------------------------------------------------------------------------------- + Select Case If(UStV_POS.UStVPo_SchnittstellenNr, -1) Case 6, 0, 11 : da_id = sql.getValueTxtBySql("SELECT TOP(1) [plInv_daId] FROM [tblPLOSE_Inv_Data] where plInv_SupplierRechnungsDatum='" & UStV_POS.UStVPo_ReDat & "' and plInv_SupplierRechnungsNr='" & UStV_POS.UStVPo_ReNr & "' and plInv_SupplierCountry='" & Antrag_LandKz & "' AND [plInv_daId] is not null", "FMZOLL",,, -1) Case 7 : da_id = sql.getValueTxtBySql("SELECT TOP(1) [rmc_daId] FROM [tblRMCImport] where rmc_reDatum='" & UStV_POS.UStVPo_ReDat & "' and rmc_reNr='" & UStV_POS.UStVPo_ReNr & "' and rmc_landKZ='" & Antrag_LandKz & "' AND [rmc_daId] is not null", "FMZOLL",,, -1) diff --git a/SDL/kassenbuch/BelegReports/rptZahlungsbeleg.Designer.vb b/SDL/kassenbuch/BelegReports/rptZahlungsbeleg.Designer.vb new file mode 100644 index 00000000..93614bd1 --- /dev/null +++ b/SDL/kassenbuch/BelegReports/rptZahlungsbeleg.Designer.vb @@ -0,0 +1,91 @@ + +Partial Public Class rptZahlungsBeleg + Inherits GrapeCity.ActiveReports.SectionReport + + 'Form overrides dispose to clean up the component list. + Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean) + If disposing Then + End If + MyBase.Dispose(disposing) + End Sub + + 'NOTE: The following procedure is required by the ActiveReports Designer + 'It can be modified using the ActiveReports Designer. + 'Do not modify it using the code editor. + Private WithEvents PageHeader As GrapeCity.ActiveReports.SectionReportModel.PageHeader + Private WithEvents PageFooter As GrapeCity.ActiveReports.SectionReportModel.PageFooter + + Private Sub InitializeComponent() + Dim resources As System.Resources.ResourceManager = New System.Resources.ResourceManager(GetType(rptZahlungsBeleg)) + Me.PageHeader = New GrapeCity.ActiveReports.SectionReportModel.PageHeader() + Me.Detail = New GrapeCity.ActiveReports.SectionReportModel.Detail() + Me.PageFooter = New GrapeCity.ActiveReports.SectionReportModel.PageFooter() + Me.ReportHeader1 = New GrapeCity.ActiveReports.SectionReportModel.ReportHeader() + Me.ReportFooter1 = New GrapeCity.ActiveReports.SectionReportModel.ReportFooter() + Me.lbl_Details = New GrapeCity.ActiveReports.SectionReportModel.Label() + CType(Me.lbl_Details, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me, System.ComponentModel.ISupportInitialize).BeginInit() + ' + 'PageHeader + ' + Me.PageHeader.Height = 0.2697397! + Me.PageHeader.Name = "PageHeader" + ' + 'Detail + ' + Me.Detail.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lbl_Details}) + Me.Detail.Height = 2.148031! + Me.Detail.Name = "Detail" + ' + 'PageFooter + ' + Me.PageFooter.Height = 0! + Me.PageFooter.Name = "PageFooter" + ' + 'ReportHeader1 + ' + Me.ReportHeader1.CanShrink = True + Me.ReportHeader1.Height = 0.2096124! + Me.ReportHeader1.Name = "ReportHeader1" + ' + 'ReportFooter1 + ' + Me.ReportFooter1.CanShrink = True + Me.ReportFooter1.Height = 3.039764! + Me.ReportFooter1.Name = "ReportFooter1" + ' + 'lbl_Details + ' + Me.lbl_Details.Height = 2.148031! + Me.lbl_Details.HyperLink = Nothing + Me.lbl_Details.Left = 0! + Me.lbl_Details.Name = "lbl_Details" + Me.lbl_Details.Style = "font-size: 8pt; text-align: center" + Me.lbl_Details.Text = "A 4975 Suben | Suben 14-15" & Global.Microsoft.VisualBasic.ChrW(10) & "UID: ATU53187000" + Me.lbl_Details.Top = 0! + Me.lbl_Details.Width = 2.649606! + ' + 'rptZahlungsBeleg + ' + Me.MasterReport = False + Me.PageSettings.Margins.Bottom = 0.1968504! + Me.PageSettings.Margins.Left = 0.1574803! + Me.PageSettings.Margins.Right = 0.1574803! + Me.PageSettings.Margins.Top = 0! + Me.PageSettings.PaperHeight = 11.0! + Me.PageSettings.PaperWidth = 8.5! + Me.PrintWidth = 2.64252! + Me.Sections.Add(Me.ReportHeader1) + Me.Sections.Add(Me.PageHeader) + Me.Sections.Add(Me.Detail) + Me.Sections.Add(Me.PageFooter) + Me.Sections.Add(Me.ReportFooter1) + CType(Me.lbl_Details, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me, System.ComponentModel.ISupportInitialize).EndInit() + + End Sub + Private WithEvents ReportHeader1 As GrapeCity.ActiveReports.SectionReportModel.ReportHeader + Public WithEvents Detail As GrapeCity.ActiveReports.SectionReportModel.Detail + Public WithEvents ReportFooter1 As GrapeCity.ActiveReports.SectionReportModel.ReportFooter + Public WithEvents lbl_Details As GrapeCity.ActiveReports.SectionReportModel.Label +End Class diff --git a/SDL/kassenbuch/BelegReports/rptZahlungsbeleg.resx b/SDL/kassenbuch/BelegReports/rptZahlungsbeleg.resx new file mode 100644 index 00000000..e8cbd0f3 --- /dev/null +++ b/SDL/kassenbuch/BelegReports/rptZahlungsbeleg.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0, 0 + + + 0, 0 + + \ No newline at end of file diff --git a/SDL/kassenbuch/BelegReports/rptZahlungsbeleg.vb b/SDL/kassenbuch/BelegReports/rptZahlungsbeleg.vb new file mode 100644 index 00000000..90301a7e --- /dev/null +++ b/SDL/kassenbuch/BelegReports/rptZahlungsbeleg.vb @@ -0,0 +1,9 @@ +Imports GrapeCity.ActiveReports +Imports GrapeCity.ActiveReports.Document + +Public Class rptZahlungsBeleg + + Private Sub rptAEBeleg_ReportStart(sender As Object, e As EventArgs) Handles MyBase.ReportStart + ' Me.PageSettings.PaperKind = GrapeCity.ActiveReports.Printing.PaperKind.Custom + End Sub +End Class diff --git a/SDL/kassenbuch/frmBelegNeu.vb b/SDL/kassenbuch/frmBelegNeu.vb index 15044df6..d1d7d8f6 100644 --- a/SDL/kassenbuch/frmBelegNeu.vb +++ b/SDL/kassenbuch/frmBelegNeu.vb @@ -1,9 +1,12 @@ Imports System.Drawing.Printing Imports System.Globalization -Imports System.Web.UI.WebControls.Expressions -Imports com.sun.org.apache.xalan.internal.xsltc.compiler.util +Imports java.awt.geom +Imports javax.print.attribute.standard Imports Microsoft.Win32 Imports SDL.RKSVServer +Imports VERAG_PROG_ALLGEMEIN + + Public Class frmBelegNeu Implements System.ComponentModel.INotifyPropertyChanged @@ -1399,19 +1402,35 @@ Public Class frmBelegNeu Dim returnCode = CInt(ZVTKey.GetValue("Ergebnis")) Dim response As String = ZVTKey.GetValue("ErgebnisText") Dim ZahlungsmittelCode As Integer = ZVTKey.GetValue("Kartentyp") + Dim ECZahlungsNr As String = ZVTKey.GetValue("BelegNr").ToString + Dim txt_Drucktext As String = Replace(ZVTKey.GetValue("Drucktext"), vbLf, vbCrLf) + Dim txt_Drucktext2 As String = Replace(ZVTKey.GetValue("Drucktext2"), vbLf, vbCrLf) + Dim txt_Haendlerbeleg As String = Replace(ZVTKey.GetValue("Haendlerbeleg"), vbLf, vbCrLf) + + If ECZahlungsNr = "" Then + ECZahlungsNr = -1 + End If + + Dim daid As Integer = -1 + If (txt_Haendlerbeleg <> "") AndAlso BELEG IsNot Nothing Then 'Nur Händlerbeleg!!! + If returnCode = 1000 Or returnCode = 0 Then + daid = createZahlungsBeleg(txt_Haendlerbeleg, ECZahlungsNr, "Haendlerbeleg", BELEG) + End If + End If + ZVTKey.Close() MsgBox(response) If returnCode = 0 Then 'Zahlung wurde erfolgreich durchgeführt - setRKSV() + setRKSV(True, ECZahlungsNr, returnCode, daid) ElseIf returnCode = 1000 Then 'Workaround, wenn nicht in Registry geschrieben wurden konnte. If vbYes = MsgBox("In der Registry wurde der Returncode 1000 abgegeben! " & vbNewLine & "Wurde die Zahlung dennoch vom Zahlungsterminal erfolgreich durchgeführt, dann mit Ja bestätigen", MsgBoxStyle.YesNoCancel) Then - setRKSV() + setRKSV(True, "", returnCode, daid) Else Me.Cursor = Cursors.Default End If Else - Me.Cursor = Cursors.Default + Me.Cursor = Cursors.Default End If End Sub @@ -1429,7 +1448,7 @@ Public Class frmBelegNeu dt = SQL.loadDgvBySql("SELECT * FROM tblRKSV_POS WHERE [pos_aktiv] = 1 And [pos_kasse]='" & cboKassen.SelectedItem.Value & "'", "FMZOLL") - Select Case dt.Rows.Count + Select Case dt.Rows.Count Case 0 MsgBox("Für diese Kasse ist kein aktives POS-Terminal hinterlegt!") Case 1 @@ -1546,8 +1565,19 @@ Public Class frmBelegNeu ' KASSE.LOAD(cboKassen._value) If BELEG.rksv_id > 0 Then KASSE.LOAD(BELEG.rksv_id) Select Case BELEG.Belegart - Case "1" : If cRKSV.printKundenBeleg(BELEG, KASSE, PERSONAL, cboPrinter.SelectedItem.ToString, cbxBelegOffnen.Checked) Then Me.Close() - Case "2" : If cRKSV.printKundenBelegLG(BELEG, KASSE, PERSONAL, cboPrinter.SelectedItem.ToString, "LG") Then Me.Close() 'Beleg drucken + Case "1" : If cRKSV.printKundenBeleg(BELEG, KASSE, PERSONAL, cboPrinter.SelectedItem.ToString, cbxBelegOffnen.Checked) Then + If cbxBelegOffnen.Checked AndAlso BELEG.EC_daid > 0 Then + openZahlungsbeleg(BELEG.EC_daid) + End If + Me.Close() + End If + Case "2" : If cRKSV.printKundenBelegLG(BELEG, KASSE, PERSONAL, cboPrinter.SelectedItem.ToString, "LG") Then + If cbxBelegOffnen.Checked AndAlso BELEG.EC_daid > 0 Then + openZahlungsbeleg(BELEG.EC_daid) + End If + + Me.Close() 'Beleg drucken + End If End Select Else TESTBUCHUNG = False @@ -1593,7 +1623,7 @@ Public Class frmBelegNeu Return False End Function - Private Sub setRKSV() + Private Sub setRKSV(Optional ECZahlung As Boolean = False, Optional ECZahlungsNr As String = "", Optional ECTerminalreturnCode As Integer = -1, Optional DA_ID As Integer = 0) Try @@ -1601,6 +1631,12 @@ Public Class frmBelegNeu If Not BELEG.gebucht And Not BELEG.gebuchtStorno Then + BELEG.ECZahlungsNr = ECZahlungsNr + BELEG.ECZahlungsPerAPI = ECZahlung + BELEG.ECTerminalreturnCode = ECTerminalreturnCode + If DA_ID <> 0 Then BELEG.EC_daid = DA_ID + BELEG.durchfuehrender_Benutzer = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID + Me.Cursor = Cursors.WaitCursor Dim isLeihgeldeinzahlung As Boolean = False @@ -1780,6 +1816,49 @@ Public Class frmBelegNeu End Sub + Private Function createZahlungsBeleg(Ausdruck As String, BelegNr As String, Belegtyp As String, BELEG As EABeleg) As Integer + + If Ausdruck <> "" Then + + Dim filename As String = Belegtyp & "_" & BELEG.KundenNr & "_" & Now.ToString("yyyyMMddHHmmss") + + Dim rpt As New rptZahlungsBeleg + rpt.lbl_Details.Text = Ausdruck + Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(filename, ".pdf", , False) + Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport + rpt.Run(True) + p.NeverEmbedFonts = "" + p.Export(rpt.Document, tmpPath) + + Dim RG_DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("BARZAHLUNGBELEGE", "Firma_" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA_ID, CDate(BELEG.BelegDat).Year & "_" & CDate(BELEG.BelegDat).Month, "", "", filename & ".pdf", BELEG.KundenNr, False) + If RG_DS.uploadDataToDATENSERVER(tmpPath, filename & ".pdf", ".pdf",,,, True) Then + Return RG_DS.da_id + End If + + Else + Return -1 + + End If + + + + + End Function + + Private Sub openZahlungsbeleg(daid As Integer) + + If daid > 0 Then + + Dim ZahlungsBeleg As New cDATENSERVER(daid) + Dim pathPDF = ZahlungsBeleg.GET_TOP1_PATH + If pathPDF <> "" Then Process.Start(pathPDF) + + End If + + End Sub + + + Private Sub LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked Process.Start("https://wiki.verag.ag/de/software/aviso/howtos/Bankomat") End Sub diff --git a/SDL/kassenbuch/frmKassenbuch.Designer.vb b/SDL/kassenbuch/frmKassenbuch.Designer.vb index 4dbbf849..eb297dcd 100644 --- a/SDL/kassenbuch/frmKassenbuch.Designer.vb +++ b/SDL/kassenbuch/frmKassenbuch.Designer.vb @@ -130,7 +130,7 @@ Partial Class frmKassenbuch Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label5.ForeColor = System.Drawing.Color.White - Me.Label5.Location = New System.Drawing.Point(542, 31) + Me.Label5.Location = New System.Drawing.Point(603, 31) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(151, 20) Me.Label5.TabIndex = 1 @@ -184,7 +184,7 @@ Partial Class frmKassenbuch Me.DataGridView2.ReadOnly = True Me.DataGridView2.RowHeadersVisible = False Me.DataGridView2.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.DataGridView2.Size = New System.Drawing.Size(705, 145) + Me.DataGridView2.Size = New System.Drawing.Size(766, 145) Me.DataGridView2.TabIndex = 5 ' 'datVon @@ -266,7 +266,7 @@ Partial Class frmKassenbuch Me.FlatButton7.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.FlatButton7.ForeColor = System.Drawing.Color.Black Me.FlatButton7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.FlatButton7.Location = New System.Drawing.Point(654, 20) + Me.FlatButton7.Location = New System.Drawing.Point(688, 20) Me.FlatButton7.Name = "FlatButton7" Me.FlatButton7.Size = New System.Drawing.Size(41, 34) Me.FlatButton7.TabIndex = 0 @@ -307,7 +307,7 @@ Partial Class frmKassenbuch Me.Label9.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label9.ForeColor = System.Drawing.Color.White - Me.Label9.Location = New System.Drawing.Point(390, 9) + Me.Label9.Location = New System.Drawing.Point(451, 9) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(305, 20) Me.Label9.TabIndex = 9 @@ -419,7 +419,7 @@ Partial Class frmKassenbuch Me.Button5.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button5.ForeColor = System.Drawing.Color.Black Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button5.Location = New System.Drawing.Point(436, 36) + Me.Button5.Location = New System.Drawing.Point(458, 36) Me.Button5.Name = "Button5" Me.Button5.Size = New System.Drawing.Size(184, 42) Me.Button5.TabIndex = 19 @@ -434,7 +434,7 @@ Partial Class frmKassenbuch Me.btnDGVBelege.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnDGVBelege.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnDGVBelege.ForeColor = System.Drawing.Color.White - Me.btnDGVBelege.Location = New System.Drawing.Point(373, 24) + Me.btnDGVBelege.Location = New System.Drawing.Point(407, 24) Me.btnDGVBelege.Name = "btnDGVBelege" Me.btnDGVBelege.Size = New System.Drawing.Size(98, 30) Me.btnDGVBelege.TabIndex = 418 @@ -448,7 +448,7 @@ Partial Class frmKassenbuch Me.btnDGVKassenbuch.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnDGVKassenbuch.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnDGVKassenbuch.ForeColor = System.Drawing.Color.DimGray - Me.btnDGVKassenbuch.Location = New System.Drawing.Point(477, 24) + Me.btnDGVKassenbuch.Location = New System.Drawing.Point(511, 24) Me.btnDGVKassenbuch.Name = "btnDGVKassenbuch" Me.btnDGVKassenbuch.Size = New System.Drawing.Size(112, 30) Me.btnDGVKassenbuch.TabIndex = 419 @@ -477,7 +477,7 @@ Partial Class frmKassenbuch Me.btnStorno.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnStorno.ForeColor = System.Drawing.Color.Black Me.btnStorno.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnStorno.Location = New System.Drawing.Point(436, 84) + Me.btnStorno.Location = New System.Drawing.Point(458, 84) Me.btnStorno.Name = "btnStorno" Me.btnStorno.Size = New System.Drawing.Size(184, 42) Me.btnStorno.TabIndex = 420 @@ -498,7 +498,7 @@ Partial Class frmKassenbuch Me.pnlTop.Dock = System.Windows.Forms.DockStyle.Top Me.pnlTop.Location = New System.Drawing.Point(0, 0) Me.pnlTop.Name = "pnlTop" - Me.pnlTop.Size = New System.Drawing.Size(707, 60) + Me.pnlTop.Size = New System.Drawing.Size(768, 60) Me.pnlTop.TabIndex = 421 ' 'Label15 @@ -526,7 +526,7 @@ Partial Class frmKassenbuch ' Me.Label7.AutoSize = True Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label7.Location = New System.Drawing.Point(433, 20) + Me.Label7.Location = New System.Drawing.Point(455, 20) Me.Label7.Name = "Label7" Me.Label7.Size = New System.Drawing.Size(58, 13) Me.Label7.TabIndex = 422 @@ -544,7 +544,7 @@ Partial Class frmKassenbuch Me.pnlSuche.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlSuche.Location = New System.Drawing.Point(0, 470) Me.pnlSuche.Name = "pnlSuche" - Me.pnlSuche.Size = New System.Drawing.Size(707, 205) + Me.pnlSuche.Size = New System.Drawing.Size(768, 205) Me.pnlSuche.TabIndex = 423 ' 'pnlSearch @@ -566,7 +566,7 @@ Partial Class frmKassenbuch Me.pnlSearch.Dock = System.Windows.Forms.DockStyle.Top Me.pnlSearch.Location = New System.Drawing.Point(0, 0) Me.pnlSearch.Name = "pnlSearch" - Me.pnlSearch.Size = New System.Drawing.Size(705, 58) + Me.pnlSearch.Size = New System.Drawing.Size(766, 58) Me.pnlSearch.TabIndex = 420 ' 'btnExcel @@ -574,7 +574,7 @@ Partial Class frmKassenbuch Me.btnExcel.BackgroundImage = Global.SDL.My.Resources.Resources.Excel_logo Me.btnExcel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center Me.btnExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnExcel.Location = New System.Drawing.Point(607, 20) + Me.btnExcel.Location = New System.Drawing.Point(641, 20) Me.btnExcel.Name = "btnExcel" Me.btnExcel.Size = New System.Drawing.Size(41, 34) Me.btnExcel.TabIndex = 420 @@ -584,7 +584,7 @@ Partial Class frmKassenbuch ' Me.Label14.AutoSize = True Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label14.Location = New System.Drawing.Point(375, 8) + Me.Label14.Location = New System.Drawing.Point(409, 8) Me.Label14.Name = "Label14" Me.Label14.Size = New System.Drawing.Size(56, 13) Me.Label14.TabIndex = 1 @@ -624,7 +624,7 @@ Partial Class frmKassenbuch Me.pnlMain.Dock = System.Windows.Forms.DockStyle.Top Me.pnlMain.Location = New System.Drawing.Point(0, 60) Me.pnlMain.Name = "pnlMain" - Me.pnlMain.Size = New System.Drawing.Size(707, 410) + Me.pnlMain.Size = New System.Drawing.Size(768, 410) Me.pnlMain.TabIndex = 425 ' 'Button10 @@ -669,7 +669,7 @@ Partial Class frmKassenbuch Me.pnl.Controls.Add(Me.Button8) Me.pnl.Controls.Add(Me.cboKassen) Me.pnl.Controls.Add(Me.Label18) - Me.pnl.Location = New System.Drawing.Point(420, 132) + Me.pnl.Location = New System.Drawing.Point(442, 132) Me.pnl.Name = "pnl" Me.pnl.Size = New System.Drawing.Size(287, 223) Me.pnl.TabIndex = 430 @@ -799,7 +799,7 @@ Partial Class frmKassenbuch Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button1.ForeColor = System.Drawing.Color.Black Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button1.Location = New System.Drawing.Point(436, 197) + Me.Button1.Location = New System.Drawing.Point(458, 197) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(260, 42) Me.Button1.TabIndex = 434 @@ -812,7 +812,7 @@ Partial Class frmKassenbuch Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(707, 675) + Me.ClientSize = New System.Drawing.Size(768, 675) Me.Controls.Add(Me.pnlSuche) Me.Controls.Add(Me.pnlMain) Me.Controls.Add(Me.pnlTop) diff --git a/SDL/kassenbuch/frmKassenbuch.resx b/SDL/kassenbuch/frmKassenbuch.resx index 0d69e8a8..66ac4fbc 100644 --- a/SDL/kassenbuch/frmKassenbuch.resx +++ b/SDL/kassenbuch/frmKassenbuch.resx @@ -121,26 +121,25 @@ iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABVSURBVEhL7c0xDgAgCMVQ7n9pjJGxI8WF4X1NFyIz - R2E0YTRhNGE0YTRhNGE0YTRhNL3PfSbU7sE+tXuwT+2Hg4MwmjCaMJowmjCaMJowmjCaMHoyDu1ZWBna - hF7mAAAAAElFTkSuQmCC + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABSSURBVEhL7c0xDgAgCMVQ7n9pjJGtK8WF4X1NFyIz + YxKCDcGGYEOwIdgQbAg2BBuC7X3uM6F2D/ap3YN9aj8cHIRgQ7Ah2BBsCDYEG4INwYZgO+1ZWBm2HQ2i + AAAAAElFTkSuQmCC - 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 diff --git a/SDL/kassenbuch/frmKassenbuch.vb b/SDL/kassenbuch/frmKassenbuch.vb index f3017794..10835f01 100644 --- a/SDL/kassenbuch/frmKassenbuch.vb +++ b/SDL/kassenbuch/frmKassenbuch.vb @@ -191,8 +191,8 @@ Public Class frmKassenbuch lgTxt = ",[Fahrer],[Passnummer] " End If .SET_SQL("SELECT b.rksv_BelegId, b.BelegDat, CASE WHEN b.Belegart=1 THEN 'E' ELSE 'A' END as Belegart,CASE WHEN b.Beleg_TYP='E' THEN rksv_umsatz ELSE (SELECT sum( betrag ) FROM tblEABelegposition WHERE (b.BelegNr = tblEABelegposition.BelegNr) AND (b.BelegDat = tblEABelegposition.BelegDat) AND (b.Benutzer = tblEABelegposition.Benutzer) AND (b.Niederlassung = tblEABelegposition.Niederlassung) AND (b.Mandant = tblEABelegposition.Mandant ) ) END as Betrag, b.Ordnungsbegriff, b.BelegNr, b.Frachtführer, " & - " CASE WHEN b.storniert=1 THEN 'JA' ELSE '' END as [storniert], b.Beleg_TYP ,b.Benutzer " & benutzerBezTMP & lgTxt & - " FROM tblEABelegnummer as b WHERE b.Mandant='" & PERSONAL.Mandant & "' AND b.Niederlassung='" & PERSONAL.Niederlassung & "' " & benutzerTMP & " AND BelegDat BETWEEN '" & datVon.Value.ToShortDateString & "' AND '" & datBis.Value.ToShortDateString & "' " & + " CASE WHEN b.storniert=1 THEN 'JA' ELSE '' END as [storniert], b.Beleg_TYP ,b.Benutzer " & benutzerBezTMP & lgTxt & ", b.ECZahlungsPerAPI as EC,b.ECZahlungsNr as ECNr, mit_username as kassiert" & + " FROM tblEABelegnummer as b LEFT JOIN " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & " .[ADMIN].[dbo].[tblMitarbeiter] on durchfuehrender_Benutzer = mit_id WHERE b.Mandant='" & PERSONAL.Mandant & "' AND b.Niederlassung='" & PERSONAL.Niederlassung & "' " & benutzerTMP & " AND BelegDat BETWEEN '" & datVon.Value.ToShortDateString & "' AND '" & datBis.Value.ToShortDateString & "' " & " ORDER BY b.rksv_BelegId DESC, b.[upsize_ts] desc;", "FMZOLL") ' .DataSource = SQL.loadDgvBySql("SELECT b.rksv_BelegId, b.BelegDat, CASE WHEN b.Belegart=1 THEN 'E' ELSE 'A' END as Belegart,CASE WHEN b.Beleg_TYP='E' THEN rksv_umsatz ELSE (SELECT sum( betrag ) FROM tblEABelegposition WHERE (b.BelegNr = tblEABelegposition.BelegNr) AND (b.BelegDat = tblEABelegposition.BelegDat) AND (b.Benutzer = tblEABelegposition.Benutzer) AND (b.Niederlassung = tblEABelegposition.Niederlassung) AND (b.Mandant = tblEABelegposition.Mandant ) ) END as Betrag, b.Ordnungsbegriff, b.BelegNr, b.Frachtführer, " & ' " CASE WHEN b.storniert=1 THEN 'JA' ELSE '' END as [storniert], b.Beleg_TYP ,b.Benutzer " & benutzerBezTMP & @@ -220,7 +220,10 @@ Public Class frmKassenbuch .Columns("Beleg_TYP").Visible = False .Columns("storniert").HeaderText = "Storn." .Columns("storniert").Width = 45 + .Columns("EC").Width = 45 + .Columns("ECNr").Width = 60 .Columns("Benutzer").Visible = False + '.Columns("kassiert").Visible = False If PERSONAL.isLeihgeldkasse Then .Columns("Fahrer").Visible = False @@ -252,8 +255,8 @@ Public Class frmKassenbuch End If - .SET_SQL("SELECT [JournalNr],[BelegDat],[BelegNr],CASE WHEN Belegart=1 THEN 'E' ELSE 'A' END as Belegart,[Buchungstext],tblKassenbuch.Finanzwege as FW ,([Betrag]+[Steuerbetrag]) as Brutto,[Konto],[Soll],[Haben],Steuerbetrag as Steuer,tblKassenbuch.Benutzer " & - " FROM Personal INNER JOIN tblKassenbuch ON Personal.ID = tblKassenbuch.Benutzer " & + .SET_SQL("SELECT [JournalNr],[BelegDat],[BelegNr],CASE WHEN Belegart=1 THEN 'E' ELSE 'A' END as Belegart,[Buchungstext],tblKassenbuch.Finanzwege as FW ,([Betrag]+[Steuerbetrag]) as Brutto,[Konto],[Soll],[Haben],Steuerbetrag as Steuer,tblKassenbuch.Benutzer, mit_username as kassiert " & + " FROM Personal INNER JOIN tblKassenbuch ON Personal.ID = tblKassenbuch.Benutzer LEFT JOIN " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & " .[ADMIN].[dbo].[tblMitarbeiter] on durchfuehrender_Benutzer = mit_id" & " WHERE tblKassenbuch.Mandant='" & PERSONAL.Mandant & "' AND tblKassenbuch.Niederlassung='" & PERSONAL.Niederlassung & "' " & " " & benutzerTMP & " AND BelegDat BETWEEN '" & datVon.Value.ToShortDateString & "' AND '" & datBis.Value.ToShortDateString & "' ORDER BY JournalNr DESC", "FMZOLL") @@ -287,6 +290,7 @@ Public Class frmKassenbuch .Columns("Steuer").Width = 60 .Columns("Steuer").DefaultCellStyle.Format = "C" .Columns("Benutzer").Visible = False + '.Columns("kassiert").Visible = False End If End With diff --git a/SDL/kassenbuch/frmPOSTerminal.vb b/SDL/kassenbuch/frmPOSTerminal.vb index ce49bf14..cf258be8 100644 --- a/SDL/kassenbuch/frmPOSTerminal.vb +++ b/SDL/kassenbuch/frmPOSTerminal.vb @@ -1,10 +1,5 @@ Imports System.Drawing.Printing -Imports System.Security.Authentication.ExtendedProtection -Imports com.sun.tools.corba.se.idl.constExpr -Imports DocumentFormat.OpenXml.Drawing.Diagrams -Imports java.awt.print Imports Microsoft.Win32 -Imports TAlex.WPF.Helpers Public Class frmPOSTerminal @@ -188,7 +183,7 @@ Public Class frmPOSTerminal Dim ZVTKey As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\GUB\ZVT", True) - TextBox_Aktiv.Text = "" + 'TextBox_Aktiv.Text = "" txt_Ergebnis.Text = ZVTKey.GetValue("Ergebnis") txt_ErgebnisText.Text = ZVTKey.GetValue("ErgebnisText") txt_Drucktext.Text = Replace(ZVTKey.GetValue("Drucktext"), vbLf, vbCrLf) @@ -285,16 +280,14 @@ Public Class frmPOSTerminal Private Sub PDoc_SeiteDrucken(ByVal sender As System.Object, ByVal e As System.Drawing.Printing.PrintPageEventArgs) Handles PDoc.PrintPage - 'Dim Textfont As Font = TextBox_Kassenbon.Font + Dim Hoehe, Breite As Integer Dim Links, Oben As Integer With PDoc.DefaultPageSettings - 'Hoehe = .PaperSize.Height - .Margins.Top - .Margins.Bottom - 'Breite = .PaperSize.Width - .Margins.Left - .Margins.Right + Hoehe = 500 ' 5,00 Zoll Breite = 270 ' = 2,70 zoll - 'Links = PDoc.DefaultPageSettings.Margins.Left - 'Oben = PDoc.DefaultPageSettings.Margins.Top + Links = 10 Oben = 10 End With diff --git a/SDL/kunden/frmGoMautBoxen_Bestellung.vb b/SDL/kunden/frmGoMautBoxen_Bestellung.vb index cba34879..c3018085 100644 --- a/SDL/kunden/frmGoMautBoxen_Bestellung.vb +++ b/SDL/kunden/frmGoMautBoxen_Bestellung.vb @@ -1,6 +1,4 @@ - -Imports javax.xml.bind.annotation -Imports VERAG_PROG_ALLGEMEIN +Imports VERAG_PROG_ALLGEMEIN Public Class frmGoMautBoxen_Bestellung Public kundenNr = -1 diff --git a/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb b/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb index 06298b5d..4ef79bf0 100644 --- a/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb +++ b/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb @@ -22,6 +22,7 @@ Partial Class frmKundenUebersichtZOLL 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() @@ -29,17 +30,19 @@ Partial Class frmKundenUebersichtZOLL Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmKundenUebersichtZOLL)) - Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.KopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.tabZolltarife = New System.Windows.Forms.TabPage() Me.pnlZollTarife = New System.Windows.Forms.Panel() Me.tabKundendaten = New System.Windows.Forms.TabPage() Me.rtbInfo = New System.Windows.Forms.RichTextBox() Me.lblAbfertigungsverbot = New System.Windows.Forms.Label() - Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip() + Me.usrcntlKundenuebersicht = New SDL.usrCntlKundenuebersicht() + Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() Me.tbcntrKundenDaten = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() Me.tbStatistik = New System.Windows.Forms.TabPage() Me.cboKundenblattFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button1 = New System.Windows.Forms.Button() @@ -86,10 +89,10 @@ Partial Class frmKundenUebersichtZOLL Me.btnSpeichern = New System.Windows.Forms.Button() Me.Label35 = New System.Windows.Forms.Label() Me.tbRechnungen = New System.Windows.Forms.TabPage() - Me.dgvRg = New VERAG_PROG_ALLGEMEIN.MyDatagridview() - Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel() + Me.dgvRg = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) Me.btnRgPdf = New System.Windows.Forms.Button() - Me.ctxtRg = New System.Windows.Forms.ContextMenuStrip() + Me.ctxtRg = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DateiHochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.btnMonat = New System.Windows.Forms.Button() Me.Button10 = New System.Windows.Forms.Button() @@ -97,8 +100,9 @@ Partial Class frmKundenUebersichtZOLL Me.Label40 = New System.Windows.Forms.Label() Me.tbSpeditionsbuch = New System.Windows.Forms.TabPage() Me.tbFiskaluebersicht = New System.Windows.Forms.TabPage() + Me.UsrcntlFiskaluebersicht1 = New SDL.usrcntlFiskaluebersicht() Me.tbCBAM = New System.Windows.Forms.TabPage() - Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon() + Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components) Me.Panel1 = New System.Windows.Forms.Panel() Me.MenuStripKunden = New System.Windows.Forms.MenuStrip() Me.mnueKunden = New System.Windows.Forms.ToolStripMenuItem() @@ -117,6 +121,7 @@ Partial Class frmKundenUebersichtZOLL Me.ToolStripMenuItem8 = New System.Windows.Forms.ToolStripMenuItem() Me.ZollvollmachtATEVToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.VollmachtFinanzamtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ZollvollmachtDEIndirektToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem9 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem10 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem14 = New System.Windows.Forms.ToolStripMenuItem() @@ -145,8 +150,8 @@ Partial Class frmKundenUebersichtZOLL Me.lblTESTSystem = New System.Windows.Forms.Label() Me.pic = New System.Windows.Forms.PictureBox() Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() - Me.tmrFiskal = New System.Windows.Forms.Timer() - Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip() + Me.tmrFiskal = New System.Windows.Forms.Timer(Me.components) + Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() Me.ÄndernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.HochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -154,10 +159,6 @@ Partial Class frmKundenUebersichtZOLL Me.PDFLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.usrcntlKundenuebersicht = New SDL.usrCntlKundenuebersicht() - Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() - Me.UsrcntlFiskaluebersicht1 = New SDL.usrcntlFiskaluebersicht() - Me.ZollvollmachtDEIndirektToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ContextMenuStrip1.SuspendLayout() Me.tabZolltarife.SuspendLayout() Me.tabKundendaten.SuspendLayout() @@ -260,6 +261,17 @@ Partial Class frmKundenUebersichtZOLL Me.lblAbfertigungsverbot.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.lblAbfertigungsverbot.Visible = False ' + 'usrcntlKundenuebersicht + ' + Me.usrcntlKundenuebersicht.BackColor = System.Drawing.Color.White + Me.usrcntlKundenuebersicht.BER_STUFE = 0 + Me.usrcntlKundenuebersicht.Dock = System.Windows.Forms.DockStyle.Fill + Me.usrcntlKundenuebersicht.Location = New System.Drawing.Point(3, 3) + Me.usrcntlKundenuebersicht.Margin = New System.Windows.Forms.Padding(2) + Me.usrcntlKundenuebersicht.Name = "usrcntlKundenuebersicht" + Me.usrcntlKundenuebersicht.Size = New System.Drawing.Size(1176, 744) + Me.usrcntlKundenuebersicht.TabIndex = 0 + ' 'ContextMenuStrip2 ' Me.ContextMenuStrip2.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -305,6 +317,16 @@ Partial Class frmKundenUebersichtZOLL Me.TabPage1.TabIndex = 2 Me.TabPage1.Text = "Offerte" ' + 'UsrCntlOfferte1 + ' + Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White + Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlOfferte1.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(2) + Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" + Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1176, 744) + Me.UsrCntlOfferte1.TabIndex = 0 + ' 'tbStatistik ' Me.tbStatistik.BackColor = System.Drawing.Color.White @@ -1027,6 +1049,15 @@ Partial Class frmKundenUebersichtZOLL Me.tbFiskaluebersicht.Text = "Fiskal-Analyse" Me.tbFiskaluebersicht.UseVisualStyleBackColor = True ' + 'UsrcntlFiskaluebersicht1 + ' + Me.UsrcntlFiskaluebersicht1.BackColor = System.Drawing.Color.White + Me.UsrcntlFiskaluebersicht1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrcntlFiskaluebersicht1.Location = New System.Drawing.Point(0, 0) + Me.UsrcntlFiskaluebersicht1.Name = "UsrcntlFiskaluebersicht1" + Me.UsrcntlFiskaluebersicht1.Size = New System.Drawing.Size(1182, 750) + Me.UsrcntlFiskaluebersicht1.TabIndex = 0 + ' 'tbCBAM ' Me.tbCBAM.Location = New System.Drawing.Point(4, 25) @@ -1225,6 +1256,12 @@ Partial Class frmKundenUebersichtZOLL Me.VollmachtFinanzamtToolStripMenuItem.Size = New System.Drawing.Size(215, 22) Me.VollmachtFinanzamtToolStripMenuItem.Text = "Vollmacht Finanzamt" ' + 'ZollvollmachtDEIndirektToolStripMenuItem + ' + Me.ZollvollmachtDEIndirektToolStripMenuItem.Name = "ZollvollmachtDEIndirektToolStripMenuItem" + Me.ZollvollmachtDEIndirektToolStripMenuItem.Size = New System.Drawing.Size(215, 22) + Me.ZollvollmachtDEIndirektToolStripMenuItem.Text = "Zollvollmacht DE - indirekt" + ' 'ToolStripMenuItem9 ' Me.ToolStripMenuItem9.Name = "ToolStripMenuItem9" @@ -1309,7 +1346,7 @@ Partial Class frmKundenUebersichtZOLL Me.mnueFiskaluebersicht.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnueFiskaluebersicht.Name = "mnueFiskaluebersicht" Me.mnueFiskaluebersicht.Size = New System.Drawing.Size(107, 64) - Me.mnueFiskaluebersicht.Text = "Fiskal-Analyse" + Me.mnueFiskaluebersicht.Text = "Due Diligence" Me.mnueFiskaluebersicht.TextAlign = System.Drawing.ContentAlignment.BottomCenter Me.mnueFiskaluebersicht.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText Me.mnueFiskaluebersicht.Visible = False @@ -1547,42 +1584,6 @@ Partial Class frmKundenUebersichtZOLL Me.DataGridViewTextBoxColumn2.HeaderText = "KundenNr" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' - 'usrcntlKundenuebersicht - ' - Me.usrcntlKundenuebersicht.BackColor = System.Drawing.Color.White - Me.usrcntlKundenuebersicht.BER_STUFE = 0 - Me.usrcntlKundenuebersicht.Dock = System.Windows.Forms.DockStyle.Fill - Me.usrcntlKundenuebersicht.Location = New System.Drawing.Point(3, 3) - Me.usrcntlKundenuebersicht.Margin = New System.Windows.Forms.Padding(2) - Me.usrcntlKundenuebersicht.Name = "usrcntlKundenuebersicht" - Me.usrcntlKundenuebersicht.Size = New System.Drawing.Size(1176, 744) - Me.usrcntlKundenuebersicht.TabIndex = 0 - ' - 'UsrCntlOfferte1 - ' - Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White - Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlOfferte1.Location = New System.Drawing.Point(3, 3) - Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(2) - Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" - Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1176, 744) - Me.UsrCntlOfferte1.TabIndex = 0 - ' - 'UsrcntlFiskaluebersicht1 - ' - Me.UsrcntlFiskaluebersicht1.BackColor = System.Drawing.Color.White - Me.UsrcntlFiskaluebersicht1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrcntlFiskaluebersicht1.Location = New System.Drawing.Point(0, 0) - Me.UsrcntlFiskaluebersicht1.Name = "UsrcntlFiskaluebersicht1" - Me.UsrcntlFiskaluebersicht1.Size = New System.Drawing.Size(1182, 750) - Me.UsrcntlFiskaluebersicht1.TabIndex = 0 - ' - 'ZollvollmachtDEIndirektToolStripMenuItem - ' - Me.ZollvollmachtDEIndirektToolStripMenuItem.Name = "ZollvollmachtDEIndirektToolStripMenuItem" - Me.ZollvollmachtDEIndirektToolStripMenuItem.Size = New System.Drawing.Size(215, 22) - Me.ZollvollmachtDEIndirektToolStripMenuItem.Text = "Zollvollmacht DE - indirekt" - ' 'frmKundenUebersichtZOLL ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index d16f38e9..9cf321a3 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -2819,7 +2819,7 @@ Public Class frmKundenblatt Dim Kunde As New cKundenSDL(row("gb_adressNr"), 200) Kunde.Erfassungsdatum = Now Kunde.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME - Kunde.SAVE + Kunde.SAVE() End If diff --git a/SDL/kunden/usrCntlCBAM.vb b/SDL/kunden/usrCntlCBAM.vb index 8df58a10..53542613 100644 --- a/SDL/kunden/usrCntlCBAM.vb +++ b/SDL/kunden/usrCntlCBAM.vb @@ -850,7 +850,8 @@ Public Class usrCntlCBAM ,isnull(max(Versender_CZ_EORI),'') as AbsenderEORI ,isnull(max(CZ_Name), '') as Absender ,'' as 'Rechnungsnummer' - ,'' as 'Rechnungsdatum'" + ,'' as 'Rechnungsdatum' + ,isnull(max(Anmelder_DT_EORI),'') as 'AnmelderEORI' " Dim SQLSTR = " FROM [tbl_DY_Zollmeldungen_Import] where diff --git a/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb b/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb index b347afb1..a009c7e2 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb +++ b/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb @@ -25,14 +25,14 @@ Partial Class usrcntlFiskaluebersicht Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrcntlFiskaluebersicht)) Me.btnAdd = New System.Windows.Forms.Button() - Me.lblFiskaluebersicht = New System.Windows.Forms.Label() + Me.lblUebersicht = New System.Windows.Forms.Label() Me.lblCheckliste = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.lblWarning = New System.Windows.Forms.Label() Me.Button4 = New System.Windows.Forms.Button() Me.picLocked = New System.Windows.Forms.PictureBox() Me.lblAbschluss = New System.Windows.Forms.Label() - Me.cbxFiskalart = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cbxLand = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) Me.btnOK = New System.Windows.Forms.Button() Me.btnSave = New System.Windows.Forms.Button() @@ -94,6 +94,8 @@ Partial Class usrcntlFiskaluebersicht Me.dgvUnterlagen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.cbxUID = New System.Windows.Forms.CheckBox() Me.txtUID = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label15 = New System.Windows.Forms.Label() + Me.cbxArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() CType(Me.picLocked, System.ComponentModel.ISupportInitialize).BeginInit() Me.MyPanel1.SuspendLayout() CType(Me.dgvFiskaluebersicht, System.ComponentModel.ISupportInitialize).BeginInit() @@ -119,15 +121,15 @@ Partial Class usrcntlFiskaluebersicht Me.btnAdd.TabIndex = 96 Me.btnAdd.UseVisualStyleBackColor = True ' - 'lblFiskaluebersicht + 'lblUebersicht ' - Me.lblFiskaluebersicht.AutoSize = True - Me.lblFiskaluebersicht.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblFiskaluebersicht.Location = New System.Drawing.Point(8, 12) - Me.lblFiskaluebersicht.Name = "lblFiskaluebersicht" - Me.lblFiskaluebersicht.Size = New System.Drawing.Size(130, 20) - Me.lblFiskaluebersicht.TabIndex = 111 - Me.lblFiskaluebersicht.Text = "Fiskalübersicht" + Me.lblUebersicht.AutoSize = True + Me.lblUebersicht.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblUebersicht.Location = New System.Drawing.Point(8, 12) + Me.lblUebersicht.Name = "lblUebersicht" + Me.lblUebersicht.Size = New System.Drawing.Size(86, 20) + Me.lblUebersicht.TabIndex = 111 + Me.lblUebersicht.Text = "Übersicht" ' 'lblCheckliste ' @@ -143,18 +145,18 @@ Partial Class usrcntlFiskaluebersicht ' Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(319, 12) + Me.Label1.Location = New System.Drawing.Point(316, 12) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(94, 20) + Me.Label1.Size = New System.Drawing.Size(65, 20) Me.Label1.TabIndex = 118 - Me.Label1.Text = "Fiskalart - " + Me.Label1.Text = "Land - " ' 'lblWarning ' Me.lblWarning.AutoSize = True Me.lblWarning.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblWarning.ForeColor = System.Drawing.Color.Red - Me.lblWarning.Location = New System.Drawing.Point(502, 17) + Me.lblWarning.Location = New System.Drawing.Point(565, 15) Me.lblWarning.Name = "lblWarning" Me.lblWarning.Size = New System.Drawing.Size(0, 16) Me.lblWarning.TabIndex = 113 @@ -176,9 +178,9 @@ Partial Class usrcntlFiskaluebersicht Me.picLocked.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.picLocked.BackgroundImage = Global.SDL.My.Resources.Resources.locked Me.picLocked.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.picLocked.Location = New System.Drawing.Point(865, 3) + Me.picLocked.Location = New System.Drawing.Point(886, 3) Me.picLocked.Name = "picLocked" - Me.picLocked.Size = New System.Drawing.Size(56, 30) + Me.picLocked.Size = New System.Drawing.Size(35, 30) Me.picLocked.TabIndex = 130 Me.picLocked.TabStop = False Me.picLocked.Visible = False @@ -187,23 +189,23 @@ Partial Class usrcntlFiskaluebersicht ' Me.lblAbschluss.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAbschluss.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAbschluss.Location = New System.Drawing.Point(559, 14) + Me.lblAbschluss.Location = New System.Drawing.Point(571, 3) Me.lblAbschluss.Name = "lblAbschluss" Me.lblAbschluss.RightToLeft = System.Windows.Forms.RightToLeft.Yes - Me.lblAbschluss.Size = New System.Drawing.Size(301, 20) + Me.lblAbschluss.Size = New System.Drawing.Size(309, 31) Me.lblAbschluss.TabIndex = 138 Me.lblAbschluss.TextAlign = System.Drawing.ContentAlignment.TopRight ' - 'cbxFiskalart + 'cbxLand ' - Me.cbxFiskalart._allowedValuesFreiText = Nothing - Me.cbxFiskalart._allowFreiText = False - Me.cbxFiskalart._value = "" - Me.cbxFiskalart.FormattingEnabled = True - Me.cbxFiskalart.Location = New System.Drawing.Point(419, 12) - Me.cbxFiskalart.Name = "cbxFiskalart" - Me.cbxFiskalart.Size = New System.Drawing.Size(53, 21) - Me.cbxFiskalart.TabIndex = 117 + Me.cbxLand._allowedValuesFreiText = Nothing + Me.cbxLand._allowFreiText = False + Me.cbxLand._value = "" + Me.cbxLand.FormattingEnabled = True + Me.cbxLand.Location = New System.Drawing.Point(385, 11) + Me.cbxLand.Name = "cbxLand" + Me.cbxLand.Size = New System.Drawing.Size(53, 21) + Me.cbxLand.TabIndex = 117 ' 'MyPanel1 ' @@ -1161,18 +1163,41 @@ Partial Class usrcntlFiskaluebersicht Me.txtUID.Size = New System.Drawing.Size(86, 20) Me.txtUID.TabIndex = 106 ' + 'Label15 + ' + Me.Label15.AutoSize = True + Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label15.Location = New System.Drawing.Point(444, 12) + Me.Label15.Name = "Label15" + Me.Label15.Size = New System.Drawing.Size(49, 20) + Me.Label15.TabIndex = 139 + Me.Label15.Text = "Art - " + ' + 'cbxArt + ' + Me.cbxArt._allowedValuesFreiText = Nothing + Me.cbxArt._allowFreiText = False + Me.cbxArt._value = "" + Me.cbxArt.FormattingEnabled = True + Me.cbxArt.Location = New System.Drawing.Point(489, 11) + Me.cbxArt.Name = "cbxArt" + Me.cbxArt.Size = New System.Drawing.Size(70, 21) + Me.cbxArt.TabIndex = 140 + ' 'usrcntlFiskaluebersicht ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White + Me.Controls.Add(Me.cbxArt) + Me.Controls.Add(Me.Label15) Me.Controls.Add(Me.picLocked) Me.Controls.Add(Me.Button4) Me.Controls.Add(Me.Label1) - Me.Controls.Add(Me.cbxFiskalart) + Me.Controls.Add(Me.cbxLand) Me.Controls.Add(Me.lblWarning) Me.Controls.Add(Me.lblCheckliste) - Me.Controls.Add(Me.lblFiskaluebersicht) + Me.Controls.Add(Me.lblUebersicht) Me.Controls.Add(Me.MyPanel1) Me.Controls.Add(Me.btnAdd) Me.Controls.Add(Me.dgvFiskaluebersicht) @@ -1213,14 +1238,14 @@ Partial Class usrcntlFiskaluebersicht Friend WithEvents btnOK As Button Friend WithEvents btnSave As Button Friend WithEvents btnPDFReport As Button - Friend WithEvents lblFiskaluebersicht As Label + Friend WithEvents lblUebersicht As Label Friend WithEvents lblCheckliste As Label Friend WithEvents lblUnterlagen As Label Friend WithEvents dgvUnterlagen As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents MyPanel2 As VERAG_PROG_ALLGEMEIN.MyPanel Friend WithEvents Button1 As Button Friend WithEvents Label1 As Label - Friend WithEvents cbxFiskalart As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents cbxLand As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents lblWarning As Label Friend WithEvents Button4 As Button Friend WithEvents picOK As PictureBox @@ -1269,4 +1294,6 @@ Partial Class usrcntlFiskaluebersicht Friend WithEvents Label14 As Label Friend WithEvents txtUmsatz As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents lblUmsatz As Label + Friend WithEvents Label15 As Label + Friend WithEvents cbxArt As VERAG_PROG_ALLGEMEIN.MyComboBox End Class diff --git a/SDL/kunden/usrcntlFiskaluebersicht.resx b/SDL/kunden/usrcntlFiskaluebersicht.resx index ca08742d..2e79f648 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.resx +++ b/SDL/kunden/usrcntlFiskaluebersicht.resx @@ -120,24 +120,25 @@ - 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 + rkJggg== diff --git a/SDL/kunden/usrcntlFiskaluebersicht.vb b/SDL/kunden/usrcntlFiskaluebersicht.vb index 79b974b6..2af0f989 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.vb +++ b/SDL/kunden/usrcntlFiskaluebersicht.vb @@ -24,14 +24,15 @@ Public Class usrcntlFiskaluebersicht With dgvFiskaluebersicht .Columns.Clear() - .DataSource = SQL.loadDgvBySql("SELECT FK_Id , FK_Datum, FK_Art, FK_locked, FK_Kdnr FROM tblFiskalkunden WHERE FK_Kdnr='" & kdNr & "' ORDER BY FK_Datum ", "FMZOLL") + .DataSource = SQL.loadDgvBySql("SELECT FK_Id , FK_Datum, FK_Art, FK_locked, FK_Kdnr, FK_Land FROM tblFiskalkunden WHERE FK_Kdnr='" & kdNr & "' ORDER BY FK_Datum ", "FMZOLL") .Columns("FK_Datum").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("FK_Datum").HeaderText = "Datum" - .Columns("FK_Art").Visible = False + .Columns("FK_Art").HeaderText = "Art" .Columns("FK_locked").Visible = False .Columns("FK_Id").Visible = False .Columns("FK_Kdnr").Visible = False + .Columns("FK_Land").Visible = False End With @@ -41,12 +42,14 @@ Public Class usrcntlFiskaluebersicht Dim where As String = "" - Select Case cbxFiskalart._value - Case "DE" - where = " And FilialenNr = 4811" - Case "AT" - where = " And FilialenNr = 4805" - End Select + If cbxArt._value = "FI" Then + Select Case cbxLand._value + Case "DE" + where = " And FilialenNr = 4811" + Case "AT" + where = " And FilialenNr = 4805" + End Select + End If Label2.Text = "Top 5 Lieferanten (" & year & ")" @@ -74,12 +77,14 @@ Public Class usrcntlFiskaluebersicht Dim where As String = "" - Select Case cbxFiskalart._value - Case "DE" - where = " And FilialenNr = 4811" - Case "AT" - where = " And FilialenNr = 4805" - End Select + If cbxArt._value = "FI" Then + Select Case cbxLand._value + Case "DE" + where = " And FilialenNr = 4811" + Case "AT" + where = " And FilialenNr = 4805" + End Select + End If Label3.Text = "Top 5 Empfänger (" & year & ")" With dgvEmpfaenger @@ -105,12 +110,15 @@ Public Class usrcntlFiskaluebersicht Dim where As String = "" - Select Case cbxFiskalart._value - Case "DE" - where = " And FilialenNr = 4811" - Case "AT" - where = " And FilialenNr = 4805" - End Select + If cbxArt._value = "FI" Then + Select Case cbxLand._value + Case "DE" + where = " And FilialenNr = 4811" + Case "AT" + where = " And FilialenNr = 4805" + End Select + End If + Label6.Text = "Top 5 Auftraggeber (" & year & ")" With dgvZwischenh @@ -167,10 +175,16 @@ Public Class usrcntlFiskaluebersicht Sub init(_kdnr As Integer) - cbxFiskalart.Items.Clear() - cbxFiskalart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AT", "AT")) - cbxFiskalart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DE", "DE")) - cbxFiskalart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + cbxLand.Items.Clear() + cbxLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AT", "AT")) + cbxLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DE", "DE")) + cbxLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + + + cbxArt.Items.Clear() + cbxArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("INDIREKT", "IN")) + cbxArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FISKAL", "FI")) + cbxArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) cbxAttachmentArt.Items.Clear() @@ -181,7 +195,6 @@ Public Class usrcntlFiskaluebersicht cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Website", "Website")) cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Website-Steuerberater", "Website-Steuerberater")) - kdNr = _kdnr KUNDE = New VERAG_PROG_ALLGEMEIN.cKunde(kdNr) KUNDE_ERW = New VERAG_PROG_ALLGEMEIN.cKundenErweitert(kdNr) @@ -209,42 +222,47 @@ Public Class usrcntlFiskaluebersicht Private Sub btnAdd_Click(sender As Object, e As EventArgs) Handles btnAdd.Click - If cbxFiskalart._value = "" Then - lblWarning.Text = "Fiskalart auswählen!" + lblWarning.Text = "" + + If cbxArt._value = "" Then + lblWarning.Text = "Art auswählen!" Exit Sub ElseIf ADRESSE.LandKz = "" Then lblWarning.Text = "Land im Kunden hinterlegen!" Exit Sub + ElseIf cbxArt._value = "FI" AndAlso cbxLand._value = "" Then + lblWarning.Text = "Land auswählen!" + Exit Sub + End If - If cbxFiskalart._value = "DE" And ADRESSE.LandKz = "D" Or cbxFiskalart._value = "AT" And ADRESSE.LandKz = "A" Then - lblWarning.Text = "Fiskalart " & cbxFiskalart._value & " für " & ADRESSE.LandKz & " nicht möglich!" + If cbxLand._value = "DE" And ADRESSE.LandKz = "D" Or cbxLand._value = "AT" And ADRESSE.LandKz = "A" Then + lblWarning.Text = "Fiskalart " & cbxLand._value & " für " & ADRESSE.LandKz & " nicht möglich!" Exit Sub End If lblWarning.Text = "" - Dim input = InputBox("Bitte geben Sie das Datum der neuen Fiskal-Übersicht ein: ", "Fiskal-Übersicht anlegen") - If input <> "" Then - Dim hint As String - If checkDateIsValid(input, hint) Then - fk = New VERAG_PROG_ALLGEMEIN.cFiskalkunden() - fk.FK_Datum = CDate(input) - fk.FK_Kdnr = kdNr - fk.FK_Art = cbxFiskalart._value - fk.SAVE() - dgvFiskaluebersicht.GetOrder() - initDGVFiskaluebersicht() - dgvFiskaluebersicht.SetOrder() - Else - MsgBox(hint) - End If + Dim f As New frmDatumsabfrage("Datum der neuen Due Diligence:", True) - Else - MsgBox("Kein Datum angegeben!") + f.ShowDialog() + If f.DialogResult = DialogResult.OK Then + Dim fisDate As Date = CDate(f.Datum) + + fk = New VERAG_PROG_ALLGEMEIN.cFiskalkunden() + fk.FK_Datum = fisDate + fk.FK_Kdnr = kdNr + fk.FK_Art = cbxArt._value + fk.FK_Land = cbxLand._value + fk.SAVE() + dgvFiskaluebersicht.GetOrder() + initDGVFiskaluebersicht() + dgvFiskaluebersicht.SetOrder() End If + + End Sub Private Function checkDateIsValid(ByRef checkDate As Date, ByRef hint As String) As Boolean @@ -367,17 +385,17 @@ Public Class usrcntlFiskaluebersicht getFields() - If checkEntries() Then - fk.FK_locked = True - fk.FK_Abschlussdatum = Now() - fk.FK_MaId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID - fk.SAVE() - initDGVFiskaluebersicht() - btnOK.Enabled = False - btnSave.Enabled = False - End If + If checkEntries() Then + fk.FK_locked = True + fk.FK_Abschlussdatum = Now() + fk.FK_MaId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID + fk.SAVE() + initDGVFiskaluebersicht() + btnOK.Enabled = False + btnSave.Enabled = False + End If - End If + End If End Sub Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click @@ -469,7 +487,8 @@ Public Class usrcntlFiskaluebersicht End If - cbxFiskalart._value = checkNullStr(fk.FK_Art) + cbxLand._value = checkNullStr(fk.FK_land) + cbxArt._value = checkNullStr(fk.FK_Art) txtHomepage.Text = checkNullStr(fk.FK_Website_URL) rtbAnmerkung.Text = checkNullStr(fk.FK_Anmerkung) rtfLieferanten.Text = checkNullStr(fk.FK_Lieferanten) @@ -487,7 +506,7 @@ Public Class usrcntlFiskaluebersicht txtUmsatz.Text = checkNullStr(fk.FK_Umsatz) If txtBon.Text = "" Then - Dim baid = SQL.getValueTxtBySql("SELECT TOP(1) ba_id FROM [tblBonitaetsauskunft] where ba_KundenNr=" & kdNr & " ORDER BY ba_Datum DESC", "FMZOLL") + Dim baid = SQL.getValueTxtBySql("Select TOP(1) ba_id FROM [tblBonitaetsauskunft] where ba_KundenNr=" & kdNr & " ORDER BY ba_Datum DESC", "FMZOLL") If baid <> "" Then BA = New cBonitaetsauskunft(baid) If BA IsNot Nothing Then @@ -503,9 +522,13 @@ Public Class usrcntlFiskaluebersicht If txtGeschaeftszweck.Text = "" Then txtGeschaeftszweck.Text = BA.ba_Geschaeftszweck - If txtAnzMA.Text = "" Then txtAnzMA.Text = BA.ba_Mitarbeiter + If txtAnzMA.Text = "" Then + If Not BA.ba_Mitarbeiter Is Nothing AndAlso IsNumeric(BA.ba_Mitarbeiter) AndAlso CInt(BA.ba_Mitarbeiter) <> 0 Then + txtAnzMA.Text = BA.ba_Mitarbeiter + End If + End If - If ADRESSE.LandKz = "AT" Or ADRESSE.LandKz = "A" Then + If ADRESSE.LandKz = "AT" Or ADRESSE.LandKz = "A" Then lblBon.Text = If(BA.ba_CreditSaveBonitaetsScore, "") Else If BA.ba_CreditSaveBonitaetsIndex = 0 Then @@ -519,7 +542,7 @@ Public Class usrcntlFiskaluebersicht End If If txtWaren.Text = "" Then - txtWaren.Text = SQL.getValueTxtBySql("SELECT Top(1) [Packstücke] as Bemerkungen FROM [Speditionsbuch] WHERE " & kdNr & " In([AbsenderKundenNr], [EmpfängerKundenNr], [FrachtführerKundenNr], [VermittlerKundenNr], [EndempfängerKundenNr]) AND ISNULL(CAST([Bemerkungen] as NVARCHAR(max)),'') <> '' Order by Abfertigungsdatum desc", "FMZOLL") + txtWaren.Text = SQL.getValueTxtBySql("Select Top(1) [Packstücke] As Bemerkungen FROM [Speditionsbuch] WHERE " & kdNr & " In([AbsenderKundenNr], [EmpfängerKundenNr], [FrachtführerKundenNr], [VermittlerKundenNr], [EndempfängerKundenNr]) And ISNULL(CAST([Bemerkungen] As NVARCHAR(max)),'') <> '' Order by Abfertigungsdatum desc", "FMZOLL") End If If txtUID.Text = "" Then @@ -536,32 +559,46 @@ Public Class usrcntlFiskaluebersicht End If - If txtVM.Text = "" And cbxFiskalart._value <> "" Then + If txtVM.Text = "" And cbxLand._value <> "" Then Dim vmArt As Integer = -1 Select Case FirmaTmp Case "VERAG" - If cbxFiskalart._value = "DE" Then - vmArt = 2 - ElseIf cbxFiskalart._value = "AT" Then - vmArt = 4 + If cbxArt._value = "FI" Then + If cbxLand._value = "DE" Then + vmArt = 2 + ElseIf cbxLand._value = "AT" Then + vmArt = 4 + End If + ElseIf cbxArt._value = "IN" Then + vmArt = 35 End If + Case "IMEX" - If cbxFiskalart._value = "DE" Then - vmArt = 8 - ElseIf cbxFiskalart._value = "AT" Then - vmArt = 9 + If cbxArt._value = "FI" Then + If cbxLand._value = "DE" Then + vmArt = 8 + ElseIf cbxLand._value = "AT" Then + vmArt = 9 + End If + ElseIf cbxArt._value = "IN" Then + vmArt = -1 End If Case "UNISPED" - If cbxFiskalart._value = "DE" Then - vmArt = 22 - ElseIf cbxFiskalart._value = "AT" Then - vmArt = 23 + If cbxArt._value = "FI" Then + If cbxLand._value = "DE" Then + vmArt = 22 + ElseIf cbxLand._value = "AT" Then + vmArt = 23 + End If + ElseIf cbxArt._value = "IN" Then + vmArt = -1 End If + End Select If vmArt = -1 Then @@ -577,7 +614,7 @@ Public Class usrcntlFiskaluebersicht End If End If - If txtUVM.Text = "" And cbxFiskalart._value <> "" Then + If txtUVM.Text = "" And cbxLand._value <> "" Then Dim uvmId = SQL.getValueTxtBySql("SELECT Top(1) abf.[kdvm_id] FROM [tblKundenVollmachtenArt] as art INNER Join(select * from [tblKundenVollmachten]) as abf on art.[kdvma_Id]=abf.[kdvm_kdvmaId] WHERE art.kdvma_visible = 1 And abf.kdvm_erhalten = 1 And ISNULL(abf.[kdvm_geloescht], 0)!= 1 And [kdvm_KundenNr] ='" & kdNr & "' AND [kdvm_kdvmaId]=6 Order BY abf.kdvm_erhalten_Datum desc", "FMZOLL") If uvmId <> "" Then @@ -641,7 +678,7 @@ Public Class usrcntlFiskaluebersicht End Sub Private Sub getFields() - fk.FK_Art = cbxFiskalart._value + fk.FK_Art = cbxLand._value If BA IsNot Nothing Then fk.FK_Bonitaet = BA.ba_id diff --git a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/KdSearchBox.vb b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/KdSearchBox.vb index 2b7e8721..ec8a1633 100644 --- a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/KdSearchBox.vb +++ b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/KdSearchBox.vb @@ -1,5 +1,6 @@ Imports System.ComponentModel Imports System.Drawing +Imports System.Text Imports System.Windows.Forms 'Imports System.Threading @@ -152,7 +153,7 @@ Public Class KdSearchBox Eingabe_verarbeitet = False last_eingabe = Now - doKeyDown(Now, topKunden) + DoKeyDownNew(Now, topKunden) Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Es ist ein Fehler beim Kunden-Such-Feld aufgetreten!",,,, "ERR_KDS_02") @@ -183,7 +184,7 @@ Public Class KdSearchBox 'TIMER_SEARCH If TIMER_SEARCH Then - If span_last_search < 600 And span_last_eingabe < 600 Then + If span_last_search < 600 AndAlso span_last_eingabe < 600 Then Exit Sub End If End If @@ -317,6 +318,129 @@ Public Class KdSearchBox End Try End Sub + Private Sub DoKeyDownNew(searchDate As DateTime, Optional topKunden As Integer = 10) + + Try + ' --- Guard Clauses --- + If usrcntl Is Nothing Then Exit Sub + If Eingabe_verarbeitet Then Exit Sub + + Dim spanLastSearch As Integer = CInt((searchDate - last_search).TotalMilliseconds) + Dim spanLastInput As Integer = CInt((searchDate - last_eingabe).TotalMilliseconds) + + If TIMER_SEARCH AndAlso (spanLastSearch < 600 Or spanLastInput < 400) Then + Exit Sub + End If + + ' --- Initialize UserControl Position --- + If Not usrcntl.Visible Then + InitializeUserControlPosition() + End If + + ' --- Configure Active Grid --- + If usrcntl.dgvKundenAktiv IsNot Nothing Then + If Not usrcntl.Visible Then + ConfigureGrid(usrcntl.dgvKundenAktiv) + End If + + ThreadInitAKTIV_NEW(topKunden) + End If + + ' --- Configure Inactive Grid --- + If nurAktive Then + usrcntl.dgvKundenInAktiv.Visible = False + usrcntl.Panel1.Visible = False + ElseIf usrcntl.dgvKundenInAktiv IsNot Nothing Then + + If Not usrcntl.Visible Then + ConfigureGrid(usrcntl.dgvKundenInAktiv, isInactive:=True) + End If + + ThreadInitINAKTIV_NEW() + End If + + ' --- Visibility Handling --- + If _hideIfListEmpty Then + Dim isEmpty As Boolean = + usrcntl.dgvKundenAktiv.RowCount = 0 AndAlso + usrcntl.dgvKundenInAktiv.RowCount = 0 + + setObjectVisible(usrcntl, Not isEmpty) + Else + usrcntl.Visible = True + usrcntl.Show() + usrcntl.BringToFront() + End If + + Eingabe_verarbeitet = True + last_search = DateTime.Now + + Catch ex As Exception + MsgBox(ex.Message & Environment.NewLine & ex.StackTrace) + End Try + + End Sub + + + ' ----------------------------- + ' Helper Methods + ' ----------------------------- + + Private Sub InitializeUserControlPosition() + + usrcntl.Width = usrcntlWIDTH + usrcntl.Height = usrcntlHEIGHT + + If Me.FindForm Is Nothing Then Exit Sub + + Dim locationOnForm As Point = + Me.FindForm.PointToClient(Me.Parent.PointToScreen(Me.Location)) + + If dgvpos = "RIGHT" Then + locationOnForm.X -= (usrcntl.Width - Me.Width) + End If + + If locationOnForm.Y + usrcntl.Height + Me.Height > + form.ClientRectangle.Height Then + + usrcntl.Height = + form.ClientRectangle.Height - locationOnForm.Y - Me.Height + End If + + usrcntl.Location = locationOnForm + usrcntl.Top += Me.Height + + End Sub + + + Private Sub ConfigureGrid(grid As DataGridView, + Optional isInactive As Boolean = False) + + With grid + .AllowUserToAddRows = False + .AllowUserToDeleteRows = False + .AllowUserToOrderColumns = False + .AllowUserToResizeColumns = False + .AllowUserToResizeRows = False + .ReadOnly = True + .MultiSelect = False + .SelectionMode = DataGridViewSelectionMode.FullRowSelect + .BackgroundColor = Color.White + .ForeColor = Color.Black + + Try + .GridColor = Color.White + Catch + ' Some environments throw an exception here + End Try + + If isInactive Then + .DefaultCellStyle.ForeColor = Color.Gray + End If + End With + + End Sub + Public Sub hideDgv(o) '(sender As Object, e As EventArgs) If o IsNot Nothing Then Me.searchActive = False @@ -326,6 +450,7 @@ Public Class KdSearchBox End Sub + 'old???!!!!!! Sub ThreadInitAKTIV_COMP() Try If usrcntl Is Nothing Then Exit Sub @@ -396,14 +521,6 @@ Public Class KdSearchBox End If - 'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then 'Keine - ' SQLstr &= " AND isnull(Kunden.[FilialenNr],0) NOT IN ('5701') " - 'ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "VERAG" And VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "ATILLA" Then - ' SQLstr &= " AND Kunden.[FilialenNr]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE & "' " - 'Else - ' 'SQLstr &= " AND isnull(Kunden.[FilialenNr],0)<>'5501' " - ' SQLstr &= " AND isnull(Kunden.[FilialenNr],0) NOT IN ('5501','5601','5701','5801') " - 'End If If Not _displayWoelflKd Then SQLstr &= " AND AdressenNr NOT LIKE '15%'" SQLstr &= " order by Ordnungsbegriff " @@ -416,6 +533,7 @@ Public Class KdSearchBox End Try End Sub + 'old???!!!!!! Sub ThreadInit_ALLCOPMP_AND_INAKTIV() Try If usrcntl Is Nothing Then Exit Sub @@ -447,21 +565,7 @@ Public Class KdSearchBox If srch2 <> "" Then SQLstr &= " AND (Filialen.Firma LIKE '" & srch2 & "%' OR ( Adressen.PLZ LIKE '" & srch2 & "%' OR Adressen.Ort LIKE '" & srch2 & "%' OR Adressen.LandKz LIKE '" & srch2 & "%' OR Adressen.Straße LIKE '" & srch2 & "%' )) " End If - ' SQLstr &= " AND [Auswahl]='I' " - 'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then 'Keine - ' SQLstr &= " AND isnull(Kunden.[FilialenNr],0) NOT IN ('5701') " - 'ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "VERAG" And VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "ATILLA" Then - ' SQLstr &= " AND Kunden.[FilialenNr]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE & "' " - 'Else - ' 'SQLstr &= " AND isnull([FilialenNr],0)<>'5501' " - ' SQLstr &= " AND isnull(Kunden.[FilialenNr],0) NOT IN ('5501','5601','5701','5801') " - 'End If - 'If VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER <> "" Then - ' SQLstr &= " AND (Filialen.Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR Filialen.CLUSTER='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "') " - 'Else - ' SQLstr &= " AND Filialen.Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' " - 'End If SQLstr &= " AND '" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' IN (Filialen.Firma,Filialen.Cluster) " ' Wenn die Firmenbezeichnung im CLUSter vorkommt .--> Frontoffice @@ -572,20 +676,6 @@ Public Class KdSearchBox SQLstrEnd &= " ) " End If - ''AUSNAHME BIS BESSERE LÖSUNG: - 'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then - ' SQLstr &= " and Filialen.Firma NOT IN ('AMBAR') " - 'End If - - - 'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then 'Keine - ' SQLstr &= " AND isnull(Kunden.[FilialenNr],0) NOT IN ('5701') " - 'ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "VERAG" And VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "ATILLA" Then - ' SQLstr &= " AND Kunden.[FilialenNr]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE & "' " - 'Else - ' 'SQLstr &= " AND isnull(Kunden.[FilialenNr],0)<>'5501' " - ' SQLstr &= " AND isnull(Kunden.[FilialenNr],0) NOT IN ('5501','5601','5701','5801') " - 'End If If Not _displayWoelflKd Then SQLstrEnd &= " AND AdressenNr NOT LIKE '15%'" Dim searchstring = SQLstr & SQLstrEnd & " order by Ordnungsbegriff " @@ -629,20 +719,6 @@ Public Class KdSearchBox SQLstr &= " ) " If srch2 <> "" Then SQLstr &= " AND (Filialen.Firma LIKE '" & srch2 & "%' OR ( Adressen.PLZ LIKE '" & srch2 & "%' OR Adressen.Ort LIKE '" & srch2 & "%' OR Adressen.LandKz LIKE '" & srch2 & "%' OR Adressen.Straße LIKE '" & srch2 & "%' )) " SQLstr &= " AND [Auswahl]='I' " - 'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then 'Keine - ' SQLstr &= " AND isnull(Kunden.[FilialenNr],0) NOT IN ('5701') " - 'ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "VERAG" And VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "ATILLA" Then - ' SQLstr &= " AND Kunden.[FilialenNr]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE & "' " - 'Else - ' 'SQLstr &= " AND isnull([FilialenNr],0)<>'5501' " - ' SQLstr &= " AND isnull(Kunden.[FilialenNr],0) NOT IN ('5501','5601','5701','5801') " - 'End If - - 'If VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER <> "" Then - ' SQLstr &= " AND (Filialen.Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR Filialen.CLUSTER='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "') " - 'Else - ' SQLstr &= " AND Filialen.Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' " - 'End If If _AlleFirmenCLUSTER Then SQLstr &= " AND '" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' IN (Filialen.Firma,Filialen.Cluster) " ' Wenn die Firmenbezeichnung im CLUSter vorkommt .--> Frontoffice @@ -666,11 +742,6 @@ Public Class KdSearchBox End If - 'AUSNAHME BIS BESSERE LÖSUNG - 'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then - ' SQLstr &= " and Filialen.Firma NOT IN ('AMBAR') " - 'End If - If Not _displayWoelflKd Then SQLstr &= " AND AdressenNr NOT LIKE '15%'" SQLstr &= " order by Ordnungsbegriff " @@ -683,6 +754,200 @@ Public Class KdSearchBox End Try End Sub + Private Sub ThreadInitAKTIV_NEW(Optional topKunden As Integer = 10) + + Try + If usrcntl?.dgvKundenAktiv Is Nothing Then Exit Sub + + Dim search = ParseSearch(Me.Text) + Dim topCount As Integer = If(nurAktive, 16, topKunden) + + Dim sql = BuildCustomerSql(search, topCount, auswahl:="A", includeAviso:=_displayAVISO_Email) + + Dim countSql = "SELECT COUNT(Ordnungsbegriff) " & sql.SqlEnd.ToString.Replace("ORDER BY Ordnungsbegriff", "") + + setDS(True, usrcntl.dgvKundenAktiv, (New SQL).loadDgvBySql(sql.FullSql, "FMZOLL"), topCount, If(search.Primary.Length > 2, (New SQL).getValueTxtBySql(countSql, "FMZOLL"), "")) + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler im Kunden-Such-Feld!",,,, "ERR_KDS_03") + End Try + + End Sub + + Private Sub ThreadInitINAKTIV_NEW() + + Try + If usrcntl?.dgvKundenInAktiv Is Nothing Then Exit Sub + + Dim search = ParseSearch(Me.Text) + + Dim sql = BuildCustomerSql(search, topCount:=4, auswahl:="I", includeAviso:=False) + + setDS(False, usrcntl.dgvKundenInAktiv, (New SQL).loadDgvBySql(sql.FullSql, "FMZOLL"), 4) + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler im Kunden-Such-Feld!",,,, "ERR_KDS_04") + End Try + + End Sub + + Private Function ParseSearch(input As String) As (Primary As String, Secondary As String) + + Dim cleaned = input.Replace("'", "").Trim() + + Dim primary = cleaned + Dim secondary As String = "" + + If cleaned.Contains(",") Then + Dim parts = cleaned.Split(","c) + primary = parts(0).Trim() + secondary = parts(1).Trim() + End If + + If primary.StartsWith("*") Then + primary = "%" & primary.Substring(1) + End If + + If secondary.StartsWith("*") Then + secondary = "%" & secondary.Substring(1) + End If + + Return (primary, secondary) + + End Function + + Private Function BuildCustomerSql( + search As (Primary As String, Secondary As String), + topCount As Integer, + auswahl As String, + includeAviso As Boolean) _ + As (FullSql As String, SqlEnd As String) + + Dim avisoField As String = "" + + If includeAviso Then + avisoField = ", (SELECT CASE WHEN COUNT(*) > 0 THEN 'JA' ELSE '' END FROM tblEmailBenachrichtigung WHERE eb_KundenNr = AdressenNr) AS [E-Mail]" + End If + + Dim selectPart = $"SELECT TOP {topCount} + Ordnungsbegriff AS Firma, + AdressenNr AS KdNr, + Adressen.[LandKz] + ' ' + + Adressen.[PLZ] + ' - ' + + Adressen.[Ort] + ' ' + + Adressen.[Straße] AS Adresse + {avisoField}" + + If ShouldIncludeFirmaIntern() Then + selectPart &= ", Filialen.Firma AS Firma_Intern" + End If + + Dim sqlEnd As New StringBuilder() + + sqlEnd.AppendLine(" FROM Adressen") + sqlEnd.AppendLine(" INNER JOIN Kunden ON KundenNr = AdressenNr") + sqlEnd.AppendLine(" INNER JOIN Filialen ON Filialen.FilialenNr = COALESCE(Kunden.FilialenNr, 4803)") + sqlEnd.AppendLine(" WHERE 1=1") + + ' Search + sqlEnd.AppendLine(" AND (") + sqlEnd.AppendLine($" Ordnungsbegriff_AI LIKE '{search.Primary}%'") + + If IsNumeric(search.Primary) Then + sqlEnd.AppendLine($" OR AdressenNr LIKE '{search.Primary}%'") + End If + + If _searchName1 Then + sqlEnd.AppendLine($" OR Adressen.[Name 1] LIKE '{search.Primary}%'") + End If + + sqlEnd.AppendLine(" )") + + If search.Secondary <> "" Then + sqlEnd.AppendLine( + $" AND ( + Filialen.Firma LIKE '{search.Secondary}%' + OR Adressen.PLZ LIKE '{search.Secondary}%' + OR Adressen.Ort LIKE '{search.Secondary}%' + OR Adressen.LandKz LIKE '{search.Secondary}%' + OR Adressen.Straße LIKE '{search.Secondary}%' + )") + End If + + sqlEnd.AppendLine($" AND Auswahl = '{auswahl}'") + + AppendFirmaFilter(sqlEnd) + + If Not _displayWoelflKd Then + sqlEnd.AppendLine(" AND AdressenNr NOT LIKE '15%'") + End If + + sqlEnd.AppendLine(" ORDER BY Ordnungsbegriff") + + Return (selectPart & sqlEnd.ToString(), sqlEnd.ToString()) + + End Function + + Private Sub AppendFirmaFilter(sql As StringBuilder) + + If _AlleFirmenCLUSTER Then + + sql.AppendLine( + $" AND '{VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER}' + IN (Filialen.Firma, Filialen.Cluster)") + + ElseIf _UseFIRMA <> "" Then + + sql.AppendLine( + $" AND '{_UseFIRMA}' + IN (Filialen.Firma, Filialen.Cluster)") + + Else + + sql.AppendLine(" AND (") + + sql.AppendLine( + $" '{VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA.Replace("ATILLA", "VERAG")}' + IN (Filialen.Firma, Filialen.Cluster)") + + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") Then + sql.AppendLine(" OR Filialen.Firma IN ('IMEX')") + End If + + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then + sql.AppendLine(" OR Filialen.Firma IN ('IMEX','VERAG')") + End If + + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_UNISPED_BREXIT", "SDL") Then + sql.AppendLine(" OR (Filialen.Firma IN ('UNISPED') AND Kunden.FilialenNr = 7002)") + End If + + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_FRONTOFFICE", "SDL") Then + sql.AppendLine(" OR Filialen.Firma IN ('FRONTOFFICE')") + End If + + sql.AppendLine(" )") + + End If + + End Sub + + + + Private Function ShouldIncludeFirmaIntern() As Boolean + + Return VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" _ + OrElse VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" _ + OrElse _AlleFirmenCLUSTER _ + OrElse _UseFIRMA <> "" _ + OrElse VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") _ + OrElse VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") + + End Function + + + + 'threadsicherer Aufruf ' Delegate Sub setLabelCallback(l As DataGridView, t As DataTable) Private Sub setDS(aktiveKunden As Boolean, l As DataGridView, t As DataTable, topKunden As Integer, Optional anzahlKunden As String = "") @@ -866,7 +1131,7 @@ Public Class KdSearchBox Try If e.KeyCode = Keys.Return Or e.KeyCode = Keys.Enter Or e.KeyCode = Keys.Tab Then last_search = Now.AddSeconds(-10) - doKeyDown(Now) ' Damit Suche-Timer sicherausgelöst wurde + DoKeyDownNew(Now) ' Damit Suche-Timer sicherausgelöst wurde ' System.Threading.Thread.Sleep(5000) End If @@ -1140,7 +1405,7 @@ Public Class KdSearchBox End Sub Private Sub tmr_Search_Tick(sender As Object, e As EventArgs) Handles tmr_Search.Tick - If TIMER_SEARCH Then doKeyDown(Now) + If TIMER_SEARCH Then DoKeyDownNew(Now) End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb b/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb index 118948df..8994c84b 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cFiskalkunden.vb @@ -30,6 +30,7 @@ Public Class cFiskalkunden Property FK_Geschaeftsfuehrer As Object = Nothing Property FK_Steuerberater As Object = Nothing Property FK_Umsatz As Object = Nothing + Property FK_Land As Object = Nothing Public hasEntry = False @@ -73,6 +74,7 @@ Public Class cFiskalkunden list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Geschaeftsfuehrer", FK_Geschaeftsfuehrer)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Steuerberater", FK_Steuerberater)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Umsatz", FK_Umsatz)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FK_Land", FK_Land)) Return list End Function diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb index 13fe004f..8f929fdd 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb @@ -849,19 +849,22 @@ Public Class cMDMFunctionsAllgemein End If - If dsID < 0 Then - Return "" - ElseIf returnDSID Then - If schnittstellenNr = 8 Then 'Nr enthätl alle IDS-Rechnungen, die nicht mitgeben! - Return -1 - Else - Return dsID - End If + If Not schnittstellenNr = 1 Then + If dsID < 0 Then + Return "" + ElseIf returnDSID Then + If schnittstellenNr = 8 Then 'Nr enthätl alle IDS-Rechnungen, die nicht mitgeben! + Return -1 + Else + Return dsID + End If + End If End If + 'Anschrift Nummerierung: Dim x = 100 Dim y = 10