diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index 1199322f..0b08c017 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -534,7 +534,7 @@ Public Class usrCntlFaktAbrechnung cboRechnungSprache.changeItem(0) 'cboSteuerschlüssel.fillWithSQL("SELECT tblSteuersätze.Nr, tblSteuersätze.Beschreibung FROM tblSteuersätze ORDER BY tblSteuersätze.Nr; ", False, "FMZOLL", True) - cboSteuerschlüssel.fillWithSQL("SELECT [Steuerschlüssel],isnull([Steuerbezeichnung],'') as Steuerbezeichnung FROM [Steuertabelle] ORDER BY [Steuerschlüssel]", False, "FMZOLL", True) + cboSteuerschlüssel.fillWithSQL("SELECT [Steuerschlüssel],isnull([AuswahlSteuerbezeichnung],'') as Steuerbezeichnung FROM [Steuertabelle] ORDER BY [Steuerschlüssel]", False, "FMZOLL", True) Dim whereFirma = "" Dim firstEmpty = False @@ -4092,7 +4092,7 @@ Nächste_Textzeile_lesen: Dim check As Integer = cAllgemein.checkSteuerschluessel(cboFirma._value, RECHNUNG.RechnungsLandKz, RECHNUNG.RechnungsUstIdKz, RECHNUNG.RechnungsUstIdNr, RECHNUNG.RechnungsUstIdGeprüft) If check >= 0 Then If IsNumeric(cboSteuerschlüssel._value) AndAlso CInt(cboSteuerschlüssel._value) <> check Then - Dim text = SQL.getValueTxtBySql("select Steuerbezeichnung from Steuertabelle where Steuerschlüssel =" & check, "FMZOLL") + Dim text = SQL.getValueTxtBySql("select AuswahlSteuerbezeichnung from Steuertabelle where Steuerschlüssel =" & check, "FMZOLL") Dim hintUIDPruef As String = IIf((RECHNUNG.RechnungsUstIdGeprüft IsNot Nothing AndAlso CDate(RECHNUNG.RechnungsUstIdGeprüft) < Today.AddDays(-30)), " UID-ÜrPrüfung ist älter als 30 Tage!", "") If Not vbYes = MsgBox("Falscher Steuertyp!" & vbNewLine & " Steuerschlüssel " & text & " sollte hinterlegt werden." & vbNewLine & IIf(hintUIDPruef <> "", hintUIDPruef & vbNewLine, "") & "Trotzdem speichern?", vbYesNo) Then Return False diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.Designer.vb index 25adc27d..7288fda6 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.Designer.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.Designer.vb @@ -109,10 +109,12 @@ Partial Class usrcntlVerzollungsunterlagen Me.txtAdresse2._DateTimeOnly = False Me.txtAdresse2._numbersOnly = False Me.txtAdresse2._numbersOnlyKommastellen = "" + Me.txtAdresse2._numbersOnlyTrennzeichen = True Me.txtAdresse2._Prozent = False Me.txtAdresse2._ShortDateNew = False Me.txtAdresse2._ShortDateOnly = False Me.txtAdresse2._TimeOnly = False + Me.txtAdresse2._TimeOnly_Seconds = False Me.txtAdresse2._value = Nothing Me.txtAdresse2._Waehrung = False Me.txtAdresse2._WaehrungZeichen = True @@ -131,10 +133,12 @@ Partial Class usrcntlVerzollungsunterlagen Me.txtAdresse1._DateTimeOnly = False Me.txtAdresse1._numbersOnly = False Me.txtAdresse1._numbersOnlyKommastellen = "" + Me.txtAdresse1._numbersOnlyTrennzeichen = True Me.txtAdresse1._Prozent = False Me.txtAdresse1._ShortDateNew = False Me.txtAdresse1._ShortDateOnly = False Me.txtAdresse1._TimeOnly = False + Me.txtAdresse1._TimeOnly_Seconds = False Me.txtAdresse1._value = Nothing Me.txtAdresse1._Waehrung = False Me.txtAdresse1._WaehrungZeichen = True @@ -220,10 +224,12 @@ Partial Class usrcntlVerzollungsunterlagen Me.txtAdresse3._DateTimeOnly = False Me.txtAdresse3._numbersOnly = False Me.txtAdresse3._numbersOnlyKommastellen = "" + Me.txtAdresse3._numbersOnlyTrennzeichen = True Me.txtAdresse3._Prozent = False Me.txtAdresse3._ShortDateNew = False Me.txtAdresse3._ShortDateOnly = False Me.txtAdresse3._TimeOnly = False + Me.txtAdresse3._TimeOnly_Seconds = False Me.txtAdresse3._value = Nothing Me.txtAdresse3._Waehrung = False Me.txtAdresse3._WaehrungZeichen = True @@ -242,10 +248,12 @@ Partial Class usrcntlVerzollungsunterlagen Me.txtFirma2._DateTimeOnly = False Me.txtFirma2._numbersOnly = False Me.txtFirma2._numbersOnlyKommastellen = "" + Me.txtFirma2._numbersOnlyTrennzeichen = True Me.txtFirma2._Prozent = False Me.txtFirma2._ShortDateNew = False Me.txtFirma2._ShortDateOnly = False Me.txtFirma2._TimeOnly = False + Me.txtFirma2._TimeOnly_Seconds = False Me.txtFirma2._value = Nothing Me.txtFirma2._Waehrung = False Me.txtFirma2._WaehrungZeichen = True @@ -280,6 +288,7 @@ Partial Class usrcntlVerzollungsunterlagen Me.txtFirma._displayWoelflKd = False Me.txtFirma._hideIfListEmpty = True Me.txtFirma._loadKdData = True + Me.txtFirma._searchName1 = True Me.txtFirma._UseFIRMA = "" Me.txtFirma._ValueKdAndName = False Me.txtFirma.dgvpos = "LEFT" @@ -310,10 +319,12 @@ Partial Class usrcntlVerzollungsunterlagen Me.txtTel._DateTimeOnly = False Me.txtTel._numbersOnly = False Me.txtTel._numbersOnlyKommastellen = "" + Me.txtTel._numbersOnlyTrennzeichen = True Me.txtTel._Prozent = False Me.txtTel._ShortDateNew = False Me.txtTel._ShortDateOnly = False Me.txtTel._TimeOnly = False + Me.txtTel._TimeOnly_Seconds = False Me.txtTel._value = Nothing Me.txtTel._Waehrung = False Me.txtTel._WaehrungZeichen = True @@ -331,10 +342,12 @@ Partial Class usrcntlVerzollungsunterlagen Me.txtFax._DateTimeOnly = False Me.txtFax._numbersOnly = False Me.txtFax._numbersOnlyKommastellen = "" + Me.txtFax._numbersOnlyTrennzeichen = True Me.txtFax._Prozent = False Me.txtFax._ShortDateNew = False Me.txtFax._ShortDateOnly = False Me.txtFax._TimeOnly = False + Me.txtFax._TimeOnly_Seconds = False Me.txtFax._value = Nothing Me.txtFax._Waehrung = False Me.txtFax._WaehrungZeichen = True @@ -352,10 +365,12 @@ Partial Class usrcntlVerzollungsunterlagen Me.txtEmail._DateTimeOnly = False Me.txtEmail._numbersOnly = False Me.txtEmail._numbersOnlyKommastellen = "" + Me.txtEmail._numbersOnlyTrennzeichen = True Me.txtEmail._Prozent = False Me.txtEmail._ShortDateNew = False Me.txtEmail._ShortDateOnly = False Me.txtEmail._TimeOnly = False + Me.txtEmail._TimeOnly_Seconds = False Me.txtEmail._value = Nothing Me.txtEmail._Waehrung = False Me.txtEmail._WaehrungZeichen = True @@ -373,10 +388,12 @@ Partial Class usrcntlVerzollungsunterlagen Me.txtBearbeiter._DateTimeOnly = False Me.txtBearbeiter._numbersOnly = False Me.txtBearbeiter._numbersOnlyKommastellen = "" + Me.txtBearbeiter._numbersOnlyTrennzeichen = True Me.txtBearbeiter._Prozent = False Me.txtBearbeiter._ShortDateNew = False Me.txtBearbeiter._ShortDateOnly = False Me.txtBearbeiter._TimeOnly = False + Me.txtBearbeiter._TimeOnly_Seconds = False Me.txtBearbeiter._value = Nothing Me.txtBearbeiter._Waehrung = False Me.txtBearbeiter._WaehrungZeichen = True @@ -430,11 +447,13 @@ Partial Class usrcntlVerzollungsunterlagen Me.txtAnlage1._DateTimeOnly = False Me.txtAnlage1._numbersOnly = False Me.txtAnlage1._numbersOnlyKommastellen = "" + Me.txtAnlage1._numbersOnlyTrennzeichen = True Me.txtAnlage1._Prozent = False Me.txtAnlage1._ShortDateNew = False Me.txtAnlage1._ShortDateOnly = False Me.txtAnlage1._TimeOnly = False - Me.txtAnlage1._value = "Zollbeleg" + Me.txtAnlage1._TimeOnly_Seconds = False + Me.txtAnlage1._value = "Original Präferenz" Me.txtAnlage1._Waehrung = False Me.txtAnlage1._WaehrungZeichen = True Me.txtAnlage1.ForeColor = System.Drawing.Color.Black @@ -445,17 +464,19 @@ Partial Class usrcntlVerzollungsunterlagen Me.txtAnlage1.Name = "txtAnlage1" Me.txtAnlage1.Size = New System.Drawing.Size(310, 20) Me.txtAnlage1.TabIndex = 23 - Me.txtAnlage1.Text = "Zollbeleg" + Me.txtAnlage1.Text = "Original Präferenz" ' 'txtAnlage2 ' Me.txtAnlage2._DateTimeOnly = False Me.txtAnlage2._numbersOnly = False Me.txtAnlage2._numbersOnlyKommastellen = "" + Me.txtAnlage2._numbersOnlyTrennzeichen = True Me.txtAnlage2._Prozent = False Me.txtAnlage2._ShortDateNew = False Me.txtAnlage2._ShortDateOnly = False Me.txtAnlage2._TimeOnly = False + Me.txtAnlage2._TimeOnly_Seconds = False Me.txtAnlage2._value = "Lieferanten-Rechnung" Me.txtAnlage2._Waehrung = False Me.txtAnlage2._WaehrungZeichen = True @@ -474,11 +495,13 @@ Partial Class usrcntlVerzollungsunterlagen Me.txtAnlage3._DateTimeOnly = False Me.txtAnlage3._numbersOnly = False Me.txtAnlage3._numbersOnlyKommastellen = "" + Me.txtAnlage3._numbersOnlyTrennzeichen = True Me.txtAnlage3._Prozent = False Me.txtAnlage3._ShortDateNew = False Me.txtAnlage3._ShortDateOnly = False Me.txtAnlage3._TimeOnly = False - Me.txtAnlage3._value = "Original Präferenz" + Me.txtAnlage3._TimeOnly_Seconds = False + Me.txtAnlage3._value = "Zollbeleg" Me.txtAnlage3._Waehrung = False Me.txtAnlage3._WaehrungZeichen = True Me.txtAnlage3.ForeColor = System.Drawing.Color.Black @@ -489,17 +512,19 @@ Partial Class usrcntlVerzollungsunterlagen Me.txtAnlage3.Name = "txtAnlage3" Me.txtAnlage3.Size = New System.Drawing.Size(310, 20) Me.txtAnlage3.TabIndex = 29 - Me.txtAnlage3.Text = "Original Präferenz" + Me.txtAnlage3.Text = "Zollbeleg" ' 'txtAnlage4 ' Me.txtAnlage4._DateTimeOnly = False Me.txtAnlage4._numbersOnly = False Me.txtAnlage4._numbersOnlyKommastellen = "" + Me.txtAnlage4._numbersOnlyTrennzeichen = True Me.txtAnlage4._Prozent = False Me.txtAnlage4._ShortDateNew = False Me.txtAnlage4._ShortDateOnly = False Me.txtAnlage4._TimeOnly = False + Me.txtAnlage4._TimeOnly_Seconds = False Me.txtAnlage4._value = Nothing Me.txtAnlage4._Waehrung = False Me.txtAnlage4._WaehrungZeichen = True @@ -517,10 +542,12 @@ Partial Class usrcntlVerzollungsunterlagen Me.txtAnlage5._DateTimeOnly = False Me.txtAnlage5._numbersOnly = False Me.txtAnlage5._numbersOnlyKommastellen = "" + Me.txtAnlage5._numbersOnlyTrennzeichen = True Me.txtAnlage5._Prozent = False Me.txtAnlage5._ShortDateNew = False Me.txtAnlage5._ShortDateOnly = False Me.txtAnlage5._TimeOnly = False + Me.txtAnlage5._TimeOnly_Seconds = False Me.txtAnlage5._value = Nothing Me.txtAnlage5._Waehrung = False Me.txtAnlage5._WaehrungZeichen = True @@ -538,10 +565,12 @@ Partial Class usrcntlVerzollungsunterlagen Me.txtAnlage6._DateTimeOnly = False Me.txtAnlage6._numbersOnly = False Me.txtAnlage6._numbersOnlyKommastellen = "" + Me.txtAnlage6._numbersOnlyTrennzeichen = True Me.txtAnlage6._Prozent = False Me.txtAnlage6._ShortDateNew = False Me.txtAnlage6._ShortDateOnly = False Me.txtAnlage6._TimeOnly = False + Me.txtAnlage6._TimeOnly_Seconds = False Me.txtAnlage6._value = Nothing Me.txtAnlage6._Waehrung = False Me.txtAnlage6._WaehrungZeichen = True @@ -559,10 +588,12 @@ Partial Class usrcntlVerzollungsunterlagen Me.txtLKW._DateTimeOnly = False Me.txtLKW._numbersOnly = False Me.txtLKW._numbersOnlyKommastellen = "" + Me.txtLKW._numbersOnlyTrennzeichen = True Me.txtLKW._Prozent = False Me.txtLKW._ShortDateNew = False Me.txtLKW._ShortDateOnly = False Me.txtLKW._TimeOnly = False + Me.txtLKW._TimeOnly_Seconds = False Me.txtLKW._value = Nothing Me.txtLKW._Waehrung = False Me.txtLKW._WaehrungZeichen = True @@ -649,6 +680,7 @@ Partial Class usrcntlVerzollungsunterlagen Me.KdInAuftrag._displayWoelflKd = False Me.KdInAuftrag._hideIfListEmpty = True Me.KdInAuftrag._loadKdData = True + Me.KdInAuftrag._searchName1 = True Me.KdInAuftrag._UseFIRMA = "" Me.KdInAuftrag._ValueKdAndName = False Me.KdInAuftrag.dgvpos = "LEFT" @@ -682,10 +714,12 @@ Partial Class usrcntlVerzollungsunterlagen Me.txtAbfertigungsNr._DateTimeOnly = False Me.txtAbfertigungsNr._numbersOnly = True Me.txtAbfertigungsNr._numbersOnlyKommastellen = "" + Me.txtAbfertigungsNr._numbersOnlyTrennzeichen = True Me.txtAbfertigungsNr._Prozent = False Me.txtAbfertigungsNr._ShortDateNew = False Me.txtAbfertigungsNr._ShortDateOnly = False Me.txtAbfertigungsNr._TimeOnly = False + Me.txtAbfertigungsNr._TimeOnly_Seconds = False Me.txtAbfertigungsNr._value = "" Me.txtAbfertigungsNr._Waehrung = False Me.txtAbfertigungsNr._WaehrungZeichen = True @@ -728,6 +762,7 @@ Partial Class usrcntlVerzollungsunterlagen Me.kdRgEmpfaenger._displayWoelflKd = False Me.kdRgEmpfaenger._hideIfListEmpty = True Me.kdRgEmpfaenger._loadKdData = True + Me.kdRgEmpfaenger._searchName1 = True Me.kdRgEmpfaenger._UseFIRMA = "" Me.kdRgEmpfaenger._ValueKdAndName = False Me.kdRgEmpfaenger.dgvpos = "LEFT" @@ -758,10 +793,12 @@ Partial Class usrcntlVerzollungsunterlagen Me.txtAvisiererAuftragsNr._DateTimeOnly = False Me.txtAvisiererAuftragsNr._numbersOnly = False Me.txtAvisiererAuftragsNr._numbersOnlyKommastellen = "" + Me.txtAvisiererAuftragsNr._numbersOnlyTrennzeichen = True Me.txtAvisiererAuftragsNr._Prozent = False Me.txtAvisiererAuftragsNr._ShortDateNew = False Me.txtAvisiererAuftragsNr._ShortDateOnly = False Me.txtAvisiererAuftragsNr._TimeOnly = False + Me.txtAvisiererAuftragsNr._TimeOnly_Seconds = False Me.txtAvisiererAuftragsNr._value = Nothing Me.txtAvisiererAuftragsNr._Waehrung = False Me.txtAvisiererAuftragsNr._WaehrungZeichen = True @@ -798,10 +835,12 @@ Partial Class usrcntlVerzollungsunterlagen Me.txtRefNr._DateTimeOnly = False Me.txtRefNr._numbersOnly = False Me.txtRefNr._numbersOnlyKommastellen = "" + Me.txtRefNr._numbersOnlyTrennzeichen = True Me.txtRefNr._Prozent = False Me.txtRefNr._ShortDateNew = False Me.txtRefNr._ShortDateOnly = False Me.txtRefNr._TimeOnly = False + Me.txtRefNr._TimeOnly_Seconds = False Me.txtRefNr._value = Nothing Me.txtRefNr._Waehrung = False Me.txtRefNr._WaehrungZeichen = True diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.vb index ff79c032..4b8e5dd5 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.vb @@ -128,7 +128,7 @@ Case "IMEX" : cboFiliale._allowedValuesFreiText = {"5501"} : txtFax.Text = "+43 7711 31630-1" Case "UNISPED" : cboFiliale._allowedValuesFreiText = {"5601"} : cboFirma.changeItem("UNISPED") : cboFirma.Enabled = False : txtFax.Text = "+43/7711/2677-27" Case "ATILLA" : cboFiliale._allowedValuesFreiText = {"4801"} : cboFirma.changeItem("ATILLA") : cboFirma.Enabled = False ': txtFax.Text = "+43 77 11 / 31073" - Case "AMBAR" : cboFiliale._allowedValuesFreiText = {"5701"} : cboFirma.changeItem("AMBAR") : cboFirma.Enabled = False : txtFax.Text = "+49 8651 9962493" + Case "AMBAR" : cboFiliale._allowedValuesFreiText = {"5701"} : cboFirma.changeItem("AMBAR") : cboFirma.Enabled = False : txtFax.Text = "+49 8651 9962493" : txtAnlage3.Text = "" End Select txtBearbeiter.Text = If(VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME, "") diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index cc56afb1..1ebd72c5 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -757,7 +757,7 @@ Public Class usrcntlKundeBearbeitenFull Private Sub loadControls() cboAbf_Waehrung.fillWithSQL("SELECT [Währungscode],[Land] FROM Währungstabelle ORDER BY Währungscode", , "FMZOLL", False) - cboAbf_Steuerschluessel.fillWithSQL("SELECT [Steuerschlüssel], isnull(cast(cast( [Steuersatz %]*100 as decimal(2))as varchar(5)) + '% - ' +Steuerbezeichnung,'') as Bezeichnung FROM [Steuertabelle] ORDER BY Steuerschlüssel", False, "FMZOLL", True) + cboAbf_Steuerschluessel.fillWithSQL("SELECT [Steuerschlüssel], isnull(cast(cast( [Steuersatz %]*100 as decimal(2))as varchar(5)) + '% - ' +AuswahlSteuerbezeichnung,'') as Bezeichnung FROM [Steuertabelle] ORDER BY Steuerschlüssel", False, "FMZOLL", True) cboUSt_UstIdNrLand.fillWithSQL(" SELECT [Länderverzeichnis für die Außenhandelsstatistik].LandKz,[Länderverzeichnis für die Außenhandelsstatistik].LandBez " & diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb index 5b33748c..4661aa3f 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb @@ -47,7 +47,7 @@ Public Class cMessenger End Function Public Shared Function GET_NewMSG_COUNT_CHATID(maId, chat_Id) As Integer If maId < 0 Then maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID - Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & " AND chatMgSt_gelesen=0 AND chatMg_chatId='" & chat_Id & "'", "ADMIN",,, 0) + Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & " AND chatMgSt_gelesen=0 AND chatMg_chatId='" & chat_Id & "'", "ADMIN",,, 0) End Function Public Shared Function SET_LKWCHAT_INAKTIV(AvisoId) As Integer @@ -56,7 +56,7 @@ Public Class cMessenger Public Shared Function GET_NewMSG_COUNT_ART(maId, chat_art) As Integer If maId < 0 Then maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID - Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_Chat on chat_id=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & " AND chatMgSt_gelesen=0 AND chat_art='" & chat_art & "'", "ADMIN",,, 0) + Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_Chat on chat_id=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & " AND chatMgSt_gelesen=0 AND chat_art='" & chat_art & "'", "ADMIN",,, 0) End Function Public Shared Function GET_NewMSG_COUNT_ART_INAKTIV(maId, chat_art) As Integer If maId < 0 Then maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID @@ -98,8 +98,6 @@ Public Class cMessenger End If End Function - - Public Shared Function GET_CHAT_LIST() As List(Of cMessenger_Chat) Dim LIST As New List(Of cMessenger_Chat) Dim dt = SQL.loadDgvBySql("SELECT [chat_id] FROM [tblMessenger_Chat] WHERE (SELECT COUNT(*) FROM tblMessenger_ChatMembers WHERE chatMB_chatId=chat_id AND chatMB_maId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & ")>0", "ADMIN") @@ -894,10 +892,10 @@ Public Class cMessenger Try If CHAT_MEMBERS IsNot Nothing Then For Each MB In CHAT_MEMBERS - Dim gelesen = False + Dim gelesen As Boolean = False Dim gelesenDatetime = Nothing - Dim gelesenvon = -1 - If MB.chatMb_maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID Then + Dim gelesenvon As Integer = -1 + If MB.chatMb_maId > 0 AndAlso MB.chatMb_maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID Then gelesen = True gelesenDatetime = Now() gelesenvon = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb index 80a8cd02..c7b40745 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb @@ -112,26 +112,11 @@ Public Class frmMessenger RELOAD_CHAT() - Else intiDGVChats() - - End If - - - - 'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGIMEX", "SDL") Then - ' Button8.Visible = True - 'End If - 'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGIMEX", "SDL") Then - ' Button8.Visible = True - 'End If - - - If My.Application.Info.AssemblyName = "SDL" Then lbl.Text = "CHAT" End If @@ -259,15 +244,15 @@ Public Class frmMessenger where = " AND chat_art IN ('" & toggle_CHAT_ART & "') " End Select - - - .DataSource = SQL.loadDgvBySql("SELECT TOP 200 * FROM( + Dim sqlQery As String = "SELECT TOP 200 * FROM( SELECT [chat_id],CASE WHEN chat_name<>'' THEN chat_name ELSE (SELECT TOP 1 mit_vname + ' ' + mit_nname FROM tblMessenger_ChatMembers INNER JOIN tblMitarbeiter ON mit_id=chatMb_maId where chatMb_chatId=chat_id AND chatMb_maId <>" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & ") END as chat_name ,(SELECT REPLACE(COUNT(*),'0','') FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE [chat_id]=chatMg_chatId AND chatMgSt_MaId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND chatMgSt_gelesen=0) as ungelesen ,chat_lastMsg FROM [tblMessenger_Chat] WHERE (SELECT COUNT(*) FROM tblMessenger_ChatMembers WHERE chatMB_chatId=chat_id AND chatMB_maId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & ")>0 AND chat_aktiv='" & (Not cbxInaktiveChats.Checked) & "' " & where & " - ) as T " & whereName & " ORDER BY chat_lastMsg DESC", "ADMIN") + ) as T " & whereName & " ORDER BY chat_lastMsg DESC" + + .DataSource = SQL.loadDgvBySql(sqlQery, "ADMIN") If .Columns.Count = 0 Then Exit Sub @@ -356,13 +341,15 @@ Public Class frmMessenger whereName = " WHERE chat_name LIKE '%" & MyTextBox1.Text.Trim & "%' " End If - .DataSource = SQL.loadDgvBySql("SELECT * FROM( + Dim sqlquery As String = "SELECT * FROM( SELECT [chat_id],CASE WHEN chat_name<>'' THEN chat_name ELSE (SELECT TOP 1 mit_vname + ' ' + mit_nname FROM tblMessenger_ChatMembers INNER JOIN tblMitarbeiter ON mit_id=chatMb_maId where chatMb_chatId=chat_id AND chatMb_maId <>" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & ") END as chat_name ,(SELECT REPLACE(COUNT(*),'0','') FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE [chat_id]=chatMg_chatId AND chatMgSt_MaId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND chatMgSt_gelesen=0) as ungelesen ,chat_lastMsg FROM [tblMessenger_Chat] WHERE (SELECT COUNT(*) FROM tblMessenger_ChatMembers WHERE chatMB_chatId=chat_id AND chatMB_maId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & ")>0 AND chat_aktiv='" & (Not cbxInaktiveChats.Checked) & "' AND chat_art NOT IN ('CHAT') - ) as T " & whereName & " ORDER BY chat_lastMsg DESC", "ADMIN") + ) as T " & whereName & " ORDER BY chat_lastMsg DESC" + + .DataSource = SQL.loadDgvBySql(sqlquery, "ADMIN") If .Columns.Count = 0 Then Exit Sub diff --git a/VERAG_PROG_ALLGEMEIN/cAllgemein.vb b/VERAG_PROG_ALLGEMEIN/cAllgemein.vb index ef8451c2..6d0ab43d 100644 --- a/VERAG_PROG_ALLGEMEIN/cAllgemein.vb +++ b/VERAG_PROG_ALLGEMEIN/cAllgemein.vb @@ -199,7 +199,7 @@ Public Class cAllgemein isEU = sql.getValueTxtBySql("select MitgliedslandEU from Währungstabelle where landkz = '" & landKz & "'", "FMZOLL",) If isEU Then - If UIDLandKz <> "" AndAlso UstIdNr <> "" AndAlso UstIdGeprüft IsNot Nothing AndAlso CDate(UstIdGeprüft) < Today.AddDays(-30) Then + If UIDLandKz <> "" AndAlso UstIdNr <> "" AndAlso UstIdGeprüft IsNot Nothing AndAlso CDate(UstIdGeprüft) > Today.AddDays(-30) Then Return 10 Else Return 2 @@ -215,7 +215,7 @@ Public Class cAllgemein isEU = sql.getValueTxtBySql("select MitgliedslandEU from Währungstabelle where landkz = '" & landKz & "'", "FMZOLL",) If isEU Then - If UIDLandKz <> "" AndAlso UstIdNr <> "" AndAlso UstIdGeprüft IsNot Nothing AndAlso CDate(UstIdGeprüft) < Today.AddDays(-30) Then + If UIDLandKz <> "" AndAlso UstIdNr <> "" AndAlso UstIdGeprüft IsNot Nothing AndAlso CDate(UstIdGeprüft) > Today.AddDays(-30) Then Return 10 Else Return 19 @@ -231,7 +231,7 @@ Public Class cAllgemein isEU = sql.getValueTxtBySql("select MitgliedslandEU from Währungstabelle where landkz = '" & landKz & "'", "FMZOLL",) If isEU Then - If UIDLandKz <> "" AndAlso UstIdNr <> "" AndAlso UstIdGeprüft IsNot Nothing AndAlso CDate(UstIdGeprüft) < Today.AddDays(-30) Then + If UIDLandKz <> "" AndAlso UstIdNr <> "" AndAlso UstIdGeprüft IsNot Nothing AndAlso CDate(UstIdGeprüft) > Today.AddDays(-30) Then Return 10 Else Return 20