Skip to content

Commit

Permalink
Added SimplerInvoicing November 2023 release
Browse files Browse the repository at this point in the history
  • Loading branch information
@phax
phax committed Nov 30, 2023
1 parent f646e94 commit d0288b1
Show file tree
Hide file tree
Showing 31 changed files with 52,401 additions and 45 deletions.
7 changes: 4 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,10 @@ I hope that with the introduction of PINT, the versioning problem will be solved

# News and noteworthy

* v3.1.6 - 2023-11-29
* Added Peppol 2023 November release (Billing 3.0.16 and Upgrade 3.0.12)
* v3.1.6 - 2023-11-30
* Added Peppol November 2023 release (Billing 3.0.16 and Upgrade 3.0.12)
* Moved Peppol 3.15.0 rules from `phive-rules-peppol` to `phive-rules-peppol-legacy`
* Added SimplerInvoicing November 2023 release (SI 2.0.3.8, NLCIUS-CII 1.0.3.7, SI 2.0 G-Account extension 1.0.8)
* v3.1.5 - 2023-11-10
* Added support for Peppol Reporting EUSR v1.1.4 and deprecated v1.1.3
* Added support for Czech ISDOC v6.0.2 and deprecated v6.0.1 [original Schematron had errors]
Expand Down Expand Up @@ -232,7 +233,7 @@ I hope that with the introduction of PINT, the versioning problem will be solved
* Added support for SimplerInvoicing 2.0.3.7 and deprecated old versions
* Added support for SimplerInvoicing NLCIUS-CII 1.0.3.6 and deprecated old versions
* Added support for SimplerInvoicing 2.0 G-Account extension 1.0.7 and deprecated old versions
* Added Peppol 2023 May release (Billing 3.0.15 and Upgrade 3.0.11) - using a new versioning number (yyyy.m)
* Added Peppol May 2023 release (Billing 3.0.15 and Upgrade 3.0.11) - using a new versioning number (yyyy.m)
* Added new submodule `phive-rules-setu` for selected Dutch SETU standards
* Added support for Peppol End User Statistics Report 1.0.1
* v3.0.3 - 2023-04-30
Expand Down
Binary file modified phive-rules-simplerinvoicing/docs/validation-2023-11-29.zip
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions phive-rules-simplerinvoicing/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
</goals>
<id>convert-si</id>
<configuration>
<schematronDirectory>${basedir}/src/test/resources/external/rule-source/simplerinvoicing/2.0.3.7</schematronDirectory>
<schematronDirectory>${basedir}/src/test/resources/external/rule-source/simplerinvoicing/2.0.3.8</schematronDirectory>
<schematronPattern>si-ubl-*.sch</schematronPattern>
<xsltDirectory>${basedir}/src/main/resources/external/schematron/simplerinvoicing</xsltDirectory>
</configuration>
Expand All @@ -146,7 +146,7 @@
</goals>
<id>convert-nlcius</id>
<configuration>
<schematronDirectory>${basedir}/src/test/resources/external/rule-source/nlcius/1.0.3.6</schematronDirectory>
<schematronDirectory>${basedir}/src/test/resources/external/rule-source/nlcius/1.0.3.7</schematronDirectory>
<schematronPattern>nlcius-*.sch</schematronPattern>
<xsltDirectory>${basedir}/src/main/resources/external/schematron/nlcius</xsltDirectory>
</configuration>
Expand Down
101 changes: 70 additions & 31 deletions ...invoicing/src/main/java/com/helger/phive/simplerinvoicing/SimplerInvoicingValidation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ public final class SimplerInvoicingValidation
public static final VESID VID_SI_INVOICE_V2037 = new VESID (GROUP_ID, "invoice", "2.0.3.7");
public static final VESID VID_SI_CREDIT_NOTE_V2037 = new VESID (GROUP_ID, "creditnote", "2.0.3.7");

public static final VESID VID_SI_INVOICE_V2038 = new VESID (GROUP_ID, "invoice", "2.0.3.8");
public static final VESID VID_SI_CREDIT_NOTE_V2038 = new VESID (GROUP_ID, "creditnote", "2.0.3.8");

@Deprecated
public static final VESID VID_SI_INVOICE_20_GACCOUNT_V10 = new VESID (GROUP_ID, "invoice20.g-account", "1.0");
@Deprecated
Expand All @@ -130,6 +133,7 @@ public final class SimplerInvoicingValidation
@Deprecated
public static final VESID VID_SI_INVOICE_20_GACCOUNT_V106 = new VESID (GROUP_ID, "invoice20.g-account", "1.0.6");
public static final VESID VID_SI_INVOICE_20_GACCOUNT_V107 = new VESID (GROUP_ID, "invoice20.g-account", "1.0.7");
public static final VESID VID_SI_INVOICE_20_GACCOUNT_V108 = new VESID (GROUP_ID, "invoice20.g-account", "1.0.8");

@Deprecated
public static final VESID VID_SI_NLCIUS_CII_V103 = new VESID (GROUP_ID, "nlcius-cii", "1.0.3");
Expand All @@ -144,6 +148,7 @@ public final class SimplerInvoicingValidation
@Deprecated
public static final VESID VID_SI_NLCIUS_CII_V1035 = new VESID (GROUP_ID, "nlcius-cii", "1.0.3.5");
public static final VESID VID_SI_NLCIUS_CII_V1036 = new VESID (GROUP_ID, "nlcius-cii", "1.0.3.6");
public static final VESID VID_SI_NLCIUS_CII_V1037 = new VESID (GROUP_ID, "nlcius-cii", "1.0.3.7");

@Nonnull
private static ClassLoader _getCL ()
Expand All @@ -157,7 +162,7 @@ private static ClassLoader _getCL ()
// SimplerInvoicing
// 1.0
@Deprecated
public static final ClassPathResource INVOICE_SI10 = new ClassPathResource (PATH_SI + "si-ubl-1.0.xslt", _getCL ());
private static final ClassPathResource INVOICE_SI10 = new ClassPathResource (PATH_SI + "si-ubl-1.0.xslt", _getCL ());

// 1.1
@Deprecated
Expand All @@ -167,63 +172,63 @@ private static ClassLoader _getCL ()
@Deprecated
public static final ClassPathResource INVOICE_SI12 = new ClassPathResource (PATH_SI + "si-ubl-1.2.xslt", _getCL ());
@Deprecated
public static final ClassPathResource ORDER_SI12 = new ClassPathResource (PATH_SI + "si-ubl-1.2-purchaseorder.xslt",
_getCL ());
private static final ClassPathResource ORDER_SI12 = new ClassPathResource (PATH_SI + "si-ubl-1.2-purchaseorder.xslt",
_getCL ());

// 1.2.3
@Deprecated
public static final ClassPathResource INVOICE_SI123 = new ClassPathResource (PATH_SI + "si-ubl-1.2.3.xslt",
_getCL ());
private static final ClassPathResource INVOICE_SI123 = new ClassPathResource (PATH_SI + "si-ubl-1.2.3.xslt",
_getCL ());
@Deprecated
public static final ClassPathResource ORDER_SI123 = new ClassPathResource (PATH_SI +
"si-ubl-1.2.3-purchaseorder.xslt",
_getCL ());
private static final ClassPathResource ORDER_SI123 = new ClassPathResource (PATH_SI +
"si-ubl-1.2.3-purchaseorder.xslt",
_getCL ());

// 1.2.4
public static final ClassPathResource INVOICE_SI124 = new ClassPathResource (PATH_SI + "si-ubl-1.2.4.xslt",
_getCL ());
public static final ClassPathResource ORDER_SI124 = new ClassPathResource (PATH_SI +
"si-ubl-1.2.4-purchaseorder.xslt",
_getCL ());
private static final ClassPathResource INVOICE_SI124 = new ClassPathResource (PATH_SI + "si-ubl-1.2.4.xslt",
_getCL ());
private static final ClassPathResource ORDER_SI124 = new ClassPathResource (PATH_SI +
"si-ubl-1.2.4-purchaseorder.xslt",
_getCL ());

// 2.0
@Deprecated
public static final ClassPathResource INVOICE_SI20 = new ClassPathResource (PATH_SI + "si-ubl-2.0.xslt", _getCL ());

// 2.0.1
@Deprecated
public static final ClassPathResource INVOICE_SI201 = new ClassPathResource (PATH_SI + "si-ubl-2.0.1.xslt",
_getCL ());
private static final ClassPathResource INVOICE_SI201 = new ClassPathResource (PATH_SI + "si-ubl-2.0.1.xslt",
_getCL ());

// 2.0.2
@Deprecated
public static final ClassPathResource INVOICE_SI202 = new ClassPathResource (PATH_SI + "si-ubl-2.0.2.xslt",
_getCL ());
private static final ClassPathResource INVOICE_SI202 = new ClassPathResource (PATH_SI + "si-ubl-2.0.2.xslt",
_getCL ());

// 2.0.3
@Deprecated
public static final ClassPathResource INVOICE_SI203 = new ClassPathResource (PATH_SI + "si-ubl-2.0.3.xslt",
_getCL ());
private static final ClassPathResource INVOICE_SI203 = new ClassPathResource (PATH_SI + "si-ubl-2.0.3.xslt",
_getCL ());

// 2.0.3.1
@Deprecated
public static final ClassPathResource INVOICE_SI2031 = new ClassPathResource (PATH_SI + "si-ubl-2.0.3.1.xslt",
_getCL ());
private static final ClassPathResource INVOICE_SI2031 = new ClassPathResource (PATH_SI + "si-ubl-2.0.3.1.xslt",
_getCL ());

// 2.0.3.2
@Deprecated
public static final ClassPathResource INVOICE_SI2032 = new ClassPathResource (PATH_SI + "si-ubl-2.0.3.2.xslt",
_getCL ());
private static final ClassPathResource INVOICE_SI2032 = new ClassPathResource (PATH_SI + "si-ubl-2.0.3.2.xslt",
_getCL ());

// 2.0.3.3
@Deprecated
public static final ClassPathResource INVOICE_SI2033 = new ClassPathResource (PATH_SI + "si-ubl-2.0.3.3.xslt",
_getCL ());
private static final ClassPathResource INVOICE_SI2033 = new ClassPathResource (PATH_SI + "si-ubl-2.0.3.3.xslt",
_getCL ());

// 2.0.3.4
@Deprecated
public static final ClassPathResource INVOICE_SI2034 = new ClassPathResource (PATH_SI + "si-ubl-2.0.3.4.xslt",
_getCL ());
private static final ClassPathResource INVOICE_SI2034 = new ClassPathResource (PATH_SI + "si-ubl-2.0.3.4.xslt",
_getCL ());

// 2.0.3.5
@Deprecated
Expand All @@ -232,12 +237,16 @@ private static ClassLoader _getCL ()

// 2.0.3.6
@Deprecated
public static final ClassPathResource INVOICE_SI2036 = new ClassPathResource (PATH_SI + "si-ubl-2.0.3.6.xslt",
_getCL ());
private static final ClassPathResource INVOICE_SI2036 = new ClassPathResource (PATH_SI + "si-ubl-2.0.3.6.xslt",
_getCL ());

// 2.0.3.7
public static final ClassPathResource INVOICE_SI2037 = new ClassPathResource (PATH_SI + "si-ubl-2.0.3.7.xslt",
_getCL ());
private static final ClassPathResource INVOICE_SI2037 = new ClassPathResource (PATH_SI + "si-ubl-2.0.3.7.xslt",
_getCL ());

// 2.0.3.8
private static final ClassPathResource INVOICE_SI2038 = new ClassPathResource (PATH_SI + "si-ubl-2.0.3.8.xslt",
_getCL ());

private SimplerInvoicingValidation ()
{}
Expand Down Expand Up @@ -447,6 +456,18 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
_createXSLT (INVOICE_SI2037)));

// 2.0.3.8
aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_V2038,
"Simplerinvoicing Invoice 2.0.3.8",
bNotDeprecated,
ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
_createXSLT (INVOICE_SI2038)));
aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_CREDIT_NOTE_V2038,
"Simplerinvoicing CreditNote 2.0.3.8",
bNotDeprecated,
ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
_createXSLT (INVOICE_SI2038)));

// 2.0 G-Account 1.0
aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_20_GACCOUNT_V10,
"Simplerinvoicing 2.0 G-Account extension 1.0",
Expand Down Expand Up @@ -519,6 +540,15 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
"si-ubl-2.0-ext-gaccount-1.0.7.xslt",
_getCL ()))));

// 2.0 G-Account 1.0.8
aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_20_GACCOUNT_V108,
"Simplerinvoicing 2.0 G-Account extension 1.0.8",
bNotDeprecated,
ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
_createXSLT (new ClassPathResource (PATH_SI +
"si-ubl-2.0-ext-gaccount-1.0.8.xslt",
_getCL ()))));

// NLCIUS 1.0.3
aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_NLCIUS_CII_V103,
"NLCIUS-CII 1.0.3",
Expand Down Expand Up @@ -581,5 +611,14 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
_createXSLT (new ClassPathResource (PATH_NL_CIUS +
"nlcius-cii-1.0.3.6.xslt",
_getCL ()))));

// NLCIUS 1.0.3.7
aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_NLCIUS_CII_V1037,
"NLCIUS-CII 1.0.3.7",
bNotDeprecated,
ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
_createXSLT (new ClassPathResource (PATH_NL_CIUS +
"nlcius-cii-1.0.3.7.xslt",
_getCL ()))));
}
}
Loading

0 comments on commit d0288b1

Please sign in to comment.