Added support for Peppol SG BIS Billing 2023.12

phax · May 16, 2024 · 3848575 · 3848575
1 parent d2877fa
commit 3848575
Show file tree

Hide file tree

Showing 30 changed files with 22,234 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -191,10 +191,11 @@ I hope that with the introduction of PINT, the versioning problem will be solved
 
 # News and noteworthy
 
-* v3.1.10 - work in progress
+* v3.1.10 - 2024-05-16
     * Added support for EN 16931 rules v1.3.12 format and deprecated v1.3.10
     * All OIOUBL 1.x validations are now correctly based on UBL 2.1 instead of UBL 2.0
     * Extracted the rules for the legacy OIOUBL rules into a separate registerable entity (`OIOUBLLegacyValidation`).
+    * Added support for SG-PEPPOL 2023.12 rules.
 * v3.1.9 - 2024-03-22
     * Deprecated Peppol Business Card formats v1 and v2
     * Deprecated Peppol May 2023 release

diff --git a/phive-rules-peppol/docs/SG/SG-BIS-Billing3-Examples-2023-12.zip b/phive-rules-peppol/docs/SG/SG-BIS-Billing3-Examples-2023-12.zip
diff --git a/phive-rules-peppol/docs/SG/SG-BIS-Billing3-Schematron-2023-12.zip b/phive-rules-peppol/docs/SG/SG-BIS-Billing3-Schematron-2023-12.zip
diff --git a/phive-rules-peppol/docs/SG/SG-BIS-eDoc-Stylesheet-2023-12.zip b/phive-rules-peppol/docs/SG/SG-BIS-eDoc-Stylesheet-2023-12.zip
diff --git a/phive-rules-peppol/pom.xml b/phive-rules-peppol/pom.xml
@@ -216,8 +216,8 @@
               <goal>convert</goal>
             </goals>
             <configuration>
-              <schematronDirectory>src/test/resources/external/rule-source/sg-peppol/2023.7</schematronDirectory>
-              <xsltDirectory>src/main/resources/external/schematron/peppol-sg/2023.7/xslt</xsltDirectory>
+              <schematronDirectory>src/test/resources/external/rule-source/sg-peppol/2023.12</schematronDirectory>
+              <xsltDirectory>src/main/resources/external/schematron/peppol-sg/2023.12/xslt</xsltDirectory>
             </configuration>
           </execution>
           -->

diff --git a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationSG.java b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationSG.java
@@ -68,6 +68,14 @@ private static ClassLoader _getCL ()
                                                                                        "creditnote",
                                                                                        "2023.7");
 
+  // 2023.12
+  public static final VESID VID_OPENPEPPOL_BIS3_SG_UBL_INVOICE_2023_12 = new VESID ("eu.peppol.bis3.sg.ubl",
+                                                                                    "invoice",
+                                                                                    "2023.12");
+  public static final VESID VID_OPENPEPPOL_BIS3_SG_UBL_CREDIT_NOTE_2023_12 = new VESID ("eu.peppol.bis3.sg.ubl",
+                                                                                        "creditnote",
+                                                                                        "2023.12");
+
   private PeppolValidationSG ()
   {}
 
@@ -151,5 +159,39 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_SG_2023_07,
                                                                                                                       aNSCtxCreditNote)));
     }
+
+    // 2023.12
+    {
+      final IReadableResource BIS3_BILLING_SG_CEN_2023_12 = new ClassPathResource (BASE_PATH +
+                                                                                   "2023.12/xslt/SG-Subset-CEN-EN16931-UBL.xslt",
+                                                                                   _getCL ());
+      final IReadableResource BIS3_BILLING_SG_PEPPOL_2023_12 = new ClassPathResource (BASE_PATH +
+                                                                                      "2023.12/xslt/SG-Subset-PEPPOL-EN16931-UBL.xslt",
+                                                                                      _getCL ());
+      final IReadableResource BIS3_BILLING_SG_2023_12 = new ClassPathResource (BASE_PATH +
+                                                                               "2023.12/xslt/SG-Billing3-UBL.xslt",
+                                                                               _getCL ());
+
+      aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_SG_UBL_INVOICE_2023_12,
+                                                                             "SG Peppol BIS3 Invoice (UBL) 2023.12",
+                                                                             _createStatus (bNotDeprecated),
+                                                                             ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
+                                                                             ValidationExecutorSchematron.createXSLT (BIS3_BILLING_SG_CEN_2023_12,
+                                                                                                                      aNSCtxInvoice),
+                                                                             ValidationExecutorSchematron.createXSLT (BIS3_BILLING_SG_PEPPOL_2023_12,
+                                                                                                                      aNSCtxInvoice),
+                                                                             ValidationExecutorSchematron.createXSLT (BIS3_BILLING_SG_2023_12,
+                                                                                                                      aNSCtxInvoice)));
+      aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_SG_UBL_CREDIT_NOTE_2023_12,
+                                                                             "SG Peppol BIS3 Credit Note (UBL) 2023.12",
+                                                                             _createStatus (bNotDeprecated),
+                                                                             ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
+                                                                             ValidationExecutorSchematron.createXSLT (BIS3_BILLING_SG_CEN_2023_12,
+                                                                                                                      aNSCtxCreditNote),
+                                                                             ValidationExecutorSchematron.createXSLT (BIS3_BILLING_SG_PEPPOL_2023_12,
+                                                                                                                      aNSCtxCreditNote),
+                                                                             ValidationExecutorSchematron.createXSLT (BIS3_BILLING_SG_2023_12,
+                                                                                                                      aNSCtxCreditNote)));
+    }
   }
 }