Merge pull request #30 from phax/issue27

Issue27
phax · Jun 12, 2024 · 50cbd30 · 50cbd30
2 parents f94633e + edeb576
commit 50cbd30
Show file tree

Hide file tree

Showing 43 changed files with 2,594 additions and 321 deletions.
diff --git a/README.md b/README.md
@@ -98,6 +98,7 @@ CII to UBL Converter for EN 16931 invoices
     * 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
+    * Fixed the item price mapping around BT-146, BT-147, BT-148, BT-149 and BT-150. See [issue #27](https://github.com/phax/en16931-cii2ubl/issues/27) - 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_example2-ubl.xml b/en16931-cii2ubl/generated/toubl21/CII_example2-ubl.xml
@@ -283,10 +283,11 @@ Penalty percentage 10% from due date</cbc:Note>
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="NOK">1273</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="NAR">1273</cbc:BaseQuantity>
+      <cbc:BaseQuantity unitCode="NAR">1498</cbc:BaseQuantity>
       <cac:AllowanceCharge>
         <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
-        <cbc:Amount currencyID="NOK">225</cbc:Amount>
+        <cbc:Amount currencyID="NOK">0</cbc:Amount>
+        <cbc:BaseAmount currencyID="NOK">1498</cbc:BaseAmount>
       </cac:AllowanceCharge>
     </cac:Price>
   </cac:InvoiceLine>
@@ -320,7 +321,7 @@ Penalty percentage 10% from due date</cbc:Note>
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="NOK">3.96</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="NAR">3.96</cbc:BaseQuantity>
+      <cbc:BaseQuantity>3.96</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
   <cac:InvoiceLine>
@@ -352,10 +353,11 @@ Penalty percentage 10% from due date</cbc:Note>
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="NOK">2.48</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="NAR">2.48</cbc:BaseQuantity>
+      <cbc:BaseQuantity unitCode="NAR">2.75</cbc:BaseQuantity>
       <cac:AllowanceCharge>
         <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
-        <cbc:Amount currencyID="NOK">0.275</cbc:Amount>
+        <cbc:Amount currencyID="NOK">0</cbc:Amount>
+        <cbc:BaseAmount currencyID="NOK">2.75</cbc:BaseAmount>
       </cac:AllowanceCharge>
     </cac:Price>
   </cac:InvoiceLine>
@@ -388,7 +390,7 @@ Penalty percentage 10% from due date</cbc:Note>
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="NOK">25</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="NAR">25</cbc:BaseQuantity>
+      <cbc:BaseQuantity>25</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
   <cac:InvoiceLine>
@@ -424,7 +426,7 @@ Penalty percentage 10% from due date</cbc:Note>
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="NOK">0.75</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="MTR">0.75</cbc:BaseQuantity>
+      <cbc:BaseQuantity>0.75</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
 </Invoice>
diff --git a/en16931-cii2ubl/generated/toubl21/CII_example5-ubl.xml b/en16931-cii2ubl/generated/toubl21/CII_example5-ubl.xml
@@ -326,10 +326,11 @@
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="DKK">1</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="C62">1</cbc:BaseQuantity>
+      <cbc:BaseQuantity unitCode="C62">1.1</cbc:BaseQuantity>
       <cac:AllowanceCharge>
         <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
-        <cbc:Amount currencyID="DKK">10</cbc:Amount>
+        <cbc:Amount currencyID="DKK">0</cbc:Amount>
+        <cbc:BaseAmount currencyID="DKK">1.1</cbc:BaseAmount>
       </cac:AllowanceCharge>
     </cac:Price>
   </cac:InvoiceLine>

diff --git a/en16931-cii2ubl/generated/toubl21/CII_example8-ubl.xml b/en16931-cii2ubl/generated/toubl21/CII_example8-ubl.xml
@@ -148,7 +148,7 @@ facturen. Kijk voor informatie op www.enexis.nl/rentenota</cbc:Note>
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="EUR">0.0088</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="KWH">0.0088</cbc:BaseQuantity>
+      <cbc:BaseQuantity>0.0088</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
   <cac:InvoiceLine>
@@ -183,7 +183,7 @@ facturen. Kijk voor informatie op www.enexis.nl/rentenota</cbc:Note>
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="EUR">0.00101</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="KWH">0.00101</cbc:BaseQuantity>
+      <cbc:BaseQuantity>0.00101</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
   <cac:InvoiceLine>
@@ -218,7 +218,7 @@ facturen. Kijk voor informatie op www.enexis.nl/rentenota</cbc:Note>
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="EUR">15.24</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="KWT">15.24</cbc:BaseQuantity>
+      <cbc:BaseQuantity>15.24</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
   <cac:InvoiceLine>
@@ -253,7 +253,7 @@ facturen. Kijk voor informatie op www.enexis.nl/rentenota</cbc:Note>
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="EUR">1.53</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="KWT">1.53</cbc:BaseQuantity>
+      <cbc:BaseQuantity>1.53</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
   <cac:InvoiceLine>
@@ -288,7 +288,7 @@ facturen. Kijk voor informatie op www.enexis.nl/rentenota</cbc:Note>
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="EUR">441</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="MON">441</cbc:BaseQuantity>
+      <cbc:BaseQuantity>441</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
   <cac:InvoiceLine>
@@ -323,7 +323,7 @@ facturen. Kijk voor informatie op www.enexis.nl/rentenota</cbc:Note>
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="EUR">678</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="MON">678</cbc:BaseQuantity>
+      <cbc:BaseQuantity>678</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
   <cac:InvoiceLine>
@@ -342,7 +342,7 @@ facturen. Kijk voor informatie op www.enexis.nl/rentenota</cbc:Note>
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="EUR">83.34</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="MON">83.34</cbc:BaseQuantity>
+      <cbc:BaseQuantity>83.34</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
   <cac:InvoiceLine>
@@ -361,7 +361,7 @@ facturen. Kijk voor informatie op www.enexis.nl/rentenota</cbc:Note>
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="EUR">190.31</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="MON">190.31</cbc:BaseQuantity>
+      <cbc:BaseQuantity>190.31</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
   <cac:InvoiceLine>
@@ -380,7 +380,7 @@ facturen. Kijk voor informatie op www.enexis.nl/rentenota</cbc:Note>
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="EUR">64.21</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="MON">64.21</cbc:BaseQuantity>
+      <cbc:BaseQuantity>64.21</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
   <cac:InvoiceLine>
@@ -399,7 +399,7 @@ facturen. Kijk voor informatie op www.enexis.nl/rentenota</cbc:Note>
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="EUR">64.46</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="MON">64.46</cbc:BaseQuantity>
+      <cbc:BaseQuantity>64.46</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
 </Invoice>
diff --git a/en16931-cii2ubl/generated/toubl21/CII_example9-ubl.xml b/en16931-cii2ubl/generated/toubl21/CII_example9-ubl.xml
@@ -116,7 +116,7 @@ het factuurnummer. Het bankrekeningnummer is 37.78.15.500, Rabobank, t.n.v. Blue
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="EUR">49</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="MON">49</cbc:BaseQuantity>
+      <cbc:BaseQuantity>49</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
 </Invoice>
diff --git a/en16931-cii2ubl/generated/toubl21/issues/issue20-ubl.xml b/en16931-cii2ubl/generated/toubl21/issues/issue20-ubl.xml
@@ -299,10 +299,11 @@
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="NOK">1273</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="NAR">1273</cbc:BaseQuantity>
+      <cbc:BaseQuantity unitCode="NAR">1498</cbc:BaseQuantity>
       <cac:AllowanceCharge>
         <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
-        <cbc:Amount currencyID="NOK">225</cbc:Amount>
+        <cbc:Amount currencyID="NOK">0</cbc:Amount>
+        <cbc:BaseAmount currencyID="NOK">1498</cbc:BaseAmount>
       </cac:AllowanceCharge>
     </cac:Price>
   </cac:InvoiceLine>
@@ -336,7 +337,7 @@
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="NOK">3.96</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="NAR">3.96</cbc:BaseQuantity>
+      <cbc:BaseQuantity>3.96</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
   <cac:InvoiceLine>
@@ -368,10 +369,11 @@
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="NOK">2.48</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="NAR">2.48</cbc:BaseQuantity>
+      <cbc:BaseQuantity unitCode="NAR">2.75</cbc:BaseQuantity>
       <cac:AllowanceCharge>
         <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
-        <cbc:Amount currencyID="NOK">0.275</cbc:Amount>
+        <cbc:Amount currencyID="NOK">0</cbc:Amount>
+        <cbc:BaseAmount currencyID="NOK">2.75</cbc:BaseAmount>
       </cac:AllowanceCharge>
     </cac:Price>
   </cac:InvoiceLine>
@@ -404,7 +406,7 @@
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="NOK">25</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="NAR">25</cbc:BaseQuantity>
+      <cbc:BaseQuantity>25</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
   <cac:InvoiceLine>
@@ -440,7 +442,7 @@
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="NOK">0.75</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="MTR">0.75</cbc:BaseQuantity>
+      <cbc:BaseQuantity>0.75</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
 </Invoice>
diff --git a/en16931-cii2ubl/generated/toubl21/issues/issue22-ubl.xml b/en16931-cii2ubl/generated/toubl21/issues/issue22-ubl.xml
@@ -297,10 +297,11 @@
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="NOK">1273</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="NAR">1273</cbc:BaseQuantity>
+      <cbc:BaseQuantity unitCode="NAR">1498</cbc:BaseQuantity>
       <cac:AllowanceCharge>
         <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
-        <cbc:Amount currencyID="NOK">225</cbc:Amount>
+        <cbc:Amount currencyID="NOK">0</cbc:Amount>
+        <cbc:BaseAmount currencyID="NOK">1498</cbc:BaseAmount>
       </cac:AllowanceCharge>
     </cac:Price>
   </cac:InvoiceLine>
@@ -334,7 +335,7 @@
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="NOK">3.96</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="NAR">3.96</cbc:BaseQuantity>
+      <cbc:BaseQuantity>3.96</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
   <cac:InvoiceLine>
@@ -366,10 +367,11 @@
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="NOK">2.48</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="NAR">2.48</cbc:BaseQuantity>
+      <cbc:BaseQuantity unitCode="NAR">2.75</cbc:BaseQuantity>
       <cac:AllowanceCharge>
         <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
-        <cbc:Amount currencyID="NOK">0.275</cbc:Amount>
+        <cbc:Amount currencyID="NOK">0</cbc:Amount>
+        <cbc:BaseAmount currencyID="NOK">2.75</cbc:BaseAmount>
       </cac:AllowanceCharge>
     </cac:Price>
   </cac:InvoiceLine>
@@ -402,7 +404,7 @@
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="NOK">25</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="NAR">25</cbc:BaseQuantity>
+      <cbc:BaseQuantity>25</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
   <cac:InvoiceLine>
@@ -438,7 +440,7 @@
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="NOK">0.75</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="MTR">0.75</cbc:BaseQuantity>
+      <cbc:BaseQuantity>0.75</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
 </Invoice>
diff --git a/en16931-cii2ubl/generated/toubl21/issues/issue23-ubl.xml b/en16931-cii2ubl/generated/toubl21/issues/issue23-ubl.xml
@@ -298,10 +298,11 @@
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="NOK">1273</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="NAR">1273</cbc:BaseQuantity>
+      <cbc:BaseQuantity unitCode="NAR">1498</cbc:BaseQuantity>
       <cac:AllowanceCharge>
         <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
-        <cbc:Amount currencyID="NOK">225</cbc:Amount>
+        <cbc:Amount currencyID="NOK">0</cbc:Amount>
+        <cbc:BaseAmount currencyID="NOK">1498</cbc:BaseAmount>
       </cac:AllowanceCharge>
     </cac:Price>
   </cac:InvoiceLine>
@@ -335,7 +336,7 @@
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="NOK">3.96</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="NAR">3.96</cbc:BaseQuantity>
+      <cbc:BaseQuantity>3.96</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
   <cac:InvoiceLine>
@@ -367,10 +368,11 @@
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="NOK">2.48</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="NAR">2.48</cbc:BaseQuantity>
+      <cbc:BaseQuantity unitCode="NAR">2.75</cbc:BaseQuantity>
       <cac:AllowanceCharge>
         <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
-        <cbc:Amount currencyID="NOK">0.275</cbc:Amount>
+        <cbc:Amount currencyID="NOK">0</cbc:Amount>
+        <cbc:BaseAmount currencyID="NOK">2.75</cbc:BaseAmount>
       </cac:AllowanceCharge>
     </cac:Price>
   </cac:InvoiceLine>
@@ -403,7 +405,7 @@
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="NOK">25</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="NAR">25</cbc:BaseQuantity>
+      <cbc:BaseQuantity>25</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
   <cac:InvoiceLine>
@@ -439,7 +441,7 @@
     </cac:Item>
     <cac:Price>
       <cbc:PriceAmount currencyID="NOK">0.75</cbc:PriceAmount>
-      <cbc:BaseQuantity unitCode="MTR">0.75</cbc:BaseQuantity>
+      <cbc:BaseQuantity>0.75</cbc:BaseQuantity>
     </cac:Price>
   </cac:InvoiceLine>
 </Invoice>