Mahnungen

SDL/Formulare/KDFormulare/frmFormulare.vb

@@ -1707,7 +1707,11 @@ Public Class FormularManagerNEU
                     Case "name" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
                     Case "name_1" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
                     Case "name_2" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text
-                    Case "address" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text & " " & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text
+                    Case "address" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text & " " & usrCntl.cbxLandKz.Text & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text
+                    Case "zipcode" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse2.Text
+                    Case "country" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbxLandKz.Text
+                    Case "place" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse3.Text
+                    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 "taxno" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtSteuerNr.Text

SDL/buchhaltung/frmBU_Mahnlauf.vb

@@ -295,6 +295,12 @@ Public Class frmBU_Mahnlauf
 
             initRgFirma(rpt, FIRMA, AD.LandKz)
 
+            rpt.lblFirmaFax.Visible = True
+            rpt.Label1.Visible = True
+            rpt.lblFaxNr.Visible = True
+
+
+
             Select Case FIRMA.Firma_ID
                 Case 1 ' rpt.picVERAG.Image= My.Resources.Verag_AG_Logo : rpt.Picture1.Image = My.Resources.aeo_AT_imex is eh standard
                 Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med : rpt.Picture1.Image = Nothing
@@ -305,7 +311,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
+                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
             End Select
 
             Dim ZZTage = 10
@@ -324,7 +330,24 @@ Public Class frmBU_Mahnlauf
 
             rpt.lblSachbearbeiter.Text = cFakturierung.getSBRgName(FIRMA.Firma_ID, VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME) 'If(RECHNUNG.Sachbearbeiter, "")
 
-            rpt.lblEmail.Text = IIf(FIRMA.Firma_E_Mail_Mahnungen <> "", FIRMA.Firma_E_Mail_Mahnungen, "buchhaltung@verag.ag")
+            Select Case FIRMA.Firma_ID
+                Case 19
+                    If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_email <> "" Then
+                        rpt.lblEmail.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_email
+                    Else
+                        rpt.lblEmail.Text = IIf(FIRMA.Firma_E_Mail_Mahnungen <> "", FIRMA.Firma_E_Mail_Mahnungen, "buchhaltung@verag.ag")
+                    End If
+
+                    If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_telefonnr <> "" AndAlso VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_durchwahl <> "" Then
+                        rpt.lblTelefon.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_telefonnr + "-" + VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_durchwahl
+                    End If
+
+
+
+                Case Else
+                    rpt.lblEmail.Text = IIf(FIRMA.Firma_E_Mail_Mahnungen <> "", FIRMA.Firma_E_Mail_Mahnungen, "buchhaltung@verag.ag")
+            End Select
+
 
             Dim waehrungCode As String = KD.Währungscode
 
@@ -645,6 +668,7 @@ Public Class frmBU_Mahnlauf
                 rpt.txtBank1.Text = If(FIRMA.Firma_Bankverbindung1, "") & vbNewLine & If(FIRMA.Firma_IBAN1, "") & vbNewLine & If(FIRMA.Firma_BIC1, "").ToString.Trim
                 rpt.txtBank2.Text = If(FIRMA.Firma_Bankverbindung2, "") & vbNewLine & If(FIRMA.Firma_IBAN2, "") & vbNewLine & If(FIRMA.Firma_BIC2, "").ToString.Trim
                 rpt.picVERAG.Size = New SizeF(2.712, 0.61)
+                rpt.lblFirmaEmail.Text = IIf(FIRMA.Firma_E_Mail_Mahnungen <> "", FIRMA.Firma_E_Mail_Mahnungen, "fibu360@verag.ag")
 
             Case 21 '"UNISPED"
                 rpt.txtBank1.Text = If(FIRMA.Firma_Bankverbindung1, "") & vbNewLine & If(FIRMA.Firma_IBAN1, "") & vbNewLine & If(FIRMA.Firma_BIC1, "").ToString.Trim

SDL/buchhaltung/rptMahnung.Designer.vb

@@ -1400,7 +1400,7 @@ Partial Public Class rptMahnung
     Public WithEvents lblTelefon As GrapeCity.ActiveReports.SectionReportModel.Label
     Private WithEvents Label5 As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblEmail As GrapeCity.ActiveReports.SectionReportModel.Label
-    Private WithEvents Label1 As GrapeCity.ActiveReports.SectionReportModel.Label
+    Public WithEvents Label1 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