Merge pull request #5 from skat/emha-xml

Emha xml
skat · Mar 23, 2021 · e714d52 · e714d52
2 parents 1727c23 + e338820
commit e714d52
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 2 deletions.
diff --git a/H7/toldsystemet_DS/toldsystemet_DS_v1.xsd b/H7/toldsystemet_DS/toldsystemet_DS_v1.xsd
@@ -793,6 +793,18 @@
             </xs:restriction>
         </xs:simpleContent>
     </xs:complexType>
+    <xs:simpleType name="CommodityClassificationSequenceNumericType">
+        <xs:annotation>
+            <xs:documentation>
+                <WCOID>006</WCOID>
+                <WCOFormat>n..5</WCOFormat>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="udt:NumericType">
+            <xs:totalDigits value="5"/>
+            <xs:fractionDigits value="0"/>
+        </xs:restriction>
+    </xs:simpleType>
     <xs:complexType name="CommunicationIdentificationIDType">
         <xs:annotation>
             <xs:documentation>
@@ -959,6 +971,18 @@
             </xs:restriction>
         </xs:simpleContent>
     </xs:complexType>
+    <xs:simpleType name="DomesticDutyTaxPartySequenceNumericType">
+        <xs:annotation>
+            <xs:documentation>
+                <WCOID>006</WCOID>
+                <WCOFormat>n..5</WCOFormat>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="udt:NumericType">
+            <xs:totalDigits value="5"/>
+            <xs:fractionDigits value="0"/>
+        </xs:restriction>
+    </xs:simpleType>
     <xs:complexType name="CustomsValuationMethodCodeType">
         <xs:annotation>
             <xs:documentation>
@@ -1080,6 +1104,20 @@
             </xs:restriction>
         </xs:simpleContent>
     </xs:complexType>
+    <xs:complexType name="DeclarationProcedureCategoryCodeType">
+        <xs:annotation>
+            <xs:documentation>
+                <WCOID>???</WCOID>
+                <WCOFormat>an..3</WCOFormat>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:simpleContent>
+            <xs:restriction base="udt:CodeType">
+                <xs:maxLength value="3"/>
+                <xs:pattern value="([a-zA-Z0-9])*"/>
+            </xs:restriction>
+        </xs:simpleContent>
+    </xs:complexType>
     <xs:complexType name="DeclarationGoodsItemQuantityType">
         <xs:annotation>
             <xs:documentation>
@@ -2103,6 +2141,18 @@
             </xs:restriction>
         </xs:simpleContent>
     </xs:complexType>
+    <xs:simpleType name="PreviousDocumentSequenceNumericType">
+        <xs:annotation>
+            <xs:documentation>
+                <WCOID>006</WCOID>
+                <WCOFormat>n..5</WCOFormat>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="udt:NumericType">
+            <xs:totalDigits value="5"/>
+            <xs:fractionDigits value="0"/>
+        </xs:restriction>
+    </xs:simpleType>
     <xs:simpleType name="PackagingSequenceNumericType">
         <xs:annotation>
             <xs:documentation>

diff --git a/H7/toldsystemet_H7_v1.1.1.xsd b/H7/toldsystemet_H7_v1.1.1.xsd
@@ -25,6 +25,16 @@
                     </xs:documentation>
                 </xs:annotation>
             </xs:element>
+            <xs:element name="ProcedureCategory" type="ds:DeclarationProcedureCategoryCodeType">
+                <xs:annotation>
+                    <xs:documentation>
+                        <type>DMS Specific field</type>
+                        <details>
+                            For Submit H7, always fill in "H7".
+                        </details>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
             <xs:element name="FunctionalReferenceID" type="ds:DeclarationFunctionalReferenceIDType" minOccurs="1">
                 <xs:annotation>
                     <xs:documentation>
@@ -479,6 +489,8 @@
                         <xs:element name="DomesticDutyTaxParty" minOccurs="0" maxOccurs="unbounded">
                             <xs:complexType>
                                 <xs:sequence>
+                                    <xs:element name="SequenceNumeric" type="ds:DomesticDutyTaxPartySequenceNumericType" minOccurs="1">
+                                    </xs:element>
                                     <xs:element name="ID" type="ds:DomesticDutyTaxPartyIdentificationIDType"
                                                 minOccurs="0"/>
                                     <xs:element name="RoleCode" type="ds:DomesticDutyTaxPartyRoleCodeType"
@@ -613,6 +625,9 @@
                                                 <xs:element name="Classification" minOccurs="1">
                                                     <xs:complexType>
                                                         <xs:sequence>
+                                                            <xs:element name="SequenceNumeric" type="ds:CommodityClassificationSequenceNumericType" minOccurs="1">
+
+                                                            </xs:element>
                                                             <xs:element name="ID"
                                                                         type="ds:ClassificationIdentificationIDType"
                                                                         minOccurs="1">
@@ -760,6 +775,9 @@
                                         </xs:annotation>
                                         <xs:complexType>
                                             <xs:sequence>
+                                                <xs:element name="SequenceNumeric" type="ds:DomesticDutyTaxPartySequenceNumericType" minOccurs="1">
+
+                                                </xs:element>
                                                 <xs:element name="ID" type="ds:DomesticDutyTaxPartyIdentificationIDType"
                                                             minOccurs="0">
                                                 </xs:element>
@@ -840,6 +858,8 @@
                                         </xs:annotation>
                                         <xs:complexType>
                                             <xs:sequence>
+                                                <xs:element name="SequenceNumeric" type="ds:PreviousDocumentSequenceNumericType"  minOccurs="1">
+                                                </xs:element>
                                                 <xs:element name="CategoryCode"
                                                             type="ds:PreviousDocumentCategoryCodeType" minOccurs="1">
                                                     <xs:annotation>
@@ -938,6 +958,8 @@
                             </xs:annotation>
                             <xs:complexType>
                                 <xs:sequence>
+                                    <xs:element name="SequenceNumeric" type="ds:PreviousDocumentSequenceNumericType" minOccurs="1">
+                                    </xs:element>
                                     <xs:element name="CategoryCode" type="ds:PreviousDocumentCategoryCodeType"
                                                 minOccurs="1">
                                         <xs:annotation>

diff --git a/README.md b/README.md
@@ -1,16 +1,22 @@
 # dms-public
 Changelog from version 1.0.0 to 1.1.1:
+* Declaration/ProcedureCategory - Element was added 
 * Declaration/Submitter/ID - Removed ID for submitter.
 * Declaration/Agent/Address - Temporarily added mandatory address on representative (Agent - 3/19).
 * Declaration/GoodsShipment/AdditionalDocument/SequenceNumeric - is added, and is mandatory.
 * Declaration/GoodsShipment/AdditionalInformation/SequenceNumeric - is added, and is mandatory.
 * Declaration/GoodsShipment/Consignment/GoodsLocation - is now mandatory.
 * Declaration/GoodsShipment/CustomsValuation/FreightChargeAmount - If CustomsValuation is filled, then is now mandatory.
+* Declaration/GoodsShipment/DomesticDutyTaxParty/SequenceNumeric - SequenceNumeric is added, and is mandatory.
+* Declaration/GoodsShipment/PreviousDocument/SequenceNumeric -  is added, and is mandatory.
 * Declaration/GoodsShipment/GovernmentAgencyGoodsItem/AdditionalDocument - Temporarily added AdditionalDocument is mandatory.
 * Declaration/GoodsShipment/GovernmentAgencyGoodsItem/AdditionalDocument/SequenceNumeric -  is added, and is mandatory.
 * Declaration/GoodsShipment/GovernmentAgencyGoodsItem/AdditionalDocument/* -  All subfields under AdditionalDocument are mandatory.
 * Declaration/GoodsShipment/GovernmentAgencyGoodsItem/AdditionalInformation/SequenceNumeric -  is added, and is mandatory.
 * Declaration/GoodsShipment/GovernmentAgencyGoodsItem/AdditionalInformation/* -  StatementCode and StatementTypeCode are mandatory, if AdditionalInformation is used.
+* Declaration/GoodsShipment/GovernmentAgencyGoodsItem/Commodity/Classification/SequenceNumeric - SequenceNumeric is added, and is mandatory.
+* Declaration/GoodsShipment/GovernmentAgencyGoodsItem/DomesticDutyTaxParty/SequenceNumeric - SequenceNumeric is added, and is mandatory.
 * Declaration/GoodsShipment/GovernmentAgencyGoodsItem/GovernmentProcedure -  Can now occur 3 times.
-* Declaration/GoodsShipment/GovernmentAgencyGoodsItem/GovernmentProcedure/SequenceNumeric -  SequenceNumeric is added, and is mandatory.
-* Declaration/GoodsShipment/Importer/Address/CountryCode - Temporarily added CountryCode is mandatory.
+* Declaration/GoodsShipment/GovernmentAgencyGoodsItem/GovernmentProcedure/SequenceNumeric - SequenceNumeric is added, and is mandatory.
+* Declaration/GoodsShipment/GovernmentAgencyGoodsItem/PreviousDocument/SequenceNumeric -  is added, and is mandatory.
+* Declaration/GoodsShipment/Importer/Address/CountryCode - Temporarily added CountryCode is mandatory.