Merge pull request #126 from OpenPEPPOL/POACC-806

Added DeliveryLocation to Order on line level
OpenPEPPOL · Feb 19, 2025 · 458b166 · 458b166
2 parents a81ef39 + d07c838
commit 458b166
Show file tree

Hide file tree

Showing 6 changed files with 126 additions and 3 deletions.
diff --git a/build-actions.sh b/build-actions.sh
@@ -14,7 +14,7 @@ docker run --rm -i \
     difi/vefa-structure:0.6.1
 
 # Testing validation rules
-docker run --rm -i -v $PROJECT:/src anskaffelser/validator:2.1.0 build -x -t -n eu.peppol.poacc.upgrade.v3 -a rules -target target/validator-test /src
+docker run --rm -i -v $PROJECT:/src phelger/vefa-validator:2.3.1 build -x -t -n eu.peppol.poacc.upgrade.v3 -a rules -target target/validator-test /src
 
 # Schematron
 for sch in $PROJECT/rules/sch/*.sch; do

diff --git a/build.bat b/build.bat
@@ -14,7 +14,7 @@ if exist "%PROJECT%\target" (
 docker run --rm -i -v "%PROJECT%:/src" -v "%PROJECT%\target:/target" difi/vefa-structure:0.6.1
 
 :: Testing validation rules
-docker run --rm -i -v "%PROJECT%:/src" anskaffelser/validator:2.1.0 build -x -t -n eu.peppol.poacc.upgrade.v3 -a rules -target target/validator-test /src
+docker run --rm -i -v "%PROJECT%:/src" phelger/vefa-validator:2.3.1 build -x -t -n eu.peppol.poacc.upgrade.v3 -a rules -target target/validator-test /src
 
 :: Schematron
 for %%s in ("%PROJECT%\rules\sch\*.sch") do (

diff --git a/build.sh b/build.sh
@@ -14,7 +14,7 @@ docker run --rm -i \
     difi/vefa-structure:0.6.1
 
 # Testing validation rules
-docker run --rm -i -v $PROJECT:/src anskaffelser/validator:2.1.0 build -x -t -n eu.peppol.poacc.upgrade.v3 -a rules -target target/validator-test /src
+docker run --rm -i -v $PROJECT:/src phelger/vefa-validator:2.3.1 build -x -t -n eu.peppol.poacc.upgrade.v3 -a rules -target target/validator-test /src
 
 # Schematron
 for sch in $PROJECT/rules/sch/*.sch; do

diff --git a/guides/release-notes/v3.0.15.adoc b/guides/release-notes/v3.0.15.adoc
@@ -11,6 +11,7 @@ Release date:: May 2025
 * Order transaction (T01) [MINOR CHANGE TO TRANSACTION VERSION NUMBER]
 ** Added new codelist to Item CertificateTypeCode (PackagingMarkedLabelAccrediationCode from GS1 GDSN) which can be used in addition to the current NA value. The element was previously fixed to NA as the element was mandatory in UBL.
 ** Added business terms and elements for the requested despatch date and time (The date/time on which the buyer requests the ordered goods be ready for pickup at the seller’s warehouse or an agreed-upon pickup location.)
+** Added Physical delivery location on order line level
 * Order Change(T114)
 ** RELEASE NOTES
 * Order Agreement(T110) 

diff --git a/rules/examples/Order_Example.xml b/rules/examples/Order_Example.xml
@@ -391,6 +391,22 @@
 					<cbc:StartDate>2012-10-15</cbc:StartDate>
 					<cbc:EndDate>2012-10-31</cbc:EndDate>
 				</cac:RequestedDeliveryPeriod>
+				<cac:DeliveryLocation>
+					<cbc:ID schemeID="0088">7300010000002</cbc:ID>
+					<cac:Address>
+						<cbc:StreetName>Solheimsveien 15</cbc:StreetName>
+						<cbc:AdditionalStreetName>Add</cbc:AdditionalStreetName>
+						<cbc:CityName>Lørenskog</cbc:CityName>
+						<cbc:PostalZone>1473</cbc:PostalZone>
+						<cbc:CountrySubentity>Region</cbc:CountrySubentity>
+						<cac:AddressLine>
+							<cbc:Line>3rd Address line</cbc:Line>
+						</cac:AddressLine>
+						<cac:Country>
+							<cbc:IdentificationCode>NO</cbc:IdentificationCode>
+						</cac:Country>
+					</cac:Address>
+				</cac:DeliveryLocation>
 			</cac:Delivery>
 			<cac:OriginatorParty>
 				<cac:PartyIdentification>

diff --git a/structure/syntax/ubl-order.xml b/structure/syntax/ubl-order.xml
@@ -1894,6 +1894,112 @@
 							<Value type="EXAMPLE">18:00:00</Value>
 						</Element>
 					</Element>
+					<Element cardinality="0..1">
+						<Term>cac:DeliveryLocation</Term>
+						<Name>Delivery location </Name>
+						<Element cardinality="0..1">
+							<Term>cbc:ID</Term>
+							<Name>Delivery location ID</Name>
+							<Description>An identifer for the location to where the ordered items should be
+								delivered.</Description>
+							<DataType>Identifier</DataType>
+							<Reference type="BUSINESS_TERM">tir01-169</Reference>
+							<Attribute usage="Optional">
+								<Term>schemeID</Term>
+								<Name>Deliver to location identifier identification scheme identifier</Name>
+								<Description>The identification scheme identifier of the Deliver to location
+									identifier.</Description>
+								<Reference type="CODE_LIST">ICD</Reference>
+								<Value type="EXAMPLE">0088</Value>
+							</Attribute>
+							<Value type="EXAMPLE">7300010000002</Value>
+						</Element>
+						<Element cardinality="0..1">
+							<Term>cbc:Name</Term>
+							<Name>Delivery location name</Name>
+							<Description>A name of the location to where the ordered items should be
+								delivered.</Description>
+							<DataType>Text</DataType>
+							<Reference type="BUSINESS_TERM">tir01-p028</Reference>
+							<Value type="EXAMPLE">South side goods arrival dock</Value>
+						</Element>
+						<Element>
+							<Term>cac:Address</Term>
+							<Name>Delivery address</Name>
+							<Element cardinality="0..1">
+								<Term>cbc:StreetName</Term>
+								<Name>Address line 1</Name>
+								<Description>The main address line in a postal address usually the street
+									name and number.</Description>
+								<DataType>Text</DataType>
+								<Reference type="BUSINESS_TERM">tir01-092</Reference>
+							</Element>
+							<Element cardinality="0..1">
+								<Term>cbc:AdditionalStreetName</Term>
+								<Name>Address line 2</Name>
+								<Description>An additional address line in a postal address that can be used
+									to give further details supplementing the main line. Common use are
+									secondary house number in a complex or in a building.</Description>
+								<DataType>Text</DataType>
+								<Reference type="BUSINESS_TERM">tir01-093</Reference>
+							</Element>
+							<Element cardinality="0..1">
+								<Term>cbc:CityName</Term>
+								<Name>City</Name>
+								<Description>The common name of the city where the postal address is. The
+									name is written in full rather than as a code.</Description>
+								<DataType>Text</DataType>
+								<Reference type="BUSINESS_TERM">tir01-096</Reference>
+							</Element>
+							<Element cardinality="0..1">
+								<Term>cbc:PostalZone</Term>
+								<Name>Post code</Name>
+								<Description>The identifier for an addressable group of properties according
+									to the relevant national postal service, such as a ZIP code or Post
+									Code.</Description>
+								<DataType>Text</DataType>
+								<Reference type="BUSINESS_TERM">tir01-097</Reference>
+							</Element>
+							<Element cardinality="0..1">
+								<Term>cbc:CountrySubentity</Term>
+								<Name>Country subdivision</Name>
+								<Description>For specifying a region, county, state, province etc. within a
+									country by using text.</Description>
+								<DataType>Text</DataType>
+								<Reference type="BUSINESS_TERM">tir01-144</Reference>
+							</Element>
+							<Element cardinality="0..1">
+								<Term>cac:AddressLine</Term>
+								<Name>Address line</Name>
+								<Element>
+									<Term>cbc:Line</Term>
+									<Name>Address line 3</Name>
+									<Description>An additional address line in an address that can be used
+										to give further details supplementing the main line.</Description>
+									<DataType>Text</DataType>
+									<Reference type="BUSINESS_TERM">tir01-p007</Reference>
+									<Value type="EXAMPLE">Gate 34</Value>
+								</Element>
+							</Element>
+							<Element>
+								<Term>cac:Country</Term>
+								<Name>Country</Name>
+								<Element>
+									<Term>cbc:IdentificationCode</Term>
+									<Name>Country code</Name>
+									<Description>A code that identifies the country.The lists of valid
+										countries are registered with the ISO 3166-1 Maintenance agency,
+										"Codes for the representation of names of countries and their
+										subdivisions". Codes must be according to the alpha-2
+										representation.</Description>
+									<DataType>Code</DataType>
+									<Reference type="BUSINESS_TERM">tir01-098</Reference>
+									<Reference type="CODE_LIST">ISO3166</Reference>
+									<Value type="EXAMPLE">NL</Value>
+								</Element>
+							</Element>
+						</Element>
+					</Element>
 				</Element>
 				<Element cardinality="0..1">
 					<Term>cac:OriginatorParty</Term>