Skip to content

Commit

Permalink
Added Peppol May 2024 release
Browse files Browse the repository at this point in the history
  • Loading branch information
phax committed Jun 23, 2024
1 parent ff2aed3 commit cd56a10
Show file tree
Hide file tree
Showing 104 changed files with 87,180 additions and 5 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,8 @@ I hope that with the introduction of PINT, the versioning problem will be solved

# News and noteworthy

* v3.1.11 - work in progress
* Added Peppol May 2024 release (Billing 3.0.17 and Upgrade 3.0.13)
* 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
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions phive-rules-peppol/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@
<goal>convert</goal>
</goals>
<configuration>
<schematronDirectory>src/test/resources/external/rule-source/openpeppol/2023.11</schematronDirectory>
<schematronDirectory>src/test/resources/external/rule-source/openpeppol/2024.5</schematronDirectory>
<schematronPattern>*.sch</schematronPattern>
<xsltDirectory>src/main/resources/external/schematron/openpeppol/2023.11/xslt</xsltDirectory>
<xsltDirectory>src/main/resources/external/schematron/openpeppol/2024.5/xslt</xsltDirectory>
</configuration>
</execution>
-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ public final class PeppolValidation
public static String getVersionToUse ()
{
final LocalDate aNow = PDTFactory.getCurrentLocalDate ();
if (aNow.isBefore (PeppolValidation2023_11.VALID_PER))
if (aNow.isBefore (PeppolValidation2024_05.VALID_PER))
{
// Previous version
return PeppolValidation2023_05.VERSION_STR;
return PeppolValidation2023_11.VERSION_STR;
}
// Latest version
return PeppolValidation2023_11.VERSION_STR;
return PeppolValidation2024_05.VERSION_STR;
}

private PeppolValidation ()
Expand All @@ -76,6 +76,7 @@ public static void initStandard (@Nonnull final IValidationExecutorSetRegistry <

PeppolValidation2023_05.init (aRegistry);
PeppolValidation2023_11.init (aRegistry);
PeppolValidation2024_05.init (aRegistry);
PeppolValidationAUNZ.init (aRegistry);
PeppolValidationSG.init (aRegistry);
PeppolValidationDirectory.init (aRegistry);
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import com.helger.phive.peppol.PeppolValidation;
import com.helger.phive.peppol.PeppolValidation2023_05;
import com.helger.phive.peppol.PeppolValidation2023_11;
import com.helger.phive.peppol.PeppolValidation2024_05;
import com.helger.phive.peppol.PeppolValidationAUNZ;
import com.helger.phive.peppol.PeppolValidationDirectory;
import com.helger.phive.peppol.PeppolValidationJP;
Expand Down Expand Up @@ -110,6 +111,22 @@ public static ICommonsList <TestFile> getAllTestFiles ()
PeppolValidation2023_11.VID_OPENPEPPOL_ORDER_CANCELLATION_V3,
PeppolValidation2023_11.VID_OPENPEPPOL_ORDER_RESPONSE_ADVANCED_V3,

PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3,
PeppolValidation2024_05.VID_OPENPEPPOL_CREDIT_NOTE_UBL_V3,
// PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_CII_V3,
PeppolValidation2024_05.VID_OPENPEPPOL_ORDER_V3,
PeppolValidation2024_05.VID_OPENPEPPOL_DESPATCH_ADVICE_V3,
PeppolValidation2024_05.VID_OPENPEPPOL_CATALOGUE_V3,
PeppolValidation2024_05.VID_OPENPEPPOL_CATALOGUE_RESPONSE_V3,
PeppolValidation2024_05.VID_OPENPEPPOL_MLR_V3,
PeppolValidation2024_05.VID_OPENPEPPOL_ORDER_RESPONSE_V3,
PeppolValidation2024_05.VID_OPENPEPPOL_PUNCH_OUT_V3,
PeppolValidation2024_05.VID_OPENPEPPOL_ORDER_AGREEMENT_V3,
PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_MESSAGE_RESPONSE_V3,
PeppolValidation2024_05.VID_OPENPEPPOL_ORDER_CHANGE_V3,
PeppolValidation2024_05.VID_OPENPEPPOL_ORDER_CANCELLATION_V3,
PeppolValidation2024_05.VID_OPENPEPPOL_ORDER_RESPONSE_ADVANCED_V3,

/* Directory */
PeppolValidationDirectory.VID_OPENPEPPOL_BUSINESS_CARD_V1,
PeppolValidationDirectory.VID_OPENPEPPOL_BUSINESS_CARD_V2,
Expand Down Expand Up @@ -439,6 +456,91 @@ public static ICommonsList <? extends IReadableResource> getAllMatchingTestFiles
return new CommonsArrayList <> (new FileSystemResource (sPrefix + "OrderResponseAdvanced_Example.xml"));
}

// 2024-05
{
final String sPrefix = sPrefix0 + "openpeppol/2024.5/";
// https://github.com/OpenPEPPOL/peppol-bis-invoice-3/tree/master/rules/examples
if (aVESID.equals (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3))
return new CommonsArrayList <> (new FileSystemResource (sPrefix + "billing/Allowance-example.xml"),
new FileSystemResource (sPrefix + "billing/base-example.xml"),
new FileSystemResource (sPrefix + "billing/base-negative-inv-correction.xml"),
new FileSystemResource (sPrefix + "billing/vat-category-E.xml"),
new FileSystemResource (sPrefix + "billing/vat-category-O.xml"),
new FileSystemResource (sPrefix + "billing/Vat-category-S.xml"),
new FileSystemResource (sPrefix + "billing/vat-category-Z.xml"));
if (aVESID.equals (PeppolValidation2024_05.VID_OPENPEPPOL_CREDIT_NOTE_UBL_V3))
return new CommonsArrayList <> (new FileSystemResource (sPrefix + "billing/base-creditnote-correction.xml"));
if (aVESID.equals (PeppolValidation2024_05.VID_OPENPEPPOL_ORDER_V3))
return new CommonsArrayList <> (new FileSystemResource (sPrefix + "Order_Example.xml"),
new FileSystemResource (sPrefix + "Order use cases/UC1_Order.xml"),
new FileSystemResource (sPrefix + "Order use cases/UC2_Order.xml"),
new FileSystemResource (sPrefix + "Order use cases/UC3_Order.xml"),
new FileSystemResource (sPrefix + "Order use cases/UC4_Order.xml"),
new FileSystemResource (sPrefix + "Order use cases/UC5_Order.xml"));
if (aVESID.equals (PeppolValidation2024_05.VID_OPENPEPPOL_DESPATCH_ADVICE_V3))
return new CommonsArrayList <> (new FileSystemResource (sPrefix + "DespatchAdvice_Example.xml"),
new FileSystemResource (sPrefix +
"Despatch Advice use cases/DespatchAdvice-BIS3_UseCase1.xml"),
new FileSystemResource (sPrefix +
"Despatch Advice use cases/DespatchAdvice-BIS3_UseCase2.xml"),
new FileSystemResource (sPrefix +
"Despatch Advice use cases/DespatchAdvice-BIS3_UseCase3.xml"),
new FileSystemResource (sPrefix +
"Despatch Advice use cases/DespatchAdvice-BIS3_UseCase4.xml"),
new FileSystemResource (sPrefix +
"Despatch Advice use cases/DespatchAdvice-BIS3_UseCase5.xml"));
if (aVESID.equals (PeppolValidation2024_05.VID_OPENPEPPOL_CATALOGUE_V3))
return new CommonsArrayList <> (new FileSystemResource (sPrefix + "Catalogue_Example.xml"));
if (aVESID.equals (PeppolValidation2024_05.VID_OPENPEPPOL_CATALOGUE_RESPONSE_V3))
return new CommonsArrayList <> (new FileSystemResource (sPrefix + "CatalogueResponse_Example.xml"));
if (aVESID.equals (PeppolValidation2024_05.VID_OPENPEPPOL_MLR_V3))
return new CommonsArrayList <> (new FileSystemResource (sPrefix + "MessageLevelResponse_Example.xml"));
if (aVESID.equals (PeppolValidation2024_05.VID_OPENPEPPOL_ORDER_RESPONSE_V3))
return new CommonsArrayList <> (new FileSystemResource (sPrefix + "OrderResponse_Example.xml"),
new FileSystemResource (sPrefix +
"Order-response use cases/UC1_Order_response.xml"),
new FileSystemResource (sPrefix +
"Order-response use cases/UC2_Order_response.xml"),
new FileSystemResource (sPrefix +
"Order-response use cases/UC3_Order_response.xml"),
new FileSystemResource (sPrefix +
"Order-response use cases/UC4_Order_response.xml"),
new FileSystemResource (sPrefix +
"Order-response use cases/UC5_Order_response.xml"));
if (aVESID.equals (PeppolValidation2024_05.VID_OPENPEPPOL_PUNCH_OUT_V3))
return new CommonsArrayList <> (new FileSystemResource (sPrefix + "PunchOut_Example.xml"));
if (aVESID.equals (PeppolValidation2024_05.VID_OPENPEPPOL_ORDER_AGREEMENT_V3))
return new CommonsArrayList <> (new FileSystemResource (sPrefix + "OrderAgreement_Example.xml"));

final String sBase2 = sPrefix + "Invoice reponse use cases/";
if (aVESID.equals (PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_MESSAGE_RESPONSE_V3))
return new CommonsArrayList <> (new FileSystemResource (sPrefix + "InvoiceResponse_Example.xml"),
new FileSystemResource (sBase2 + "T111-uc001-Invoice in process.xml"),
new FileSystemResource (sBase2 + "T111-uc002a-Additional reference data.xml"),
new FileSystemResource (sBase2 + "T111-uc002b-In process but postponed.xml"),
new FileSystemResource (sBase2 + "T111-uc003-Invoice is accepted.xml"),
new FileSystemResource (sBase2 + "T111-uc004a-Invoice is rejected.xml"),
new FileSystemResource (sBase2 + "T111-uc004b-Rejected requesting reissue.xml"),
new FileSystemResource (sBase2 +
"T111-uc004c-Rejected requesting replacement.xml"),
new FileSystemResource (sBase2 +
"T111-uc005-Invoice is conditionally accepted.xml"),
new FileSystemResource (sBase2 +
"T111-uc006a-Under query missing information.xml"),
new FileSystemResource (sBase2 + "T111-uc006b-Missing PO.xml"),
new FileSystemResource (sBase2 + "T111-uc006c-Wrong detail partial credit.xml"),
new FileSystemResource (sBase2 + "T111-uc007-Payment has been initiated.xml"),
new FileSystemResource (sBase2 +
"T111-uc008-Invoice is accepted by third party.xml"));

if (aVESID.equals (PeppolValidation2024_05.VID_OPENPEPPOL_ORDER_CHANGE_V3))
return new CommonsArrayList <> (new FileSystemResource (sPrefix + "OrderChange_Example.xml"));
if (aVESID.equals (PeppolValidation2024_05.VID_OPENPEPPOL_ORDER_CANCELLATION_V3))
return new CommonsArrayList <> (new FileSystemResource (sPrefix + "OrderCancellation_Example.xml"));
if (aVESID.equals (PeppolValidation2024_05.VID_OPENPEPPOL_ORDER_RESPONSE_ADVANCED_V3))
return new CommonsArrayList <> (new FileSystemResource (sPrefix + "OrderResponseAdvanced_Example.xml"));
}

/* Peppol Directory BusinessCard */
if (aVESID.equals (PeppolValidationDirectory.VID_OPENPEPPOL_BUSINESS_CARD_V1))
{
Expand Down
Loading

0 comments on commit cd56a10

Please sign in to comment.