Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

This commit is contained in:
2025-05-27 17:07:05 +02:00
7 changed files with 172 additions and 38 deletions

View File

@@ -307,7 +307,7 @@ Public Class frmFaktEmail
TextHTML &= "" & vbNewLine & vbNewLine & vbNewLine & "Mit freundlichen Grüßen" & vbNewLine & vbNewLine & ""
Case Else
txtSubject.Text = If(BelegartenNr = 71, "Credit No. ", "Invoice No. ") & txtRgNr
TextHTML = "Dear Sir or Madam," & vbNewLine & vbNewLine & "attached we send you the invoice mentioned above."
TextHTML = "Dear Sir or Madam," & vbNewLine & vbNewLine & "attached we send you the " & If(BelegartenNr = 71, "credit note", "invoice") & " mentioned above."
TextHTML &= TextHTMLADD
TextHTML &= "" & vbNewLine & vbNewLine & vbNewLine & "Best regards" & vbNewLine & vbNewLine & ""
End Select
@@ -546,7 +546,7 @@ Public Class frmFaktEmail
Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
Mail = outl.CreateItem(0)
If Firma_ID = 24 Then
If Firma_ID = 24 OrElse Firma_ID = 19 Then
Try
Dim oAccount As Outlook.Account
Dim accountToSent = SDL.cFakturierung.getDefaultMail("AMBAR",, True)
@@ -603,7 +603,7 @@ Public Class frmFaktEmail
RichTextBox.Text = RichTextBox.Text.Replace("%RgNr%", RechnungsNr)
txtSubject.Text = txtSubject.Text.Replace("%RgNr%", RechnungsNr) & abfNr
txtSubject.Text = txtSubject.Text.Replace("%RgNr%", RechnungsNr) & IIf(RECHNUNG.Firma_ID <> 19, abfNr, "")
Dim TextHTML = "<div style=""font-family:Calibri, Arial"">" & RichTextBox.Text.Replace(ControlChars.Lf, "<br>") & cFakturierung.getSignature(RECHNUNG.RechnungsLandKz, RECHNUNG.Firma_ID,,,, additionalLine,, IIf(Firma_ID = "24", True, False)) & "</div>"

View File

@@ -68,6 +68,12 @@ Partial Public Class rptMWSTListe
Me.GroupHeader2 = New GrapeCity.ActiveReports.SectionReportModel.GroupHeader()
Me.lblFirma = New GrapeCity.ActiveReports.SectionReportModel.Label()
Me.GroupFooter2 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter()
Me.Line13 = New GrapeCity.ActiveReports.SectionReportModel.Line()
Me.Line21 = New GrapeCity.ActiveReports.SectionReportModel.Line()
Me.Line22 = New GrapeCity.ActiveReports.SectionReportModel.Line()
Me.Line23 = New GrapeCity.ActiveReports.SectionReportModel.Line()
Me.Line24 = New GrapeCity.ActiveReports.SectionReportModel.Line()
Me.Line25 = New GrapeCity.ActiveReports.SectionReportModel.Line()
CType(Me.lblNumber, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.lblGoods, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.lblName, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -204,7 +210,7 @@ Partial Public Class rptMWSTListe
'
'Line4
'
Me.Line4.Height = 0.00000004470348!
Me.Line4.Height = 0!
Me.Line4.Left = 0.8157481!
Me.Line4.LineWeight = 1.0!
Me.Line4.Name = "Line4"
@@ -337,7 +343,7 @@ Partial Public Class rptMWSTListe
'
'ReportInfo2
'
Me.ReportInfo2.FormatString = "Page {PageNumber} from {PageCount} Seiten "
Me.ReportInfo2.FormatString = "Page {PageNumber} from {PageCount} Pages"
Me.ReportInfo2.Height = 0.1330709!
Me.ReportInfo2.Left = 5.829922!
Me.ReportInfo2.Name = "ReportInfo2"
@@ -358,7 +364,7 @@ Partial Public Class rptMWSTListe
'
'ReportHeader1
'
Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.picVERAG, Me.lblUeberschrift, Me.Label2, Me.lblVatNo, Me.lblCompanyname, Me.Label1})
Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.picVERAG, Me.lblUeberschrift, Me.Label2, Me.lblVatNo, Me.lblCompanyname, Me.Label1, Me.Line13, Me.Line21, Me.Line22, Me.Line23, Me.Line24, Me.Line25})
Me.ReportHeader1.Height = 1.05315!
Me.ReportHeader1.Name = "ReportHeader1"
'
@@ -388,12 +394,12 @@ Partial Public Class rptMWSTListe
'
Me.Label2.Height = 0.2311024!
Me.Label2.HyperLink = Nothing
Me.Label2.Left = 1.696063!
Me.Label2.Left = 1.216929!
Me.Label2.Name = "Label2"
Me.Label2.Style = "font-size: 12pt; font-weight: normal; text-align: left; ddo-char-set: 0"
Me.Label2.Text = "Name/Company"
Me.Label2.Top = 0.1338583!
Me.Label2.Width = 3.815748!
Me.Label2.Width = 4.294882!
'
'lblVatNo
'
@@ -413,13 +419,13 @@ Partial Public Class rptMWSTListe
Me.lblCompanyname.DataField = ""
Me.lblCompanyname.Height = 0.2311024!
Me.lblCompanyname.HyperLink = Nothing
Me.lblCompanyname.Left = 1.696063!
Me.lblCompanyname.Left = 1.216929!
Me.lblCompanyname.Name = "lblCompanyname"
Me.lblCompanyname.Style = "color: Black; font-size: 12pt; font-weight: bold; text-align: left; ddo-char-set:" &
" 1"
Me.lblCompanyname.Text = "Name/Company"
Me.lblCompanyname.Top = 0.4169292!
Me.lblCompanyname.Width = 3.815748!
Me.lblCompanyname.Width = 4.294882!
'
'Label1
'
@@ -482,7 +488,7 @@ Partial Public Class rptMWSTListe
Me.TextBox17.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: center; ddo-char-set" &
": 1"
Me.TextBox17.SummaryGroup = ""
Me.TextBox17.Text = "Date and number of invoice or import document"
Me.TextBox17.Text = "Date and number of invoice"
Me.TextBox17.Top = 0!
Me.TextBox17.Width = 1.457087!
'
@@ -496,8 +502,7 @@ Partial Public Class rptMWSTListe
Me.TextBox23.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: center; ddo-char-set" &
": 1"
Me.TextBox23.SummaryGroup = ""
Me.TextBox23.Text = "Name, VAT, Registration No. (if known) and address of supplier of goods or servic" &
"es"
Me.TextBox23.Text = "Name of supplier and goods or services"
Me.TextBox23.Top = 0.1795276!
Me.TextBox23.Width = 4.854725!
'
@@ -691,6 +696,84 @@ Partial Public Class rptMWSTListe
Me.GroupFooter2.Name = "GroupFooter2"
Me.GroupFooter2.NewPage = GrapeCity.ActiveReports.SectionReportModel.NewPage.After
'
'Line13
'
Me.Line13.Height = 0!
Me.Line13.Left = 0.005118132!
Me.Line13.LineWeight = 1.0!
Me.Line13.Name = "Line13"
Me.Line13.Top = 0.3956693!
Me.Line13.Width = 5.506693!
Me.Line13.X1 = 0.005118132!
Me.Line13.X2 = 5.511811!
Me.Line13.Y1 = 0.3956693!
Me.Line13.Y2 = 0.3956693!
'
'Line21
'
Me.Line21.Height = 0!
Me.Line21.Left = 0!
Me.Line21.LineWeight = 1.0!
Me.Line21.Name = "Line21"
Me.Line21.Top = 0.6480315!
Me.Line21.Width = 5.506692!
Me.Line21.X1 = 0!
Me.Line21.X2 = 5.506692!
Me.Line21.Y1 = 0.6480315!
Me.Line21.Y2 = 0.6480315!
'
'Line22
'
Me.Line22.Height = 0!
Me.Line22.Left = 0!
Me.Line22.LineWeight = 1.0!
Me.Line22.Name = "Line22"
Me.Line22.Top = 0.1338583!
Me.Line22.Width = 5.506692!
Me.Line22.X1 = 0!
Me.Line22.X2 = 5.506692!
Me.Line22.Y1 = 0.1338583!
Me.Line22.Y2 = 0.1338583!
'
'Line23
'
Me.Line23.Height = 0.5141731!
Me.Line23.Left = 5.506693!
Me.Line23.LineWeight = 1.0!
Me.Line23.Name = "Line23"
Me.Line23.Top = 0.1338584!
Me.Line23.Width = 0!
Me.Line23.X1 = 5.506693!
Me.Line23.X2 = 5.506693!
Me.Line23.Y1 = 0.6480315!
Me.Line23.Y2 = 0.1338584!
'
'Line24
'
Me.Line24.Height = 0.514173!
Me.Line24.Left = 1.185433!
Me.Line24.LineWeight = 1.0!
Me.Line24.Name = "Line24"
Me.Line24.Top = 0.1338585!
Me.Line24.Width = 0!
Me.Line24.X1 = 1.185433!
Me.Line24.X2 = 1.185433!
Me.Line24.Y1 = 0.6480315!
Me.Line24.Y2 = 0.1338585!
'
'Line25
'
Me.Line25.Height = 0.514173!
Me.Line25.Left = 0.01023626!
Me.Line25.LineWeight = 1.0!
Me.Line25.Name = "Line25"
Me.Line25.Top = 0.1338585!
Me.Line25.Width = 0!
Me.Line25.X1 = 0.01023626!
Me.Line25.X2 = 0.01023626!
Me.Line25.Y1 = 0.6480315!
Me.Line25.Y2 = 0.1338585!
'
'rptMWSTListe
'
Me.PageSettings.DefaultPaperSize = False
@@ -793,4 +876,10 @@ Partial Public Class rptMWSTListe
Private WithEvents Line18 As GrapeCity.ActiveReports.SectionReportModel.Line
Private WithEvents Line19 As GrapeCity.ActiveReports.SectionReportModel.Line
Private WithEvents Line20 As GrapeCity.ActiveReports.SectionReportModel.Line
Private WithEvents Line13 As GrapeCity.ActiveReports.SectionReportModel.Line
Private WithEvents Line21 As GrapeCity.ActiveReports.SectionReportModel.Line
Private WithEvents Line22 As GrapeCity.ActiveReports.SectionReportModel.Line
Private WithEvents Line23 As GrapeCity.ActiveReports.SectionReportModel.Line
Private WithEvents Line24 As GrapeCity.ActiveReports.SectionReportModel.Line
Private WithEvents Line25 As GrapeCity.ActiveReports.SectionReportModel.Line
End Class

View File

@@ -3177,14 +3177,32 @@ Public Class frmMDM_USTVAntrag
Private Sub pb_Beleg_Click(sender As Object, e As EventArgs) Handles pb_Beleg.Click
Dim RK_ID As Integer = CInt(SQL.getValueTxtBySql("select top(1) RK_ID from Rechnungsausgang where FilialenNr = " & USTV_ANTRAG.FilialenNr & " and AbfertigungsNr = " & USTV_ANTRAG.AbfertigungsNr & " and DruckDatumZeit is not null and Firma_ID = 19", "FMZOLL", ,, "0"))
If RK_ID > 0 Then
Dim RG_PATH = ""
cFakturierung.doRechnungsDruck_SRorER(RK_ID,, False, 4, RG_PATH,,, True)
Process.Start(RG_PATH)
Dim dtRE As DataTable = (New SQL).loadDgvBySql("select RK_ID, RechnungsNr, FilialenNr from Rechnungsausgang where FilialenNr = " & USTV_ANTRAG.FilialenNr & " and AbfertigungsNr = " & USTV_ANTRAG.AbfertigungsNr & " and Firma_ID = 19", "FMZOLL")
ncs_Belege.Items.Clear()
If dtRE.Rows.Count > 0 Then
Dim RK_ID As String = ""
For Each r As DataRow In dtRE.Rows
Dim re = New ToolStripMenuItem() With {.Text = r.Item("FilialenNr") & " - " & r.Item("RechnungsNr"), .Name = r.Item("RK_ID"), .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
ncs_Belege.Items.Add(re)
AddHandler re.Click, AddressOf mnuItemBelegeOpenPDF_Clicked
Next
End If
ncs_Belege.Show(Cursor.Position)
End Sub
Private Sub cbxRGretour_CheckedChanged(sender As Object, e As EventArgs) Handles cbxRGretour.CheckedChanged
@@ -3320,8 +3338,30 @@ Public Class frmMDM_USTVAntrag
End If
End If
End Sub
Private Sub mnuItemBelegeOpenPDF_Clicked(sender As Object, e As EventArgs)
ncs_Belege.Hide()
Dim item As ToolStripMenuItem = TryCast(sender, ToolStripMenuItem)
If item IsNot Nothing Then
If item.Name <> "" Then
If IsNumeric(item.Name) Then
Dim RG_PATH = ""
cFakturierung.doRechnungsDruck_SRorER(item.Name,, False, 4, RG_PATH,,, True)
Process.Start(RG_PATH)
End If
End If
End If
End Sub

View File

@@ -434,7 +434,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.lblEmail.Visible = False : rpt.lblFaxNr.Visible = False
Case 19 : rpt.picVERAG.Image = My.Resources.VERAG_360 : rpt.Picture1.Visible = False : rpt.lblFirmaFax.Visible = False : rpt.lblEmail.Visible = False : rpt.lblFaxNr.Visible = False
End Select
Dim ZZTage = 10

View File

@@ -38,7 +38,6 @@ Partial Public Class rptMahnung
Me.txtBank2 = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
Me.txtDisclaimer = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
Me.ReportHeader1 = New GrapeCity.ActiveReports.SectionReportModel.ReportHeader()
Me.Picture1 = New GrapeCity.ActiveReports.SectionReportModel.Picture()
Me.picVERAG = New GrapeCity.ActiveReports.SectionReportModel.Picture()
Me.lblKundenNrUeberschrift = New GrapeCity.ActiveReports.SectionReportModel.Label()
Me.lblKundenNr = New GrapeCity.ActiveReports.SectionReportModel.Label()
@@ -108,6 +107,7 @@ Partial Public Class rptMahnung
Me.lblAusstand = New GrapeCity.ActiveReports.SectionReportModel.Label()
Me.lblMS = New GrapeCity.ActiveReports.SectionReportModel.Label()
Me.GroupFooter4 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter()
Me.Picture1 = New GrapeCity.ActiveReports.SectionReportModel.Picture()
CType(Me.txtLeistung, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.Label15, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.Label16, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -122,7 +122,6 @@ Partial Public Class rptMahnung
CType(Me.txtBank1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.txtBank2, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.txtDisclaimer, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.Picture1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.picVERAG, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.lblKundenNrUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.lblKundenNr, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -175,6 +174,7 @@ Partial Public Class rptMahnung
CType(Me.lblZahlung, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.lblAusstand, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.lblMS, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.Picture1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me, System.ComponentModel.ISupportInitialize).BeginInit()
'
'PageHeader
@@ -403,21 +403,10 @@ 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.lblSachbearbeiterTelefon, Me.lblTelefon, Me.lblSachbearbeiterEMail, Me.lblEmail, Me.lblFax, Me.lblFaxNr, Me.lblAnrede})
Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {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.Picture1})
Me.ReportHeader1.Height = 3.470997!
Me.ReportHeader1.Name = "ReportHeader1"
'
'Picture1
'
Me.Picture1.Height = 0.6102362!
Me.Picture1.HyperLink = Nothing
Me.Picture1.ImageBase64String = resources.GetString("Picture1.ImageBase64String")
Me.Picture1.Left = 2.964!
Me.Picture1.Name = "Picture1"
Me.Picture1.SizeMode = GrapeCity.ActiveReports.SectionReportModel.SizeModes.Zoom
Me.Picture1.Top = 0.042!
Me.Picture1.Width = 1.059449!
'
'picVERAG
'
Me.picVERAG.Height = 0.5389765!
@@ -1259,6 +1248,16 @@ Partial Public Class rptMahnung
Me.GroupFooter4.Height = 0!
Me.GroupFooter4.Name = "GroupFooter4"
'
'Picture1
'
Me.Picture1.Height = 0.59375!
Me.Picture1.ImageBase64String = resources.GetString("Picture1.ImageBase64String")
Me.Picture1.Left = 3.200788!
Me.Picture1.Name = "Picture1"
Me.Picture1.SizeMode = GrapeCity.ActiveReports.SectionReportModel.SizeModes.Zoom
Me.Picture1.Top = 0.04212599!
Me.Picture1.Width = 0.8229167!
'
'rptMahnung
'
Me.PageSettings.Margins.Bottom = 0.3937008!
@@ -1295,7 +1294,6 @@ Partial Public Class rptMahnung
CType(Me.txtBank1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.txtBank2, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.txtDisclaimer, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.Picture1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.picVERAG, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.lblKundenNrUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.lblKundenNr, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1348,6 +1346,7 @@ Partial Public Class rptMahnung
CType(Me.lblZahlung, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.lblAusstand, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.lblMS, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.Picture1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me, System.ComponentModel.ISupportInitialize).EndInit()
End Sub
@@ -1381,7 +1380,6 @@ Partial Public Class rptMahnung
Public WithEvents txtVermerk As GrapeCity.ActiveReports.SectionReportModel.TextBox
Public WithEvents txtBank1 As GrapeCity.ActiveReports.SectionReportModel.TextBox
Public WithEvents txtBank2 As GrapeCity.ActiveReports.SectionReportModel.TextBox
Public WithEvents Picture1 As GrapeCity.ActiveReports.SectionReportModel.Picture
Public WithEvents picVERAG As GrapeCity.ActiveReports.SectionReportModel.Picture
Public WithEvents txtLeistung As GrapeCity.ActiveReports.SectionReportModel.TextBox
Public WithEvents lblFirmaOrt As GrapeCity.ActiveReports.SectionReportModel.Label
@@ -1440,4 +1438,5 @@ Partial Public Class rptMahnung
Public WithEvents TextBox1 As GrapeCity.ActiveReports.SectionReportModel.TextBox
Public WithEvents Label4 As GrapeCity.ActiveReports.SectionReportModel.Label
Public WithEvents Label6 As GrapeCity.ActiveReports.SectionReportModel.Label
Public WithEvents Picture1 As GrapeCity.ActiveReports.SectionReportModel.Picture
End Class

File diff suppressed because one or more lines are too long