edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MWST-Liste, Email, mdmfunctions

Browse Source
This commit is contained in:
d.breimaier
2025-05-27 16:21:59 +02:00
parent 20b62840cd
commit 05fed2d357
3 changed files with 105 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SDL/Fakturierung/frmFaktEmail.vb
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>"

109
SDL/Reports/MDM/rptMWSTListe.Designer.vb generated
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

3
VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb
View File

@@ -1099,6 +1099,9 @@ Public Class cMDMFunctionsAllgemein
Else
For Each row In dtNew.Rows
row("Name of supplier") = row("Name of supplier").ToString.Replace(" " & row("VAT").ToString.Substring(0, 2), "")
Next
If dtNew.Columns.Contains("Number") Then
dt = dtNew