diff --git a/SDL/Classes/cEORIPruefung.vb b/SDL/Classes/cEORIPruefung.vb index 1a4b37de..e0e56111 100644 --- a/SDL/Classes/cEORIPruefung.vb +++ b/SDL/Classes/cEORIPruefung.vb @@ -12,6 +12,9 @@ Public Class cEORIPruefung Property eori_sendungsid As Object = Nothing Property eori_firma As Object = Nothing Property eori_sachbearbeiter As Object = Nothing + Property eori_sessionID As Object = Nothing + Property eori_AvisoID As Object = Nothing + Property eori_Nr As Object = Nothing Public hasEntry = False @@ -35,6 +38,9 @@ Public Class cEORIPruefung list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eori_sendungsid", eori_sendungsid)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eori_firma", eori_firma)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eori_sachbearbeiter", eori_sachbearbeiter)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eori_sessionID", eori_sessionID)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eori_AvisoID", eori_AvisoID)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eori_Nr", eori_Nr)) Return list End Function diff --git a/SDL/Classes/cEORIWebService.vb b/SDL/Classes/cEORIWebService.vb index e4d208b4..fc3a40b4 100644 --- a/SDL/Classes/cEORIWebService.vb +++ b/SDL/Classes/cEORIWebService.vb @@ -131,10 +131,10 @@ Public Class cEORIWebService If EORI_ERG.Result(0).Status = 0 Or EORI_ERG.Result(0).Status = 1 Then - Firma = EORI_ERG.Result(0).Name & vbNewLine - Firma &= EORI_ERG.Result(0).Street & vbNewLine + Firma = EORI_ERG.Result(0).Name & " " + Firma &= EORI_ERG.Result(0).Street & " " Firma &= EORI_ERG.Result(0).Country & " " & EORI_ERG.Result(0).PostalCode & " " & EORI_ERG.Result(0).City - Firma = Firma.Trim + Firma = Firma EORI_ERGInt = EORI_ERG.Result(0).Status Select Case EORI_ERG.Result(0).Status @@ -142,7 +142,7 @@ Public Class cEORIWebService Case 1 : msgErgebnis = "EORI-Nr. UNGÜLTIG" End Select - setEORIEntry(KdNr, SendungsId, EORI_ERG) + setEORIEntry(KdNr, SendungsId, AvisoId, EORI_ERG, tmp_SESSION_ID, EORI_ERG.Result(0).Eori) Dim PdfTmp = SDL.FormularManagerNEU.EORI_PRUEFUNG(msgErgebnis, Firma, tmp_SESSION_ID, txtEORI, AvisoId, SendungsId) @@ -196,10 +196,10 @@ Public Class cEORIWebService If EORI_ERG.Result(0).Status = 0 Or EORI_ERG.Result(0).Status = 1 Then - Firma = EORI_ERG.Result(0).Name & vbNewLine - Firma &= EORI_ERG.Result(0).Street & vbNewLine + Firma = EORI_ERG.Result(0).Name & " " & vbNewLine + Firma &= EORI_ERG.Result(0).Street & " " & vbNewLine Firma &= EORI_ERG.Result(0).Country & " " & EORI_ERG.Result(0).PostalCode & " " & EORI_ERG.Result(0).City - Firma = Firma.Trim + 'Firma = Firma.Trim EORI_ERGInt = EORI_ERG.Result(0).Status Select Case EORI_ERG.Result(0).Status @@ -207,7 +207,7 @@ Public Class cEORIWebService Case 1 : msgErgebnis = "EORI-Nr. UNGÜLTIG" End Select - setEORIEntry(kdnr, SendungsId, EORI_ERG) + setEORIEntry(kdnr, SendungsId, AvisoId, EORI_ERG, tmp_SESSION_ID, txtEORI) Dim PdfTmp = SDL.FormularManagerNEU.EORI_PRUEFUNG(msgErgebnis, Firma, tmp_SESSION_ID, txtEORI, AvisoId, SendungsId) @@ -228,7 +228,7 @@ Public Class cEORIWebService End Function - Shared Sub setEORIEntry(kdnr As Integer, SendungsID As Integer, EORI_ERG As EoriResponseModel) + Shared Sub setEORIEntry(kdnr As Integer, SendungsID As Integer, avisoID As Integer, EORI_ERG As EoriResponseModel, tmp_SESSION_ID As String, txtEORI As String) Dim EORIPruefung = New cEORIPruefung() Dim kdErw = New VERAG_PROG_ALLGEMEIN.cKundenErweitert(kdnr) @@ -246,6 +246,8 @@ Public Class cEORIWebService EORIPruefung.eori_sendungsid = SendungsID EORIPruefung.eori_firma = (EORI_ERG.Result(0).Name & EORI_ERG.Result(0).Street & EORI_ERG.Result(0).Country & EORI_ERG.Result(0).PostalCode & EORI_ERG.Result(0).City).Trim EORIPruefung.eori_sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + EORIPruefung.eori_sessionID = tmp_SESSION_ID + EORIPruefung.eori_AvisoID = avisoID EORIPruefung.SAVE() End Sub diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 784bdd62..6d9067bc 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -1093,6 +1093,8 @@ Public Class cFakturierung Case 4 : rpt.picVERAG.Image = My.Resources.Verag_AG_Logo : rpt.Picture1.Image = Nothing Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med : rpt.Picture1.Image = Nothing Case 11 : rpt.picVERAG.Image = My.Resources.Verag_Customs_Service_GMBH_Logo : rpt.Picture1.Image = My.Resources.aeo_CS + Case 17 : rpt.picVERAG.Image = My.Resources.FrontOfficeSUB_Horizontal : rpt.Picture1.Image = Nothing + Case 19 : rpt.picVERAG.Image = My.Resources.VERAG_360 : rpt.Picture1.Image = Nothing Case 20 : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Picture1.Image = My.Resources.aeo_AT_imex Case 21 : rpt.picVERAG.Image = My.Resources.Unisped_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_AT Case 22 : rpt.picVERAG.Image = My.Resources.Unisped_DE_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_DE @@ -1100,7 +1102,7 @@ Public Class cFakturierung Case 23 : rpt.picVERAG.Image = My.Resources.Unisped_ZS_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_ZS_AT Case 24 : rpt.picVERAG.Image = My.Resources.ambar_boarder : rpt.Picture1.Image = Nothing rpt.txtAvisierer.Visible = False : rpt.lblAvisiererUeberschrift.Visible = False : rpt.txtWarenwert.Visible = False : rpt.lblWarenWertUeberschrift.Visible = False - Case 17 : rpt.picVERAG.Image = My.Resources.FrontOfficeSUB_Horizontal : rpt.Picture1.Image = Nothing + End Select Dim ZZTage = 10 diff --git a/SDL/Fakturierung/frmAbrechnungsMaske.vb b/SDL/Fakturierung/frmAbrechnungsMaske.vb index d1166024..0c15e964 100644 --- a/SDL/Fakturierung/frmAbrechnungsMaske.vb +++ b/SDL/Fakturierung/frmAbrechnungsMaske.vb @@ -49,11 +49,11 @@ Public Class frmAbrechnungsMaske FirmaTmp = "VERAGIMEX" End If - If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then - FirmaTmp = "AMBAR" - End If + 'If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then + FirmaTmp = "AMBAR" + 'End If - MyComboBox2.Items.Clear() + MyComboBox2.Items.Clear() Select Case FirmaTmp Case "VERAG" diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index f575734a..697fb142 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -1118,7 +1118,7 @@ Public Class frmFormulare Mail.HTMLBody = "
" & TextHTML & "
" - Mail.Subject = tX.txt_betreff + Mail.Subject = IIf(tX.txt_betreff <> "", tX.txt_betreff, " ") If AVISO IsNot Nothing Then Mail.Subject = Mail.Subject.Replace("%LKW%", AVISO.LKW_Nr) Mail.Subject = Mail.Subject.Replace("%LKWKennzeichen%", AVISO.LKW_Nr) diff --git a/SDL/My Project/Resources.Designer.vb b/SDL/My Project/Resources.Designer.vb index e9608123..11bacc69 100644 --- a/SDL/My Project/Resources.Designer.vb +++ b/SDL/My Project/Resources.Designer.vb @@ -2401,6 +2401,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property VERAG_360() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("VERAG_360", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/SDL/My Project/Resources.resx b/SDL/My Project/Resources.resx index 666a3dee..8a673c00 100644 --- a/SDL/My Project/Resources.resx +++ b/SDL/My Project/Resources.resx @@ -922,4 +922,7 @@ ..\Resources\xml_gray.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\VERAG_360.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/SDL/Resources/VERAG_360.jpg b/SDL/Resources/VERAG_360.jpg new file mode 100644 index 00000000..33e8366a Binary files /dev/null and b/SDL/Resources/VERAG_360.jpg differ diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index fb722116..c16dffc1 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -4763,6 +4763,7 @@ + Always diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 7d946584..28fd4d01 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -295,6 +295,8 @@ Public Class frmMDM_USTVAntrag For Each r As DataRow In dt.Rows + Dim kdNr = r.Item("rmc_kdNr") + Dim USTV_POS As New VERAG_PROG_ALLGEMEIN.cUStVPositionen USTV_POS.UStVAn_ID = USTV_ANTRAG.[UStVAn_ID] USTV_POS.UStVPo_ID = USTV_ANTRAG.getMaxPosNr @@ -322,13 +324,15 @@ Public Class frmMDM_USTVAntrag USTV_POS.UStVPo_USteuerbetrag = r.Item("rmc_betragMWST") End If - USTV_POS.INSERT() + If USTV_POS.INSERT() Then + cRMC.UPDATE_ARCHIV(USTV_POS.UStVPo_ReDat, USTV_POS.UStVPo_ReNr, kdNr) + End If End If Next - cRMC.UPDATE_ARCHIV(USTV_ANTRAG.UStVAn_ReDatVon, USTV_ANTRAG.UStVAn_ReDatBis, USTV_ANTRAG.UStVAn_KuNr) + End If Return True diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index 4e871434..81051c11 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -271,6 +271,7 @@ Public Class frmBU_Mahnlauf Case 26 : rpt.picVERAG.Image = My.Resources.VERAG_UNISPED_Logo : rpt.Picture1.Image = Nothing Case 23 : rpt.picVERAG.Image = My.Resources.Unisped_ZS_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_ZS_AT Case 17 : rpt.picVERAG.Image = My.Resources.FrontOfficeSUB_Horizontal : rpt.Picture1.Image = Nothing + Case 19 : rpt.picVERAG.Image = My.Resources.VERAG_360 : rpt.Picture1.Image = Nothing End Select Dim ZZTage = 10 @@ -349,7 +350,7 @@ Public Class frmBU_Mahnlauf Dim MahnTEXT_NACH = "" Dim MAHNTEXT As String = "Zahlungserinnerung" - getMahnstufetext(Sprache, MAHNSTUFE, MahnTEXT_VOR, MahnTEXT_NACH, MAHNTEXT) + getMahnstufetext(AD.LandKz, MAHNSTUFE, MahnTEXT_VOR, MahnTEXT_NACH, MAHNTEXT) rpt.lblUeberschriftRG_GS.Text = MAHNTEXT @@ -487,17 +488,20 @@ Public Class frmBU_Mahnlauf In the meantime, we ask you to forward them to the responsible persons in your company." Mail_HTMLBody &= "


" & cFakturierung.getSignature(AD.LandKz, FIRMA.Firma_ID) Case "A", "AT", "D", "DE", "CH" + + + Mail_Subject = MAHNTEXT & IIf(KdNr > 0, " - KdNr.: " & KdNr, "") Mail_HTMLBody = "Sehr geehrte Damen und Herren,

im Anhang finden Sie ihre Mahnung, mit der Bitte um Bearbeitung. " Mail_HTMLBody &= "


" Mail_HTMLBody &= "Sollten Sie für diesen Sachverhalt nicht zuständig sein, teilen Sie uns bitte per Mail an buchhaltung@verag.ag eine Mailadresse mit, an welche zukünftig die Mahnungen versandt werden sollen.
Derweil bitten wir um Weiterleitung an die zuständigen Personen in ihrem Haus." - Mail_HTMLBody &= "


Mit freundlichen Grüßen

" & cFakturierung.getSignature(AD.LandKz, FIRMA.Firma_ID) + Case Else Mail_Subject = "PAYMENT REMINDER" & IIf(KdNr > 0, " - Cust.: " & KdNr, "") - Mail_HTMLBody = "Sehr geehrte Damen und Herren,

attached we send you the invoice reminder." + Mail_HTMLBody = "Dear Sear or Madam,

attached we send you the invoice reminder." Mail_HTMLBody &= "


" Mail_HTMLBody &= "If you are not responsible for this matter, please send us an e-mail address to buchhaltung@verag.ag, to which future reminders should be sent.
@@ -519,9 +523,9 @@ Public Class frmBU_Mahnlauf Case 5 'MAIL_SEND Dim list As New List(Of String) list.Add(tmpPath) - Mail_BCC = "buchhaltung@verag.ag;" & Mail_BCC + Mail_BCC = IIf(FIRMA.Firma_E_Mail_Mahnungen <> "", FIRMA.Firma_E_Mail_Mahnungen, "buchhaltung@verag.ag") & Mail_BCC - VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mail_To, Mail_Subject, Mail_HTMLBody, "buchhaltung@verag.ag", False, False, Mail_CC, Mail_BCC, list) + VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mail_To, Mail_Subject, Mail_HTMLBody, IIf(FIRMA.Firma_E_Mail_Mahnungen <> "", FIRMA.Firma_E_Mail_Mahnungen, "buchhaltung@verag.ag"), False, False, Mail_CC, Mail_BCC, list) Case Else @@ -536,9 +540,8 @@ Public Class frmBU_Mahnlauf Mail.BCC = Mail_BCC Mail.Attachments.Add(tmpPath, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , "Mahnung.pdf") - 'Mail.Sender = "bewerbung@verag.ag" Try - Mail.SentOnBehalfOfName = "buchhaltung@verag.ag" + Mail.SentOnBehalfOfName = SDL.cFakturierung.getDefaultMail("AMBAR") ',"buchhaltung@verag.ag" Catch ex2 As Exception MsgBox(ex2.Message) End Try @@ -590,6 +593,12 @@ Public Class frmBU_Mahnlauf Select Case FIRMA.Firma_ID'VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + + Case 19 '"VERAG360" + rpt.txtBank1.Text = If(FIRMA.Firma_Bankverbindung1, "") & vbNewLine & If(FIRMA.Firma_IBAN1, "") & vbNewLine & If(FIRMA.Firma_BIC1, "").ToString.Trim + rpt.txtBank2.Text = If(FIRMA.Firma_Bankverbindung2, "") & vbNewLine & If(FIRMA.Firma_IBAN2, "") & vbNewLine & If(FIRMA.Firma_BIC2, "").ToString.Trim + rpt.picVERAG.Size = New SizeF(2.712, 0.61) + Case 21 '"UNISPED" rpt.txtBank1.Text = If(FIRMA.Firma_Bankverbindung1, "") & vbNewLine & If(FIRMA.Firma_IBAN1, "") & vbNewLine & If(FIRMA.Firma_BIC1, "").ToString.Trim rpt.txtBank2.Text = If(FIRMA.Firma_Bankverbindung2, "") & vbNewLine & If(FIRMA.Firma_IBAN2, "") & vbNewLine & If(FIRMA.Firma_BIC2, "").ToString.Trim @@ -671,39 +680,7 @@ Public Class frmBU_Mahnlauf MahnTEXT_NACH = "Belirtilen sürenin yine olumsuz olarak gelismesi durumunda gerekli hukuki süreci, herhangi bir ön bildirim yapmaksizin baslatmamiz gerektigini bildirmek durumundayiz." MAHNTEXT = MAHNSTUFE & ". UYARI" End Select - Case "EN" - Select Case MAHNSTUFE - Case -2 - MahnTEXT_VOR = "Subsequent invoices have not yet been paid:" - MahnTEXT_NACH = "" - MAHNTEXT = "List - Open accounts" - Case -1 - MahnTEXT_VOR = "The following invoices have not yet been collected:" - MahnTEXT_NACH = "The above amounts will be collected by SEPA direct debit mandate from your specified bank account." - MAHNTEXT = "List - Open accounts" - Case 0 - MahnTEXT_VOR = "We request that the following invoices be settled:" - MahnTEXT_NACH = "" - MAHNTEXT = "REMINDER" - Case 1 - MahnTEXT_VOR = "We request that the following invoices be settled:" - MahnTEXT_NACH = "We assume that this is due to an organisational oversight. " & vbNewLine & "If your payment has already been sent to us, please consider the reminder as irrelevant." - MAHNTEXT = "1. REMINDER" - Case 2 - MahnTEXT_VOR = "Despite our previous reminder, the listed invoices have still not been settled:" - MahnTEXT_NACH = "We assume that this is due to an organisational oversight, but we must now request you in all certainty to transfer the amount due according to the above list to us immediately in order to avoid further costs and inconvenience." - MAHNTEXT = MAHNSTUFE & ". REMINDER" - Case 3 - MahnTEXT_VOR = "Despite two reminders, the items listed below have still not been paid. We hereby request you for the last time to pay the outstanding amount immediately. Please send us a copy of the remittance slip." - MahnTEXT_NACH = "After the unsuccessful expiry of this new deadline, we would then be forced either to instruct a debt collection agency to collect the debt or to take legal action without further prior notice." - MAHNTEXT = MAHNSTUFE & ". REMINDER" - Case >= 4 - MahnTEXT_VOR = "Despite several reminders, the items listed below have still not been paid. We hereby request you for the last time to pay the outstanding amount immediately. Please send us a copy of the transfer receipt." - MahnTEXT_NACH = "After the unsuccessful expiry of this new deadline, we would then be forced either to instruct a debt collection agency to collect the debt or to take legal action without further prior notice." - MAHNTEXT = MAHNSTUFE & ". REMINDER" - End Select - Case Else - + Case "DE", "D" Select Case MAHNSTUFE Case -2 MahnTEXT_VOR = "Nachfolgende Rechnungen wurden noch nicht beglichen:" @@ -734,6 +711,139 @@ Public Class frmBU_Mahnlauf MahnTEXT_NACH = "Nach erfolglosem Ablauf dieser neuerlichen Frist wären wir dann gezwungen, entweder ein Inkassounternehmen mit der Einziehung der Forderung zu beauftragen oder aber ohne weitere vorherige Ankündigung gerichtliche Schritte einzuleiten." MAHNTEXT = MAHNSTUFE & ". MAHNUNG" End Select + + + Case "RO" + Select Case MAHNSTUFE + Case -2 + MahnTEXT_VOR = "Facturile ulterioare nu au fost încă plătite:" + MahnTEXT_NACH = "" + MAHNTEXT = "Listă - Articole deschise" + Case -1 + MahnTEXT_VOR = "Facturile ulterioare nu au fost încă încasate:" + MahnTEXT_NACH = "Sumele menționate mai sus vor fi încasate din contul dumneavoastră bancar specificat prin mandat de debitare directă SEPA." + MAHNTEXT = "Listă - Articole deschise" + Case 0 + MahnTEXT_VOR = "Solicităm ca următoarele facturi să fie decontate:" + MahnTEXT_NACH = "" + MAHNTEXT = "Reamintire de plată" + Case 1 + MahnTEXT_VOR = "Solicităm ca următoarele facturi să fie decontate:" + MahnTEXT_NACH = "Considerand ca neefectuarea platii se bazeaza pe o mica problema organizatorica, va rugam sa efectuati platile restante in cel mai scurt timp. In cazul in care platile au fost efectuate, va rugam sa considerati acest inscris nefondat." + MAHNTEXT = "1. Memento" + Case 2 + MahnTEXT_VOR = "În ciuda atenționărilor noastre anterioare, facturile enumerate nu au fost încă achitate:" + MahnTEXT_NACH = "Presupunem că acest lucru se datorează unei inadvertențe organizaționale. " & vbNewLine & ”Dacă plata a fost deja trimisă către noi, vă rugăm să considerați că acest memento este irelevant." + MAHNTEXT = MAHNSTUFE & ". MENȚIUNE" + Case 3 + MahnTEXT_VOR = "În ciuda a două atenționări, elementele enumerate mai jos nu au fost încă plătite. Prin prezenta, vă solicităm pentru ultima dată să achitați imediat sumele restante. Vă rugăm să ne trimiteți o copie a chitanței de plată." + MahnTEXT_NACH = "În cazul în care acest nou termen expiră fără succes, vom fi nevoiți fie să însărcinăm o agenție de colectare a creanțelor să recupereze datoria, fie să acționăm în justiție fără altă notificare." + MAHNTEXT = MAHNSTUFE & ". MENȚIUNE" + Case >= 4 + MahnTEXT_VOR = "În ciuda mai multor atenționări, elementele enumerate mai jos nu au fost încă plătite. Prin prezenta, vă solicităm pentru ultima dată să achitați imediat sumele restante. Vă rugăm să ne trimiteți o copie a chitanței de remitere." + MahnTEXT_NACH = "În cazul în care acest nou termen expiră fără succes, vom fi nevoiți fie să instruim o agenție de colectare a creanțelor pentru a colecta datoria, fie să acționăm în justiție fără altă notificare.." + MAHNTEXT = MAHNSTUFE & ". MENȚIUNE" + End Select + + Case "BG" + Select Case MAHNSTUFE + Case -2 + MahnTEXT_VOR = "Следните фактури все още не са платени:" + MahnTEXT_NACH = "" + MAHNTEXT = "Списък - Отворени елементи" + Case -1 + MahnTEXT_VOR = "Следните фактури все още не са събрани:" + MahnTEXT_NACH = "Горепосочените суми ще бъдат събрани от посочената от вас банкова сметка чрез SEPA мандат за директен дебит." + MAHNTEXT = "Списък - Отворени елементи" + Case 0 + MahnTEXT_VOR = "Искаме уреждане на следните фактури:" + MahnTEXT_NACH = "" + MAHNTEXT = "Напомняне за плащане" + Case 1 + MahnTEXT_VOR = "Искаме уреждане на следните фактури." + MahnTEXT_NACH = "Предполагаме, че това се дължи на организационен пропуск. " & vbNewLine & “Ако плащането ви вече е изпратено до нас, моля, считайте напомнянето за неуместно." + MAHNTEXT = "Първо напомняне" + Case 2 + MahnTEXT_VOR = "Въпреки предишното ни напомняне, изброените фактури все още не са уредени.:" + MahnTEXT_NACH = "In cazul de fata trebuie sa insistam la efectuarea platilor facturilor sus mentionate, pentru a evita alte costuri si neplaceri. Va rugam sa efectuali platile restante pana le data de" & + MAHNTEXT = MAHNSTUFE & ". напомняне" + Case 3 + MahnTEXT_VOR = "Въпреки двете напомняния изброените по-долу елементи все още не са платени. С настоящото ви молим за последен път да платите незабавно дължимата сума. Моля, изпратете ни копие от платежното нареждане." + MahnTEXT_NACH = "Ако този нов срок изтече без успех, ще бъдем принудени или да възложим на агенция за събиране на вземания да събере дълга, или да предприемем правни действия без допълнително уведомление." + MAHNTEXT = MAHNSTUFE & ". напомняне" + Case >= 4 + MahnTEXT_VOR = "Въпреки няколкото напомняния, изброените по-долу елементи все още не са платени. С настоящото ви молим за последен път да платите незабавно дължимата сума. Моля, изпратете ни копие от платежното нареждане." + MahnTEXT_NACH = "Ако този нов срок изтече без успех, ще бъдем принудени или да възложим на агенция за събиране на вземания да събере дълга, или да предприемем правни действия без допълнително уведомление." + MAHNTEXT = MAHNSTUFE & ". напомняне" + End Select + + Case "HR", "SRB", "BIH", "MKD" + Select Case MAHNSTUFE + Case -2 + MahnTEXT_VOR = "Naknadni računi još nisu plaćeni:" + MahnTEXT_NACH = "" + MAHNTEXT = "Popis - Otvorene stavken" + Case -1 + MahnTEXT_VOR = "Naknadni računi još nisu naplaćeni:" + MahnTEXT_NACH = "Gore navedeni iznosi bit će prikupljeni putem SEPA naloga za izravno terećenje s vašeg navedenog bankovnog računa." + MAHNTEXT = "Popis - Otvorene stavken" + Case 0 + MahnTEXT_VOR = "Molimo da se podmire sljedeći računi:" + MahnTEXT_NACH = "" + MAHNTEXT = "Podsjetnik za plaćanje" + Case 1 + MahnTEXT_VOR = "Molimo da se podmire sljedeći računi:" + MahnTEXT_NACH = "Vjerujemo da je to zbog organizacijskog propusta. " & vbNewLine & "Ako nam je vaša uplata već poslana, molimo vas da podsjetnik smatrate nevažnim." + MAHNTEXT = "1. upozorenje" + Case 2 + MahnTEXT_VOR = "Unatoč našem prethodnom podsjećanju, navedeni računi još uvijek nisu plaćeni:" + MahnTEXT_NACH = "Pretpostavljamo da je to zbog organizacijskog propusta, ali sada vas moramo odlučno zamoliti da nam odmah prenesete iznos koji dugujete prema gornjem popisu kako bismo izbjegli daljnje troškove i neugodnosti." + MAHNTEXT = MAHNSTUFE & ". UPOZORENJE" + Case 3 + MahnTEXT_VOR = "Unatoč dvama opomenama, stavke navedene u nastavku još uvijek nisu plaćene. Ovim vas posljednji put molimo da odmah položite preostali iznos. Pošaljite nam kopiju potvrde o prijenosu." + MahnTEXT_NACH = "Ako ovaj novi rok istekne bez uspjeha, tada bismo bili prisiljeni angažirati tvrtku za naplatu duga da naplati dug ili poduzeti pravne radnje bez daljnje prethodne obavijesti." + MAHNTEXT = MAHNSTUFE & ". UPOZORENJE" + Case >= 4 + MahnTEXT_VOR = "Unatoč opetovanim podsjetnicima, stavke navedene u nastavku još uvijek nisu plaćene. Ovim vas posljednji put molimo da odmah položite preostali iznos. Pošaljite nam kopiju potvrde o prijenosu." + MahnTEXT_NACH = "Ako ovaj novi rok istekne bez uspjeha, tada bismo bili prisiljeni angažirati tvrtku za naplatu duga da naplati dug ili poduzeti pravne radnje bez daljnje prethodne obavijesti." + MAHNTEXT = MAHNSTUFE & ". UPOZORENJE" + End Select + + + Case Else + + Select Case MAHNSTUFE + Case -2 + MahnTEXT_VOR = "Subsequent invoices have not yet been paid:" + MahnTEXT_NACH = "" + MAHNTEXT = "List - Open accounts" + Case -1 + MahnTEXT_VOR = "The following invoices have not yet been collected:" + MahnTEXT_NACH = "The above amounts will be collected by SEPA direct debit mandate from your specified bank account." + MAHNTEXT = "List - Open accounts" + Case 0 + MahnTEXT_VOR = "We request that the following invoices be settled:" + MahnTEXT_NACH = "" + MAHNTEXT = "REMINDER" + Case 1 + MahnTEXT_VOR = "We request that the following invoices be settled:" + MahnTEXT_NACH = "We assume that this is due to an organisational oversight. " & vbNewLine & "If your payment has already been sent to us, please consider the reminder as irrelevant." + MAHNTEXT = "1. REMINDER" + Case 2 + MahnTEXT_VOR = "Despite our previous reminder, the listed invoices have still not been settled:" + MahnTEXT_NACH = "We assume that this is due to an organisational oversight, but we must now request you in all certainty to transfer the amount due according to the above list to us immediately in order to avoid further costs and inconvenience." + MAHNTEXT = MAHNSTUFE & ". REMINDER" + Case 3 + MahnTEXT_VOR = "Despite two reminders, the items listed below have still not been paid. We hereby request you for the last time to pay the outstanding amount immediately. Please send us a copy of the remittance slip." + MahnTEXT_NACH = "After the unsuccessful expiry of this new deadline, we would then be forced either to instruct a debt collection agency to collect the debt or to take legal action without further prior notice." + MAHNTEXT = MAHNSTUFE & ". REMINDER" + Case >= 4 + MahnTEXT_VOR = "Despite several reminders, the items listed below have still not been paid. We hereby request you for the last time to pay the outstanding amount immediately. Please send us a copy of the transfer receipt." + MahnTEXT_NACH = "After the unsuccessful expiry of this new deadline, we would then be forced either to instruct a debt collection agency to collect the debt or to take legal action without further prior notice." + MAHNTEXT = MAHNSTUFE & ". REMINDER" + End Select + + End Select End Sub diff --git a/SDL/buchhaltung/rptMahnung.Designer.vb b/SDL/buchhaltung/rptMahnung.Designer.vb index c04c0d75..82dfe60b 100644 --- a/SDL/buchhaltung/rptMahnung.Designer.vb +++ b/SDL/buchhaltung/rptMahnung.Designer.vb @@ -65,11 +65,11 @@ Partial Public Class rptMahnung Me.lblFirma = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.lblRechnung_Land = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Label3 = New GrapeCity.ActiveReports.SectionReportModel.Label() - Me.Label4 = New GrapeCity.ActiveReports.SectionReportModel.Label() + Me.lblTelefon = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Label5 = New GrapeCity.ActiveReports.SectionReportModel.Label() - Me.Label6 = New GrapeCity.ActiveReports.SectionReportModel.Label() + Me.lblEmail = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Label1 = New GrapeCity.ActiveReports.SectionReportModel.Label() - Me.Label7 = New GrapeCity.ActiveReports.SectionReportModel.Label() + Me.lblFaxNr = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Label25 = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.lblUeberschriftRG_GS = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.ReportFooter1 = New GrapeCity.ActiveReports.SectionReportModel.ReportFooter() @@ -145,11 +145,11 @@ Partial Public Class rptMahnung CType(Me.lblFirma, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblRechnung_Land, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label3, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Label4, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblTelefon, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label5, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Label6, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblEmail, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Label7, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblFaxNr, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label25, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblUeberschriftRG_GS, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblSummeUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit() @@ -400,7 +400,7 @@ Partial Public Class rptMahnung ' 'ReportHeader1 ' - Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Picture1, Me.picVERAG, Me.lblKundenNrUeberschrift, Me.lblKundenNr, Me.Line3, Me.lblFirmaOrt, Me.lblFirmaStrasse, Me.lblFirmaTel, Me.lblFirmaFax, Me.lblFirmaEmail, Me.lblFirmaWeb, Me.lblRgDatumUeberschrift, Me.lblRgDatum, Me.lblSachbearbeiterUeberschrift, Me.lblSachbearbeiter, Me.lblFirmenbuchUeberschrift, Me.lblFirmenbuch, Me.lblUIDUeberschrift, Me.lblUID, Me.lblRechnung_Name1, Me.lblRechnung_Name2, Me.lblRechnung_Strasse, Me.lblRechnung_Ort, Me.Line15, Me.lblFirma, Me.lblRechnung_Land, Me.Label3, Me.Label4, Me.Label5, Me.Label6, Me.Label1, Me.Label7, Me.Label25}) + Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Picture1, Me.picVERAG, Me.lblKundenNrUeberschrift, Me.lblKundenNr, Me.Line3, Me.lblFirmaOrt, Me.lblFirmaStrasse, Me.lblFirmaTel, Me.lblFirmaFax, Me.lblFirmaEmail, Me.lblFirmaWeb, Me.lblRgDatumUeberschrift, Me.lblRgDatum, Me.lblSachbearbeiterUeberschrift, Me.lblSachbearbeiter, Me.lblFirmenbuchUeberschrift, Me.lblFirmenbuch, Me.lblUIDUeberschrift, Me.lblUID, Me.lblRechnung_Name1, Me.lblRechnung_Name2, Me.lblRechnung_Strasse, Me.lblRechnung_Ort, Me.Line15, Me.lblFirma, Me.lblRechnung_Land, Me.Label3, Me.lblTelefon, Me.Label5, Me.lblEmail, Me.Label1, Me.lblFaxNr, Me.Label25}) Me.ReportHeader1.Height = 3.470997! Me.ReportHeader1.Name = "ReportHeader1" ' @@ -729,17 +729,18 @@ Partial Public Class rptMahnung Me.Label3.Top = 2.193! Me.Label3.Width = 0.9884803! ' - 'Label4 + 'lblTelefon ' - Me.Label4.Height = 0.1574802! - Me.Label4.HyperLink = Nothing - Me.Label4.Left = 5.197! - Me.Label4.Name = "Label4" - Me.Label4.Style = "font-size: 8pt; font-weight: normal; text-align: right; vertical-align: middle; d" & - "do-char-set: 1" - Me.Label4.Text = "+43 (0) 7711 / 2777 - 110" - Me.Label4.Top = 2.193! - Me.Label4.Width = 1.895268! + Me.lblTelefon.DataField = "" + Me.lblTelefon.Height = 0.1574802! + Me.lblTelefon.HyperLink = Nothing + Me.lblTelefon.Left = 5.197! + Me.lblTelefon.Name = "lblTelefon" + Me.lblTelefon.Style = "color: Black; font-size: 8pt; font-weight: normal; text-align: right; vertical-al" & + "ign: middle; ddo-char-set: 1" + Me.lblTelefon.Text = "+43 (0) 7711 / 2777 - 110" + Me.lblTelefon.Top = 2.193! + Me.lblTelefon.Width = 1.895268! ' 'Label5 ' @@ -753,17 +754,18 @@ Partial Public Class rptMahnung Me.Label5.Top = 2.35! Me.Label5.Width = 0.9884803! ' - 'Label6 + 'lblEmail ' - Me.Label6.Height = 0.1574802! - Me.Label6.HyperLink = Nothing - Me.Label6.Left = 5.197479! - Me.Label6.Name = "Label6" - Me.Label6.Style = "font-size: 8pt; font-weight: normal; text-align: right; vertical-align: middle; d" & - "do-char-set: 1" - Me.Label6.Text = "buchhaltung@verag.ag" - Me.Label6.Top = 2.35! - Me.Label6.Width = 1.895268! + Me.lblEmail.DataField = "" + Me.lblEmail.Height = 0.1574802! + Me.lblEmail.HyperLink = Nothing + Me.lblEmail.Left = 5.197479! + Me.lblEmail.Name = "lblEmail" + Me.lblEmail.Style = "color: Black; font-size: 8pt; font-weight: normal; text-align: right; vertical-al" & + "ign: middle; ddo-char-set: 1" + Me.lblEmail.Text = "buchhaltung@verag.ag" + Me.lblEmail.Top = 2.35! + Me.lblEmail.Width = 1.895268! ' 'Label1 ' @@ -777,17 +779,18 @@ Partial Public Class rptMahnung Me.Label1.Top = 2.507! Me.Label1.Width = 0.9884806! ' - 'Label7 + 'lblFaxNr ' - Me.Label7.Height = 0.1574802! - Me.Label7.HyperLink = Nothing - Me.Label7.Left = 5.19748! - Me.Label7.Name = "Label7" - Me.Label7.Style = "font-size: 8pt; font-weight: normal; text-align: right; vertical-align: middle; d" & - "do-char-set: 1" - Me.Label7.Text = "+43 (0) 7711 / 31600" - Me.Label7.Top = 2.507! - Me.Label7.Width = 1.895268! + Me.lblFaxNr.DataField = "" + Me.lblFaxNr.Height = 0.1574802! + Me.lblFaxNr.HyperLink = Nothing + Me.lblFaxNr.Left = 5.19748! + Me.lblFaxNr.Name = "lblFaxNr" + Me.lblFaxNr.Style = "color: Black; font-size: 8pt; font-weight: normal; text-align: right; vertical-al" & + "ign: middle; ddo-char-set: 1" + Me.lblFaxNr.Text = "+43 (0) 7711 / 31600" + Me.lblFaxNr.Top = 2.507! + Me.lblFaxNr.Width = 1.895268! ' 'Label25 ' @@ -1272,11 +1275,11 @@ Partial Public Class rptMahnung CType(Me.lblFirma, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblRechnung_Land, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label3, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Label4, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblTelefon, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label5, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Label6, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblEmail, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Label7, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblFaxNr, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label25, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblUeberschriftRG_GS, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblSummeUeberschrift, System.ComponentModel.ISupportInitialize).EndInit() @@ -1363,11 +1366,11 @@ Partial Public Class rptMahnung Private WithEvents lblUIDUeberschrift As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents lblUID As GrapeCity.ActiveReports.SectionReportModel.Label Private WithEvents Label3 As GrapeCity.ActiveReports.SectionReportModel.Label - Public WithEvents Label4 As GrapeCity.ActiveReports.SectionReportModel.Label + Public WithEvents lblTelefon As GrapeCity.ActiveReports.SectionReportModel.Label Private WithEvents Label5 As GrapeCity.ActiveReports.SectionReportModel.Label - Public WithEvents Label6 As GrapeCity.ActiveReports.SectionReportModel.Label + Public WithEvents lblEmail As GrapeCity.ActiveReports.SectionReportModel.Label Private WithEvents Label1 As GrapeCity.ActiveReports.SectionReportModel.Label - Public WithEvents Label7 As GrapeCity.ActiveReports.SectionReportModel.Label + Public WithEvents lblFaxNr As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents TextBox2 As GrapeCity.ActiveReports.SectionReportModel.TextBox Public WithEvents Label2 As GrapeCity.ActiveReports.SectionReportModel.Label Private WithEvents lblRgDat As GrapeCity.ActiveReports.SectionReportModel.Label diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 27b5e258..de04d910 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -1,13 +1,7 @@ Imports System.Data.SqlClient Imports System.Globalization Imports System.IO -Imports com.oracle.xmlns.internal.webservices.jaxws_databinding -Imports com.sun.org.apache.bcel.internal.generic -Imports itextsharp.text.pdf -Imports java.rmi.server -Imports javax.swing.plaf Imports SDL.EORI -Imports sun.invoke.empty Imports VERAG_PROG_ALLGEMEIN Public Class usrCntlKundenuebersicht @@ -373,7 +367,7 @@ Public Class usrCntlKundenuebersicht If KdFirma <> VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then - lblFirma.Text = KdFirma + lblFirma.Text = KdFirma lblFirma.Visible = True btnVMhinzufuegen.Enabled = False If Not (KdFirma = "IMEX" And VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO")) Then @@ -2465,7 +2459,7 @@ Public Class usrCntlKundenuebersicht Dim url = SDL.cEORIWebService.genEORI_Formular(kdNr, EORI_NR) - Dim pdf = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURL(url) + 'Dim pdf = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURL(url) 'If pdf <> "" Then Process.Start(pdf) @@ -2637,13 +2631,24 @@ Public Class usrCntlKundenuebersicht If dt IsNot Nothing Then frmList.dgv.DataSource = dt frmList.dgv.Columns("eori_id").Visible = False - 'AddHandler frmList.dgv.CellDoubleClick, Sub() - ' Dim PdfTmp = SDL.FormularManagerNEU.EORI_Antrag(frmList.dgv.SelectedRows(0).Cells("eori_id").Value) - ' If PdfTmp <> "" Then - ' Process.Start(PdfTmp) - ' End If - ' End Sub + '-------------------------- + AddHandler frmList.dgv.CellDoubleClick, Sub() + Dim eoripruef As New cEORIPruefung(frmList.dgv.SelectedRows(0).Cells("eori_id").Value) + Dim msgErgebnis + Select Case eoripruef.eori_valid + Case 0 : msgErgebnis = "EORI-Nr. GÜLTIG - OK" + Case 1 : msgErgebnis = "EORI-Nr. UNGÜLTIG" + End Select + + Dim PdfTmp = SDL.FormularManagerNEU.EORI_PRUEFUNG(msgErgebnis, eoripruef.eori_firma, eoripruef.eori_sessionID, KUNDE.EORITIN,, eoripruef.eori_sendungsid) + If PdfTmp <> "" Then + Process.Start(PdfTmp) + + End If + End Sub + '-------------------------- + frmList.Show(Me) End If diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cFirmen.vb b/VERAG_PROG_ALLGEMEIN/Classes/cFirmen.vb index a6e5fc8f..24e7ea98 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cFirmen.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cFirmen.vb @@ -25,6 +25,7 @@ Public Class cFirmen Property Firma_Telefon As Object = Nothing ' NVARCHAR (40) NULL, Property Firma_Telefax As Object = Nothing ' NVARCHAR (40) NULL, Property Firma_E_Mail As Object = Nothing ' NVARCHAR (40) NULL, ----- + Property Firma_E_Mail_Mahnungen As Object = Nothing Property Firma_Webadresse As Object = Nothing ' NVARCHAR (40) NULL, Property Firma_LandKz As Object = Nothing ' NVARCHAR (40) NULL, @@ -66,6 +67,7 @@ Public Class cFirmen list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_Telefon", Firma_Telefon)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_Telefax", Firma_Telefax)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_E-Mail", Firma_E_Mail, "Firma_E_Mail")) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_E_Mail_Mahnungen", Firma_E_Mail_Mahnungen, "Firma_E_Mail_Mahnungen")) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_Webadresse", Firma_Webadresse)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_LandKz", Firma_LandKz)) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb b/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb index 930817e0..a2c002b9 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb @@ -163,11 +163,11 @@ Public Class cRMC Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() - Using cmd As New SqlCommand(" SELECT rmc_reDatum,[rmc_reNr],sum([rmc_betragNetto])[rmc_betragNetto],sum([rmc_betragMWST])[rmc_betragMWST] ,sum([rmc_betragBrutto] )[rmc_betragBrutto], [rmc_waehrung], sum([rmc_euroBrutto])[rmc_euroBrutto] FROM [tblRMCImport] + Using cmd As New SqlCommand(" SELECT rmc_reDatum,rmc_kdNr,[rmc_reNr],sum([rmc_betragNetto])[rmc_betragNetto],sum([rmc_betragMWST])[rmc_betragMWST] ,sum([rmc_betragBrutto] )[rmc_betragBrutto], [rmc_waehrung], sum([rmc_euroBrutto])[rmc_euroBrutto] FROM [tblRMCImport] INNER JOIN Adressen as adr on rmc_kdNr=adr.[WölflKundenNr] where cast(rmc_reDatum as date) between @von and @bis and AdressenNr=@AdressenNr AND rmc_landKZ ='" & LandKZ & "'" & If(Archiv, " And rmc_archiv =@Archiv ", "") & " - group by rmc_reDatum,[rmc_reNr],[rmc_waehrung] + group by rmc_reDatum,rmc_kdNr,[rmc_reNr],[rmc_waehrung] having sum([rmc_betragMWST])>0 order by rmc_reDatum", conn) @@ -194,20 +194,20 @@ Public Class cRMC End Function - Public Shared Function UPDATE_ARCHIV(von As Date, bis As Date, KundenNr As Integer) As Boolean + Public Shared Function UPDATE_ARCHIV(reDat As Date, reNr As Integer, rmc_kdNr As Integer) As Boolean Try Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("von", von)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("bis", bis)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KundenNr", KundenNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("reDat", reDat)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("reNr", reNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_kdNr", rmc_kdNr)) Return SQL.doSQLVarList(" UPDATE [tblRMCImport] set rmc_archiv=1, [rmc_archiviertDatum]=GETDATE() - WHERE cast(rmc_reDatum as date) between @von and @bis and rmc_kdNr=@KundenNr + WHERE cast(rmc_reDatum as date) = @reDat and rmc_reNr = @reNr and rmc_kdNr=@rmc_kdNr ", "FMZOLL",, list) Catch ex As Exception diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb index 5054035b..5f430869 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb @@ -24,6 +24,7 @@ Partial Class frmMessenger '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() @@ -38,12 +39,12 @@ Partial Class frmMessenger Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMessenger)) Me.SplitContainer = New System.Windows.Forms.SplitContainer() Me.SplitContainer2 = New System.Windows.Forms.SplitContainer() - Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel6 = New System.Windows.Forms.Panel() Me.Label3 = New System.Windows.Forms.Label() Me.lblLKWChat_MsgCntInaktiv = New System.Windows.Forms.Label() Me.cbxInaktiveChats = New System.Windows.Forms.CheckBox() - Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel5 = New System.Windows.Forms.Panel() Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.PictureBox2 = New System.Windows.Forms.PictureBox() @@ -64,7 +65,7 @@ Partial Class frmMessenger Me.btnNeu = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() - Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel() + Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components) Me.UsrCntlMessenger_ChatElement1 = New VERAG_PROG_ALLGEMEIN.usrCntlMessenger_ChatElement() Me.Panel3 = New System.Windows.Forms.Panel() Me.btnTeilnehmer = New System.Windows.Forms.Button() @@ -92,9 +93,9 @@ Partial Class frmMessenger Me.btnSendAtt = New System.Windows.Forms.Button() Me.btnSenden = New System.Windows.Forms.Button() Me.rtbChatMessage = New System.Windows.Forms.RichTextBox() - Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer() - Me.Timer_REFRESH = New System.Windows.Forms.Timer() - Me.cntxt = New System.Windows.Forms.ContextMenuStrip() + Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer(Me.components) + Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components) + Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ChatDeaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.toolChatReminder = New System.Windows.Forms.ToolStripMenuItem() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()