diff --git a/Jobs/ZUGFeRD/XRechnungViewDocument.vb b/Jobs/ZUGFeRD/XRechnungViewDocument.vb index 8e011bc7..688ecabd 100644 --- a/Jobs/ZUGFeRD/XRechnungViewDocument.vb +++ b/Jobs/ZUGFeRD/XRechnungViewDocument.vb @@ -272,6 +272,25 @@ Public Class XRechnungViewDocument Next Next + 'oPosTerm += $" {oItemValue}" + oDisplay = False + ElseIf oItemSPECNAME = "INVOICE_POSITION_ARTICLE_DESCRIPTION" Then + 'Tabellendarstellung + Dim cleanedText As String = RemoveNewlinesAndTabs(oItemValue) + Dim oParts As List(Of String) = StringFunctions.SplitText_Length(cleanedText, 70) + ' Durchlaufen der einzelnen Teile in einer Schleife + Dim oYDyn As Integer = yPosition + Dim oPartsNL As List(Of String) = StringFunctions.SplitTextByNewLine(oItemValue) + For Each olinepart As String In oPartsNL + Dim oPartsPN As List(Of String) = StringFunctions.SplitText_Length(olinepart, 70) + ' Durchlaufen der einzelnen Teile in einer Schleife + For Each part As String In oPartsPN + oYDyn += 5 + oYPlus += 5 + MyGDPicturePDF.DrawText(fontResName, 50, oYDyn, part) + Next + Next + 'oPosTerm += $" {oItemValue}" oDisplay = False ElseIf oItemSPECNAME = "INVOICE_TAXPOS_TAX_RATE" Or oItemSPECNAME = "INVOICE_TAXPOS_RATE" Then @@ -281,10 +300,12 @@ Public Class XRechnungViewDocument ' oPosTerm += $" - {oItemValue} %" oDisplay = False ElseIf oItemSPECNAME = "INVOICE_POSITION_TAX_AMOUNT" Then - ' oPosTerm += $" - {oItemValue} {oCurrencySymbol}" 'Tabellendarstellung Dim oYPos = yPosition - 3.5 - Dim TAXTERM = $"{oItemValue} {oCurrencySymbol}" + Dim oBetrag As Decimal = oItemValue + Dim oFormatiert As String = oBetrag.ToString("N2", New Globalization.CultureInfo("de-DE")) + + Dim TAXTERM = $"{oFormatiert} {oCurrencySymbol}" MyGDPicturePDF.DrawTextBox(fontResName, 177, oYPos, 198, YCoo_TextBoxPlus5(oYPos), TextAlignment.TextAlignmentFar, TextAlignment.TextAlignmentNear, TAXTERM) @@ -303,7 +324,10 @@ Public Class XRechnungViewDocument oPosTerm = $"{oItemValue} %:" oDisplay = False ElseIf oItemSPECNAME = "INVOICE_TAXPOS_AMOUNT" Then - oPosTerm += $" {oItemValue} {oCurrencySymbol}" + Dim oBetrag As Decimal = oItemValue + Dim oFormatiert As String = oBetrag.ToString("N2", New Globalization.CultureInfo("de-DE")) + oFormatiert += $" {oCurrencySymbol}" + oPosTerm += $" {oFormatiert}" oDisplay = False ElseIf oItemSPECNAME = "INVOICE_TAXPOS_TYPE" Then oPosTerm += $" {oItemValue}" @@ -320,7 +344,10 @@ Public Class XRechnungViewDocument End If If oArea = "AMOUNT" Then If oItemSPECNAME = "INVOICE_TOTAL_TAX" Or oItemSPECNAME = "INVOICE_TOTAL_NET" Or oItemSPECNAME = "INVOICE_TOTAL_GROSS" Then - oItemValue += $" {oCurrencySymbol}" + Dim oBetrag As Decimal = oItemValue + Dim oFormatiert As String = oBetrag.ToString("N2", New Globalization.CultureInfo("de-DE")) + oFormatiert += $" {oCurrencySymbol}" + oItemValue = oFormatiert End If End If