From 94fc588c115afd7668cb7d7da3e56369e7a2b709 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 27 Aug 2024 17:24:39 +0200 Subject: [PATCH] Mahnlauf, Mahnungen, Kundenblatt, CMR, Datenverarbeitung --- SDL/Formulare/CMR/frmCMR.Designer.vb | 1 + SDL/Formulare/KDFormulare/frmFormulare.vb | 2 + SDL/My Project/AssemblyInfo.vb | 4 +- SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb | 15 + SDL/buchhaltung/frmBU_Mahnlauf.vb | 454 +++++++++--------- SDL/buchhaltung/rptMahnung.Designer.vb | 364 +++++++------- SDL/buchhaltung/rptMahnung.vb | 15 +- SDL/cProgramFunctions.vb | 35 +- SDL/kunden/frmKundenblatt.Designer.vb | 26 +- SDL/kunden/usrcntlKundeBearbeitenFull.vb | 1 + SDL/mdm/frmMDMDatenverarbetiung.vb | 59 ++- ...MDMDatenverarbeitungAuswertungen_divers.vb | 76 +-- VERAG_PROG_ALLGEMEIN/Classes/cEasyBinding.vb | 2 + VERAG_PROG_ALLGEMEIN/Classes/cTranslate.vb | 7 +- .../DATENSERVER/cDATENSERVER.vb | 1 + .../Messenger/frmMessenger.Designer.vb | 13 +- .../frmUeberstundenauszahlen.vb | 4 +- .../Schnittstellen/MSE/cMSEAPI.vb | 8 +- 18 files changed, 603 insertions(+), 484 deletions(-) diff --git a/SDL/Formulare/CMR/frmCMR.Designer.vb b/SDL/Formulare/CMR/frmCMR.Designer.vb index 9224bb79..aead2d24 100644 --- a/SDL/Formulare/CMR/frmCMR.Designer.vb +++ b/SDL/Formulare/CMR/frmCMR.Designer.vb @@ -172,6 +172,7 @@ Partial Class frmCMR Me.txtSuchbegriff._WaehrungZeichen = True Me.txtSuchbegriff.ForeColor = System.Drawing.Color.Black Me.txtSuchbegriff.Location = New System.Drawing.Point(3, 33) + Me.txtSuchbegriff.MaxLength = 80 Me.txtSuchbegriff.MaxLineLength = -1 Me.txtSuchbegriff.MaxLines_Warning = "" Me.txtSuchbegriff.MaxLines_Warning_Label = Nothing diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index b3298e5d..c82eb8d9 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -1714,6 +1714,8 @@ Public Class FormularManagerNEU Case "street" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text Case "surname_firstname" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtHerrFrau.Text Case "vatno" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtUid.Text + Case "mailcontact" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtEmail.Text ' TODO: neues Feld im formular + Case "phone" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtEmail.Text ' TODO: neues Feld im formular Case "taxno" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtSteuerNr.Text Case "c_name" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez Case "c_name1" : odoc.FormFields(fieldName).Range.Text = FIRMA.Firma_Bez diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index e30efcec..28c55751 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/buchhaltung/frmBU_Mahnlauf.Designer.vb b/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb index 351bce0c..dad7e791 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb @@ -54,6 +54,7 @@ Partial Class frmBU_Mahnlauf Me.Button2 = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button() Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Button7 = New System.Windows.Forms.Button() Me.Panel1.SuspendLayout() Me.pnlTop.SuspendLayout() Me.Panel2.SuspendLayout() @@ -266,6 +267,7 @@ Partial Class frmBU_Mahnlauf ' 'Panel3 ' + Me.Panel3.Controls.Add(Me.Button7) Me.Panel3.Controls.Add(Me.cbxMahnstufeErh) Me.Panel3.Controls.Add(Me.Label8) Me.Panel3.Controls.Add(Me.Button6) @@ -471,6 +473,18 @@ Partial Class frmBU_Mahnlauf Me.MyTextBox2.TabIndex = 39 Me.MyTextBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' + 'Button7 + ' + Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.Button7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button7.Location = New System.Drawing.Point(38, 89) + Me.Button7.Name = "Button7" + Me.Button7.Size = New System.Drawing.Size(123, 23) + Me.Button7.TabIndex = 45 + Me.Button7.Text = "Übersetzungen" + Me.Button7.UseVisualStyleBackColor = True + ' 'frmBU_Mahnlauf ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -526,4 +540,5 @@ Partial Class frmBU_Mahnlauf Friend WithEvents Label8 As Label Friend WithEvents Button6 As Button Friend WithEvents cbxMahnstufeErh As CheckBox + Friend WithEvents Button7 As Button End Class diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index bd6d938e..7140e0d1 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -265,21 +265,34 @@ Public Class frmBU_Mahnlauf Sprache = If(KD_ERW.kde_Fakturierung_Sprache, "DE") End If - Dim rpt As New rptMahnung(Sprache) - rpt.Document.Printer.PrinterName = "" - Dim RG_Bezeichnung = "Mahnung.pdf" - - Dim FIRMA As New VERAG_PROG_ALLGEMEIN.cFirmen(Firma_ID) - Dim KD_RG As New VERAG_PROG_ALLGEMEIN.cAdressen(AD.AdressenNr) - - If FIRMA Is Nothing Then MsgBox("Keine Firma gewählt!") : Return False - If dtDataSource Is Nothing Then MsgBox("Keine Daten vorhanden!") : Return False If dtDataSource.Rows.Count = 0 Then MsgBox("Keine Daten vorhanden!") : Return False - rpt.DataSource = dtDataSource + Dim MAHNSTUFE As Integer = -1 + If forceMahnstufe <> "" Then + MAHNSTUFE = CInt(forceMahnstufe) + Else + 'MAX Mahnstufe + For Each r In dtDataSource.Rows + If r("Mahnstufe") > MAHNSTUFE Then MAHNSTUFE = r("Mahnstufe") + Next + End If + + + + Dim rpt As New rptMahnung(Sprache, MAHNSTUFE, Firma_ID) + rpt.Document.Printer.PrinterName = "" + Dim RG_Bezeichnung = "Mahnung.pdf" + + + Dim KD_RG As New VERAG_PROG_ALLGEMEIN.cAdressen(AD.AdressenNr) + Dim FIRMA As New VERAG_PROG_ALLGEMEIN.cFirmen(Firma_ID) + If FIRMA Is Nothing Then MsgBox("Keine Firma gewählt!") : Return False + + + rpt.DataSource = dtDataSource Dim sum = 0 @@ -289,14 +302,14 @@ Public Class frmBU_Mahnlauf rpt.lblSummeUeberschrift.Text = "Total:" rpt.lblSteuersatz.Text = "Late payment interest of 9.5% p.a. from due date" rpt.lblZwText.Text = "Dunning fee" - rpt.Label2.Text = "Subtotal" + rpt.lblZwischensumme.Text = "Subtotal" End Select initRgFirma(rpt, FIRMA, AD.LandKz) rpt.lblFirmaFax.Visible = True - rpt.Label1.Visible = True + rpt.lblEmail.Visible = True rpt.lblFaxNr.Visible = True @@ -311,7 +324,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 : rpt.lblFirmaFax.Visible = False : rpt.Label1.Visible = False : rpt.lblFaxNr.Visible = False + Case 19 : rpt.picVERAG.Image = My.Resources.VERAG_360 : rpt.Picture1.Image = Nothing : rpt.lblFirmaFax.Visible = False : rpt.lblEmail.Visible = False : rpt.lblFaxNr.Visible = False End Select Dim ZZTage = 10 @@ -361,12 +374,9 @@ Public Class frmBU_Mahnlauf End If If AD.Ansprechpartner <> "" Then - rpt.Label25.Text = (If(AD.Anrede, "") & " " & AD.Ansprechpartner).trim + rpt.lblAnrede.Text = (If(AD.Anrede, "") & " " & AD.Ansprechpartner).trim Else - Select Case Sprache - Case "EN" : rpt.Label25.Text = "Abt.: BUCHHALTUNG/GESCHÄFTSFÜHRUNG" - Case Else : rpt.Label25.Text = "Dept.: ACCOUNTING/MANAGEMENT" - End Select + rpt.lblAnrede.Text = "Abt.: BUCHHALTUNG/GESCHÄFTSFÜHRUNG" End If rpt.lblRechnung_Strasse.Text = If(AD.Straße, "") @@ -376,18 +386,6 @@ Public Class frmBU_Mahnlauf rpt.txtVermerk.Text = "" - Dim MAHNSTUFE As Integer = -1 - - If forceMahnstufe <> "" Then - MAHNSTUFE = CInt(forceMahnstufe) - Else - 'MAX Mahnstufe - For Each r In dtDataSource.Rows - If r("Mahnstufe") > MAHNSTUFE Then MAHNSTUFE = r("Mahnstufe") - Next - End If - - 'Dim cnt As Integer = 0 Dim ZWSBetrag As Double = 0 @@ -415,7 +413,7 @@ Public Class frmBU_Mahnlauf rpt.lblUeberschriftRG_GS.Text = MAHNTEXT - rpt.TextBox2.Text = MahnTEXT_VOR + rpt.txtMahnungstextVOR.Text = MahnTEXT_VOR rpt.txtVermerk.Text = MahnTEXT_NACH AddHandler rpt.Detail.Format, Sub() @@ -643,7 +641,7 @@ Public Class frmBU_Mahnlauf - Catch ex As Exception + Catch ex As Exception MsgBox(ex.Message & ex.StackTrace) End Try Return False @@ -719,203 +717,203 @@ Public Class frmBU_Mahnlauf End Sub Private Shared Sub getMahnstufetext(Sprache, MAHNSTUFE, ByRef MahnTEXT_VOR, ByRef MahnTEXT_NACH, ByRef MAHNTEXT) - Select Case Sprache - Case "TR" - Select Case MAHNSTUFE - Case -2 - MahnTEXT_VOR = "Aşağıdaki faturalar henüz ödenmemiştir:" - MahnTEXT_NACH = "" - MAHNTEXT = "List - öğeleri aç" - Case -1 - MahnTEXT_VOR = "Aşağıdaki faturalar henüz tahsil edilmemiştir:" - MahnTEXT_NACH = "Yukarıdaki tutarlar, SEPA otomatik ödeme talimatı yoluyla belirttiğiniz Benk bağlantınızdan tahsil edilecektir." - MAHNTEXT = "List - öğeleri aç" - Case 0 - MahnTEXT_VOR = "WeLütfen asagida belirilen faturalarin ödemesini yapiniz:" - MahnTEXT_NACH = "" - MAHNTEXT = "Ödeme hatırlatıcısı" - Case 1 - MahnTEXT_VOR = "Lütfen asagida belirilen faturalarin ödemesini yapiniz:" - MahnTEXT_NACH = "Bu gecikmenin organizasyon acisindan olusan bir hatadan kaynaklandigini düsünüyoruz. Ödemeniz tarafimiza yapildiysa ilgili ihtari gecersiz sayabilirsiniz." - MAHNTEXT = "1. UYARI" - Case 2 - MahnTEXT_VOR = "Bir önceki ihtarimiza ragmen asagida belirtilen faturalarin ödemesi gerceklesmemistir:" - MahnTEXT_NACH = "WirBu gecikmenin organizasyon acisindan olusan bir hatadan kaynaklandigini düsünüyoruz, fakat bütün sorumluluklarinizi hatirlatarak, daha fazla masrafin ve olumsuzluklarin olusmamasi adina yukarida belirtilen acik tutarin acil olarak ödenmesi gerektigini bildirmek durumundayiz." - MAHNTEXT = MAHNSTUFE & ". UYARI" - Case 3 - MahnTEXT_VOR = "Iki kez iletilen hatirlatma ve ihtara ragmen asagida belirtilen faturalarin ödemesi gerceklesmemistir. Bu vesile ile sizleri son kez acik bakiyenin ödenmesi icin uyariyoruz. Lütfen yapilan ödemeye dair hesap dekontunu tarafimiza iletiniz." - 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" - Case >= 4 - MahnTEXT_VOR = "Defalarca iletilen hatirlatma ve ihtara ragmen asagida belirtilen faturalarin ödemesi gerceklesmemistir. Bu vesile ile sizleri son kez acik bakiyenin ödenmesi icin uyariyoruz. Lütfen yapilan ödemeye dair hesap dekontunu tarafimiza iletiniz." - 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 "DE", "D" - Select Case MAHNSTUFE - Case -2 - MahnTEXT_VOR = "Nachfolgende Rechnungen wurden noch nicht beglichen:" - MahnTEXT_NACH = "" - MAHNTEXT = "Liste - Offene Posten" - Case -1 - MahnTEXT_VOR = "Nachfolgende Rechnungen wurden noch nicht eingezogen:" - MahnTEXT_NACH = "Die oben genannten Beträge werden per SEPA-Lastschriftmandat von Ihrem angegebenen Benkverbindung eingezogen." - MAHNTEXT = "Liste - Offene Posten" - Case 0 - MahnTEXT_VOR = "Wir ersuchen um Ausgleich der nachfolgenden Rechnungen:" - MahnTEXT_NACH = "" - MAHNTEXT = "Zahlungserinnerung" - Case 1 - MahnTEXT_VOR = "Wir ersuchen um Ausgleich der nachfolgenden Rechnungen:" - MahnTEXT_NACH = "Wir gehen davon aus, dass dies auf einem organisatorischen Versehen beruht. " & vbNewLine & "Sollte Ihre Zahlung bereits an uns abgegangen sein, bitten wir Sie, die Mahnung als gegenstandslos zu betrachten." - MAHNTEXT = "1. Mahnung" - Case 2 - MahnTEXT_VOR = "Trotz unserer vorhergehenden Mahnung wurden die aufgeführten Rechnungen immer noch nicht ausgeglichen:" - MahnTEXT_NACH = "Wir gehen davon aus, dass dies auf einem organisatorischen Versehen beruht, müssen Sie aber nunmehr mit aller Bestimmtheit auffordern, den laut oben stehender Aufstellung fälligen Betrag zur Vermeidung weiterer Kosten und Unannehmlichkeiten unverzüglich an uns zu überweisen." - MAHNTEXT = MAHNSTUFE & ". MAHNUNG" - Case 3 - MahnTEXT_VOR = "Trotz zweifacher Mahnung sind die unten aufgeführten Posten immer noch nicht beglichen. Wir fordern Sie hiermit letztmalig auf, den offenen Betrag unverzüglich zur Einzahlung zu bringen. Bitte senden Sie uns eine Kopie des Überweisungsbeleges." - 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" - Case >= 4 - MahnTEXT_VOR = "Trotz mehrfacher Mahnung sind die unten aufgeführten Posten immer noch nicht beglichen. Wir fordern Sie hiermit letztmalig auf, den offenen Betrag unverzüglich zur Einzahlung zu bringen. Bitte senden Sie uns eine Kopie des Überweisungsbeleges." - 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 - - + 'Select Case Sprache + ' Case "TR" + ' Select Case MAHNSTUFE + ' Case -2 + ' MahnTEXT_VOR = "Aşağıdaki faturalar henüz ödenmemiştir:" + ' MahnTEXT_NACH = "" + ' MAHNTEXT = "List - öğeleri aç" + ' Case -1 + ' MahnTEXT_VOR = "Aşağıdaki faturalar henüz tahsil edilmemiştir:" + ' MahnTEXT_NACH = "Yukarıdaki tutarlar, SEPA otomatik ödeme talimatı yoluyla belirttiğiniz Benk bağlantınızdan tahsil edilecektir." + ' MAHNTEXT = "List - öğeleri aç" + ' Case 0 + ' MahnTEXT_VOR = "WeLütfen asagida belirilen faturalarin ödemesini yapiniz:" + ' MahnTEXT_NACH = "" + ' MAHNTEXT = "Ödeme hatırlatıcısı" + ' Case 1 + ' MahnTEXT_VOR = "Lütfen asagida belirilen faturalarin ödemesini yapiniz:" + ' MahnTEXT_NACH = "Bu gecikmenin organizasyon acisindan olusan bir hatadan kaynaklandigini düsünüyoruz. Ödemeniz tarafimiza yapildiysa ilgili ihtari gecersiz sayabilirsiniz." + ' MAHNTEXT = "1. UYARI" + ' Case 2 + ' MahnTEXT_VOR = "Bir önceki ihtarimiza ragmen asagida belirtilen faturalarin ödemesi gerceklesmemistir:" + ' MahnTEXT_NACH = "WirBu gecikmenin organizasyon acisindan olusan bir hatadan kaynaklandigini düsünüyoruz, fakat bütün sorumluluklarinizi hatirlatarak, daha fazla masrafin ve olumsuzluklarin olusmamasi adina yukarida belirtilen acik tutarin acil olarak ödenmesi gerektigini bildirmek durumundayiz." + ' MAHNTEXT = MAHNSTUFE & ". UYARI" + ' Case 3 + ' MahnTEXT_VOR = "Iki kez iletilen hatirlatma ve ihtara ragmen asagida belirtilen faturalarin ödemesi gerceklesmemistir. Bu vesile ile sizleri son kez acik bakiyenin ödenmesi icin uyariyoruz. Lütfen yapilan ödemeye dair hesap dekontunu tarafimiza iletiniz." + ' 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" + ' Case >= 4 + ' MahnTEXT_VOR = "Defalarca iletilen hatirlatma ve ihtara ragmen asagida belirtilen faturalarin ödemesi gerceklesmemistir. Bu vesile ile sizleri son kez acik bakiyenin ödenmesi icin uyariyoruz. Lütfen yapilan ödemeye dair hesap dekontunu tarafimiza iletiniz." + ' 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 "DE", "D" + Select Case MAHNSTUFE + Case -2 + MahnTEXT_VOR = "Nachfolgende Rechnungen wurden noch nicht beglichen:" + MahnTEXT_NACH = "" + MAHNTEXT = "Liste - Offene Posten" + Case -1 + MahnTEXT_VOR = "Nachfolgende Rechnungen wurden noch nicht eingezogen:" + MahnTEXT_NACH = "Die oben genannten Beträge werden per SEPA-Lastschriftmandat von Ihrem angegebenen Benkverbindung eingezogen." + MAHNTEXT = "Liste - Offene Posten" + Case 0 + MahnTEXT_VOR = "Wir ersuchen um Ausgleich der nachfolgenden Rechnungen:" + MahnTEXT_NACH = "" + MAHNTEXT = "Zahlungserinnerung" + Case 1 + MahnTEXT_VOR = "Wir ersuchen um Ausgleich der nachfolgenden Rechnungen:" + MahnTEXT_NACH = "Wir gehen davon aus, dass dies auf einem organisatorischen Versehen beruht. " & vbNewLine & "Sollte Ihre Zahlung bereits an uns abgegangen sein, bitten wir Sie, die Mahnung als gegenstandslos zu betrachten." + MAHNTEXT = "1. Mahnung" + Case 2 + MahnTEXT_VOR = "Trotz unserer vorhergehenden Mahnung wurden die aufgeführten Rechnungen immer noch nicht ausgeglichen:" + MahnTEXT_NACH = "Wir gehen davon aus, dass dies auf einem organisatorischen Versehen beruht, müssen Sie aber nunmehr mit aller Bestimmtheit auffordern, den laut oben stehender Aufstellung fälligen Betrag zur Vermeidung weiterer Kosten und Unannehmlichkeiten unverzüglich an uns zu überweisen." + MAHNTEXT = MAHNSTUFE & ". MAHNUNG" + Case 3 + MahnTEXT_VOR = "Trotz zweifacher Mahnung sind die unten aufgeführten Posten immer noch nicht beglichen. Wir fordern Sie hiermit letztmalig auf, den offenen Betrag unverzüglich zur Einzahlung zu bringen. Bitte senden Sie uns eine Kopie des Überweisungsbeleges." + 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" + Case >= 4 + MahnTEXT_VOR = "Trotz mehrfacher Mahnung sind die unten aufgeführten Posten immer noch nicht beglichen. Wir fordern Sie hiermit letztmalig auf, den offenen Betrag unverzüglich zur Einzahlung zu bringen. Bitte senden Sie uns eine Kopie des Überweisungsbeleges." + 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 6b0f9e6d..c6ec39bc 100644 --- a/SDL/buchhaltung/rptMahnung.Designer.vb +++ b/SDL/buchhaltung/rptMahnung.Designer.vb @@ -28,8 +28,8 @@ Partial Public Class rptMahnung Me.Label19 = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Label20 = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Label21 = New GrapeCity.ActiveReports.SectionReportModel.Label() - Me.Label22 = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.TextBox1 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.Label22 = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.PageFooter = New GrapeCity.ActiveReports.SectionReportModel.PageFooter() Me.Line2 = New GrapeCity.ActiveReports.SectionReportModel.Line() Me.ReportInfo2 = New GrapeCity.ActiveReports.SectionReportModel.ReportInfo() @@ -64,13 +64,13 @@ Partial Public Class rptMahnung Me.Line15 = New GrapeCity.ActiveReports.SectionReportModel.Line() Me.lblFirma = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.lblRechnung_Land = New GrapeCity.ActiveReports.SectionReportModel.Label() - Me.Label3 = New GrapeCity.ActiveReports.SectionReportModel.Label() + Me.lblSachbearbeiterTelefon = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.lblTelefon = New GrapeCity.ActiveReports.SectionReportModel.Label() - Me.Label5 = New GrapeCity.ActiveReports.SectionReportModel.Label() + Me.lblSachbearbeiterEMail = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.lblEmail = New GrapeCity.ActiveReports.SectionReportModel.Label() - Me.Label1 = New GrapeCity.ActiveReports.SectionReportModel.Label() + Me.lblFax = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.lblFaxNr = New GrapeCity.ActiveReports.SectionReportModel.Label() - Me.Label25 = New GrapeCity.ActiveReports.SectionReportModel.Label() + Me.lblAnrede = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.lblUeberschriftRG_GS = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.ReportFooter1 = New GrapeCity.ActiveReports.SectionReportModel.ReportFooter() Me.Line8 = New GrapeCity.ActiveReports.SectionReportModel.Line() @@ -88,7 +88,7 @@ Partial Public Class rptMahnung Me.Line14 = New GrapeCity.ActiveReports.SectionReportModel.Line() Me.lblZwText = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Line17 = New GrapeCity.ActiveReports.SectionReportModel.Line() - Me.Label2 = New GrapeCity.ActiveReports.SectionReportModel.Label() + Me.lblZwischensumme = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Label23 = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Label24 = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Label4 = New GrapeCity.ActiveReports.SectionReportModel.Label() @@ -99,14 +99,14 @@ Partial Public Class rptMahnung Me.Line12 = New GrapeCity.ActiveReports.SectionReportModel.Line() Me.Line13 = New GrapeCity.ActiveReports.SectionReportModel.Line() Me.Line16 = New GrapeCity.ActiveReports.SectionReportModel.Line() - Me.TextBox2 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.txtMahnungstextVOR = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.lblRgDat = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.lblFaelligkeit = New GrapeCity.ActiveReports.SectionReportModel.Label() - Me.Label10 = New GrapeCity.ActiveReports.SectionReportModel.Label() - Me.Label11 = New GrapeCity.ActiveReports.SectionReportModel.Label() - Me.Label12 = New GrapeCity.ActiveReports.SectionReportModel.Label() - Me.Label13 = New GrapeCity.ActiveReports.SectionReportModel.Label() - Me.Label14 = New GrapeCity.ActiveReports.SectionReportModel.Label() + Me.lblReBetrag = New GrapeCity.ActiveReports.SectionReportModel.Label() + Me.lblAbfertigungsNr = New GrapeCity.ActiveReports.SectionReportModel.Label() + Me.lblZahlung = New GrapeCity.ActiveReports.SectionReportModel.Label() + Me.lblAusstand = New GrapeCity.ActiveReports.SectionReportModel.Label() + Me.lblMS = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.GroupFooter4 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter() CType(Me.txtLeistung, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label15, System.ComponentModel.ISupportInitialize).BeginInit() @@ -115,8 +115,8 @@ Partial Public Class rptMahnung CType(Me.Label19, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label20, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label21, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Label22, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextBox1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.Label22, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ReportInfo2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblBankUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtBank1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -146,13 +146,13 @@ Partial Public Class rptMahnung CType(Me.lblRechnung_Ort, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblFirma, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblRechnung_Land, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Label3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblSachbearbeiterTelefon, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblTelefon, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Label5, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblSachbearbeiterEMail, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblEmail, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Label1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblFax, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblFaxNr, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Label25, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblAnrede, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblUeberschriftRG_GS, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblSummeUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblSumme, System.ComponentModel.ISupportInitialize).BeginInit() @@ -161,20 +161,20 @@ Partial Public Class rptMahnung CType(Me.lblSteuersatz, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtVermerk, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblZwText, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Label2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblZwischensumme, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label23, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label24, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblLeistungUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextBox2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtMahnungstextVOR, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblRgDat, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblFaelligkeit, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Label10, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Label11, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Label12, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Label13, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Label14, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblReBetrag, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblAbfertigungsNr, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblZahlung, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblAusstand, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblMS, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me, System.ComponentModel.ISupportInitialize).BeginInit() ' 'PageHeader @@ -301,6 +301,17 @@ Partial Public Class rptMahnung Me.Label21.Top = 0! Me.Label21.Width = 0.3669996! ' + 'TextBox1 + ' + Me.TextBox1.Height = 0.1570866! + Me.TextBox1.Left = 2.585827! + Me.TextBox1.Name = "TextBox1" + Me.TextBox1.Style = "font-size: 10pt; font-weight: normal; text-align: left; text-justify: auto; ddo-c" & + "har-set: 1" + Me.TextBox1.Text = "Abfertigungs Nr." + Me.TextBox1.Top = 0! + Me.TextBox1.Width = 2.431409! + ' 'Label22 ' Me.Label22.Height = 0.1568192! @@ -314,17 +325,6 @@ Partial Public Class rptMahnung Me.Label22.Visible = False Me.Label22.Width = 0.5239997! ' - 'TextBox1 - ' - Me.TextBox1.Height = 0.1570866! - Me.TextBox1.Left = 2.585827! - Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Style = "font-size: 10pt; font-weight: normal; text-align: left; text-justify: auto; ddo-c" & - "har-set: 1" - Me.TextBox1.Text = "Abfertigungs Nr." - Me.TextBox1.Top = 0! - Me.TextBox1.Width = 2.431409! - ' 'PageFooter ' Me.PageFooter.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Line2, Me.ReportInfo2, Me.lblBankUeberschrift, Me.txtBank1, Me.txtBank2, Me.txtDisclaimer}) @@ -403,7 +403,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.lblTelefon, Me.Label5, Me.lblEmail, Me.Label1, Me.lblFaxNr, 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.lblSachbearbeiterTelefon, Me.lblTelefon, Me.lblSachbearbeiterEMail, Me.lblEmail, Me.lblFax, Me.lblFaxNr, Me.lblAnrede}) Me.ReportHeader1.Height = 3.470997! Me.ReportHeader1.Name = "ReportHeader1" ' @@ -720,17 +720,18 @@ Partial Public Class rptMahnung Me.lblRechnung_Land.Top = 2.664197! Me.lblRechnung_Land.Width = 4.589763! ' - 'Label3 + 'lblSachbearbeiterTelefon ' - Me.Label3.Height = 0.1574803! - Me.Label3.HyperLink = Nothing - Me.Label3.Left = 5.022282! - Me.Label3.Name = "Label3" - Me.Label3.Style = "font-size: 8pt; font-weight: normal; text-align: left; vertical-align: middle; dd" & - "o-char-set: 1" - Me.Label3.Text = "Telefon:" - Me.Label3.Top = 2.193134! - Me.Label3.Width = 0.9884803! + Me.lblSachbearbeiterTelefon.DataField = "" + Me.lblSachbearbeiterTelefon.Height = 0.1574803! + Me.lblSachbearbeiterTelefon.HyperLink = Nothing + Me.lblSachbearbeiterTelefon.Left = 5.022282! + Me.lblSachbearbeiterTelefon.Name = "lblSachbearbeiterTelefon" + Me.lblSachbearbeiterTelefon.Style = "color: Black; font-size: 8pt; font-weight: normal; text-align: left; vertical-ali" & + "gn: middle; ddo-char-set: 1" + Me.lblSachbearbeiterTelefon.Text = "Telefon:" + Me.lblSachbearbeiterTelefon.Top = 2.193134! + Me.lblSachbearbeiterTelefon.Width = 0.9884803! ' 'lblTelefon ' @@ -745,17 +746,18 @@ Partial Public Class rptMahnung Me.lblTelefon.Top = 2.193701! Me.lblTelefon.Width = 1.895268! ' - 'Label5 + 'lblSachbearbeiterEMail ' - Me.Label5.Height = 0.1574803! - Me.Label5.HyperLink = Nothing - Me.Label5.Left = 5.022762! - Me.Label5.Name = "Label5" - Me.Label5.Style = "font-size: 8pt; font-weight: normal; text-align: left; vertical-align: middle; dd" & - "o-char-set: 1" - Me.Label5.Text = "E-Mail:" - Me.Label5.Top = 2.350134! - Me.Label5.Width = 0.9884803! + Me.lblSachbearbeiterEMail.DataField = "" + Me.lblSachbearbeiterEMail.Height = 0.1574803! + Me.lblSachbearbeiterEMail.HyperLink = Nothing + Me.lblSachbearbeiterEMail.Left = 5.022762! + Me.lblSachbearbeiterEMail.Name = "lblSachbearbeiterEMail" + Me.lblSachbearbeiterEMail.Style = "color: Black; font-size: 8pt; font-weight: normal; text-align: left; vertical-ali" & + "gn: middle; ddo-char-set: 1" + Me.lblSachbearbeiterEMail.Text = "E-Mail:" + Me.lblSachbearbeiterEMail.Top = 2.350134! + Me.lblSachbearbeiterEMail.Width = 0.9884803! ' 'lblEmail ' @@ -771,17 +773,18 @@ Partial Public Class rptMahnung Me.lblEmail.Top = 2.350701! Me.lblEmail.Width = 1.895268! ' - 'Label1 + 'lblFax ' - Me.Label1.Height = 0.1574803! - Me.Label1.HyperLink = Nothing - Me.Label1.Left = 5.022762! - Me.Label1.Name = "Label1" - Me.Label1.Style = "font-size: 8pt; font-weight: normal; text-align: left; vertical-align: middle; dd" & - "o-char-set: 1" - Me.Label1.Text = "Fax:" - Me.Label1.Top = 2.507134! - Me.Label1.Width = 0.9884806! + Me.lblFax.DataField = "" + Me.lblFax.Height = 0.1574803! + Me.lblFax.HyperLink = Nothing + Me.lblFax.Left = 5.022762! + Me.lblFax.Name = "lblFax" + Me.lblFax.Style = "color: Black; font-size: 8pt; font-weight: normal; text-align: left; vertical-ali" & + "gn: middle; ddo-char-set: 1" + Me.lblFax.Text = "Fax:" + Me.lblFax.Top = 2.507134! + Me.lblFax.Width = 0.9884806! ' 'lblFaxNr ' @@ -796,17 +799,18 @@ Partial Public Class rptMahnung Me.lblFaxNr.Top = 2.507701! Me.lblFaxNr.Width = 1.895268! ' - 'Label25 + 'lblAnrede ' - Me.Label25.Height = 0.1771653! - Me.Label25.HyperLink = Nothing - Me.Label25.Left = 0.404433! - Me.Label25.Name = "Label25" - Me.Label25.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" & - "do-char-set: 1" - Me.Label25.Text = "Herr/Frau" - Me.Label25.Top = 2.132866! - Me.Label25.Width = 4.589763! + Me.lblAnrede.DataField = "" + Me.lblAnrede.Height = 0.1771653! + Me.lblAnrede.HyperLink = Nothing + Me.lblAnrede.Left = 0.404433! + Me.lblAnrede.Name = "lblAnrede" + Me.lblAnrede.Style = "color: Black; font-size: 10pt; font-weight: normal; text-align: left; vertical-al" & + "ign: middle; ddo-char-set: 1" + Me.lblAnrede.Text = "Herr/Frau" + Me.lblAnrede.Top = 2.132866! + Me.lblAnrede.Width = 4.589763! ' 'lblUeberschriftRG_GS ' @@ -821,7 +825,7 @@ Partial Public Class rptMahnung ' 'ReportFooter1 ' - Me.ReportFooter1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Line8, Me.Line9, Me.lblSummeUeberschrift, Me.lblSumme, Me.Label46, Me.Line1, Me.Line5, Me.lblZWSumme, Me.lblSteuersatz, Me.txtVermerk, Me.Line6, Me.Line7, Me.Line14, Me.lblZwText, Me.Line17, Me.Label2, Me.Label23, Me.Label24, Me.Label4, Me.Label6}) + Me.ReportFooter1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Line8, Me.Line9, Me.lblSummeUeberschrift, Me.lblSumme, Me.Label46, Me.Line1, Me.Line5, Me.lblZWSumme, Me.lblSteuersatz, Me.txtVermerk, Me.Line6, Me.Line7, Me.Line14, Me.lblZwText, Me.Line17, Me.lblZwischensumme, Me.Label23, Me.Label24, Me.Label4, Me.Label6}) Me.ReportFooter1.Height = 1.241811! Me.ReportFooter1.KeepTogether = True Me.ReportFooter1.Name = "ReportFooter1" @@ -854,11 +858,13 @@ Partial Public Class rptMahnung ' 'lblSummeUeberschrift ' + Me.lblSummeUeberschrift.DataField = "" Me.lblSummeUeberschrift.Height = 0.1771653! Me.lblSummeUeberschrift.HyperLink = Nothing Me.lblSummeUeberschrift.Left = 3.994324! Me.lblSummeUeberschrift.Name = "lblSummeUeberschrift" - Me.lblSummeUeberschrift.Style = "font-size: 9pt; font-weight: bold; text-align: right; ddo-char-set: 1" + Me.lblSummeUeberschrift.Style = "color: Black; font-size: 9pt; font-weight: bold; text-align: right; ddo-char-set:" & + " 1" Me.lblSummeUeberschrift.Text = "Gesamtsumme" Me.lblSummeUeberschrift.Top = 0.7582361! Me.lblSummeUeberschrift.Width = 1.549213! @@ -889,7 +895,7 @@ Partial Public Class rptMahnung ' 'Line1 ' - Me.Line1.Height = 0.0003936887! + Me.Line1.Height = 0.0003937483! Me.Line1.Left = 6.101314! Me.Line1.LineWeight = 2.0! Me.Line1.Name = "Line1" @@ -1010,16 +1016,18 @@ Partial Public Class rptMahnung Me.Line17.Y1 = 0! Me.Line17.Y2 = 0.1035433! ' - 'Label2 + 'lblZwischensumme ' - Me.Label2.Height = 0.1574803! - Me.Label2.HyperLink = Nothing - Me.Label2.Left = 3.076284! - Me.Label2.Name = "Label2" - Me.Label2.Style = "font-size: 9pt; font-weight: normal; text-align: right; ddo-char-set: 1" - Me.Label2.Text = "Zwischensumme" - Me.Label2.Top = 0.1791339! - Me.Label2.Width = 1.549212! + Me.lblZwischensumme.DataField = "" + Me.lblZwischensumme.Height = 0.1574803! + Me.lblZwischensumme.HyperLink = Nothing + Me.lblZwischensumme.Left = 3.076284! + Me.lblZwischensumme.Name = "lblZwischensumme" + Me.lblZwischensumme.Style = "color: Black; font-size: 9pt; font-weight: normal; text-align: right; ddo-char-se" & + "t: 1" + Me.lblZwischensumme.Text = "Zwischensumme" + Me.lblZwischensumme.Top = 0.1791339! + Me.lblZwischensumme.Width = 1.549212! ' 'Label23 ' @@ -1072,7 +1080,7 @@ Partial Public Class rptMahnung ' 'GroupHeader4 ' - Me.GroupHeader4.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblLeistungUeberschrift, Me.Line4, Me.Line12, Me.Line13, Me.Line16, Me.lblUeberschriftRG_GS, Me.TextBox2, Me.lblRgDat, Me.lblFaelligkeit, Me.Label10, Me.Label11, Me.Label12, Me.Label13, Me.Label14, Me.Label22}) + Me.GroupHeader4.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblLeistungUeberschrift, Me.Line4, Me.Line12, Me.Line13, Me.Line16, Me.lblUeberschriftRG_GS, Me.txtMahnungstextVOR, Me.lblRgDat, Me.lblFaelligkeit, Me.lblReBetrag, Me.lblAbfertigungsNr, Me.lblZahlung, Me.lblAusstand, Me.lblMS, Me.Label22}) Me.GroupHeader4.Height = 1.032275! Me.GroupHeader4.KeepTogether = True Me.GroupHeader4.Name = "GroupHeader4" @@ -1122,7 +1130,7 @@ Partial Public Class rptMahnung Me.Line13.LineWeight = 1.0! Me.Line13.Name = "Line13" Me.Line13.Top = 0.761! - Me.Line13.Width = 0.00157547! + Me.Line13.Width = 0.001574993! Me.Line13.X1 = 7.486614! Me.Line13.X2 = 7.488189! Me.Line13.Y1 = 0.761! @@ -1141,16 +1149,19 @@ Partial Public Class rptMahnung Me.Line16.Y1 = 0.761! Me.Line16.Y2 = 0.761! ' - 'TextBox2 + 'txtMahnungstextVOR ' - Me.TextBox2.Height = 0.262! - Me.TextBox2.Left = 0.4040001! - Me.TextBox2.Name = "TextBox2" - Me.TextBox2.Style = "font-size: 10pt; font-weight: normal; text-align: left; text-justify: auto; ddo-c" & - "har-set: 1" - Me.TextBox2.Text = "Wir ersuchen um Ausgleich der nachfolgenden Rechnungen:" - Me.TextBox2.Top = 0.399! - Me.TextBox2.Width = 7.097969! + Me.txtMahnungstextVOR.DataField = "" + Me.txtMahnungstextVOR.DistinctField = "" + Me.txtMahnungstextVOR.Height = 0.262! + Me.txtMahnungstextVOR.Left = 0.4040001! + Me.txtMahnungstextVOR.Name = "txtMahnungstextVOR" + Me.txtMahnungstextVOR.Style = "color: Black; font-size: 10pt; font-weight: normal; text-align: left; text-justif" & + "y: auto; ddo-char-set: 1" + Me.txtMahnungstextVOR.SummaryGroup = "" + Me.txtMahnungstextVOR.Text = "Wir ersuchen um Ausgleich der nachfolgenden Rechnungen:" + Me.txtMahnungstextVOR.Top = 0.399! + Me.txtMahnungstextVOR.Width = 7.097969! ' 'lblRgDat ' @@ -1176,67 +1187,72 @@ Partial Public Class rptMahnung Me.lblFaelligkeit.Top = 0.791! Me.lblFaelligkeit.Width = 0.6614173! ' - 'Label10 + 'lblReBetrag ' - Me.Label10.Height = 0.1807087! - Me.Label10.HyperLink = Nothing - Me.Label10.Left = 4.999308! - Me.Label10.Name = "Label10" - Me.Label10.Padding = New GrapeCity.ActiveReports.PaddingEx(0, 0, 2, 0) - Me.Label10.Style = "font-size: 9pt; font-weight: bold; text-align: right; text-justify: auto; ddo-cha" & - "r-set: 1" - Me.Label10.Text = "Rg.Betrag" - Me.Label10.Top = 0.7909449! - Me.Label10.Width = 0.6889764! + Me.lblReBetrag.DataField = "" + Me.lblReBetrag.Height = 0.1807087! + Me.lblReBetrag.HyperLink = Nothing + Me.lblReBetrag.Left = 4.999308! + Me.lblReBetrag.Name = "lblReBetrag" + Me.lblReBetrag.Padding = New GrapeCity.ActiveReports.PaddingEx(0, 0, 2, 0) + Me.lblReBetrag.Style = "color: Black; font-size: 9pt; font-weight: bold; text-align: right; text-justify:" & + " auto; ddo-char-set: 1" + Me.lblReBetrag.Text = "Belegnr." + Me.lblReBetrag.Top = 0.7909449! + Me.lblReBetrag.Width = 0.6889764! ' - 'Label11 + 'lblAbfertigungsNr ' - Me.Label11.Height = 0.1810001! - Me.Label11.HyperLink = Nothing - Me.Label11.Left = 2.544576! - Me.Label11.Name = "Label11" - Me.Label11.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) - Me.Label11.Style = "font-size: 9pt; font-weight: bold; text-align: left; text-justify: auto; ddo-char" & - "-set: 1" - Me.Label11.Text = "Abfertigungs-Nr." - Me.Label11.Top = 0.791! - Me.Label11.Width = 2.472747! + Me.lblAbfertigungsNr.DataField = "" + Me.lblAbfertigungsNr.Height = 0.1810001! + Me.lblAbfertigungsNr.HyperLink = Nothing + Me.lblAbfertigungsNr.Left = 2.544576! + Me.lblAbfertigungsNr.Name = "lblAbfertigungsNr" + Me.lblAbfertigungsNr.Padding = New GrapeCity.ActiveReports.PaddingEx(6, 0, 0, 0) + Me.lblAbfertigungsNr.Style = "color: Black; font-size: 9pt; font-weight: bold; text-align: left; text-justify: " & + "auto; ddo-char-set: 1" + Me.lblAbfertigungsNr.Text = "Abfertigungs-Nr." + Me.lblAbfertigungsNr.Top = 0.791! + Me.lblAbfertigungsNr.Width = 2.472747! ' - 'Label12 + 'lblZahlung ' - Me.Label12.Height = 0.1807087! - Me.Label12.HyperLink = Nothing - Me.Label12.Left = 5.685528! - Me.Label12.Name = "Label12" - Me.Label12.Style = "font-size: 9pt; font-weight: bold; text-align: right; text-justify: auto; ddo-cha" & - "r-set: 1" - Me.Label12.Text = "Zahlungen" - Me.Label12.Top = 0.7909449! - Me.Label12.Width = 0.6889764! + Me.lblZahlung.DataField = "" + Me.lblZahlung.Height = 0.1807087! + Me.lblZahlung.HyperLink = Nothing + Me.lblZahlung.Left = 5.685528! + Me.lblZahlung.Name = "lblZahlung" + Me.lblZahlung.Style = "color: Black; font-size: 9pt; font-weight: bold; text-align: right; text-justify:" & + " auto; ddo-char-set: 1" + Me.lblZahlung.Text = "Zahlungen" + Me.lblZahlung.Top = 0.7909449! + Me.lblZahlung.Width = 0.6889764! ' - 'Label13 + 'lblAusstand ' - Me.Label13.Height = 0.1808192! - Me.Label13.HyperLink = Nothing - Me.Label13.Left = 6.390852! - Me.Label13.Name = "Label13" - Me.Label13.Style = "font-size: 9pt; font-weight: bold; text-align: center; text-justify: auto; ddo-ch" & - "ar-set: 1" - Me.Label13.Text = "Ausstand" - Me.Label13.Top = 0.791! - Me.Label13.Width = 0.7354794! + Me.lblAusstand.DataField = "" + Me.lblAusstand.Height = 0.1808192! + Me.lblAusstand.HyperLink = Nothing + Me.lblAusstand.Left = 6.390852! + Me.lblAusstand.Name = "lblAusstand" + Me.lblAusstand.Style = "color: Black; font-size: 9pt; font-weight: bold; text-align: center; text-justify" & + ": auto; ddo-char-set: 1" + Me.lblAusstand.Text = "Ausstand" + Me.lblAusstand.Top = 0.791! + Me.lblAusstand.Width = 0.7354794! ' - 'Label14 + 'lblMS ' - Me.Label14.Height = 0.1808192! - Me.Label14.HyperLink = Nothing - Me.Label14.Left = 6.803056! - Me.Label14.Name = "Label14" - Me.Label14.Style = "font-size: 9pt; font-weight: bold; text-align: right; text-justify: auto; ddo-cha" & - "r-set: 1" - Me.Label14.Text = "MS" - Me.Label14.Top = 0.7909449! - Me.Label14.Width = 0.6699996! + Me.lblMS.DataField = "" + Me.lblMS.Height = 0.1808192! + Me.lblMS.HyperLink = Nothing + Me.lblMS.Left = 6.803056! + Me.lblMS.Name = "lblMS" + Me.lblMS.Style = "color: Black; font-size: 9pt; font-weight: bold; text-align: right; text-justify:" & + " auto; ddo-char-set: 1" + Me.lblMS.Text = "MS" + Me.lblMS.Top = 0.7909449! + Me.lblMS.Width = 0.6699996! ' 'GroupFooter4 ' @@ -1272,8 +1288,8 @@ Partial Public Class rptMahnung CType(Me.Label19, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label20, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label21, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Label22, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextBox1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.Label22, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ReportInfo2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblBankUeberschrift, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtBank1, System.ComponentModel.ISupportInitialize).EndInit() @@ -1303,13 +1319,13 @@ Partial Public Class rptMahnung CType(Me.lblRechnung_Ort, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblFirma, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblRechnung_Land, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Label3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblSachbearbeiterTelefon, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblTelefon, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Label5, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblSachbearbeiterEMail, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblEmail, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Label1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblFax, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblFaxNr, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Label25, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblAnrede, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblUeberschriftRG_GS, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblSummeUeberschrift, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblSumme, System.ComponentModel.ISupportInitialize).EndInit() @@ -1318,20 +1334,20 @@ Partial Public Class rptMahnung CType(Me.lblSteuersatz, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtVermerk, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblZwText, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Label2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblZwischensumme, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label23, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label24, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label4, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label6, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblLeistungUeberschrift, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextBox2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtMahnungstextVOR, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblRgDat, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblFaelligkeit, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Label10, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Label11, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Label12, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Label13, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Label14, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblReBetrag, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblAbfertigungsNr, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblZahlung, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblAusstand, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblMS, System.ComponentModel.ISupportInitialize).EndInit() CType(Me, System.ComponentModel.ISupportInitialize).EndInit() End Sub @@ -1396,21 +1412,21 @@ Partial Public Class rptMahnung Public WithEvents lblFirmenbuch As GrapeCity.ActiveReports.SectionReportModel.Label Private WithEvents lblUIDUeberschrift As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents lblUID As GrapeCity.ActiveReports.SectionReportModel.Label - Private WithEvents Label3 As GrapeCity.ActiveReports.SectionReportModel.Label + Private WithEvents lblSachbearbeiterTelefon As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents lblTelefon As GrapeCity.ActiveReports.SectionReportModel.Label - Private WithEvents Label5 As GrapeCity.ActiveReports.SectionReportModel.Label + Private WithEvents lblSachbearbeiterEMail As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents lblEmail As GrapeCity.ActiveReports.SectionReportModel.Label - Public WithEvents Label1 As GrapeCity.ActiveReports.SectionReportModel.Label + Public WithEvents lblFax 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 + Public WithEvents txtMahnungstextVOR As GrapeCity.ActiveReports.SectionReportModel.TextBox + Public WithEvents lblZwischensumme As GrapeCity.ActiveReports.SectionReportModel.Label Private WithEvents lblRgDat As GrapeCity.ActiveReports.SectionReportModel.Label Private WithEvents lblFaelligkeit As GrapeCity.ActiveReports.SectionReportModel.Label - Private WithEvents Label10 As GrapeCity.ActiveReports.SectionReportModel.Label - Private WithEvents Label11 As GrapeCity.ActiveReports.SectionReportModel.Label - Private WithEvents Label12 As GrapeCity.ActiveReports.SectionReportModel.Label - Private WithEvents Label13 As GrapeCity.ActiveReports.SectionReportModel.Label - Private WithEvents Label14 As GrapeCity.ActiveReports.SectionReportModel.Label + Private WithEvents lblReBetrag As GrapeCity.ActiveReports.SectionReportModel.Label + Private WithEvents lblAbfertigungsNr As GrapeCity.ActiveReports.SectionReportModel.Label + Private WithEvents lblZahlung As GrapeCity.ActiveReports.SectionReportModel.Label + Private WithEvents lblAusstand As GrapeCity.ActiveReports.SectionReportModel.Label + Private WithEvents lblMS As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents Label23 As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents Label24 As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents Label15 As GrapeCity.ActiveReports.SectionReportModel.Label @@ -1420,7 +1436,7 @@ Partial Public Class rptMahnung Public WithEvents Label20 As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents Label21 As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents Label22 As GrapeCity.ActiveReports.SectionReportModel.Label - Public WithEvents Label25 As GrapeCity.ActiveReports.SectionReportModel.Label + Public WithEvents lblAnrede As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents TextBox1 As GrapeCity.ActiveReports.SectionReportModel.TextBox Public WithEvents Label4 As GrapeCity.ActiveReports.SectionReportModel.Label Public WithEvents Label6 As GrapeCity.ActiveReports.SectionReportModel.Label diff --git a/SDL/buchhaltung/rptMahnung.vb b/SDL/buchhaltung/rptMahnung.vb index 0dd88309..4bcae0fc 100644 --- a/SDL/buchhaltung/rptMahnung.vb +++ b/SDL/buchhaltung/rptMahnung.vb @@ -3,25 +3,30 @@ Imports GrapeCity.ActiveReports.Document Public Class rptMahnung Dim _LAN = "" + Dim _OPTION = "" + Dim _FIRMAID As Integer = -1 + Sub New() InitializeComponent() Me.Document.Printer.PrinterName = "" End Sub - Sub New(_LAN) + Sub New(_LAN, _OPTION, _FIRMAID) ' Dieser Aufruf ist fr den Designer erforderlich. InitializeComponent() Me.Document.Printer.PrinterName = "" Me._LAN = _LAN + Me._OPTION = _OPTION + Me._FIRMAID = _FIRMAID ' Fgen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. End Sub Private Sub rptRechnungDruck_ReportStart(sender As Object, e As EventArgs) Handles MyBase.ReportStart Me.Document.Printer.PrinterName = "" If _LAN.replace("DE", "") <> "" Then - SDL.cProgramFunctions._TRANSLATE_RPT(Me, Me.ReportHeader1.Controls, _LAN, "rptMahnung") - SDL.cProgramFunctions._TRANSLATE_RPT(Me, Me.ReportFooter1.Controls, _LAN, "rptMahnung") - SDL.cProgramFunctions._TRANSLATE_RPT(Me, Me.GroupHeader4.Controls, _LAN, "rptMahnung") - SDL.cProgramFunctions._TRANSLATE_RPT(Me, Me.PageFooter.Controls, _LAN, "rptMahnung") + SDL.cProgramFunctions._TRANSLATE_RPT(Me, Me.ReportHeader1.Controls, _LAN, "rptMahnung", _OPTION, _FIRMAID) + SDL.cProgramFunctions._TRANSLATE_RPT(Me, Me.ReportFooter1.Controls, _LAN, "rptMahnung", _OPTION, _FIRMAID) + SDL.cProgramFunctions._TRANSLATE_RPT(Me, Me.GroupHeader4.Controls, _LAN, "rptMahnung", _OPTION, _FIRMAID) + SDL.cProgramFunctions._TRANSLATE_RPT(Me, Me.PageFooter.Controls, _LAN, "rptMahnung", _OPTION, _FIRMAID) End If End Sub diff --git a/SDL/cProgramFunctions.vb b/SDL/cProgramFunctions.vb index 6f80b16c..c38d3ba7 100644 --- a/SDL/cProgramFunctions.vb +++ b/SDL/cProgramFunctions.vb @@ -1364,7 +1364,7 @@ Public Class cProgramFunctions End Sub - Public Shared Sub _TRANSLATE_RPT(rpt As GrapeCity.ActiveReports.SectionReport, o As GrapeCity.ActiveReports.SectionReportModel.ControlCollection, lan As String, reportName As String) + Public Shared Sub _TRANSLATE_RPT(rpt As GrapeCity.ActiveReports.SectionReport, o As GrapeCity.ActiveReports.SectionReportModel.ControlCollection, lan As String, reportName As String, Optional _option As String = "", Optional _firmenid As Integer = -1) If lan = "" Then Exit Sub If lan = "DE" Then Exit Sub 'o... Form @@ -1378,8 +1378,37 @@ Public Class cProgramFunctions Dim found As GrapeCity.ActiveReports.SectionReportModel.ARControl = Nothing For Each search As GrapeCity.ActiveReports.SectionReportModel.ARControl In o If search.Name = TXT.trs_control Then - found = search - End If + + If Not IsDBNull(TXT.trs_FirmaID) AndAlso TXT.trs_FirmaID > 0 Then + If TXT.trs_FirmaID = _firmenid Then + If IsDBNull(TXT.trs_Option) AndAlso TXT.trs_Option = "" Then + found = search + Else + If _option = TXT.trs_Option Then + found = search + End If + + End If + End If + + Else + + + If IsDBNull(TXT.trs_Option) OrElse TXT.trs_Option = "" Then + found = search + Else + If _option = TXT.trs_Option Then + found = search + End If + + End If + + End If + End If + + + + Next ' MsgBox(TXT.trs_control) diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index 0924097a..67f60857 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -272,7 +272,7 @@ Partial Class frmKundenblatt Me.tbFirmendaten.Location = New System.Drawing.Point(4, 25) Me.tbFirmendaten.Name = "tbFirmendaten" Me.tbFirmendaten.Padding = New System.Windows.Forms.Padding(3) - Me.tbFirmendaten.Size = New System.Drawing.Size(1630, 880) + Me.tbFirmendaten.Size = New System.Drawing.Size(1630, 897) Me.tbFirmendaten.TabIndex = 3 Me.tbFirmendaten.Text = "Firmendaten" ' @@ -282,7 +282,7 @@ Partial Class frmKundenblatt Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(3, 3) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(1624, 874) + Me.Panel4.Size = New System.Drawing.Size(1624, 891) Me.Panel4.TabIndex = 0 ' 'UsrcntlKundeBearbeitenFull1 @@ -292,7 +292,7 @@ Partial Class frmKundenblatt Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" - Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1624, 874) + Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1624, 891) Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 ' 'tbcntrMain @@ -310,7 +310,7 @@ Partial Class frmKundenblatt Me.tbcntrMain.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMain.Name = "tbcntrMain" Me.tbcntrMain.SelectedIndex = 0 - Me.tbcntrMain.Size = New System.Drawing.Size(1638, 909) + Me.tbcntrMain.Size = New System.Drawing.Size(1638, 926) Me.tbcntrMain.TabIndex = 3 ' 'tbAllgemein @@ -350,7 +350,7 @@ Partial Class frmKundenblatt Me.tbAllgemein.Margin = New System.Windows.Forms.Padding(0) Me.tbAllgemein.Name = "tbAllgemein" Me.tbAllgemein.Padding = New System.Windows.Forms.Padding(3) - Me.tbAllgemein.Size = New System.Drawing.Size(1630, 880) + Me.tbAllgemein.Size = New System.Drawing.Size(1630, 897) Me.tbAllgemein.TabIndex = 0 Me.tbAllgemein.Text = "Allgemein" ' @@ -425,7 +425,7 @@ Partial Class frmKundenblatt Me.dgvOffenePosten.ReadOnly = True Me.dgvOffenePosten.RowHeadersVisible = False Me.dgvOffenePosten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvOffenePosten.Size = New System.Drawing.Size(714, 281) + Me.dgvOffenePosten.Size = New System.Drawing.Size(714, 298) Me.dgvOffenePosten.TabIndex = 175 ' 'btnOP @@ -772,7 +772,7 @@ Partial Class frmKundenblatt DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle7 - Me.dgvSperrliste.Size = New System.Drawing.Size(432, 836) + Me.dgvSperrliste.Size = New System.Drawing.Size(432, 853) Me.dgvSperrliste.TabIndex = 23 ' 'PictureBox2 @@ -857,7 +857,7 @@ Partial Class frmKundenblatt Me.tbMdm.Location = New System.Drawing.Point(4, 25) Me.tbMdm.Name = "tbMdm" Me.tbMdm.Padding = New System.Windows.Forms.Padding(3) - Me.tbMdm.Size = New System.Drawing.Size(1630, 880) + Me.tbMdm.Size = New System.Drawing.Size(1630, 897) Me.tbMdm.TabIndex = 10 Me.tbMdm.Text = "MDM" Me.tbMdm.UseVisualStyleBackColor = True @@ -875,7 +875,7 @@ Partial Class frmKundenblatt Me.tbcntrMDM.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMDM.Name = "tbcntrMDM" Me.tbcntrMDM.SelectedIndex = 0 - Me.tbcntrMDM.Size = New System.Drawing.Size(1624, 874) + Me.tbcntrMDM.Size = New System.Drawing.Size(1624, 891) Me.tbcntrMDM.TabIndex = 0 ' 'tbSDL @@ -887,7 +887,7 @@ Partial Class frmKundenblatt Me.tbSDL.Margin = New System.Windows.Forms.Padding(0) Me.tbSDL.Name = "tbSDL" Me.tbSDL.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDL.Size = New System.Drawing.Size(1616, 848) + Me.tbSDL.Size = New System.Drawing.Size(1616, 865) Me.tbSDL.TabIndex = 5 Me.tbSDL.Text = "SDL-Leistungen" Me.tbSDL.UseVisualStyleBackColor = True @@ -929,7 +929,7 @@ Partial Class frmKundenblatt DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle11 Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1610, 652) + Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1610, 669) Me.dgvSDLLeistungenFull.TabIndex = 5 ' 'Panel6 @@ -1033,7 +1033,7 @@ Partial Class frmKundenblatt Me.Panel5.Controls.Add(Me.lblLetzterSA_SDL) Me.Panel5.Controls.Add(Me.rtbVermerke) Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel5.Location = New System.Drawing.Point(3, 702) + Me.Panel5.Location = New System.Drawing.Point(3, 719) Me.Panel5.Name = "Panel5" Me.Panel5.Size = New System.Drawing.Size(1610, 143) Me.Panel5.TabIndex = 177 @@ -2337,7 +2337,7 @@ Partial Class frmKundenblatt Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScroll = True Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(1180, 1038) + Me.ClientSize = New System.Drawing.Size(1180, 1055) Me.Controls.Add(Me.lblAbfVerb) Me.Controls.Add(Me.btnAbfVerb) Me.Controls.Add(Me.tbcntrMain) diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index 193e1acc..f08c7993 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -779,6 +779,7 @@ Public Class usrcntlKundeBearbeitenFull cboRechnungSprache.Items.Clear() cboRechnungSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Deutsch", "DE")) cboRechnungSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Englisch", "EN")) + cboRechnungSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Rumänisch", "RO")) cboRechnungSprache.changeItem(0) cboProvisionStaffelArt.fillWithSQL("SELECT [PreislistenNr],[PreislistenBez] FROM [VERAG].[dbo].[tblPreislisten] WHERE Art='E' ORDER BY Preislistenbez", False, "FMZOLL", True) diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 98308c7f..f180fdf9 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -362,11 +362,36 @@ Public Class frmMDMDatenverarbetiung Dim displayFilter = False Dim sqlstr As String = "" - sqlstr &= "SELECT Kundennummer, KundenNr, [Name 1], LandKz, Ort, Lieferland, Kartennummer, Sum(Gesamtbetrag_Netto_in_Darstellwährung) AS SummevonGesamtbetrag_Netto_in_Darstellwährung, Sum(Gesamtbetrag_Brutto_in_Darstellwährung) AS SummevonGesamtbetrag_Brutto_in_Darstellwährung from ( - SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.LandKz, Adressen.Ort, Adressen.UTAExportCSV, Adressen.Rechnungsdruck, Offertenpositionen.KundenNr, Offertenpositionen.OffertenNr, Offertenpositionen.LeistungsNr, Offertenpositionen.LeistungsBez, tblUTAFakturierwarenarten.Warenart, tblUTAImport.* + sqlstr &= "SELECT Kundennummer, + KundenNr, + [Name 1], + LandKz, + Ort, + Lieferland, + Kartennummer, + Sum(Gesamtbetrag_Netto_in_Darstellwährung) AS SummevonGesamtbetrag_Netto_in_Darstellwährung, + Sum(Gesamtbetrag_Brutto_in_Darstellwährung) AS SummevonGesamtbetrag_Brutto_in_Darstellwährung from ( + SELECT Adressen.AdressenNr, + Adressen.[Name 1], + Adressen.LandKz, + Adressen.Ort, + Adressen.UTAExportCSV, + Adressen.Rechnungsdruck, + Offertenpositionen.KundenNr, + Offertenpositionen.OffertenNr, + Offertenpositionen.LeistungsNr, + Offertenpositionen.LeistungsBez, + tblUTAFakturierwarenarten.Warenart, + tblUTAImport.* FROM tblUTAFakturierwarenarten - INNER JOIN (((Adressen INNER JOIN tblUTAImport ON Adressen.UTAKundenNr = tblUTAImport.Kundennummer) INNER JOIN Offertenpositionen ON Adressen.AdressenNr = Offertenpositionen.KundenNr) INNER JOIN tblUTALeistungen ON (tblUTALeistungen.VERAG_LeistungsNr = Offertenpositionen.LeistungsNr) - AND (tblUTALeistungen.VERAG_OffertenNr = Offertenpositionen.OffertenNr) AND (tblUTAImport.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart) as temp + INNER JOIN (((Adressen INNER JOIN tblUTAImport ON Adressen.UTAKundenNr = tblUTAImport.Kundennummer) + INNER JOIN Offertenpositionen ON Adressen.AdressenNr = Offertenpositionen.KundenNr) + INNER JOIN tblUTALeistungen ON (tblUTALeistungen.VERAG_LeistungsNr = Offertenpositionen.LeistungsNr) + AND (tblUTALeistungen.VERAG_OffertenNr = Offertenpositionen.OffertenNr) + AND (tblUTAImport.Lieferland = tblUTALeistungen.Lieferland) + AND (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart) + as temp + where temp.abgerechnet <> 1 GROUP BY Kundennummer, KundenNr, [Name 1], LandKz, Ort, Lieferland, Kartennummer" Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL") @@ -624,22 +649,34 @@ Public Class frmMDMDatenverarbetiung 'Exit Sub 'MsgBox(.sql) - .SET_SQL(" SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.LandKz, Adressen.Ort,Offertenpositionen.OffertenNr, Offertenpositionen.LeistungsNr, Offertenpositionen.LeistungsBez, tblUTAFakturierwarenarten.Warenart, tblUTAImport.Fakturierwarenart,sum(tblUTAImport.Gesamtbetrag_Netto_in_Lieferlandwährung) as Netto ,sum(tblUTAImport.Gesamtbetrag_Brutto_in_Lieferlandwährung) as Brutto + .SET_SQL("SELECT Kundennummer, KundenNr, [Name 1], LandKz, Ort, /*Lieferland, Kartennummer,*/ Sum(Gesamtbetrag_Netto_in_Darstellwährung) AS Netto, Sum(Gesamtbetrag_Brutto_in_Darstellwährung) AS Brutto + from ( + SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.LandKz, Adressen.Ort, Adressen.UTAExportCSV, Adressen.Rechnungsdruck, Offertenpositionen.KundenNr, Offertenpositionen.OffertenNr, Offertenpositionen.LeistungsNr, Offertenpositionen.LeistungsBez, tblUTAFakturierwarenarten.Warenart, tblUTAImport.* FROM tblUTAFakturierwarenarten - INNER JOIN (((Adressen INNER JOIN tblUTAImport ON Adressen.UTAKundenNr = tblUTAImport.Kundennummer) - INNER JOIN Offertenpositionen ON Adressen.AdressenNr = Offertenpositionen.KundenNr) - INNER JOIN tblUTALeistungen ON (tblUTALeistungen.VERAG_LeistungsNr = Offertenpositionen.LeistungsNr) AND (tblUTALeistungen.VERAG_OffertenNr = Offertenpositionen.OffertenNr) AND (tblUTAImport.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart - where abgerechnet <> 1 - group by Adressen.AdressenNr, Adressen.[Name 1], Adressen.LandKz, Adressen.Ort, Offertenpositionen.OffertenNr, Offertenpositionen.LeistungsNr, Offertenpositionen.LeistungsBez, tblUTAFakturierwarenarten.Warenart,tblUTAImport.Fakturierwarenart ", "FMZOLL") + INNER JOIN (((Adressen + INNER JOIN tblUTAImport ON Adressen.UTAKundenNr = tblUTAImport.Kundennummer) + INNER JOIN Offertenpositionen ON Adressen.AdressenNr = Offertenpositionen.KundenNr) + INNER JOIN tblUTALeistungen ON (tblUTALeistungen.VERAG_LeistungsNr = Offertenpositionen.LeistungsNr) + AND (tblUTALeistungen.VERAG_OffertenNr = Offertenpositionen.OffertenNr) + AND (tblUTAImport.Lieferland = tblUTALeistungen.Lieferland) + AND (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) + ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart) as temp + where temp.abgerechnet <> 1 + GROUP BY Kundennummer, KundenNr, [Name 1], LandKz, Ort", "FMZOLL") .LOAD() 'MsgBox(.GET_SQL()) If .Columns.Count > 0 Then - .Columns("AdressenNr").HeaderText = "KdNr" + .Columns("KundenNr").HeaderText = "KdNr" .Columns("Name 1").HeaderText = "Kunde" + .Columns("LandKz").Width = 75 .Columns("LandKz").HeaderText = "Land" + .Columns("Ort").HeaderText = "Ort" + .Columns("Ort").Width = 100 + '.Columns("Lieferland").HeaderText = "Land" .Columns("Name 1").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + '.Columns("VERAGLeistungsNr").ReadOnly = False '.Columns("VERAGKdNr").ReadOnly = False diff --git a/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.vb b/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.vb index 1ccc9afc..03aba78e 100644 --- a/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.vb +++ b/SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.vb @@ -39,9 +39,9 @@ Public Class usrCntlMDMDatenverarbeitungAuswertungen_divers Case "UTA" - Button6.Text = "Kundennummern" - Button2.Text = "Fakturierwarenart" - Button1.Text = "Offertenpositionen" + Button6.Text = "fehlende KdNr" + Button2.Text = "fehlende Fakt.warenart" + Button1.Text = "fehlende Offertenpos." Case "MSE" @@ -302,14 +302,14 @@ Public Class usrCntlMDMDatenverarbeitungAuswertungen_divers Case "KDNR" - sqlstr = "SELECT tblUTAImport.Kundennummer + sqlstr = "SELECT tblUTAImport.Kundennummer as 'fehlende UTA-Kundennummer' FROM tblUTAImport LEFT JOIN Adressen ON tblUTAImport.Kundennummer = Adressen.UTAKundenNr GROUP BY tblUTAImport.Kundennummer, Adressen.UTAKundenNr HAVING (((Adressen.UTAKundenNr) Is Null))" Case "FKWA" - sqlstr = "SELECT tblUTAImport.Fakturierwarenart, tblUTAImport.Lieferland + sqlstr = "SELECT tblUTAImport.Fakturierwarenart as Fakturierwarenart, tblUTAImport.Lieferland as Lieferland FROM tblUTAImport LEFT JOIN tblUTALeistungen ON (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart) AND (tblUTAImport.Lieferland = tblUTALeistungen.Lieferland) GROUP BY tblUTAImport.Fakturierwarenart, tblUTAImport.Lieferland, tblUTALeistungen.Fakturierwarenart, tblUTALeistungen.Lieferland HAVING (((tblUTALeistungen.Fakturierwarenart) Is Null) AND ((tblUTALeistungen.Lieferland) Is Null))" @@ -334,52 +334,54 @@ Public Class usrCntlMDMDatenverarbeitungAuswertungen_divers End If - Dim rpt As New rptPLOSE_LaenderGesamt - rpt.DataSource = dt + cProgramFunctions.genExcelCSVFromDT(dt, True) - Dim sum = 0 - ' rpt.lblUeberschrift.Text = "PLOSE Summenbericht " & dat_Sum_Von.Text & " bis " & dat_Sum_Bis.Text - rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME - 'rpt.lblMandantNiederlassung.Text = PERSONAL.Mandant & " / " & PERSONAL.Niederlassung + 'Dim rpt As New rptPLOSE_LaenderGesamt + 'rpt.DataSource = dt - 'Dim cnt As Integer = 0 - rpt.lblDat.Text = Now.ToLongDateString + 'Dim sum = 0 + '' rpt.lblUeberschrift.Text = "PLOSE Summenbericht " & dat_Sum_Von.Text & " bis " & dat_Sum_Bis.Text + 'rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME + ''rpt.lblMandantNiederlassung.Text = PERSONAL.Mandant & " / " & PERSONAL.Niederlassung + + ''Dim cnt As Integer = 0 + 'rpt.lblDat.Text = Now.ToLongDateString - 'Dim sumPreis As Double = 0 - 'Dim sumNetto As Double = 0 - 'Dim sumMWST As Double = 0 - 'Dim sumBrutto As Double = 0 - 'Dim sumBruttoAlleLeistungen As Double = 0 - 'Dim sumMenge As Double = 0 + ''Dim sumPreis As Double = 0 + ''Dim sumNetto As Double = 0 + ''Dim sumMWST As Double = 0 + ''Dim sumBrutto As Double = 0 + ''Dim sumBruttoAlleLeistungen As Double = 0 + ''Dim sumMenge As Double = 0 - 'AddHandler rpt.Detail.Format, Sub() - ' rpt.lblLand.Text = SQL.isDbnullEmpty(rpt.Fields.Item("plp_Land").Value, "") - ' rpt.lblEU.Text = SQL.isDbnullEmpty(rpt.Fields.Item("EU").Value, "") + ''AddHandler rpt.Detail.Format, Sub() + '' rpt.lblLand.Text = SQL.isDbnullEmpty(rpt.Fields.Item("plp_Land").Value, "") + '' rpt.lblEU.Text = SQL.isDbnullEmpty(rpt.Fields.Item("EU").Value, "") - ' rpt.lblNetto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Netto").Value, 2, "") - ' rpt.lblMWST.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("MWST").Value, 2, "") - ' rpt.lblBrutto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Brutto").Value, 2, "") + '' rpt.lblNetto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Netto").Value, 2, "") + '' rpt.lblMWST.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("MWST").Value, 2, "") + '' rpt.lblBrutto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Brutto").Value, 2, "") - ' sumNetto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Netto").Value, 4, 0) - ' sumMWST += SQL.isDbnullEmptyDbl(rpt.Fields.Item("MWST").Value, 4, 0) - ' sumBrutto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Brutto").Value, 4, 0) + '' sumNetto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Netto").Value, 4, 0) + '' sumMWST += SQL.isDbnullEmptyDbl(rpt.Fields.Item("MWST").Value, 4, 0) + '' sumBrutto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Brutto").Value, 4, 0) - ' End Sub + '' End Sub - 'AddHandler rpt.ReportFooter1.Format, Sub() - ' rpt.lblSumNetto.Text = sumNetto.ToString("N2") - ' rpt.lblSumMwst.Text = sumMWST.ToString("N2") - ' rpt.lblSumBrutto.Text = sumBrutto.ToString("N2") + ''AddHandler rpt.ReportFooter1.Format, Sub() + '' rpt.lblSumNetto.Text = sumNetto.ToString("N2") + '' rpt.lblSumMwst.Text = sumMWST.ToString("N2") + '' rpt.lblSumBrutto.Text = sumBrutto.ToString("N2") - ' End Sub + '' End Sub - print.Viewer.LoadDocument(rpt) - print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous - print.Show() + 'print.Viewer.LoadDocument(rpt) + 'print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous + 'print.Show() End Sub diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cEasyBinding.vb b/VERAG_PROG_ALLGEMEIN/Classes/cEasyBinding.vb index 15ee127b..314ccdcc 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cEasyBinding.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cEasyBinding.vb @@ -88,7 +88,9 @@ Public Class cEasyBinding MsgBox("Es ist ein SQL-Fehler beim Updaten der Daten aufgetreten:" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & "Die Werte werden zurückgesetzt!", MsgBoxStyle.OkCancel, "Datenbank-Fehler") Me.bindingSource.ResumeBinding() End Try + Return False + End Function diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cTranslate.vb b/VERAG_PROG_ALLGEMEIN/Classes/cTranslate.vb index d0d8afd3..fd5b2560 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cTranslate.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cTranslate.vb @@ -26,6 +26,8 @@ Public Class cTranslate_LIST T.trs_subControl = dr("trs_subControl") T.trs_sprache = dr("trs_sprache") T.trs_text = dr("trs_text") + T.trs_FirmaID = dr("trs_FirmaID") + T.trs_Option = dr("trs_Option") list.Add(T) End While dr.Close() @@ -47,7 +49,8 @@ Public Class cTranslate Property trs_subControl As Object = Nothing Property trs_sprache As String Property trs_text As String - + Property trs_Option As Object = Nothing + Property trs_FirmaID As Object = Nothing Public hasEntry = False @@ -69,6 +72,8 @@ Public Class cTranslate list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("trs_subControl", trs_subControl)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("trs_sprache", trs_sprache)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("trs_text", trs_text)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("trs_Option", trs_Option)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("trs_FirmaID", trs_FirmaID)) Return list End Function diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb index d49ceaef..2bb571cb 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb @@ -288,6 +288,7 @@ Public Class cDATENSERVER Dim tempBytes = System.Text.Encoding.GetEncoding("ISO-8859-8").GetBytes(s) s = System.Text.Encoding.UTF8.GetString(tempBytes) s = s.Replace("�", "") + s = s.Replace("?", "") Return s End Function diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb index 5f430869..5054035b 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb @@ -24,7 +24,6 @@ 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() @@ -39,12 +38,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.components) + Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview() 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.components) + Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview() Me.Panel5 = New System.Windows.Forms.Panel() Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.PictureBox2 = New System.Windows.Forms.PictureBox() @@ -65,7 +64,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.components) + Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel() Me.UsrCntlMessenger_ChatElement1 = New VERAG_PROG_ALLGEMEIN.usrCntlMessenger_ChatElement() Me.Panel3 = New System.Windows.Forms.Panel() Me.btnTeilnehmer = New System.Windows.Forms.Button() @@ -93,9 +92,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.components) - Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components) - Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer() + Me.Timer_REFRESH = New System.Windows.Forms.Timer() + Me.cntxt = New System.Windows.Forms.ContextMenuStrip() Me.ChatDeaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.toolChatReminder = New System.Windows.Forms.ToolStripMenuItem() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb index f545e8b7..bd4aba13 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb @@ -502,7 +502,7 @@ Public Class frmUeberstundenauszahlen Try Dim dtbereitsausgezahlteUE As DataTable - Dim bereitsgezahlteueberstunden = "select uest_deleted as geloescht, uest_date as Datum ,isnull(uest_100,0) as ÜS100 , isnull(uest_50,0) as ÜS50, isnull(uest_25,0) as ÜS25, isnull(uest_0,0) as ÜS50_Saldo, isnull(uest_paidout_sum,0) as ausbezahlt, uest_systemuser as eingetragen_von ,uest_created as eingetragen_am + Dim bereitsgezahlteueberstunden = "select uest_deleted as geloescht, uest_date as Datum ,isnull(uest_100,0) as ÜS100 , isnull(uest_50,0) as ÜS50, isnull(uest_25,0) as ÜS25, isnull(uest_0,0) as ÜS50_Saldo, isnull(uest_paidout_sum,0) as ausbezahlt, uest_systemuser as eingetragen_von ,uest_created as eingetragen_am, cast (case when isnull([uest_ignorePayoutDate],0) = 0 then 0 else 1 end) as bit as ignoreAuszahlungsdatum FROM [ADMIN].[dbo].[tblUeberstunden] where uest_timasId = " & MA.mit_timasId & IIf(Not cbxalle.Checked, " and uest_deleted = 0", "") & " Order by uest_date" @@ -513,6 +513,8 @@ Public Class frmUeberstundenauszahlen .DataSource = dtbereitsausgezahlteUE .Columns("geloescht").Visible = False + .Columns("ignoreAuszahlungsdatum").HeaderText = "Auszdat. irgnoriert" + .Columns("ignoreAuszahlungsdatum").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter For Each row As DataGridViewRow In .Rows diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb index 76e0f16f..1b73b301 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb @@ -2,6 +2,7 @@ Imports System.EnterpriseServices Imports System.Net Imports System.Reflection +Imports DocumentFormat.OpenXml.InkML Public Class cMSEAPI @@ -207,7 +208,7 @@ Public Class cMSEAPI Debug.WriteLine(responseJson) - 'Newest Settlements werden nicht benötigt, erst beim Abrufen der RECHNUNG sollen die dazugehörigen Settlements abgerufen werden, allerdings müssen diese initial 1x per API abgerufen werden (mittels getNewSettlements , ansonsten können Sie nicht gefunden werden)! + 'Newest Settlements werden nicht benötigt, erst beim Abrufen der RECHNUNG sollen die dazugehörigen Settlements abgerufen werden, allerdings müssen diese initial 1x per API abgerufen werden (mittels getNewSettlements) ansonsten können Sie nicht gefunden werden! 'sollten sie dennoch gespeichert werden, dann fogenden Return-Statement auskommentieren (damit nachfolgender Code ausgeführt werden kann): @@ -1329,7 +1330,8 @@ Public Class cMSEAPI cust.alternative_vat_number = checkNullStr(R("alternative_vat_number")) cust.coc_number = checkNullStr(R("coc_number")) cust.partner_fleet_card_number = checkNullStr(R("partner_fleet_card_number")) - cust.SAVE() + cust.tstmp = Now() + If cust.customer_id <> "12065 " Then cust.SAVE() 'diesed Kunde soll nicht gespeichert werden!! j = j + 1 End While @@ -1787,6 +1789,7 @@ Public Class cMSECustomers Property alternative_vat_number As Object = Nothing Property coc_number As Object = Nothing Property partner_fleet_card_number As Object = Nothing + Property tstmp As Object = Nothing Public hasEntry = False @@ -1809,6 +1812,7 @@ Public Class cMSECustomers list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("alternative_vat_number", alternative_vat_number)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("coc_number", coc_number)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("partner_fleet_card_number", partner_fleet_card_number)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tstmp", tstmp)) Return list End Function