Merge pull request #26 from BEAst-AB/transformation

Transformation updates
BEAst-AB · Apr 22, 2024 · 7cc5aad · 7cc5aad
2 parents 28861ff + 0e8ef2e
commit 7cc5aad
Show file tree

Hide file tree

Showing 46 changed files with 3,931 additions and 42,099 deletions.
diff --git a/build.sh b/build.sh
@@ -136,11 +136,12 @@ docker run --rm -i -v $PROJECT:/src -v $PROJECT/target/generated:/target atomgra
     -s:/src/structure/syntax/ubl-orderagreement.xml \
     -xsl:/src/tools/create-mapping-document.xsl \
     -o:/src/rules/mapping/Orderagreement.xml -ext:on --allow-external-functions:on
-#echo ""Generating mapping documents: Catalogue"
-#docker run --rm -i -v $PROJECT:/src -v $PROJECT/target/generated:/target atomgraph/saxon \
- #   -s:/src/structure/syntax/ubl-catalogue.xml \
-  #  -xsl:/src/tools/create-mapping-document.xsl \
-   # -o:/src/rules/mapping/Catalogue.xml  -ext:on --allow-external-functions:on
+echo "Generating mapping documents: Catalogue"
+docker run --rm -i -v $PROJECT:/src -v $PROJECT/target/generated:/target atomgraph/saxon \
+    -s:/src/structure/syntax/ubl-catalogue.xml \
+    -xsl:/src/tools/create-mapping-document.xsl \
+    -o:/src/rules/mapping/Catalogue.xml  -ext:on --allow-external-functions:on
+
 echo "Generating mapping documents: Advanced Despatch advice"
 docker run --rm -i -v $PROJECT:/src -v $PROJECT/target/generated:/target atomgraph/saxon \
     -s:/src/structure/syntax/ubl-advanced-despatch-advice.xml \

diff --git a/rules/examples/Invoice_Example_Full.xml b/rules/examples/Invoice_Example_Full.xml
diff --git a/rules/examples/Order_Agreement_Example_Full.xml b/rules/examples/Order_Agreement_Example_Full.xml
@@ -41,7 +41,7 @@
             <cbc:AdditionalStreetName>Department A</cbc:AdditionalStreetName>
             <cbc:CityName>Oslo</cbc:CityName>
             <cbc:PostalZone>0585</cbc:PostalZone>
-            <cbc:CountrySubentity/>
+            <cbc:CountrySubentity>Region</cbc:CountrySubentity>
             <cac:AddressLine>
                <cbc:Line>Address Line 3</cbc:Line>
             </cac:AddressLine>
@@ -68,10 +68,10 @@
          </cac:PartyIdentification>
          <cac:PostalAddress>
             <cbc:StreetName>Sinsenveien 40</cbc:StreetName>
-            <cbc:AdditionalStreetName/>
+            <cbc:AdditionalStreetName>Department B</cbc:AdditionalStreetName>
             <cbc:CityName>Oslo</cbc:CityName>
             <cbc:PostalZone>0501</cbc:PostalZone>
-            <cbc:CountrySubentity/>
+            <cbc:CountrySubentity>Region</cbc:CountrySubentity>
             <cac:AddressLine>
                <cbc:Line>Address Line 3</cbc:Line>
             </cac:AddressLine>
@@ -129,7 +129,7 @@
             <cbc:AdditionalStreetName>Department A</cbc:AdditionalStreetName>
             <cbc:CityName>Delivery Party City name</cbc:CityName>
             <cbc:PostalZone>12345</cbc:PostalZone>
-            <cbc:CountrySubentity/>
+            <cbc:CountrySubentity>code</cbc:CountrySubentity>
             <cac:AddressLine>
                <cbc:Line>Place</cbc:Line>
             </cac:AddressLine>
@@ -146,10 +146,10 @@
          <cbc:ID>Stockholm</cbc:ID>
          <cac:Address>
             <cbc:StreetName>Vasagatan 12</cbc:StreetName>
-            <cbc:AdditionalStreetName/>
+            <cbc:AdditionalStreetName>Additional address</cbc:AdditionalStreetName>
             <cbc:CityName>Stockholm</cbc:CityName>
             <cbc:PostalZone>12345</cbc:PostalZone>
-            <cbc:CountrySubentity/>
+            <cbc:CountrySubentity>Address</cbc:CountrySubentity>
             <cac:AddressLine>
                <cbc:Line>xxx</cbc:Line>
             </cac:AddressLine>
@@ -217,7 +217,7 @@
          <cac:Price>
             <cbc:PriceAmount currencyID="EUR">2.50</cbc:PriceAmount>
             <cbc:BaseQuantity unitCode="C62">1</cbc:BaseQuantity>
-            <cbc:PriceType/>
+            <cbc:PriceType>AAA</cbc:PriceType>
             <cac:AllowanceCharge>
                <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
                <cbc:Amount currencyID="EUR">0.20</cbc:Amount>
@@ -238,7 +238,7 @@
             </cac:StandardItemIdentification>
             <cac:ItemSpecificationDocumentReference>
                <cbc:ID>147852</cbc:ID>
-               <cbc:DocumentTypeCode/>
+               <cbc:DocumentTypeCode>2</cbc:DocumentTypeCode>
                <cbc:DocumentType>Timesheet</cbc:DocumentType>
                <cac:Attachment>
                   <cbc:EmbeddedDocumentBinaryObject mimeCode="image/tiff" filename="hours-spend.csv">UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi</cbc:EmbeddedDocumentBinaryObject>
@@ -262,10 +262,10 @@
             </cac:ClassifiedTaxCategory>
             <cac:AdditionalItemProperty>
                <cbc:Name>Length</cbc:Name>
-               <cbc:NameCode listID=""/>
+               <cbc:NameCode listID="NN">test</cbc:NameCode>
                <cbc:Value>30 mm</cbc:Value>
-               <cbc:ValueQuantity unitCode=""/>
-               <cbc:ValueQualifier/>
+               <cbc:ValueQuantity unitCode="MMT">30</cbc:ValueQuantity>
+               <cbc:ValueQualifier>Z3</cbc:ValueQualifier>
             </cac:AdditionalItemProperty>
             <cac:Certificate>
                <cbc:ID>EU EcoLabel</cbc:ID>