Fixed mapping BT-27 and BT-28; #26

phax · May 8, 2024 · b5549e2 · b5549e2
1 parent b64f52a
commit b5549e2
Show file tree

Hide file tree

Showing 229 changed files with 469 additions and 1,504 deletions.
diff --git a/README.md b/README.md
@@ -97,6 +97,7 @@ CII to UBL Converter for EN 16931 invoices
 * v2.2.3 - work in progress
     * Added additional mapping of BT-41. See [issue #28](https://github.com/phax/en16931-cii2ubl/issues/28) - thx @bdewein
     * Fixed the mapping of the Due Date Type Code for BT-8. See [issue #29](https://github.com/phax/en16931-cii2ubl/issues/29) - thx @bdewein
+    * Fixed the mapping of BT-27 and BT-28. See [issue #26](https://github.com/phax/en16931-cii2ubl/issues/26) - thx @bdewein
 * v2.2.2 - 2024-04-12
     * Added support for providing the default UBL order reference ID, in case the empty String is not good enough. See [issue #23](https://github.com/phax/en16931-cii2ubl/issues/23) - thx @lkumai
 * v2.2.1 - 2024-03-29

diff --git a/en16931-cii2ubl/generated/toubl21/CII_business_example_01-ubl.xml b/en16931-cii2ubl/generated/toubl21/CII_business_example_01-ubl.xml
@@ -21,9 +21,6 @@
   <cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
   <cac:AccountingSupplierParty>
     <cac:Party>
-      <cac:PartyName>
-        <cbc:Name>XXX AG</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Storkower Straße 207</cbc:StreetName>
         <cbc:CityName>Berlin</cbc:CityName>
@@ -49,9 +46,6 @@
       <cac:PartyIdentification>
         <cbc:ID>10202</cbc:ID>
       </cac:PartyIdentification>
-      <cac:PartyName>
-        <cbc:Name>XXX AG</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Storkower Straße 207</cbc:StreetName>
         <cbc:CityName>Berlin</cbc:CityName>

diff --git a/en16931-cii2ubl/generated/toubl21/CII_business_example_02-ubl.xml b/en16931-cii2ubl/generated/toubl21/CII_business_example_02-ubl.xml
@@ -17,9 +17,6 @@
   </cac:ContractDocumentReference>
   <cac:AccountingSupplierParty>
     <cac:Party>
-      <cac:PartyName>
-        <cbc:Name>xxxx</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Storkower Straße 207</cbc:StreetName>
         <cbc:CityName>Berlin</cbc:CityName>
@@ -45,9 +42,6 @@
       <cac:PartyIdentification>
         <cbc:ID schemeID="0088">1111111111</cbc:ID>
       </cac:PartyIdentification>
-      <cac:PartyName>
-        <cbc:Name>Buyercompany ltd</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Anystreet, Building 1</cbc:StreetName>
         <cbc:CityName>Anytown</cbc:CityName>

diff --git a/en16931-cii2ubl/generated/toubl21/CII_example1-ubl.xml b/en16931-cii2ubl/generated/toubl21/CII_example1-ubl.xml
@@ -10,9 +10,6 @@
   <cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
   <cac:AccountingSupplierParty>
     <cac:Party>
-      <cac:PartyName>
-        <cbc:Name>De Koksmaat</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Postbus 7l</cbc:StreetName>
         <cbc:CityName>Velsen-Noord</cbc:CityName>
@@ -38,9 +35,6 @@
       <cac:PartyIdentification>
         <cbc:ID>10202</cbc:ID>
       </cac:PartyIdentification>
-      <cac:PartyName>
-        <cbc:Name>ODIN 59</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>POSTBUS 367</cbc:StreetName>
         <cbc:CityName>HEEMSKERK</cbc:CityName>

diff --git a/en16931-cii2ubl/generated/toubl21/CII_example1a-ubl.xml b/en16931-cii2ubl/generated/toubl21/CII_example1a-ubl.xml
@@ -17,9 +17,6 @@
   </cac:OrderReference>
   <cac:AccountingSupplierParty>
     <cac:Party>
-      <cac:PartyName>
-        <cbc:Name>De Koksmaat</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Postbus 7l</cbc:StreetName>
         <cbc:CityName>Velsen-Noord</cbc:CityName>
@@ -48,9 +45,6 @@
       <cac:PartyIdentification>
         <cbc:ID>10202</cbc:ID>
       </cac:PartyIdentification>
-      <cac:PartyName>
-        <cbc:Name>ODIN 59</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>POSTBUS 367</cbc:StreetName>
         <cbc:CityName>HEEMSKERK</cbc:CityName>

diff --git a/en16931-cii2ubl/generated/toubl21/CII_example2-ubl.xml b/en16931-cii2ubl/generated/toubl21/CII_example2-ubl.xml
@@ -35,9 +35,6 @@
       <cac:PartyIdentification>
         <cbc:ID schemeID="0088">1238764941386</cbc:ID>
       </cac:PartyIdentification>
-      <cac:PartyName>
-        <cbc:Name>Salescompany ltd.</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Main street 34</cbc:StreetName>
         <cbc:AdditionalStreetName>Suite 123</cbc:AdditionalStreetName>
@@ -70,9 +67,6 @@
       <cac:PartyIdentification>
         <cbc:ID schemeID="0088">3456789012098</cbc:ID>
       </cac:PartyIdentification>
-      <cac:PartyName>
-        <cbc:Name>The Buyercompany</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Anystreet 8</cbc:StreetName>
         <cbc:AdditionalStreetName>Back door</cbc:AdditionalStreetName>

diff --git a/en16931-cii2ubl/generated/toubl21/CII_example3-ubl.xml b/en16931-cii2ubl/generated/toubl21/CII_example3-ubl.xml
@@ -17,9 +17,6 @@
   </cac:ContractDocumentReference>
   <cac:AccountingSupplierParty>
     <cac:Party>
-      <cac:PartyName>
-        <cbc:Name>SubscriptionSeller</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Main street 2, Building 4</cbc:StreetName>
         <cbc:CityName>Big city</cbc:CityName>
@@ -48,9 +45,6 @@
       <cac:PartyIdentification>
         <cbc:ID schemeID="0088">5790000435975</cbc:ID>
       </cac:PartyIdentification>
-      <cac:PartyName>
-        <cbc:Name>Buyercompany ltd</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Anystreet, Building 1</cbc:StreetName>
         <cbc:CityName>Anytown</cbc:CityName>

diff --git a/en16931-cii2ubl/generated/toubl21/CII_example4-ubl.xml b/en16931-cii2ubl/generated/toubl21/CII_example4-ubl.xml
@@ -16,9 +16,6 @@
       <cac:PartyIdentification>
         <cbc:ID schemeID="0088">5790000436101</cbc:ID>
       </cac:PartyIdentification>
-      <cac:PartyName>
-        <cbc:Name>SellerCompany</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Main street 2, Building 4</cbc:StreetName>
         <cbc:CityName>Big city</cbc:CityName>
@@ -49,9 +46,6 @@
       <cac:PartyIdentification>
         <cbc:ID schemeID="0088">5790000436057</cbc:ID>
       </cac:PartyIdentification>
-      <cac:PartyName>
-        <cbc:Name>Buyercompany ltd</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Anystreet, Building 1</cbc:StreetName>
         <cbc:CityName>Anytown</cbc:CityName>

diff --git a/en16931-cii2ubl/generated/toubl21/CII_example5-ubl.xml b/en16931-cii2ubl/generated/toubl21/CII_example5-ubl.xml
@@ -58,7 +58,7 @@
         <cbc:ID schemeID="0088">5790000436101</cbc:ID>
       </cac:PartyIdentification>
       <cac:PartyName>
-        <cbc:Name>SellerCompany</cbc:Name>
+        <cbc:Name>SelCo</cbc:Name>
       </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Hoofdstraat 4</cbc:StreetName>
@@ -83,7 +83,7 @@
         </cac:TaxScheme>
       </cac:PartyTaxScheme>
       <cac:PartyLegalEntity>
-        <cbc:RegistrationName>SelCo</cbc:RegistrationName>
+        <cbc:RegistrationName>SellerCompany</cbc:RegistrationName>
         <cbc:CompanyID>NL16356706</cbc:CompanyID>
         <cbc:CompanyLegalForm>Export</cbc:CompanyLegalForm>
       </cac:PartyLegalEntity>
@@ -101,7 +101,7 @@
         <cbc:ID schemeID="0088">5790000436057</cbc:ID>
       </cac:PartyIdentification>
       <cac:PartyName>
-        <cbc:Name>Buyercompany ltd</cbc:Name>
+        <cbc:Name>Buyco</cbc:Name>
       </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Anystreet, Building 1</cbc:StreetName>
@@ -120,7 +120,7 @@
         </cac:TaxScheme>
       </cac:PartyTaxScheme>
       <cac:PartyLegalEntity>
-        <cbc:RegistrationName>Buyco</cbc:RegistrationName>
+        <cbc:RegistrationName>Buyercompany ltd</cbc:RegistrationName>
         <cbc:CompanyID>DK16356607</cbc:CompanyID>
       </cac:PartyLegalEntity>
       <cac:Contact>

diff --git a/en16931-cii2ubl/generated/toubl21/CII_example6-ubl.xml b/en16931-cii2ubl/generated/toubl21/CII_example6-ubl.xml
@@ -9,9 +9,6 @@
   <cbc:DocumentCurrencyCode>DKK</cbc:DocumentCurrencyCode>
   <cac:AccountingSupplierParty>
     <cac:Party>
-      <cac:PartyName>
-        <cbc:Name>SellerCompany</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cac:Country>
           <cbc:IdentificationCode>DK</cbc:IdentificationCode>
@@ -30,9 +27,6 @@
   </cac:AccountingSupplierParty>
   <cac:AccountingCustomerParty>
     <cac:Party>
-      <cac:PartyName>
-        <cbc:Name>Buyercompany ltd</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cac:Country>
           <cbc:IdentificationCode>DK</cbc:IdentificationCode>

diff --git a/en16931-cii2ubl/generated/toubl21/CII_example7-ubl.xml b/en16931-cii2ubl/generated/toubl21/CII_example7-ubl.xml
@@ -20,7 +20,7 @@
         <cbc:ID>5532331183</cbc:ID>
       </cac:PartyIdentification>
       <cac:PartyName>
-        <cbc:Name>The Sellercompany Incorporated</cbc:Name>
+        <cbc:Name>Civic Service Centre</cbc:Name>
       </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Main street 2, Building 4</cbc:StreetName>
@@ -31,7 +31,7 @@
         </cac:Country>
       </cac:PostalAddress>
       <cac:PartyLegalEntity>
-        <cbc:RegistrationName>Civic Service Centre</cbc:RegistrationName>
+        <cbc:RegistrationName>The Sellercompany Incorporated</cbc:RegistrationName>
       </cac:PartyLegalEntity>
       <cac:Contact>
         <cbc:Name>Anthon Larsen</cbc:Name>
@@ -42,9 +42,6 @@
   </cac:AccountingSupplierParty>
   <cac:AccountingCustomerParty>
     <cac:Party>
-      <cac:PartyName>
-        <cbc:Name>THe Buyercompany</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Anystreet 8</cbc:StreetName>
         <cbc:AdditionalStreetName>Back door</cbc:AdditionalStreetName>

diff --git a/en16931-cii2ubl/generated/toubl21/CII_example8-ubl.xml b/en16931-cii2ubl/generated/toubl21/CII_example8-ubl.xml
@@ -23,7 +23,7 @@ www.enexis.nl</cbc:Note>
   <cac:AccountingSupplierParty>
     <cac:Party>
       <cac:PartyName>
-        <cbc:Name>Enexis B.V.</cbc:Name>
+        <cbc:Name>Enexis</cbc:Name>
       </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Magistratenlaan 116</cbc:StreetName>
@@ -40,7 +40,7 @@ www.enexis.nl</cbc:Note>
         </cac:TaxScheme>
       </cac:PartyTaxScheme>
       <cac:PartyLegalEntity>
-        <cbc:RegistrationName>Enexis</cbc:RegistrationName>
+        <cbc:RegistrationName>Enexis B.V.</cbc:RegistrationName>
         <cbc:CompanyID>17131139</cbc:CompanyID>
       </cac:PartyLegalEntity>
       <cac:Contact>
@@ -53,9 +53,6 @@ www.enexis.nl</cbc:Note>
       <cac:PartyIdentification>
         <cbc:ID>1081119</cbc:ID>
       </cac:PartyIdentification>
-      <cac:PartyName>
-        <cbc:Name>Klant</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Bedrijfslaan 4</cbc:StreetName>
         <cbc:CityName>ONDERNEMERSTAD</cbc:CityName>

diff --git a/en16931-cii2ubl/generated/toubl21/CII_example9-ubl.xml b/en16931-cii2ubl/generated/toubl21/CII_example9-ubl.xml
@@ -16,9 +16,6 @@ het factuurnummer. Het bankrekeningnummer is 37.78.15.500, Rabobank, t.n.v. Blue
   </cac:ContractDocumentReference>
   <cac:AccountingSupplierParty>
     <cac:Party>
-      <cac:PartyName>
-        <cbc:Name>Bluem BV</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Lindeboomseweg 41</cbc:StreetName>
         <cbc:CityName>Amersfoort</cbc:CityName>
@@ -45,9 +42,6 @@ het factuurnummer. Het bankrekeningnummer is 37.78.15.500, Rabobank, t.n.v. Blue
   </cac:AccountingSupplierParty>
   <cac:AccountingCustomerParty>
     <cac:Party>
-      <cac:PartyName>
-        <cbc:Name>Provide Verzekeringen</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Henry Dunantweg 42</cbc:StreetName>
         <cbc:CityName>Alphen aan den Rijn</cbc:CityName>

diff --git a/en16931-cii2ubl/generated/toubl21/issues/issue12-ubl.xml b/en16931-cii2ubl/generated/toubl21/issues/issue12-ubl.xml
@@ -16,9 +16,6 @@
       <cac:PartyIdentification>
         <cbc:ID schemeID="0088">Homepage Design GmbH</cbc:ID>
       </cac:PartyIdentification>
-      <cac:PartyName>
-        <cbc:Name>Homepage Design GmbH</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Musterstr. 60</cbc:StreetName>
         <cbc:CityName>Berlin</cbc:CityName>
@@ -48,9 +45,6 @@
       <cac:PartyIdentification>
         <cbc:ID>Lampenlager GmbH</cbc:ID>
       </cac:PartyIdentification>
-      <cac:PartyName>
-        <cbc:Name>Anne Mach</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Industriestr. 21</cbc:StreetName>
         <cbc:CityName>Berlin </cbc:CityName>

diff --git a/en16931-cii2ubl/generated/toubl21/issues/issue20-ubl.xml b/en16931-cii2ubl/generated/toubl21/issues/issue20-ubl.xml
@@ -51,9 +51,6 @@
       <cac:PartyIdentification>
         <cbc:ID schemeID="0088">1238764941386</cbc:ID>
       </cac:PartyIdentification>
-      <cac:PartyName>
-        <cbc:Name>Salescompany ltd.</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Main street 34</cbc:StreetName>
         <cbc:AdditionalStreetName>Suite 123</cbc:AdditionalStreetName>
@@ -86,9 +83,6 @@
       <cac:PartyIdentification>
         <cbc:ID schemeID="0088">3456789012098</cbc:ID>
       </cac:PartyIdentification>
-      <cac:PartyName>
-        <cbc:Name>The Buyercompany</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Anystreet 8</cbc:StreetName>
         <cbc:AdditionalStreetName>Back door</cbc:AdditionalStreetName>

diff --git a/en16931-cii2ubl/generated/toubl21/issues/issue22-ubl.xml b/en16931-cii2ubl/generated/toubl21/issues/issue22-ubl.xml
@@ -49,9 +49,6 @@
       <cac:PartyIdentification>
         <cbc:ID schemeID="0088">1238764941386</cbc:ID>
       </cac:PartyIdentification>
-      <cac:PartyName>
-        <cbc:Name>Salescompany ltd.</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Main street 34</cbc:StreetName>
         <cbc:AdditionalStreetName>Suite 123</cbc:AdditionalStreetName>
@@ -84,9 +81,6 @@
       <cac:PartyIdentification>
         <cbc:ID schemeID="0088">3456789012098</cbc:ID>
       </cac:PartyIdentification>
-      <cac:PartyName>
-        <cbc:Name>The Buyercompany</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Anystreet 8</cbc:StreetName>
         <cbc:AdditionalStreetName>Back door</cbc:AdditionalStreetName>

diff --git a/en16931-cii2ubl/generated/toubl21/issues/issue23-ubl.xml b/en16931-cii2ubl/generated/toubl21/issues/issue23-ubl.xml
@@ -50,9 +50,6 @@
       <cac:PartyIdentification>
         <cbc:ID schemeID="0088">1238764941386</cbc:ID>
       </cac:PartyIdentification>
-      <cac:PartyName>
-        <cbc:Name>Salescompany ltd.</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Main street 34</cbc:StreetName>
         <cbc:AdditionalStreetName>Suite 123</cbc:AdditionalStreetName>
@@ -85,9 +82,6 @@
       <cac:PartyIdentification>
         <cbc:ID schemeID="0088">3456789012098</cbc:ID>
       </cac:PartyIdentification>
-      <cac:PartyName>
-        <cbc:Name>The Buyercompany</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Anystreet 8</cbc:StreetName>
         <cbc:AdditionalStreetName>Back door</cbc:AdditionalStreetName>

diff --git a/en16931-cii2ubl/generated/toubl21/issues/issue28-ubl.xml b/en16931-cii2ubl/generated/toubl21/issues/issue28-ubl.xml
@@ -50,9 +50,6 @@
       <cac:PartyIdentification>
         <cbc:ID schemeID="0088">1238764941386</cbc:ID>
       </cac:PartyIdentification>
-      <cac:PartyName>
-        <cbc:Name>Salescompany ltd.</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Main street 34</cbc:StreetName>
         <cbc:AdditionalStreetName>Suite 123</cbc:AdditionalStreetName>
@@ -85,9 +82,6 @@
       <cac:PartyIdentification>
         <cbc:ID schemeID="0088">3456789012098</cbc:ID>
       </cac:PartyIdentification>
-      <cac:PartyName>
-        <cbc:Name>The Buyercompany</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Anystreet 8</cbc:StreetName>
         <cbc:AdditionalStreetName>Back door</cbc:AdditionalStreetName>

diff --git a/en16931-cii2ubl/generated/toubl21/issues/issue7-ubl.xml b/en16931-cii2ubl/generated/toubl21/issues/issue7-ubl.xml
@@ -15,9 +15,6 @@
       <cac:PartyIdentification>
         <cbc:ID schemeID="SEPA">asdfdsf</cbc:ID>
       </cac:PartyIdentification>
-      <cac:PartyName>
-        <cbc:Name>De Koksmaat</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>Postbus 7l</cbc:StreetName>
         <cbc:CityName>Velsen-Noord</cbc:CityName>
@@ -43,9 +40,6 @@
       <cac:PartyIdentification>
         <cbc:ID>10202</cbc:ID>
       </cac:PartyIdentification>
-      <cac:PartyName>
-        <cbc:Name>ODIN 59</cbc:Name>
-      </cac:PartyName>
       <cac:PostalAddress>
         <cbc:StreetName>POSTBUS 367</cbc:StreetName>
         <cbc:CityName>HEEMSKERK</cbc:CityName>