diff --git a/SDL/Classes/cFiskaltrustClient_chilkat.vb b/SDL/Classes/cFiskaltrustClient_chilkat.vb index a9ff87db..4c8c6ff6 100644 --- a/SDL/Classes/cFiskaltrustClient_chilkat.vb +++ b/SDL/Classes/cFiskaltrustClient_chilkat.vb @@ -545,9 +545,9 @@ Public Class cFiskaltrustClient_chilkat 'To cancel a receipt, resend it with this flag added to the ftReceiptCase and inverse the cbPayItems OR cbChargeItems (This is not the same behavior as described in the general part — in Germany, this flag requires only one of cbPayItems or cbChargeItems to be negative, and both must not be negative at the same time)' 'https://docs.fiskaltrust.cloud/docs/poscreators/middleware-doc/germany/reference-tables/ftreceiptcase - If PayItemCasesIntern.Kasseneinzahlungen_Auszahlungen Then + 'If PayItemCasesIntern.Kasseneinzahlungen_Auszahlungen Then - End If + 'End If diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb index 2a04c7c5..84c195ed 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb @@ -290,6 +290,7 @@ Public Class cDATENSERVER s = s.Replace("Ј", "J") 'cyrillic J s = s.Replace("Е", "E") 'cyrillic E s = s.Replace("?", "") + s = s.Replace("/", "") Dim temp = s s = Regex.Replace(s, "[бБвгГдДёЁжЖзЗиИйЙкКлЛмнпПртфФхХцЦчЧшШщЩъЪыЫьЬэЭюЮяЯ]", "").Replace("""", "") 'REMOVE cyrillic letters diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb index abae6fa0..3b185388 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb @@ -240,7 +240,7 @@ Public Class cSyska_Interface Dim dt_Stamm As DataTable = getStammdaten(FiBuSchnittstelleNr) Dim postfix As String = "" If dt_Stamm IsNot Nothing AndAlso dt_Stamm.Rows.Count > 0 Then - If FiBuSchnittstelleNr = 19 Then postfix = "MDM_" + If FiBuSchnittstelleNr = 19 Then postfix = "_MDM" Dim fileKD As System.IO.StreamWriter Dim DateinameKD = "AVISO_DEBI_" & Now.ToString("ddMMyyyy_HHmm") & postfix & ".txt" fileKD = My.Computer.FileSystem.OpenTextFileWriter(pathKD & DateinameKD, True, System.Text.Encoding.GetEncoding("iso-8859-15")) diff --git a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb index d3c35e40..a0113f44 100644 --- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb +++ b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb @@ -1312,8 +1312,15 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( Continue For End If - ' Keine doppelten Punkte - If localPart.Contains("..") Then + ' Keine führenden/abschließenden Punkte + If localPart.StartsWith("'") Then + invalid.Add(e) + Continue For + End If + + + ' Keine doppelten Punkte + If localPart.Contains("..") Then invalid.Add(e) Continue For End If @@ -1327,6 +1334,11 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( Continue For End If + If domainAscii.EndsWith("'") Then + invalid.Add(e) + Continue For + End If + ' Domainlabels prüfen