diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/PeppolStandardBusinessHeader.java b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/PeppolStandardBusinessHeader.java index 349c05ea1..e513f6856 100644 --- a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/PeppolStandardBusinessHeader.java +++ b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/PeppolStandardBusinessHeader.java @@ -130,8 +130,7 @@ public boolean isComplete() { (senderId != null) && (peppolDocumentTypeId != null) && (profileTypeIdentifier != null) && - // TODO: C1 Country is Not mandatory yet, uncomment once C1 country code will become mandatory - //(c1CountryIdentifier != null) && + (c1CountryIdentifier != null) && (instanceId != null) && (creationDateAndTime != null)); } @@ -147,8 +146,7 @@ public List listMissingProperties() { if (senderId == null) mhf.add("senderId"); if (peppolDocumentTypeId == null) mhf.add("peppolDocumentTypeId"); if (profileTypeIdentifier == null) mhf.add("profileTypeIdentifier"); - // TODO: C1 Country is Not mandatory yet, uncomment once C1 country code will become mandatory - //if (c1CountryIdentifier == null) mhf.add("c1CountryIdentifier"); + if (c1CountryIdentifier == null) mhf.add("c1CountryIdentifier"); if (instanceId == null) mhf.add("messageId"); if (creationDateAndTime == null) mhf.add("creationDateAndTime"); return mhf; diff --git a/oxalis-legacy/oxalis-document-sniffer/src/test/resources/peppol-bis-invoice-sbdh.xml b/oxalis-legacy/oxalis-document-sniffer/src/test/resources/peppol-bis-invoice-sbdh.xml index 5939bb626..312208373 100644 --- a/oxalis-legacy/oxalis-document-sniffer/src/test/resources/peppol-bis-invoice-sbdh.xml +++ b/oxalis-legacy/oxalis-document-sniffer/src/test/resources/peppol-bis-invoice-sbdh.xml @@ -24,6 +24,10 @@ PROCESSID urn:www.cenbii.eu:profile:bii04:ver1.0 + + COUNTRY_C1 + SE + diff --git a/oxalis-outbound/src/test/resources/peppol-bis-invoice-sbdh.xml b/oxalis-outbound/src/test/resources/peppol-bis-invoice-sbdh.xml index 95515f77c..a3059c19f 100644 --- a/oxalis-outbound/src/test/resources/peppol-bis-invoice-sbdh.xml +++ b/oxalis-outbound/src/test/resources/peppol-bis-invoice-sbdh.xml @@ -46,6 +46,10 @@ PROCESSID urn:fdc:peppol.eu:2017:poacc:billing:01:1.0 + + COUNTRY_C1 + NO + diff --git a/pom.xml b/pom.xml index daf9b6a1d..9de764293 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 1 2.9.0 1.70 - 3.2.0 + 3.3.0 4.0.1 1.6.7 1.2.2