Fixed MultiplierFactorNumeric; #17

phax · phax · commit 4516aa2dfb35 · 2022-11-15T17:10:18.000+01:00
diff --git a/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/CIIToUBL21Converter.java b/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/CIIToUBL21Converter.java
@@ -25,7 +25,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.helger.commons.CGlobal;
 import com.helger.commons.ValueEnforcer;
 import com.helger.commons.collection.CollectionHelper;
 import com.helger.commons.equals.EqualsHelper;
@@ -360,8 +359,8 @@ private void _copyAllowanceCharge (@Nonnull final TradeAllowanceChargeType aAllo
     }
     if (aAllowanceCharge.getCalculationPercent () != null)
     {
-      // TODO calc is correct?
-      aUBLAllowanceCharge.setMultiplierFactorNumeric (aAllowanceCharge.getCalculationPercentValue ().divide (CGlobal.BIGDEC_100));
+      // UBL requires values between 0 and 100
+      aUBLAllowanceCharge.setMultiplierFactorNumeric (aAllowanceCharge.getCalculationPercentValue ());
     }
     if (aAllowanceCharge.hasActualAmountEntries ())
     {
diff --git a/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/CIIToUBL22Converter.java b/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/CIIToUBL22Converter.java
@@ -25,7 +25,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.helger.commons.CGlobal;
 import com.helger.commons.ValueEnforcer;
 import com.helger.commons.collection.CollectionHelper;
 import com.helger.commons.equals.EqualsHelper;
@@ -360,8 +359,8 @@ private void _copyAllowanceCharge (@Nonnull final TradeAllowanceChargeType aAllo
     }
     if (aAllowanceCharge.getCalculationPercent () != null)
     {
-      // TODO calc is correct?
-      aUBLAllowanceCharge.setMultiplierFactorNumeric (aAllowanceCharge.getCalculationPercentValue ().divide (CGlobal.BIGDEC_100));
+      // UBL requires values between 0 and 100
+      aUBLAllowanceCharge.setMultiplierFactorNumeric (aAllowanceCharge.getCalculationPercentValue ());
     }
     if (aAllowanceCharge.hasActualAmountEntries ())
     {
diff --git a/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/CIIToUBL23Converter.java b/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/CIIToUBL23Converter.java
@@ -25,7 +25,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.helger.commons.CGlobal;
 import com.helger.commons.ValueEnforcer;
 import com.helger.commons.collection.CollectionHelper;
 import com.helger.commons.equals.EqualsHelper;
@@ -358,8 +357,8 @@ private void _copyAllowanceCharge (@Nonnull final TradeAllowanceChargeType aAllo
     }
     if (aAllowanceCharge.getCalculationPercent () != null)
     {
-      // TODO calc is correct?
-      aUBLAllowanceCharge.setMultiplierFactorNumeric (aAllowanceCharge.getCalculationPercentValue ().divide (CGlobal.BIGDEC_100));
+      // UBL requires values between 0 and 100
+      aUBLAllowanceCharge.setMultiplierFactorNumeric (aAllowanceCharge.getCalculationPercentValue ());
     }
     if (aAllowanceCharge.hasActualAmountEntries ())
     {
diff --git a/en16931-cii2ubl/toubl21/CII_example5-ubl.xml b/en16931-cii2ubl/toubl21/CII_example5-ubl.xml
@@ -201,7 +201,7 @@
     <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
     <cbc:AllowanceChargeReasonCode>95</cbc:AllowanceChargeReasonCode>
     <cbc:AllowanceChargeReason>Loyal customer</cbc:AllowanceChargeReason>
-    <cbc:MultiplierFactorNumeric>0.1</cbc:MultiplierFactorNumeric>
+    <cbc:MultiplierFactorNumeric>10</cbc:MultiplierFactorNumeric>
     <cbc:Amount currencyID="DKK">150</cbc:Amount>
     <cbc:BaseAmount currencyID="DKK">1500</cbc:BaseAmount>
     <cac:TaxCategory>
@@ -216,7 +216,7 @@
     <cbc:ChargeIndicator>true</cbc:ChargeIndicator>
     <cbc:AllowanceChargeReasonCode>ABL</cbc:AllowanceChargeReasonCode>
     <cbc:AllowanceChargeReason>Packaging</cbc:AllowanceChargeReason>
-    <cbc:MultiplierFactorNumeric>0.1</cbc:MultiplierFactorNumeric>
+    <cbc:MultiplierFactorNumeric>10</cbc:MultiplierFactorNumeric>
     <cbc:Amount currencyID="DKK">150</cbc:Amount>
     <cbc:BaseAmount currencyID="DKK">1500</cbc:BaseAmount>
     <cac:TaxCategory>
@@ -284,15 +284,15 @@
       <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
       <cbc:AllowanceChargeReasonCode>95</cbc:AllowanceChargeReasonCode>
       <cbc:AllowanceChargeReason>Loyal customer</cbc:AllowanceChargeReason>
-      <cbc:MultiplierFactorNumeric>0.1</cbc:MultiplierFactorNumeric>
+      <cbc:MultiplierFactorNumeric>10</cbc:MultiplierFactorNumeric>
       <cbc:Amount currencyID="DKK">100</cbc:Amount>
       <cbc:BaseAmount currencyID="DKK">1000</cbc:BaseAmount>
     </cac:AllowanceCharge>
     <cac:AllowanceCharge>
       <cbc:ChargeIndicator>true</cbc:ChargeIndicator>
       <cbc:AllowanceChargeReasonCode>ABL</cbc:AllowanceChargeReasonCode>
       <cbc:AllowanceChargeReason>Packaging</cbc:AllowanceChargeReason>
-      <cbc:MultiplierFactorNumeric>0.1</cbc:MultiplierFactorNumeric>
+      <cbc:MultiplierFactorNumeric>10</cbc:MultiplierFactorNumeric>
       <cbc:Amount currencyID="DKK">100</cbc:Amount>
       <cbc:BaseAmount currencyID="DKK">1000</cbc:BaseAmount>
     </cac:AllowanceCharge>
diff --git a/en16931-cii2ubl/toubl22/CII_example5-ubl.xml b/en16931-cii2ubl/toubl22/CII_example5-ubl.xml
@@ -201,7 +201,7 @@
     <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
     <cbc:AllowanceChargeReasonCode>95</cbc:AllowanceChargeReasonCode>
     <cbc:AllowanceChargeReason>Loyal customer</cbc:AllowanceChargeReason>
-    <cbc:MultiplierFactorNumeric>0.1</cbc:MultiplierFactorNumeric>
+    <cbc:MultiplierFactorNumeric>10</cbc:MultiplierFactorNumeric>
     <cbc:Amount currencyID="DKK">150</cbc:Amount>
     <cbc:BaseAmount currencyID="DKK">1500</cbc:BaseAmount>
     <cac:TaxCategory>
@@ -216,7 +216,7 @@
     <cbc:ChargeIndicator>true</cbc:ChargeIndicator>
     <cbc:AllowanceChargeReasonCode>ABL</cbc:AllowanceChargeReasonCode>
     <cbc:AllowanceChargeReason>Packaging</cbc:AllowanceChargeReason>
-    <cbc:MultiplierFactorNumeric>0.1</cbc:MultiplierFactorNumeric>
+    <cbc:MultiplierFactorNumeric>10</cbc:MultiplierFactorNumeric>
     <cbc:Amount currencyID="DKK">150</cbc:Amount>
     <cbc:BaseAmount currencyID="DKK">1500</cbc:BaseAmount>
     <cac:TaxCategory>
@@ -284,15 +284,15 @@
       <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
       <cbc:AllowanceChargeReasonCode>95</cbc:AllowanceChargeReasonCode>
       <cbc:AllowanceChargeReason>Loyal customer</cbc:AllowanceChargeReason>
-      <cbc:MultiplierFactorNumeric>0.1</cbc:MultiplierFactorNumeric>
+      <cbc:MultiplierFactorNumeric>10</cbc:MultiplierFactorNumeric>
       <cbc:Amount currencyID="DKK">100</cbc:Amount>
       <cbc:BaseAmount currencyID="DKK">1000</cbc:BaseAmount>
     </cac:AllowanceCharge>
     <cac:AllowanceCharge>
       <cbc:ChargeIndicator>true</cbc:ChargeIndicator>
       <cbc:AllowanceChargeReasonCode>ABL</cbc:AllowanceChargeReasonCode>
       <cbc:AllowanceChargeReason>Packaging</cbc:AllowanceChargeReason>
-      <cbc:MultiplierFactorNumeric>0.1</cbc:MultiplierFactorNumeric>
+      <cbc:MultiplierFactorNumeric>10</cbc:MultiplierFactorNumeric>
       <cbc:Amount currencyID="DKK">100</cbc:Amount>
       <cbc:BaseAmount currencyID="DKK">1000</cbc:BaseAmount>
     </cac:AllowanceCharge>
diff --git a/en16931-cii2ubl/toubl23/CII_example5-ubl.xml b/en16931-cii2ubl/toubl23/CII_example5-ubl.xml
@@ -201,7 +201,7 @@
     <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
     <cbc:AllowanceChargeReasonCode>95</cbc:AllowanceChargeReasonCode>
     <cbc:AllowanceChargeReason>Loyal customer</cbc:AllowanceChargeReason>
-    <cbc:MultiplierFactorNumeric>0.1</cbc:MultiplierFactorNumeric>
+    <cbc:MultiplierFactorNumeric>10</cbc:MultiplierFactorNumeric>
     <cbc:Amount currencyID="DKK">150</cbc:Amount>
     <cbc:BaseAmount currencyID="DKK">1500</cbc:BaseAmount>
     <cac:TaxCategory>
@@ -216,7 +216,7 @@
     <cbc:ChargeIndicator>true</cbc:ChargeIndicator>
     <cbc:AllowanceChargeReasonCode>ABL</cbc:AllowanceChargeReasonCode>
     <cbc:AllowanceChargeReason>Packaging</cbc:AllowanceChargeReason>
-    <cbc:MultiplierFactorNumeric>0.1</cbc:MultiplierFactorNumeric>
+    <cbc:MultiplierFactorNumeric>10</cbc:MultiplierFactorNumeric>
     <cbc:Amount currencyID="DKK">150</cbc:Amount>
     <cbc:BaseAmount currencyID="DKK">1500</cbc:BaseAmount>
     <cac:TaxCategory>
@@ -284,15 +284,15 @@
       <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
       <cbc:AllowanceChargeReasonCode>95</cbc:AllowanceChargeReasonCode>
       <cbc:AllowanceChargeReason>Loyal customer</cbc:AllowanceChargeReason>
-      <cbc:MultiplierFactorNumeric>0.1</cbc:MultiplierFactorNumeric>
+      <cbc:MultiplierFactorNumeric>10</cbc:MultiplierFactorNumeric>
       <cbc:Amount currencyID="DKK">100</cbc:Amount>
       <cbc:BaseAmount currencyID="DKK">1000</cbc:BaseAmount>
     </cac:AllowanceCharge>
     <cac:AllowanceCharge>
       <cbc:ChargeIndicator>true</cbc:ChargeIndicator>
       <cbc:AllowanceChargeReasonCode>ABL</cbc:AllowanceChargeReasonCode>
       <cbc:AllowanceChargeReason>Packaging</cbc:AllowanceChargeReason>
-      <cbc:MultiplierFactorNumeric>0.1</cbc:MultiplierFactorNumeric>
+      <cbc:MultiplierFactorNumeric>10</cbc:MultiplierFactorNumeric>
       <cbc:Amount currencyID="DKK">100</cbc:Amount>
       <cbc:BaseAmount currencyID="DKK">1000</cbc:BaseAmount>
     </cac:AllowanceCharge>

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@`
`25`	`25`	`import javax.annotation.Nonnull;`
`26`	`26`	`import javax.annotation.Nullable;`
`27`	`27`
`28`		`-import com.helger.commons.CGlobal;`
`29`	`28`	`import com.helger.commons.ValueEnforcer;`
`30`	`29`	`import com.helger.commons.collection.CollectionHelper;`
`31`	`30`	`import com.helger.commons.equals.EqualsHelper;`
`@@ -360,8 +359,8 @@ private void _copyAllowanceCharge (@Nonnull final TradeAllowanceChargeType aAllo`
`360`	`359`	`}`
`361`	`360`	`if (aAllowanceCharge.getCalculationPercent () != null)`
`362`	`361`	`{`
`363`		`- // TODO calc is correct?`
`364`		`- aUBLAllowanceCharge.setMultiplierFactorNumeric (aAllowanceCharge.getCalculationPercentValue ().divide (CGlobal.BIGDEC_100));`
	`362`	`+ // UBL requires values between 0 and 100`
	`363`	`+ aUBLAllowanceCharge.setMultiplierFactorNumeric (aAllowanceCharge.getCalculationPercentValue ());`
`365`	`364`	`}`
`366`	`365`	`if (aAllowanceCharge.hasActualAmountEntries ())`
`367`	`366`	`{`