louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ZUGFeRD fix for profiles != null

Browse Source
This commit is contained in:
Ivan Vaklinov
2022-01-31 13:43:48 +02:00
parent 2f912f5597
commit 0927755054
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporterFromA3.java
View File

@@ -115,8 +115,8 @@ public class ZUGFeRDExporterFromA3 extends XRExporter implements IZUGFeRDExporte
protected int ZFVersion = DefaultZUGFeRDVersion; protected int ZFVersion = DefaultZUGFeRDVersion;
private boolean attachZUGFeRDHeaders = true; private boolean attachZUGFeRDHeaders = true;
// Specific metaData version in case of XRechnung. We need it to be settable // Specific metaData version in case of XRechnung. We need it to be settable
// by the caller if necessary. // by the caller if necessary.
protected String XRechnungVersion = null; // Default XRechnung as of late 2021 is 2p0 protected String XRechnungVersion = null; // Default XRechnung as of late 2021 is 2p0
@@ -225,8 +225,8 @@ public class ZUGFeRDExporterFromA3 extends XRExporter implements IZUGFeRDExporte
isFacturX = true; isFacturX = true;
return this; return this;
} }
/** /**
* Sets a specific XRechnung version from outside. This version needs to be present in the * Sets a specific XRechnung version from outside. This version needs to be present in the
* meta-data as well. The caller may wish to generate a specific version of XRechnung * meta-data as well. The caller may wish to generate a specific version of XRechnung
@@ -238,7 +238,7 @@ public class ZUGFeRDExporterFromA3 extends XRExporter implements IZUGFeRDExporte
{ {
this.XRechnungVersion = XRechnungVersion; this.XRechnungVersion = XRechnungVersion;
} }
/*** /***
* Generate ZF2.0/2.1 files with filename zugferd-invoice.xml instead of factur-x.xml * Generate ZF2.0/2.1 files with filename zugferd-invoice.xml instead of factur-x.xml
@@ -619,7 +619,7 @@ public class ZUGFeRDExporterFromA3 extends XRExporter implements IZUGFeRDExporte
// ZUGFeRD 2.1.1 Technical Supplement | Part A | 2.2.2. Data Relationship // ZUGFeRD 2.1.1 Technical Supplement | Part A | 2.2.2. Data Relationship
// See documentation ZUGFeRD211_EN/Documentation/ZUGFeRD-2.1.1 - Specification_TA_Part-A.pdf // See documentation ZUGFeRD211_EN/Documentation/ZUGFeRD-2.1.1 - Specification_TA_Part-A.pdf
// https://www.ferd-net.de/standards/zugferd-2.1.1/index.html // https://www.ferd-net.de/standards/zugferd-2.1.1/index.html
if (ZFVersion >= 2) if ((this.profile != null) && (ZFVersion >= 2))
{ {
if (this.profile.getName().equalsIgnoreCase(Profiles.getByName("MINIMUM").getName()) || if (this.profile.getName().equalsIgnoreCase(Profiles.getByName("MINIMUM").getName()) ||
this.profile.getName().equalsIgnoreCase(Profiles.getByName("BASICWL").getName())) this.profile.getName().equalsIgnoreCase(Profiles.getByName("BASICWL").getName()))