AppStd/Modules
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modules.Interfaces & Modules.Jobs: ZUGFeRD 2.3.x-Logik angepasst. Auswertung der XML-Tabelle korrigiert, das Dictionary wird erst später erstellt.

Browse Source
This commit is contained in:
PitzM
2025-07-23 11:50:40 +02:00
parent 0b66b80591
commit 477bb511c4
6 changed files with 70 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Interfaces/ZUGFeRDInterface/PropertyValues.vb
View File

@@ -220,7 +220,7 @@ Public Class PropertyValues
If IsNothing(oPropertyValue) OrElse String.IsNullOrEmpty(oPropertyValue) Then
If oItem.Value.IsRequired Then
_logger.Warn("Specification [{1}] is empty, but marked as required! Skipping.", oTableColumn)
_logger.Warn("Specification [{0}] is empty, but marked as required! Skipping.", oTableColumn)
Dim oMissingProperty = New MissingProperty With
{
.Description = oPropertyDescription,
@@ -229,7 +229,7 @@ Public Class PropertyValues
oResult.MissingProperties.Add(oMissingProperty)
Continue For
Else
_logger.Debug("oPropertyValue for specification [{1}] is empty or not found. Skipping.", oTableColumn)
_logger.Debug("oPropertyValue for specification [{0}] is empty or not found. Skipping.", oTableColumn)
Continue For
End If
@@ -333,7 +333,7 @@ Public Class PropertyValues
s = Convert.ToString(Obj)
If IsDate(s) Then
If IsDate(s) = True Then
' Hier wird das DEFAULT-Format auf yyyyMMdd gesetzt
Dim dtfi As DateTimeFormatInfo = CultureInfo.CreateSpecificCulture(CultureInfo.InvariantCulture.Name).DateTimeFormat
dtfi.DateSeparator = ""
@@ -354,7 +354,7 @@ Public Class PropertyValues
Dim oResult As String
If IsNumeric(Obj) Then
If IsNumeric(Obj) = True Then
Dim decValue As Decimal = CDec(Obj)
' Es wird immer ein . als Dezimaltrenner verwendet, falls nötig
oResult = decValue.ToString(CultureInfo.InvariantCulture)
@@ -370,7 +370,6 @@ Public Class PropertyValues
End If
End If
End If
Next
Return New List(Of Object) From {Obj}

27
Interfaces/ZUGFeRDInterface/Version2.3_3_FacturX/CrossIndustryInvoiceType.vb
View File

@@ -566,18 +566,31 @@ Namespace ZUGFeRD.Version2_3_3_FacturX
System.ComponentModel.DesignerCategoryAttribute("code"), _
System.Xml.Serialization.XmlTypeAttribute([Namespace]:="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100")> _
Partial Public Class DateTimeType
Private itemField As Object
'Private itemField As Object
''''<remarks/>
'<System.Xml.Serialization.XmlElementAttribute("DateTime", GetType(Date)), _
' System.Xml.Serialization.XmlElementAttribute("DateTimeString", GetType(DateTimeTypeDateTimeString))> _
'Public Property Item() As Object
' Get
' Return Me.itemField
' End Get
' Set
' Me.itemField = value
' End Set
'End Property
Private itemField As DateTimeTypeDateTimeString
'''<remarks/>
<System.Xml.Serialization.XmlElementAttribute("DateTime", GetType(Date)), _
System.Xml.Serialization.XmlElementAttribute("DateTimeString", GetType(DateTimeTypeDateTimeString))> _
Public Property Item() As Object
<System.Xml.Serialization.XmlElementAttribute("DateTimeString")>
Public Property DateTimeString() As DateTimeTypeDateTimeString
Get
Return Me.itemField
End Get
Set
Me.itemField = value
Me.itemField = Value
End Set
End Property
End Class

29
Interfaces/ZUGFeRDInterface/Version2.3_FacturX/CrossIndustryInvoiceType.vb
View File

@@ -558,7 +558,7 @@ Namespace ZUGFeRD.Version2_3_FacturX
End Set
End Property
End Class
'''<remarks/>
<System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0"), _
System.SerializableAttribute(), _
@@ -566,18 +566,31 @@ Namespace ZUGFeRD.Version2_3_FacturX
System.ComponentModel.DesignerCategoryAttribute("code"), _
System.Xml.Serialization.XmlTypeAttribute([Namespace]:="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100")> _
Partial Public Class DateTimeType
Private itemField As Object
'Private itemField As Object
''''<remarks/>
'<System.Xml.Serialization.XmlElementAttribute("DateTime", GetType(Date)), _
' System.Xml.Serialization.XmlElementAttribute("DateTimeString", GetType(DateTimeTypeDateTimeString))> _
'Public Property Item() As Object
' Get
' Return Me.itemField
' End Get
' Set
' Me.itemField = value
' End Set
'End Property
Private itemField As DateTimeTypeDateTimeString
'''<remarks/>
<System.Xml.Serialization.XmlElementAttribute("DateTime", GetType(Date)), _
System.Xml.Serialization.XmlElementAttribute("DateTimeString", GetType(DateTimeTypeDateTimeString))> _
Public Property Item() As Object
<System.Xml.Serialization.XmlElementAttribute("DateTimeString")>
Public Property DateTimeString() As DateTimeTypeDateTimeString
Get
Return Me.itemField
End Get
Set
Me.itemField = value
Me.itemField = Value
End Set
End Property
End Class