Skip to content

Commit

Permalink
Added SG Peppol 2023.7 rules; #18
Browse files Browse the repository at this point in the history
  • Loading branch information
@phax
phax committed Sep 26, 2023
1 parent eb504f2 commit c70fda5
Show file tree
Hide file tree
Showing 32 changed files with 22,519 additions and 309 deletions.
Binary file added phive-rules-peppol/docs/SG/SG-BIS-Billing3-Examples-2023-07.zip
View file
Binary file not shown.
Binary file added phive-rules-peppol/docs/SG/SG-BIS-Billing3-Schematron-2023-07.zip
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions phive-rules-peppol/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@
<goal>convert</goal>
</goals>
<configuration>
<schematronDirectory>src/test/resources/external/rule-source/sg-peppol/1.0.3/Schematron</schematronDirectory>
<xsltDirectory>src/main/resources/external/schematron/peppol-sg/1.0.3/xslt</xsltDirectory>
<schematronDirectory>src/test/resources/external/rule-source/sg-peppol/2023.7</schematronDirectory>
<xsltDirectory>src/main/resources/external/schematron/peppol-sg/2023.7/xslt</xsltDirectory>
</configuration>
</execution>
-->
Expand Down
70 changes: 19 additions & 51 deletions phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidation2023_05.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,57 +86,6 @@ private static ClassLoader _getCL ()
return PeppolValidation2023_05.class.getClassLoader ();
}

private static final String PREFIX_XSLT = "external/schematron/openpeppol/" + VERSION_STR + "/xslt/";
public static final IReadableResource INVOICE_UBL_CEN = new ClassPathResource (PREFIX_XSLT + "CEN-EN16931-UBL.xslt",
_getCL ());
public static final IReadableResource INVOICE_UBL_PEPPOL = new ClassPathResource (PREFIX_XSLT +
"PEPPOL-EN16931-UBL.xslt",
_getCL ());

// public static final IReadableResource INVOICE_CII_CEN = new
// ClassPathResource (PREFIX_XSLT + "CEN-EN16931-CII.xslt",
// _getCL ());
// public static final IReadableResource INVOICE_CII_PEPPOL = new
// ClassPathResource (PREFIX_XSLT +
// "PEPPOL-EN16931-CII.xslt",
// _getCL ());

public static final IReadableResource ORDER = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T01.xslt", _getCL ());

public static final IReadableResource DESPATCH_ADVICE = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T16.xslt",
_getCL ());

public static final IReadableResource CATALOGUE = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T19.xslt",
_getCL ());

public static final IReadableResource CATALOGUE_RESPONSE = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T58.xslt",
_getCL ());

public static final IReadableResource MLR = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T71.xslt", _getCL ());

public static final IReadableResource ORDER_RESPONSE = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T76.xslt",
_getCL ());

public static final IReadableResource PUNCH_OUT = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T77.xslt",
_getCL ());

public static final IReadableResource ORDER_AGREEMENT = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T110.xslt",
_getCL ());

public static final IReadableResource INVOICE_MESSAGE_RESPONSE = new ClassPathResource (PREFIX_XSLT +
"PEPPOLBIS-T111.xslt",
_getCL ());

public static final IReadableResource ORDER_CHANGE = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T114.xslt",
_getCL ());

public static final IReadableResource ORDER_CANCELLATION = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T115.xslt",
_getCL ());

public static final IReadableResource ORDER_RESPONSE_ADVANCED = new ClassPathResource (PREFIX_XSLT +
"PEPPOLBIS-T116.xslt",
_getCL ());

private PeppolValidation2023_05 ()
{}

Expand Down Expand Up @@ -164,6 +113,25 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat

final boolean bNotDeprecated = false;

final String PREFIX_XSLT = "external/schematron/openpeppol/" + VERSION_STR + "/xslt/";
final IReadableResource INVOICE_UBL_CEN = new ClassPathResource (PREFIX_XSLT + "CEN-EN16931-UBL.xslt", _getCL ());
final IReadableResource INVOICE_UBL_PEPPOL = new ClassPathResource (PREFIX_XSLT + "PEPPOL-EN16931-UBL.xslt",
_getCL ());
final IReadableResource ORDER = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T01.xslt", _getCL ());
final IReadableResource DESPATCH_ADVICE = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T16.xslt", _getCL ());
final IReadableResource CATALOGUE = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T19.xslt", _getCL ());
final IReadableResource CATALOGUE_RESPONSE = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T58.xslt", _getCL ());
final IReadableResource MLR = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T71.xslt", _getCL ());
final IReadableResource ORDER_RESPONSE = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T76.xslt", _getCL ());
final IReadableResource PUNCH_OUT = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T77.xslt", _getCL ());
final IReadableResource ORDER_AGREEMENT = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T110.xslt", _getCL ());
final IReadableResource INVOICE_MESSAGE_RESPONSE = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T111.xslt",
_getCL ());
final IReadableResource ORDER_CHANGE = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T114.xslt", _getCL ());
final IReadableResource ORDER_CANCELLATION = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T115.xslt", _getCL ());
final IReadableResource ORDER_RESPONSE_ADVANCED = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T116.xslt",
_getCL ());

aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_INVOICE_UBL_V3,
"OpenPeppol UBL Invoice" +
sVersion +
Expand Down
57 changes: 18 additions & 39 deletions phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidation3_15_0.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,45 +79,6 @@ private static ClassLoader _getCL ()
return PeppolValidation3_15_0.class.getClassLoader ();
}

private static final String PREFIX_XSLT = "external/schematron/openpeppol/" + VERSION_STR + "/xslt/";
public static final IReadableResource INVOICE_UBL_CEN = new ClassPathResource (PREFIX_XSLT + "CEN-EN16931-UBL.xslt",
_getCL ());
public static final IReadableResource INVOICE_UBL_PEPPOL = new ClassPathResource (PREFIX_XSLT +
"PEPPOL-EN16931-UBL.xslt",
_getCL ());

public static final IReadableResource INVOICE_CII_CEN = new ClassPathResource (PREFIX_XSLT + "CEN-EN16931-CII.xslt",
_getCL ());
public static final IReadableResource INVOICE_CII_PEPPOL = new ClassPathResource (PREFIX_XSLT +
"PEPPOL-EN16931-CII.xslt",
_getCL ());

public static final IReadableResource ORDER = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T01.xslt", _getCL ());

public static final IReadableResource DESPATCH_ADVICE = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T16.xslt",
_getCL ());

public static final IReadableResource CATALOGUE = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T19.xslt",
_getCL ());

public static final IReadableResource CATALOGUE_RESPONSE = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T58.xslt",
_getCL ());

public static final IReadableResource MLR = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T71.xslt", _getCL ());

public static final IReadableResource ORDER_RESPONSE = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T76.xslt",
_getCL ());

public static final IReadableResource PUNCH_OUT = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T77.xslt",
_getCL ());

public static final IReadableResource ORDER_AGREEMENT = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T110.xslt",
_getCL ());

public static final IReadableResource INVOICE_MESSAGE_RESPONSE = new ClassPathResource (PREFIX_XSLT +
"PEPPOLBIS-T111.xslt",
_getCL ());

private PeppolValidation3_15_0 ()
{}

Expand Down Expand Up @@ -145,6 +106,24 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat

final boolean bDeprecated = true;

final String PREFIX_XSLT = "external/schematron/openpeppol/" + VERSION_STR + "/xslt/";
final IReadableResource INVOICE_UBL_CEN = new ClassPathResource (PREFIX_XSLT + "CEN-EN16931-UBL.xslt", _getCL ());
final IReadableResource INVOICE_UBL_PEPPOL = new ClassPathResource (PREFIX_XSLT + "PEPPOL-EN16931-UBL.xslt",
_getCL ());
final IReadableResource INVOICE_CII_CEN = new ClassPathResource (PREFIX_XSLT + "CEN-EN16931-CII.xslt", _getCL ());
final IReadableResource INVOICE_CII_PEPPOL = new ClassPathResource (PREFIX_XSLT + "PEPPOL-EN16931-CII.xslt",
_getCL ());
final IReadableResource ORDER = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T01.xslt", _getCL ());
final IReadableResource DESPATCH_ADVICE = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T16.xslt", _getCL ());
final IReadableResource CATALOGUE = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T19.xslt", _getCL ());
final IReadableResource CATALOGUE_RESPONSE = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T58.xslt", _getCL ());
final IReadableResource MLR = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T71.xslt", _getCL ());
final IReadableResource ORDER_RESPONSE = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T76.xslt", _getCL ());
final IReadableResource PUNCH_OUT = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T77.xslt", _getCL ());
final IReadableResource ORDER_AGREEMENT = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T110.xslt", _getCL ());
final IReadableResource INVOICE_MESSAGE_RESPONSE = new ClassPathResource (PREFIX_XSLT + "PEPPOLBIS-T111.xslt",
_getCL ());

aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_INVOICE_UBL_V3,
"OpenPeppol UBL Invoice" +
sVersion +
Expand Down
Loading

0 comments on commit c70fda5

Please sign in to comment.