diff --git a/Base/Base.vbproj b/Base/Base.vbproj
index 9f41cdaa..dd8a0bcd 100644
--- a/Base/Base.vbproj
+++ b/Base/Base.vbproj
@@ -45,8 +45,7 @@
On
-
- False
+
..\Logging\bin\Debug\DigitalData.Modules.Logging.dll
diff --git a/Interfaces/Interfaces.vbproj b/Interfaces/Interfaces.vbproj
index 9bcc5e07..487a76b9 100644
--- a/Interfaces/Interfaces.vbproj
+++ b/Interfaces/Interfaces.vbproj
@@ -49,86 +49,89 @@
..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll
+
+ ..\Base\bin\Debug\DigitalData.Modules.Base.dll
+
+
+ ..\Database\bin\Debug\DigitalData.Modules.Database.dll
+
+
+ ..\Logging\bin\Debug\DigitalData.Modules.Logging.dll
+
..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll
..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll
-
- ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.dll
+
+ ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll
-
- ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll
+
+ ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll
-
- ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll
+
+ ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll
-
- ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.CAD.dll
+
+ ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll
-
- ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.CAD.DWG.dll
+
+ ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll
-
- ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Common.dll
+
+ ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll
-
- ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Document.dll
+
+ ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll
-
- ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Email.dll
+
+ ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll
-
- ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.HTML.dll
+
+ ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll
-
- ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.dll
+
+ ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll
-
- ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.Formats.dll
+
+ ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll
-
- ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll
+
+ ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll
-
- ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll
+
+ ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll
-
- ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll
+
+ ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll
-
- ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.OpenDocument.dll
+
+ ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll
-
- ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.OpenXML.dll
+
+ ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll
-
- ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll
+
+ ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll
-
- ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.PDF.dll
+
+ ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll
-
- ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.RTF.dll
+
+ ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll
-
- ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.SVG.dll
+
+ ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll
- ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.wia.gateway.dll
+ ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll
True
..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll
-
- ..\packages\GdPicture.14.3.19\lib\net462\NativeSDK.Settings.dll
-
-
- ..\packages\GdPicture.14.3.19\lib\net462\NativeSDK.Settings.Edition.dll
-
..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
@@ -290,14 +293,6 @@
-
- {6ea0c51f-c2b1-4462-8198-3de0b32b74f8}
- Base
-
-
- {eaf0ea75-5fa7-485d-89c7-b2d843b03a96}
- Database
-
{903b2d7d-3b80-4be9-8713-7447b704e1b0}
Logging
@@ -308,11 +303,11 @@
powershell.exe -command "& { &'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"
-
+
Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".
-
+
\ No newline at end of file
diff --git a/Interfaces/packages.config b/Interfaces/packages.config
index a5d9f6c0..18dc42d5 100644
--- a/Interfaces/packages.config
+++ b/Interfaces/packages.config
@@ -3,8 +3,8 @@
-
-
+
+
diff --git a/Jobs/Jobs.vbproj b/Jobs/Jobs.vbproj
index 0df947a0..3e5519c4 100644
--- a/Jobs/Jobs.vbproj
+++ b/Jobs/Jobs.vbproj
@@ -125,6 +125,9 @@
..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll
+
+ ..\Logging\bin\Debug\DigitalData.Modules.Logging.dll
+
..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll
diff --git a/Jobs/ZUGFeRD/XRechnungViewDocument.vb b/Jobs/ZUGFeRD/XRechnungViewDocument.vb
index f6be6bad..7534d630 100644
--- a/Jobs/ZUGFeRD/XRechnungViewDocument.vb
+++ b/Jobs/ZUGFeRD/XRechnungViewDocument.vb
@@ -122,6 +122,7 @@ Public Class XRechnungViewDocument
Dim oCreateTextBox As Boolean = False
Dim oInvHasDiscount As Boolean = False
Dim oYDyn As Integer = 0
+ Dim Former_oItemSPECNAME As String = ""
For Each oRow As DataRow In pDTItemValues.Rows
Dim Y_eq_lastrow As Boolean = CBool(oRow.Item("Y_eq_lastrow"))
Dim oRowCaption As String = oRow.Item("Row_Caption")
@@ -129,6 +130,7 @@ Public Class XRechnungViewDocument
Dim oItemValue As String = oRow.Item("ITEM_VALUE")
Dim oDisplay As Boolean = oRow.Item("Display")
Dim oAreaSwitch As Boolean = False
+ Dim oDescriptionFollowup As Boolean = False
If oItemSPECNAME = "RECEIPT_ALLOWANCE_REASON" Then
Console.WriteLine("Uiuiu")
End If
@@ -298,7 +300,15 @@ Public Class XRechnungViewDocument
_logger.Debug($"FollowItem - Area: [{oArea}] - ItemSpecname: [{oItemSPECNAME}] - ItemValue: [{oItemValue}]")
'Dim otextBoxYPos As Integer
If oArea = "POSITION" Or oArea = "ALLOWANCE" Then
-
+ If oItemSPECNAME <> Former_oItemSPECNAME And Former_oItemSPECNAME <> "" Then
+ If oItemSPECNAME = "INVOICE_POSITION_ARTICLE" And oItemSPECNAME = "INVOICE_POSITION_ARTICLE_DESCRIPTION" Then
+ oDescriptionFollowup = True
+ Else
+ Former_oItemSPECNAME = oItemSPECNAME
+ End If
+ Else
+ Former_oItemSPECNAME = oItemSPECNAME
+ End If
If {"INVOICE_POSITION_AMOUNT", "POSITION_ALLOWANCE_ACTUAL_AMOUNT", "RECEIPT_ALLOWANCE_ACTUAL_AMOUNT"}.Contains(oItemSPECNAME) Then
oPosCount += 1
oYPlus = 0
@@ -320,7 +330,7 @@ Public Class XRechnungViewDocument
End If
Dim oPartsNL As List(Of String) = StringFunctions.SplitTextByNewLine(oItemValue)
For Each olinepart As String In oPartsNL
- Dim oParts As List(Of String) = StringFunctions.SplitText_Length(olinepart, 67)
+ Dim oParts As List(Of String) = StringFunctions.SplitText_Length(olinepart, 66)
' Durchlaufen der einzelnen Teile in einer Schleife
For Each part As String In oParts
MyGDPicturePDF.DrawText(fontResName, 19, oYDyn, part)
@@ -352,7 +362,7 @@ Public Class XRechnungViewDocument
Dim oPartsNL As List(Of String) = StringFunctions.SplitTextByNewLine(oItemValue)
For Each olinepart As String In oPartsNL
- Dim oParts As List(Of String) = StringFunctions.SplitText_Length(olinepart, 67)
+ Dim oParts As List(Of String) = StringFunctions.SplitText_Length(olinepart, 66)
' Durchlaufen der einzelnen Teile in einer Schleife
For Each part As String In oParts
MyGDPicturePDF.DrawText(fontResName, oX, oYDyn, part)