From 289307cf9ef90b3c94a12d40d06ebeec83e707a3 Mon Sep 17 00:00:00 2001
From: Emma Sofie Sandvad Hagerup <emha@netcompany.com>
Date: Fri, 19 Mar 2021 15:17:16 +0100
Subject: [PATCH] Update toldsystemet_I2_v1.xsd

---
 I2/toldsystemet_I2_v1.xsd | 136 +++++++++++++++++++++++---------------
 1 file changed, 82 insertions(+), 54 deletions(-)

diff --git a/I2/toldsystemet_I2_v1.xsd b/I2/toldsystemet_I2_v1.xsd
index b5530fe7..1225d326 100644
--- a/I2/toldsystemet_I2_v1.xsd
+++ b/I2/toldsystemet_I2_v1.xsd
@@ -6,6 +6,15 @@
 	<xs:complexType name="Declaration">
 		<xs:sequence>
 			<xs:element name="FunctionCode" type="ds:DeclarationFunctionCodeType"/>
+				<xs:annotation>
+					<xs:documentation>
+						<type>DMS specific field</type>
+						<details>
+							- "9"	For initial submission
+							- "13"	For correction
+						</details>
+					</xs:documentation>
+				</xs:annotation>
 			<xs:element name="ProcedureCategory" type="ds:DeclarationProcedureCategoryCodeType">
 			</xs:element>
 			<xs:element name="FunctionalReferenceID" type="ds:DeclarationFunctionalReferenceIDType" minOccurs="1">
@@ -19,9 +28,46 @@
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="TypeCode" type="ds:DeclarationTypeCodeType" minOccurs="1"/>
+				<xs:annotation>
+					<xs:documentation>
+						<type>DMS specific field</type>
+						<details>
+							Follows the 1/1 from H1:
+							- "IMA" 	For a standard customs declaration (under Article 162 of the Code).
+							- "IMD" 	For lodging a standard customs declaration (such as referred to under code A) in
+							accordance with Article 171 of the Code.
+						</details>
+					</xs:documentation>
+				</xs:annotation>
 			<xs:element name="GoodsItemQuantity" type="ds:DeclarationGoodsItemQuantityType" minOccurs="1"/>
+				<xs:annotation>
+					<xs:documentation>
+						<type>DMS specific field</type>
+						<details>
+							Total number of items in the declaration.
+						</details>
+					</xs:documentation>
+				</xs:annotation>
 			<xs:element name="DeclarationOfficeID" type="ds:DeclarationDeclarationOfficeIDType" minOccurs="0"/>
+				<xs:annotation>
+					<xs:documentation>
+						<type>EUCDM 5.2+</type>
+						<code>5/23</code>
+						<details>
+							See supplied DeclarationOfficeID.xlsx for valid entries.
+						</details>
+					</xs:documentation>
+				</xs:annotation>
 			<xs:element name="TotalGrossMassMeasure" type="ds:DeclarationTotalGrossMassMeasureType" minOccurs="0"/>
+				<xs:annotation>
+					<xs:documentation>
+						<type>EUCDM 5.2+</type>
+						<code>6/5</code>
+						<details>
+							Weight of packages.
+						</details>
+					</xs:documentation>
+				</xs:annotation>
 			
 			<xs:element name="Authentication">
 				<xs:complexType>
@@ -30,9 +76,8 @@
 						</xs:element>
 						<annotation>
 							<documentation>
-								<type>
-									1/8 EUDCM 5.2+ (not in EUDCM 6.0)
-								</type>
+								<type>EUDCM 5.2+ (not in EUDCM 6.0)</type>
+								<code>1/8</code>
 								<details>
 									Mandatory on header level.
 								</details>
@@ -85,9 +130,8 @@
 			<xs:element name="Agent" minOccurs="0" maxOccurs="1">
 				<annotation>
 							<documentation>
-								<type>
-									3/20 EUDCM 5.2+ (not in EUDCM 6.0)
-								</type>
+								<type>EUDCM 5.2+</type>
+								<code>3/20</code>
 								<details>
 									A representative. 
 									Mandatory on header level.
@@ -111,9 +155,8 @@
 						<xs:element name="ID" type="ds:AgentIdentificationIDType" minOccurs="1"/>
 						<annotation>
 							<documentation>
-								<type>
-									3/20 EUCDM 5.2+
-								</type>
+								<type>EUCDM 5.2+</type>
+								<code>3/20</code>
 								<details>
 									EORI
 								</details>
@@ -122,9 +165,8 @@
 						<xs:element name="FunctionCode" type="ds:AgentFunctionCodeType" minOccurs="1"/>
 						<annotation>
 							<documentation>
-								<type>
-									3/21 EUCDM 5.2+
-								</type>
+								<type>EUCDM 5.2+</type>
+								<code>3/21</code>
 								<details>
 									Form of representation
 										- Code 2 is direct representation. 
@@ -139,9 +181,8 @@
 			<xs:element name="AuthorisationHolder" minOccurs="1" maxOccurs="unbounded">
 				<annotation>
 					<documentation>
-						<type>
-							3/39 EUCDM 5.2+
-						</type>
+						<type>EUCDM 5.2+</type>
+						<code>3/39</code>
 						<details>
 							Holder of the authorisation.
 							This information shall not be required in case a customs declaration has been lodged prior to the presentation of the goods pursuant to Article 171 of the Code.	
@@ -160,9 +201,8 @@
 						</xs:element>
 						<annotation>
 							<documentation>
-								<type>
-									3/39 EUCDM 5.2+
-								</type>
+								<type>EUCDM 5.2+</type>
+								<code>3/39</code>
 								<details>
 									EORI
 							</documentation>
@@ -171,9 +211,8 @@
 						</xs:element>
 						<annotation>
 							<documentation>
-								<type>
-									3/39 EUCDM 5.2+
-								</type>
+								<type>EUCDM 5.2+</type>
+								<code>3/39</code>
 								<details>
 									Relevant Union code for the type of the authorisation
 								</details>
@@ -186,9 +225,8 @@
 			<xs:element name="Declarant">
 				<annotation>
 					<documentation>
-						<type>
-							3/41 EUCDM 5.2+
-						</type>
+						<type>EUCDM 5.2+</type>
+						<code>3/41</code>
 						<details>
 							Person presenting the goods to customs in case of entry in the declarant's records or pre-lodged customs declaration
 						</details>
@@ -200,9 +238,8 @@
 						<xs:element name="ID" type="ds:DeclarantIdentificationIDType" minOccurs="1"/>
 						<annotation>
 							<documentation>
-								<type>
-									3/41 EUCDM 5.2+
-								</type>
+								<type>EUCDM 5.2+</type>
+								<code>3/41</code>
 								<details>
 									EORI
 								</details>
@@ -233,9 +270,8 @@
 									<xs:element name="GoodsLocation">
 										<annotation>
 											<documentation>
-												<type>
-													5/23 EUCDM 5.2+
-												</type>
+												<type>EUCDM 5.2+</type>
+												<code>5/23</code>
 												<details>
 													The location of goods
 												</details>
@@ -288,9 +324,8 @@
 									<xs:element name="TransportEquipment" minOccurs="0" maxOccurs="unbounded">
 										<annotation>
 											<documentation>
-												<type>
-													7/10 EUCDM 5.2+
-												</type>
+												<type>EUCDM 5.2+</type>
+												<code>7/10</code>
 												<details>
 													Container identification
 												</details>
@@ -322,9 +357,8 @@
 									<xs:element name="SequenceNumeric" type="ds:GovernmentAgencyGoodsItemSequenceNumericType" minOccurs="1"/>
 									<annotation>
 											<documentation>
-												<type>
-													1/6 EUCDM 5.2+
-												</type>
+												<type>EUCDM 5.2+</type>
+												<code>1/6</code>
 												<details>
 													Goods item number
 												</details>
@@ -336,9 +370,8 @@
 												<xs:element name="GoodsMeasure" minOccurs="0" maxOccurs="1">
 													<annotation>
 														<documentation>
-															<type>
-																6/5 EUCDM 5.2+
-															</type>
+															<type>EUCDM 5.2+</type>
+															<code>6/5</code>
 															<details>
 																Gross mass in kilograms.
 																The gross mass is the weight of goods including packaging, but excluding the carrier's equipment for the declaration.
@@ -357,9 +390,8 @@
 												<xs:element name="TransportEquipment" minOccurs="0"	maxOccurs="unbounded">
 													<annotation>
 													<documentation>
-														<type>
-															7/10 EUCDM 5.2+
-														</type>
+														<type>EUCDM 5.2+</type>
+														<code>7/10</code>
 														<details>
 															Container identification
 														</details>
@@ -396,9 +428,8 @@
 												<xs:element name="QuantityQuantity" type="ds:PackagingQuantityQuantityType" minOccurs="1"/>
 												<annotation>
 													<documentation>
-														<type>
-															6/10 EUCDM 5.2+
-														</type>
+														<type>EUCDM 5.2+</type>
+														<code>6/10</code>
 														<details>
 															Number of packages
 														</details>
@@ -407,9 +438,8 @@
 												<xs:element name="TypeCode" type="ds:PackagingTypeCodeType"	minOccurs="0"/>
 												<annotation>
 													<documentation>
-														<type>
-															6/9 EUCDM 5.2+
-														</type>
+														<type>EUCDM 5.2+</type>
+														<code>6/9</code>
 														<details>
 															Type of packages. 
 															This information shall only be provided if the discharge of the goods under temporary storage concerns only parts of the declaration for temporary storage lodged previously in relation with the goods concerned.
@@ -433,9 +463,8 @@
 										<xs:complexType>
 											<xs:annotation>
 												<xs:documentation>
-													<type> 
-														2/1 EUDCM 5.2+
-													</type>
+													<type>EUDCM 5.2+</type>
+													<code>2/1</code>
 												</xs:documentation>
 											</xs:annotation>
 											<xs:sequence>
@@ -474,9 +503,8 @@
 						<xs:element name="PreviousDocument" minOccurs="0" maxOccurs="unbounded">
 							<xs:annotation>
 								<xs:documentation>
-									<type> 
-										2/1 - EUDCM 5.2+
-									</type>
+									<type>EUDCM 5.2+</type>
+									<code>2/1</code>
 								</xs:documentation>
 							</xs:annotation>
 							<xs:complexType>