Fixed the mapping of the Due Date Type Code for BT-8; #29

phax · May 8, 2024 · 2094b87 · 2094b87
1 parent f06b0ad
commit 2094b87
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -96,6 +96,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
 * 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/src/main/java/com/helger/en16931/cii2ubl/AbstractCIIToUBLConverter.java b/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/AbstractCIIToUBLConverter.java
@@ -542,6 +542,19 @@ protected static boolean isValidDocumentReferenceTypeCode (@Nullable final Strin
     return isOriginatorDocumentReferenceTypeCode (s) || "130".equals (s);
   }
 
+  @Nullable
+  protected static String mapDueDateTypeCode (@Nullable final String s)
+  {
+    // BT-8 mapping; see #29
+    if ("5".equals (s))
+      return "3";
+    if ("29".equals (s))
+      return "35";
+    if ("72".equals (s))
+      return "432";
+    return s;
+  }
+
   protected static boolean isLT0Strict (@Nullable final BigDecimal aBD)
   {
     return aBD != null && MathHelper.isLT0 (aBD);

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
@@ -719,7 +719,7 @@ public InvoiceType convertToInvoice (@Nonnull final CrossIndustryInvoiceType aCI
       {
         final TradeTaxType aTradeTax = aHeaderSettlement.getApplicableTradeTaxAtIndex (0);
         if (StringHelper.hasText (aTradeTax.getDueDateTypeCodeValue ()))
-          aUBLPeriod.addDescriptionCode (new DescriptionCodeType (aTradeTax.getDueDateTypeCodeValue ()));
+          aUBLPeriod.addDescriptionCode (new DescriptionCodeType (mapDueDateTypeCode (aTradeTax.getDueDateTypeCodeValue ())));
       }
 
       if (aUBLPeriod.getStartDate () != null ||
@@ -1567,7 +1567,7 @@ public CreditNoteType convertToCreditNote (@Nonnull final CrossIndustryInvoiceTy
       {
         final TradeTaxType aTradeTax = aHeaderSettlement.getApplicableTradeTaxAtIndex (0);
         if (StringHelper.hasText (aTradeTax.getDueDateTypeCodeValue ()))
-          aUBLPeriod.addDescriptionCode (new DescriptionCodeType (aTradeTax.getDueDateTypeCodeValue ()));
+          aUBLPeriod.addDescriptionCode (new DescriptionCodeType (mapDueDateTypeCode (aTradeTax.getDueDateTypeCodeValue ())));
       }
 
       if (aUBLPeriod.getStartDate () != null ||

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
@@ -718,7 +718,7 @@ public InvoiceType convertToInvoice (@Nonnull final CrossIndustryInvoiceType aCI
       {
         final TradeTaxType aTradeTax = aHeaderSettlement.getApplicableTradeTaxAtIndex (0);
         if (StringHelper.hasText (aTradeTax.getDueDateTypeCodeValue ()))
-          aUBLPeriod.addDescriptionCode (new DescriptionCodeType (aTradeTax.getDueDateTypeCodeValue ()));
+          aUBLPeriod.addDescriptionCode (new DescriptionCodeType (mapDueDateTypeCode (aTradeTax.getDueDateTypeCodeValue ())));
       }
 
       if (aUBLPeriod.getStartDate () != null ||
@@ -1563,7 +1563,7 @@ public CreditNoteType convertToCreditNote (@Nonnull final CrossIndustryInvoiceTy
         {
           final TradeTaxType aTradeTax = aHeaderSettlement.getApplicableTradeTaxAtIndex (0);
           if (StringHelper.hasText (aTradeTax.getDueDateTypeCodeValue ()))
-            aUBLPeriod.addDescriptionCode (new DescriptionCodeType (aTradeTax.getDueDateTypeCodeValue ()));
+            aUBLPeriod.addDescriptionCode (new DescriptionCodeType (mapDueDateTypeCode (aTradeTax.getDueDateTypeCodeValue ())));
         }
 
         if (aUBLPeriod.getStartDate () != null ||

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
@@ -719,7 +719,7 @@ public InvoiceType convertToInvoice (@Nonnull final CrossIndustryInvoiceType aCI
       {
         final TradeTaxType aTradeTax = aHeaderSettlement.getApplicableTradeTaxAtIndex (0);
         if (StringHelper.hasText (aTradeTax.getDueDateTypeCodeValue ()))
-          aUBLPeriod.addDescriptionCode (new DescriptionCodeType (aTradeTax.getDueDateTypeCodeValue ()));
+          aUBLPeriod.addDescriptionCode (new DescriptionCodeType (mapDueDateTypeCode (aTradeTax.getDueDateTypeCodeValue ())));
       }
 
       if (aUBLPeriod.getStartDate () != null ||
@@ -1565,7 +1565,7 @@ public CreditNoteType convertToCreditNote (@Nonnull final CrossIndustryInvoiceTy
       {
         final TradeTaxType aTradeTax = aHeaderSettlement.getApplicableTradeTaxAtIndex (0);
         if (StringHelper.hasText (aTradeTax.getDueDateTypeCodeValue ()))
-          aUBLPeriod.addDescriptionCode (new DescriptionCodeType (aTradeTax.getDueDateTypeCodeValue ()));
+          aUBLPeriod.addDescriptionCode (new DescriptionCodeType (mapDueDateTypeCode (aTradeTax.getDueDateTypeCodeValue ())));
       }
 
       if (aUBLPeriod.getStartDate () != null ||

diff --git a/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/CIIToUBL24Converter.java b/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/CIIToUBL24Converter.java
@@ -719,7 +719,7 @@ public InvoiceType convertToInvoice (@Nonnull final CrossIndustryInvoiceType aCI
       {
         final TradeTaxType aTradeTax = aHeaderSettlement.getApplicableTradeTaxAtIndex (0);
         if (StringHelper.hasText (aTradeTax.getDueDateTypeCodeValue ()))
-          aUBLPeriod.addDescriptionCode (new DescriptionCodeType (aTradeTax.getDueDateTypeCodeValue ()));
+          aUBLPeriod.addDescriptionCode (new DescriptionCodeType (mapDueDateTypeCode (aTradeTax.getDueDateTypeCodeValue ())));
       }
 
       if (aUBLPeriod.getStartDate () != null ||
@@ -1565,7 +1565,7 @@ public CreditNoteType convertToCreditNote (@Nonnull final CrossIndustryInvoiceTy
       {
         final TradeTaxType aTradeTax = aHeaderSettlement.getApplicableTradeTaxAtIndex (0);
         if (StringHelper.hasText (aTradeTax.getDueDateTypeCodeValue ()))
-          aUBLPeriod.addDescriptionCode (new DescriptionCodeType (aTradeTax.getDueDateTypeCodeValue ()));
+          aUBLPeriod.addDescriptionCode (new DescriptionCodeType (mapDueDateTypeCode (aTradeTax.getDueDateTypeCodeValue ())));
       }
 
       if (aUBLPeriod.getStartDate () != null ||