Updates for 4.1.6 (#39)

* Small updates for 4.1.6 * Wrong element-hierarchy in I2 fixed * Updated to 1.1.6 * Spelling error Co-authored-by: Emma Hagerup <[email protected]>
skat · May 26, 2021 · 865ca9f · 865ca9f
1 parent 7824141
commit 865ca9f
Show file tree

Hide file tree

Showing 22 changed files with 846 additions and 568 deletions.
diff --git a/Changelog for 1.1.5 to 1.1.6.txt b/Changelog for 1.1.5 to 1.1.6.txt
@@ -0,0 +1,27 @@
+Changelog for 1.1.5 to 1.1.6
+
+H7: 
+
+* <amendment>...</amendment> fields have been updated
+* Declaration/GoodsShipment/CustomsValuation/FreightChargeAmount annotation has been updated
+* Declaration/GoodsShipment/DomesticDutyTaxParty annotation has been updated
+* Declaration/GoodsShipment/Consignment/GoodsLocation/* annotation has been updated
+* Declaration/GoodsShipment/CustomsValuation/FreightChargeAmount annotation has been updated
+* Declaration/GoodsShipment/GovernmentAgencyGoodsItem/Commodity/GoodsMeasure is now mandatory
+* Declaration/GoodsShipment/GovernmentAgencyGoodsItem/CustomsValuation/FreightChargeAmount annotation has been updated
+* Declaration/GoodsShipment/GovernmentAgencyGoodsItem/DomesticDutyTaxParty annotation has been updated
+* Declaration/GoodsShipment/GovernmentAgencyGoodsItem/PreviousDocument/* annotation has been updated
+* Declaration/GoodsShipment/PreviousDocument/* annotation has been updated
+* Declaration/TotalGrossMassMeasure is now mandatory 
+* Declaration/TotalGrossMassMeasure annotation has been updated
+
+I2: 
+
+* Declaration/GoodsShipment/PreviousDocument/* annotation has been updated
+* Declaration/GoodsShipment/GovernmentAgencyGoodsItem/PreviousDocument/* annotation has been updated
+
+Invalidation and repayment: 
+
+* Declaration/RepaymentRemissionAuthorisation/ApplicationCodeType field was added 
+* Declaration/RepaymentRemissionAuthorisation/AttachedDocument field was added 
+
diff --git a/H7/UNECE/ISO_ISO3AlphaCurrencyCode_2012-08-31.xsd b/H7/UNECE/ISO_ISO3AlphaCurrencyCode_2012-08-31.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 Schema agency:  UN/CEFACT
-Schema version: 1.1.5
+Schema version: 1.1.6
 Schema date:    26 January 2009
 
 Code list name:     ISO 3 Alpha Currency Code
@@ -31,15 +31,15 @@ BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL
 NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR 
 FITNESS FOR A PARTICULAR PURPOSE.
 -->
-<xs:schema xmlns:clm5ISO42173A="urn:un:unece:uncefact:codelist:standard:ISO:ISO3AlphaCurrencyCode:2012-08-31"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="urn:un:unece:uncefact:codelist:standard:ISO:ISO3AlphaCurrencyCode:2012-08-31"
-    elementFormDefault="qualified"
-    version="1.1.5">
-  <xs:simpleType name="ISO3AlphaCurrencyCodeContentType">
-    <xs:restriction base="xs:string">
-      <xs:maxLength value="3"/>
-      <xs:pattern value="[A-Za-z]{3}"/>
-    </xs:restriction>
-  </xs:simpleType>
+<xs:schema
+        xmlns:xs="http://www.w3.org/2001/XMLSchema"
+        targetNamespace="urn:un:unece:uncefact:codelist:standard:ISO:ISO3AlphaCurrencyCode:2012-08-31"
+        elementFormDefault="qualified"
+        version="1.1.6">
+    <xs:simpleType name="ISO3AlphaCurrencyCodeContentType">
+        <xs:restriction base="xs:string">
+            <xs:maxLength value="3"/>
+            <xs:pattern value="[A-Za-z]{3}"/>
+        </xs:restriction>
+    </xs:simpleType>
 </xs:schema>
diff --git a/H7/UNECE/UNECE_AgencyIdentificationCode_D12B.xsd b/H7/UNECE/UNECE_AgencyIdentificationCode_D12B.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 Schema agency:  UN/CEFACT
-Schema version: 1.1.5
+Schema version: 1.1.6
 Schema date:    26 January 2009
 
 Code list name:     Agency Identification Code
@@ -35,7 +35,7 @@ FITNESS FOR A PARTICULAR PURPOSE.
         xmlns:xs="http://www.w3.org/2001/XMLSchema"
         targetNamespace="urn:un:unece:uncefact:codelist:standard:UNECE:AgencyIdentificationCode:D12B"
         elementFormDefault="qualified"
-        version="1.1.5">
+        version="1.1.6">
     <xs:simpleType name="AgencyIdentificationCodeContentType">
         <xs:restriction base="xs:string">
             <xs:maxLength value="3"/>

diff --git a/H7/UNECE/UnqualifiedDataType_6_DMS.xsd b/H7/UNECE/UnqualifiedDataType_6_DMS.xsd
@@ -4,7 +4,7 @@
 <!--======================================================================-->
 <!--
 Schema agency: 	UN/CEFACT 
-  	Schema version:	1.1.5
+  	Schema version:	1.1.6
   	Schema date: 	 26 January 2009
   	
   	Copyright (C) UN/CEFACT (2009). All Rights Reserved.
@@ -30,106 +30,114 @@ Schema agency: 	UN/CEFACT
 	NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR 
 	FITNESS FOR A PARTICULAR PURPOSE.
 -->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ccts="urn:un:unece:uncefact:documentation:standard:CoreComponentsTechnicalSpecification:2" xmlns:clm6Recommendation20="urn:un:unece:uncefact:codelist:standard:6:Recommendation20:5" xmlns:clm60133="urn:un:unece:uncefact:codelist:standard:6:0133:40106" xmlns:clm5ISO42173A="urn:un:unece:uncefact:codelist:standard:ISO:ISO3AlphaCurrencyCode:2012-08-31" xmlns:ids5ISO316612A="urn:un:unece:uncefact:identifierlist:standard:5:ISO316612A:SecondEdition2006VI-3" xmlns:clmIANAMIMEMediaType="urn:un:unece:uncefact:codelist:standard:IANA:MIMEMediaType:2008-11-12" xmlns:clmIANACharacterSetCode="urn:un:unece:uncefact:codelist:standard:IANA:CharacterSetCode:2007-05-14" xmlns:clm63055="urn:un:unece:uncefact:codelist:standard:UNECE:AgencyIdentificationCode:D12B" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:6" xmlns:clm62379="urn:un:unece:uncefact:codelist:standard:6:2379:D09B" targetNamespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:6" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1.5">
-	<xsd:import namespace="urn:un:unece:uncefact:codelist:standard:ISO:ISO3AlphaCurrencyCode:2012-08-31" schemaLocation="../UNECE/ISO_ISO3AlphaCurrencyCode_2012-08-31.xsd"/>
-	<xsd:import namespace="urn:un:unece:uncefact:codelist:standard:UNECE:AgencyIdentificationCode:D12B" schemaLocation="../UNECE/UNECE_AgencyIdentificationCode_D12B.xsd"/>
-	<xsd:complexType name="CustomsValueAmountType">
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:decimal">
-				<xsd:attribute name="currencyID" type="clm5ISO42173A:ISO3AlphaCurrencyCodeContentType" use="required"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="AmountType">
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:decimal">
-				<xsd:attribute name="currencyID" type="clm5ISO42173A:ISO3AlphaCurrencyCodeContentType" use="optional"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="CodeType">
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:token">
-				<xsd:attribute name="listID" type="xsd:token" use="optional"/>
-				<xsd:attribute name="listAgencyID" type="clm63055:AgencyIdentificationCodeContentType" use="optional"/>
-				<xsd:attribute name="listAgencyName" type="xsd:string" use="optional"/>
-				<xsd:attribute name="listName" type="xsd:string" use="optional"/>
-				<xsd:attribute name="listVersionID" type="xsd:token" use="optional"/>
-				<xsd:attribute name="name" type="xsd:string" use="optional"/>
-				<xsd:attribute name="languageID" type="xsd:language" use="optional"/>
-				<xsd:attribute name="listURI" type="xsd:anyURI" use="optional"/>
-				<xsd:attribute name="listSchemeURI" type="xsd:anyURI" use="optional"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:simpleType name="FormatCodeType">
- 		<xsd:restriction base="xsd:string">
- 			<xsd:enumeration value="102" />
- 			<xsd:enumeration value="304" />
- 		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:simpleType name="DateTimePatternType">
-		<xsd:restriction base="xsd:string">
-              <xsd:pattern value="(20\d{6})(\d{6}(Z|[-+]\d\d))?"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:complexType name="DateTimeType">
-          <xsd:simpleContent>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:clm5ISO42173A="urn:un:unece:uncefact:codelist:standard:ISO:ISO3AlphaCurrencyCode:2012-08-31"
+            xmlns:clm63055="urn:un:unece:uncefact:codelist:standard:UNECE:AgencyIdentificationCode:D12B"
+            xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:6"
+            targetNamespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:6" elementFormDefault="qualified"
+            attributeFormDefault="unqualified" version="1.1.6">
+    <xsd:import namespace="urn:un:unece:uncefact:codelist:standard:ISO:ISO3AlphaCurrencyCode:2012-08-31"
+                schemaLocation="../UNECE/ISO_ISO3AlphaCurrencyCode_2012-08-31.xsd"/>
+    <xsd:import namespace="urn:un:unece:uncefact:codelist:standard:UNECE:AgencyIdentificationCode:D12B"
+                schemaLocation="../UNECE/UNECE_AgencyIdentificationCode_D12B.xsd"/>
+    <xsd:complexType name="CustomsValueAmountType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:decimal">
+                <xsd:attribute name="currencyID" type="clm5ISO42173A:ISO3AlphaCurrencyCodeContentType" use="required"/>
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+    <xsd:complexType name="AmountType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:decimal">
+                <xsd:attribute name="currencyID" type="clm5ISO42173A:ISO3AlphaCurrencyCodeContentType" use="optional"/>
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+    <xsd:complexType name="CodeType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:token">
+                <xsd:attribute name="listID" type="xsd:token" use="optional"/>
+                <xsd:attribute name="listAgencyID" type="clm63055:AgencyIdentificationCodeContentType" use="optional"/>
+                <xsd:attribute name="listAgencyName" type="xsd:string" use="optional"/>
+                <xsd:attribute name="listName" type="xsd:string" use="optional"/>
+                <xsd:attribute name="listVersionID" type="xsd:token" use="optional"/>
+                <xsd:attribute name="name" type="xsd:string" use="optional"/>
+                <xsd:attribute name="languageID" type="xsd:language" use="optional"/>
+                <xsd:attribute name="listURI" type="xsd:anyURI" use="optional"/>
+                <xsd:attribute name="listSchemeURI" type="xsd:anyURI" use="optional"/>
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+    <xsd:simpleType name="FormatCodeType">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="102"/>
+            <xsd:enumeration value="304"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:simpleType name="DateTimePatternType">
+        <xsd:restriction base="xsd:string">
+            <xsd:pattern value="(20\d{6})(\d{6}(Z|[-+]\d\d))?"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:complexType name="DateTimeType">
+        <xsd:simpleContent>
             <xsd:extension base="udt:DateTimePatternType">
-              <xsd:attribute name="formatCode" type="udt:FormatCodeType" use="required"/>
+                <xsd:attribute name="formatCode" type="udt:FormatCodeType" use="required"/>
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+    <xsd:complexType name="IDType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:token">
+                <xsd:attribute name="schemeID" type="xsd:token" use="optional"/>
+                <xsd:attribute name="schemeName" type="xsd:string" use="optional"/>
+                <xsd:attribute name="schemeAgencyID" type="clm63055:AgencyIdentificationCodeContentType"
+                               use="optional"/>
+                <xsd:attribute name="schemeAgencyName" type="xsd:string" use="optional"/>
+                <xsd:attribute name="schemeVersionID" type="xsd:token" use="optional"/>
+                <xsd:attribute name="schemeDataURI" type="xsd:anyURI" use="optional"/>
+                <xsd:attribute name="schemeURI" type="xsd:anyURI" use="optional"/>
             </xsd:extension>
-          </xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="IDType">
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:token">
-				<xsd:attribute name="schemeID" type="xsd:token" use="optional"/>
-				<xsd:attribute name="schemeName" type="xsd:string" use="optional"/>
-				<xsd:attribute name="schemeAgencyID" type="clm63055:AgencyIdentificationCodeContentType" use="optional"/>
-				<xsd:attribute name="schemeAgencyName" type="xsd:string" use="optional"/>
-				<xsd:attribute name="schemeVersionID" type="xsd:token" use="optional"/>
-				<xsd:attribute name="schemeDataURI" type="xsd:anyURI" use="optional"/>
-				<xsd:attribute name="schemeURI" type="xsd:anyURI" use="optional"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:simpleType name="IndicatorType">
-		<xsd:restriction base="xsd:boolean">
-			<xsd:pattern value="false"/>
-			<xsd:pattern value="true"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:complexType name="MeasureType">
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:decimal">
-				<xsd:attribute name="unitCode" type="udt:MeasurementUnitCommonCodeContentType" use="optional"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:simpleType name="NumericType">
-		<xsd:restriction base="xsd:decimal"/>
-	</xsd:simpleType>
-	<xsd:complexType name="QuantityType">
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:decimal">
-				<xsd:attribute name="unitCode" type="udt:MeasurementUnitCommonCodeContentType" use="optional"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="TextType">
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:string">
-				<xsd:attribute name="languageID" type="xsd:language" use="optional"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:simpleType name="ValueType">
-		<xsd:restriction base="xsd:decimal"/>
-	</xsd:simpleType>
-	<xsd:simpleType name="MeasurementUnitCommonCodeContentType">
-		<xsd:restriction base="xsd:string">
-			<xsd:minLength value="1"/>
-			<xsd:maxLength value="5"/>
-		</xsd:restriction>
+        </xsd:simpleContent>
+    </xsd:complexType>
+    <xsd:simpleType name="IndicatorType">
+        <xsd:restriction base="xsd:boolean">
+            <xsd:pattern value="false"/>
+            <xsd:pattern value="true"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:complexType name="MeasureType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:decimal">
+                <xsd:attribute name="unitCode" type="udt:MeasurementUnitCommonCodeContentType" use="optional"/>
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+    <xsd:simpleType name="NumericType">
+        <xsd:restriction base="xsd:decimal"/>
+    </xsd:simpleType>
+    <xsd:complexType name="QuantityType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:decimal">
+                <xsd:attribute name="unitCode" type="udt:MeasurementUnitCommonCodeContentType" use="optional"/>
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+    <xsd:complexType name="TextType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute name="languageID" type="xsd:language" use="optional"/>
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+    <xsd:simpleType name="ValueType">
+        <xsd:restriction base="xsd:decimal"/>
+    </xsd:simpleType>
+    <xsd:simpleType name="MeasurementUnitCommonCodeContentType">
+        <xsd:restriction base="xsd:string">
+            <xsd:minLength value="1"/>
+            <xsd:maxLength value="5"/>
+        </xsd:restriction>
     </xsd:simpleType>
 </xsd:schema>
diff --git a/H7/toldsystemet_DS/toldsystemet_DS_v1.xsd b/H7/toldsystemet_DS/toldsystemet_DS_v1.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:6"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           targetNamespace="urn:wco:datamodel:WCO:Declaration_DS:DMS:2" elementFormDefault="qualified" version="1.1.5">
+           targetNamespace="urn:wco:datamodel:WCO:Declaration_DS:DMS:2" elementFormDefault="qualified" version="1.1.6">
     <xs:import namespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:6"
                schemaLocation="../UNECE/UnqualifiedDataType_6_DMS.xsd"/>
     <xs:import namespace="urn:un:unece:uncefact:codelist:standard:ISO:ISO3AlphaCurrencyCode:2012-08-31"