diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/rptPreislisten.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/rptPreislisten.Designer.vb index 6044f8c6..a8092587 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/rptPreislisten.Designer.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/rptPreislisten.Designer.vb @@ -588,8 +588,8 @@ Partial Public Class rptPreislisten Me.txtHinweis.Style = "color: Black; font-size: 10pt; font-weight: normal; text-align: left; ddo-char-se" & "t: 1" Me.txtHinweis.SummaryGroup = "" - Me.txtHinweis.Text = "*ausgenommen bei Vorkassenberechnungen." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Wir behalten uns Preisanpassungen vor." & - " " + Me.txtHinweis.Text = "*ausgenommen bei Vorkassenberechnungen " & Global.Microsoft.VisualBasic.ChrW(10) & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Wir behalten uns Preisanpassungen vor. " & + "" Me.txtHinweis.Top = 1.314567! Me.txtHinweis.Width = 6.68189! ' diff --git a/SDL/SMS/frmSendSMS.vb b/SDL/SMS/frmSendSMS.vb index 73aadd78..58bf50b4 100644 --- a/SDL/SMS/frmSendSMS.vb +++ b/SDL/SMS/frmSendSMS.vb @@ -374,55 +374,55 @@ Public Class frmSendSMS End Sub Private Sub Button16_Click(sender As Object, e As EventArgs) Handles Button16.Click - fillTXT("Va rog sa va prezentati la sediul firmei VERAG!", "TRUCK: ", template_RO, "") + fillTXT("Va rog sa va prezentati la sediul firmei VERAG!", "RO", "TRUCK: ", template_RO, "") End Sub Private Sub Button15_Click(sender As Object, e As EventArgs) Handles Button15.Click - fillTXT("Va rog sa va prezentati la sediul firmei VERAG cu Buletin/ Pasaport!", "TRUCK: ", template_RO, " cu Buletin/ Pasaport") + fillTXT("Va rog sa va prezentati la sediul firmei VERAG cu Buletin/ Pasaport!", "RO", "TRUCK: ", template_RO, " cu Buletin/ Pasaport") End Sub Private Sub Button14_Click(sender As Object, e As EventArgs) Handles Button14.Click - fillTXT("Va rog sa va prezentati la sediul firmei VERAG cu Stampila firmei!", "TRUCK: ", template_RO, " cu Stampila firmei") + fillTXT("Va rog sa va prezentati la sediul firmei VERAG cu Stampila firmei!", "RO", "TRUCK: ", template_RO, " cu Stampila firmei") End Sub Private Sub Button13_Click(sender As Object, e As EventArgs) Handles Button13.Click - fillTXT("Va rog sa va prezentati la sediul firmei VERAG cu suma in Cash: € ", "TRUCK: ", template_RO, " cu suma in Cash: € ") + fillTXT("Va rog sa va prezentati la sediul firmei VERAG cu suma in Cash: € ", "RO", "TRUCK: ", template_RO, " cu suma in Cash: € ") End Sub Private Sub Button20_Click(sender As Object, e As EventArgs) Handles Button20.Click - fillTXT("Моля, елате във VERAG!", "TRUCK: ", template_BG) + fillTXT("Моля, елате във VERAG!", "BG", "TRUCK: ", template_BG) End Sub Private Sub Button19_Click(sender As Object, e As EventArgs) Handles Button19.Click - fillTXT("Моля, елате във VERAG и вземете паспорта си!", "TRUCK: ", template_BG, " и вземете паспорта си") + fillTXT("Моля, елате във VERAG и вземете паспорта си!", "BG", "TRUCK: ", template_BG, " и вземете паспорта си") End Sub Private Sub Button18_Click(sender As Object, e As EventArgs) Handles Button18.Click - fillTXT("Моля, елате във VERAG и вземете печата си!", "TRUCK: ", template_BG, " и вземете печата си") + fillTXT("Моля, елате във VERAG и вземете печата си!", "BG", "TRUCK: ", template_BG, " и вземете печата си") End Sub Private Sub Button17_Click(sender As Object, e As EventArgs) Handles Button17.Click - fillTXT("Моля, елате във VERAG и вземете пари в борй в размер на: € ", "TRUCK: ", template_BG, " и вземете пари в борй в размер на: € ") + fillTXT("Моля, елате във VERAG и вземете пари в борй в размер на: € ", "BG", "TRUCK: ", template_BG, " и вземете пари в борй в размер на: € ") End Sub Private Sub Button25_Click(sender As Object, e As EventArgs) Handles Button25.Click - fillTXT("Bitte Kuvert beim Zoll holen und zu VERAG kommen!", "LKW: ", template_DE, "Bitte Kuvert beim Zoll holen!") + fillTXT("Bitte Kuvert beim Zoll holen und zu VERAG kommen!", "DE", "LKW: ", template_DE, "Bitte Kuvert beim Zoll holen!") End Sub Private Sub Button24_Click(sender As Object, e As EventArgs) Handles Button24.Click - fillTXT("Gümrükten zarfini al VERAG'a gel lütfen", "TIR: ", template_TR, "Gümrükten zarfini al gel lütfen") + fillTXT("Gümrükten zarfini al VERAG'a gel lütfen", "TR", "TIR: ", template_TR, "Gümrükten zarfini al gel lütfen") End Sub Private Sub Button23_Click(sender As Object, e As EventArgs) Handles Button23.Click - fillTXT("Idi na carinu, uzmi kovertu, i dodji u verag", "TRUCK: ", template_YU, "Idi na carinu, uzmi kovertu") + fillTXT("Idi na carinu, uzmi kovertu, i dodji u verag", "YU", "TRUCK: ", template_YU, "Idi na carinu, uzmi kovertu") End Sub Private Sub Button22_Click(sender As Object, e As EventArgs) Handles Button22.Click - fillTXT("Vă rugăm să ridicați plicul de la vamă și să veniți la VERAG", "TRUCK: ", template_RO, "Vă rugăm să ridicați plicul de la vamă și să veniți la ") + fillTXT("Vă rugăm să ridicați plicul de la vamă și să veniți la VERAG", "RO", "TRUCK: ", template_RO, "Vă rugăm să ridicați plicul de la vamă și să veniți la ") End Sub Private Sub Button21_Click(sender As Object, e As EventArgs) Handles Button21.Click - fillTXT("Molya, vzemete plika ot mitnitsata i elate vŭv VERAG", "TRUCK: ", template_BG, "Molya, vzemete plika ot mitnitsata i elate vŭv") + fillTXT("Molya, vzemete plika ot mitnitsata i elate vŭv VERAG", "BG", "TRUCK: ", template_BG, "Molya, vzemete plika ot mitnitsata i elate vŭv") End Sub Private Sub btnSndWhatsApp_Click(sender As Object, e As EventArgs) Handles btnSndWhatsApp.Click @@ -458,72 +458,72 @@ Public Class frmSendSMS End Sub Private Sub Button31_Click(sender As Object, e As EventArgs) Handles Button31.Click - If MyRichTextBox1.Text <> "" Then fillTXT("Bitte zu VERAG kommen " & MyRichTextBox1.Text, "", template_DE, MyRichTextBox1.Text) + If MyRichTextBox1.Text <> "" Then fillTXT("Bitte zu VERAG kommen " & MyRichTextBox1.Text, "DE", "", template_DE, MyRichTextBox1.Text) End Sub Private Sub Button30_Click(sender As Object, e As EventArgs) Handles Button30.Click - If MyRichTextBox1.Text <> "" Then fillTXT("VERAG ofise geliniz " & MyRichTextBox1.Text, "", template_TR, MyRichTextBox1.Text) + If MyRichTextBox1.Text <> "" Then fillTXT("VERAG ofise geliniz " & MyRichTextBox1.Text, "TR", "", template_TR, MyRichTextBox1.Text) End Sub Private Sub Button29_Click(sender As Object, e As EventArgs) Handles Button29.Click - If MyRichTextBox1.Text <> "" Then fillTXT("BMolim Vas dođite u VERAG " & MyRichTextBox1.Text, "", template_YU, MyRichTextBox1.Text) + If MyRichTextBox1.Text <> "" Then fillTXT("BMolim Vas dođite u VERAG " & MyRichTextBox1.Text, "YU", "", template_YU, MyRichTextBox1.Text) End Sub Private Sub Button28_Click(sender As Object, e As EventArgs) Handles Button28.Click - If MyRichTextBox1.Text <> "" Then fillTXT("Va rog sa va prezentati la sediul firmei VERAG " & MyRichTextBox1.Text, "", template_RO, MyRichTextBox1.Text) + If MyRichTextBox1.Text <> "" Then fillTXT("Va rog sa va prezentati la sediul firmei VERAG " & MyRichTextBox1.Text, "RO", "", template_RO, MyRichTextBox1.Text) End Sub Private Sub Button27_Click(sender As Object, e As EventArgs) Handles Button27.Click - If MyRichTextBox1.Text <> "" Then fillTXT("Моля, елате във VERAG " & MyRichTextBox1.Text, "", template_BG, MyRichTextBox1.Text) + If MyRichTextBox1.Text <> "" Then fillTXT("Моля, елате във VERAG " & MyRichTextBox1.Text, "BG", "", template_BG, MyRichTextBox1.Text) End Sub Private Sub Button35_Click(sender As Object, e As EventArgs) Handles Button35.Click - fillTXT("Lütfen Mühür/Mühürleri söküp VERAG ofise getiriniz!", "TIR: ", template_TR, "Lütfen Mühür/Mühürleri söküp VERAG ofise getiriniz!") + fillTXT("Lütfen Mühür/Mühürleri söküp VERAG ofise getiriniz!", "TR", "TIR: ", template_TR, "Lütfen Mühür/Mühürleri söküp VERAG ofise getiriniz!") End Sub Private Sub Button36_Click(sender As Object, e As EventArgs) Handles Button36.Click - fillTXT("Bitte entfernen Sie das Siegel bzw. die Siegel und bringen Sie sie zum VERAG-Büro!", "LKW: ", template_DE, "Bitte entfernen Sie das Siegel bzw. die Siegel und bringen Sie sie zum VERAG-Büro!") + fillTXT("Bitte entfernen Sie das Siegel bzw. die Siegel und bringen Sie sie zum VERAG-Büro!", "DE", "LKW: ", template_DE, "Bitte entfernen Sie das Siegel bzw. die Siegel und bringen Sie sie zum VERAG-Büro!") End Sub Private Sub Button34_Click(sender As Object, e As EventArgs) Handles Button34.Click - fillTXT("Molimo uklonite pečat i odnesite ga u VERAG!", "TIR: ", template_YU, "Molimo uklonite pečat i odnesite ga u VERAG!") + fillTXT("Molimo uklonite pečat i odnesite ga u VERAG!", "YU", "TIR: ", template_YU, "Molimo uklonite pečat i odnesite ga u VERAG!") End Sub Private Sub Button33_Click(sender As Object, e As EventArgs) Handles Button33.Click - fillTXT("Vă rugăm să îndepărtați sigiliul și să îl duceți la VERAG!", "TIR: ", template_RO, "Vă rugăm să îndepărtați sigiliul și să îl duceți la VERAG!") + fillTXT("Vă rugăm să îndepărtați sigiliul și să îl duceți la VERAG!", "RO", "TIR: ", template_RO, "Vă rugăm să îndepărtați sigiliul și să îl duceți la VERAG!") End Sub Private Sub Button32_Click(sender As Object, e As EventArgs) Handles Button32.Click - fillTXT("Моля, махнете печата и го занесете в VERAG!", "TIR: ", template_BG, "Моля, махнете печата и го занесете в VERAG!") + fillTXT("Моля, махнете печата и го занесете в VERAG!", "BG", "TIR: ", template_BG, "Моля, махнете печата и го занесете в VERAG!") End Sub Private Sub Button37_Click(sender As Object, e As EventArgs) Handles Button37.Click - fillTXT("Ве молиме дојдете во VERAG!", "LKW: ", template_MK) + fillTXT("Ве молиме дојдете во VERAG!", "MK", "LKW: ", template_MK) End Sub Private Sub Button38_Click(sender As Object, e As EventArgs) Handles Button38.Click - fillTXT("Ве молиме дојдете во VERAG и понесете го вашиот пасош!", "LKW: ", template_MK) + fillTXT("Ве молиме дојдете во VERAG и понесете го вашиот пасош!", "MK", "LKW: ", template_MK) End Sub Private Sub Button39_Click(sender As Object, e As EventArgs) Handles Button39.Click - fillTXT("Ве молиме дојдете во VERAG и подигнете го печатот!", "LKW: ", template_MK, " и земи го печатот со себе!") + fillTXT("Ве молиме дојдете во VERAG и подигнете го печатот!", "MK", "LKW: ", template_MK, " и земи го печатот со себе!") End Sub Private Sub Button40_Click(sender As Object, e As EventArgs) Handles Button40.Click - fillTXT("ВВе молиме дојдете во VERAG и понесете готовина со себе: € ", "LKW: ", template_MK, " и понесете готовина со себе: € ") + fillTXT("ВВе молиме дојдете во VERAG и понесете готовина со себе: € ", "MK", "LKW: ", template_MK, " и понесете готовина со себе: € ") End Sub Private Sub Button41_Click(sender As Object, e As EventArgs) Handles Button41.Click - fillTXT("Ве молиме подигнете го пликот од царината и дојдете во VERAG!", "LKW: ", template_MK, "Ве молиме подигнете го пликот од царината!") + fillTXT("Ве молиме подигнете го пликот од царината и дојдете во VERAG!", "MK", "LKW: ", template_MK, "Ве молиме подигнете го пликот од царината!") End Sub Private Sub Button42_Click(sender As Object, e As EventArgs) Handles Button42.Click - fillTXT("Ве молиме отстранете ги пломбите и однесете ги во канцеларијата на VERAG!", "LKW: ", template_MK, "Ве молиме отстранете ги пломбите и однесете ги во канцеларијата на VERAG.") + fillTXT("Ве молиме отстранете ги пломбите и однесете ги во канцеларијата на VERAG!", "MK", "LKW: ", template_MK, "Ве молиме отстранете ги пломбите и однесете ги во канцеларијата на VERAG.") End Sub Private Sub Button43_Click(sender As Object, e As EventArgs) Handles Button43.Click - If MyRichTextBox1.Text <> "" Then fillTXT("Ве молиме дојдете во VERAG " & MyRichTextBox1.Text, "", template_DE, MyRichTextBox1.Text) + If MyRichTextBox1.Text <> "" Then fillTXT("Ве молиме дојдете во VERAG " & MyRichTextBox1.Text, "MK", "", template_MK, MyRichTextBox1.Text) End Sub Private Sub Button44_Click(sender As Object, e As EventArgs) Handles Button44.Click @@ -531,55 +531,55 @@ Public Class frmSendSMS End Sub Private Sub Button47_Click(sender As Object, e As EventArgs) Handles Button47.Click - fillTXT("Please come to VERAG and bring your passport!", "LKW: ", template_EN, " and bring your passport!") + fillTXT("Please come to VERAG and bring your passport!", "EN", "LKW: ", template_EN, " and bring your passport!") End Sub Private Sub Button49_Click(sender As Object, e As EventArgs) Handles Button49.Click - fillTXT("Please come to VERAG and collect the STAMP!", "LKW: ", template_EN, " and collect the STAMP!") + fillTXT("Please come to VERAG and collect the STAMP!", "EN", "LKW: ", template_EN, " and collect the STAMP!") End Sub Private Sub Button51_Click(sender As Object, e As EventArgs) Handles Button51.Click - fillTXT("Please come to VERAG and bring cash with you: € ", "LKW: ", template_EN, " and bring cash with you: € ") + fillTXT("Please come to VERAG and bring cash with you: € ", "EN", "LKW: ", template_EN, " and bring cash with you: € ") End Sub Private Sub Button53_Click(sender As Object, e As EventArgs) Handles Button53.Click - fillTXT("Please collect the envelope from customs and come to VERAG!", "LKW: ", template_EN, "Please collect the envelope from customs!") + fillTXT("Please collect the envelope from customs and come to VERAG!", "EN", "LKW: ", template_EN, "Please collect the envelope from customs!") End Sub Private Sub Button55_Click(sender As Object, e As EventArgs) Handles Button55.Click - fillTXT("Please remove the seal(s) and take them to the VERAG office!", "LKW: ", template_EN, "Please remove the seal(s) and take them to the VERAG office!") + fillTXT("Please remove the seal(s) and take them to the VERAG office!", "EN", "LKW: ", template_EN, "Please remove the seal(s) and take them to the VERAG office!") End Sub Private Sub Button56_Click(sender As Object, e As EventArgs) Handles Button56.Click - If MyRichTextBox1.Text <> "" Then fillTXT("Please come to VERAG " & MyRichTextBox1.Text, "", template_EN, MyRichTextBox1.Text) + If MyRichTextBox1.Text <> "" Then fillTXT("Please come to VERAG " & MyRichTextBox1.Text, "EN", "", template_EN, MyRichTextBox1.Text) End Sub Private Sub Button57_Click(sender As Object, e As EventArgs) Handles Button57.Click - If MyRichTextBox1.Text <> "" Then fillTXT("Si prega di recarsi presso VERAG " & MyRichTextBox1.Text, "", template_EN, MyRichTextBox1.Text) + If MyRichTextBox1.Text <> "" Then fillTXT("Si prega di recarsi presso VERAG " & MyRichTextBox1.Text, "IT", "", template_IT, MyRichTextBox1.Text) End Sub Private Sub Button45_Click(sender As Object, e As EventArgs) Handles Button45.Click - fillTXT("Si prega di recarsi presso VERAG!", "LKW: ", template_IT) + fillTXT("Si prega di recarsi presso VERAG!", "IT", "LKW: ", template_IT) End Sub Private Sub Button46_Click(sender As Object, e As EventArgs) Handles Button46.Click - fillTXT("Ti preghiamo di recarti presso VERAG e di portare con te il passaporto!", "LKW: ", template_IT, " e porta con te il passaporto!") + fillTXT("Ti preghiamo di recarti presso VERAG e di portare con te il passaporto!", "IT", "LKW: ", template_IT, " e porta con te il passaporto!") End Sub Private Sub Button48_Click(sender As Object, e As EventArgs) Handles Button48.Click - fillTXT("Ti preghiamo di recarti presso VERAG e ritirare il TIMBRO!", "LKW: ", template_IT, " e ritira il TIMBRO!") + fillTXT("Ti preghiamo di recarti presso VERAG e ritirare il TIMBRO!", "IT", "LKW: ", template_IT, " e ritira il TIMBRO!") End Sub Private Sub Button50_Click(sender As Object, e As EventArgs) Handles Button50.Click - fillTXT("Ti preghiamo di venire da VERAG e di portare con te dei contanti: € ", "LKW: ", template_IT, " e portate con voi dei contanti: € ") + fillTXT("Ti preghiamo di venire da VERAG e di portare con te dei contanti: € ", "IT", "LKW: ", template_IT, " e portate con voi dei contanti: € ") End Sub Private Sub Button52_Click(sender As Object, e As EventArgs) Handles Button52.Click - fillTXT("Ti preghiamo di ritirare la busta presso la dogana e di recarti presso VERAG!", "LKW: ", template_IT, "Si prega di ritirare la busta presso la dogana!") + fillTXT("Ti preghiamo di ritirare la busta presso la dogana e di recarti presso VERAG!", "IT", "LKW: ", template_IT, "Si prega di ritirare la busta presso la dogana!") End Sub Private Sub Button54_Click(sender As Object, e As EventArgs) Handles Button54.Click - fillTXT("Si prega di rimuovere i sigilli e di consegnarli all'ufficio VERAG!", "LKW: ", template_IT, "Si prega di rimuovere i sigilli e di consegnarli all'ufficio VERAG!") + fillTXT("Si prega di rimuovere i sigilli e di consegnarli all'ufficio VERAG!", "IT", "LKW: ", template_IT, "Si prega di rimuovere i sigilli e di consegnarli all'ufficio VERAG!") End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb index 3fd10af7..2dc61798 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb @@ -337,8 +337,9 @@ Public Class cDATENSERVER Public Function insertDataToDATENSERVER(srcPath, Optional bezeichnung = "", Optional endung = "", Optional allowMsg = True, Optional coll_archiv = False) As Boolean 'Datei musss schon am Datenserver liegen, wird nciht mehr kopiert!!!!! + Try - If endung = "" Then Dim fi As New System.IO.DirectoryInfo(srcPath) : endung = fi.Extension + If endung = "" Then Dim fi As New System.IO.DirectoryInfo(srcPath) : endung = fi.Extension ' If bezeichnung = "" Then bezeichnung = System.IO.Path.GetFileName(srcPath) : endung = "" If bezeichnung = "" Then bezeichnung = da_name replaceInvalidCahr(bezeichnung) @@ -351,6 +352,13 @@ Public Class cDATENSERVER If DATA_LIST.ADD_WOcopy(srcPath, bezeichnung, "", coll_archiv) Then Return True End If + + Catch ex As Exception + + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "Pfad: " & srcPath & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + Return False + End Try + Return False End Function