From a990098a4be95b5142cf2dd2d54664e116895370 Mon Sep 17 00:00:00 2001
From: jstaerk <jstaerk@usegroup.de>
Date: Mon, 29 Aug 2022 19:41:42 +0200
Subject: [PATCH] Allow to violate CII-SR-450 and deliberately specify both ID
 and Global ID

---
 History.md                                                     | 2 ++
 .../java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index 34fc7308..dbe72470 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,5 @@
+Extend importer PR #281 thanks to weclapp-dev
+Allow to violate CII-SR-450 and specify both ID and Global ID
 
 2.5.3
 =======
diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
index 85754262..4f5b37c9 100644
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
@@ -125,7 +125,8 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 		// and ShipToTradeParty, but not both. Prefer seller assigned ID for now.
 		if (party.getID() != null) {
 			xml += "<ram:ID>" + XMLTools.encodeXML(party.getID()) + "</ram:ID>";
-		} else if ((party.getGlobalIDScheme() != null) && (party.getGlobalID() != null)) {
+		}
+		if ((party.getGlobalIDScheme() != null) && (party.getGlobalID() != null)) {
 			xml += "<ram:GlobalID schemeID=\"" + XMLTools.encodeXML(party.getGlobalIDScheme()) + "\">"
 					+ XMLTools.encodeXML(party.getGlobalID()) + "</ram:GlobalID>";
 		}