Skip to content

Commit

Permalink
Updated SimplerInvoicing rules; #10
Browse files Browse the repository at this point in the history
  • Loading branch information
@phax
phax committed Dec 23, 2021
1 parent 0885130 commit c1c6819
Show file tree
Hide file tree
Showing 33 changed files with 54,113 additions and 52 deletions.
3 changes: 3 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,9 @@ Alternate usage as a Maven BOM:
* v2.1.9 - work in progress
* Deprecated Peppol 3.12.0 rules
* Added support for UBL.BE 1.2.9, deprecated version 1.2.8
* Added support for SimplerInvoicing 2.0.3.3, deprecated 2.0.3.2
* Added support for SimplerInvoicing NLCIUS-CII 1.0.3.2, deprecated 1.0.3.1
* Added support for SimplerInvoicing 2.0 G-Account extension 1.0.3, deprecated 1.0.2
* v2.1.8 - 2021-11-05
* Fixed the UBL 2.3 version from `2.3-cs01` to `2.3` - no content-wise changes
* Added support for EN 16931 1.3.7 format (deprecated version 1.3.6)
Expand Down
Binary file modified phive-rules-simplerinvoicing/docs/testset-master.zip
View file
Binary file not shown.
Binary file added phive-rules-simplerinvoicing/docs/validation-2021-11-01.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 @@ -118,7 +118,7 @@
</goals>
<id>convert-si</id>
<configuration>
<schematronDirectory>${basedir}/src/test/resources/rule-source/simplerinvoicing/2.0.3.2</schematronDirectory>
<schematronDirectory>${basedir}/src/test/resources/rule-source/simplerinvoicing/2.0.3.3</schematronDirectory>
<schematronPattern>si-ubl-*.sch</schematronPattern>
<xsltDirectory>${basedir}/src/main/resources/schematron/simplerinvoicing</xsltDirectory>
</configuration>
Expand All @@ -131,7 +131,7 @@
</goals>
<id>convert-nlcius</id>
<configuration>
<schematronDirectory>${basedir}/src/test/resources/rule-source/nlcius/1.0.3.1</schematronDirectory>
<schematronDirectory>${basedir}/src/test/resources/rule-source/nlcius/1.0.3.2</schematronDirectory>
<schematronPattern>nlcius-*.sch</schematronPattern>
<xsltDirectory>${basedir}/src/main/resources/schematron/nlcius</xsltDirectory>
</configuration>
Expand Down
52 changes: 48 additions & 4 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 @@ -79,18 +79,27 @@ public final class SimplerInvoicingValidation
@Deprecated
public static final VESID VID_SI_CREDIT_NOTE_V2031 = new VESID ("org.simplerinvoicing", "creditnote", "2.0.3.1");

@Deprecated
public static final VESID VID_SI_INVOICE_V2032 = new VESID ("org.simplerinvoicing", "invoice", "2.0.3.2");
@Deprecated
public static final VESID VID_SI_CREDIT_NOTE_V2032 = new VESID ("org.simplerinvoicing", "creditnote", "2.0.3.2");

public static final VESID VID_SI_INVOICE_V2033 = new VESID ("org.simplerinvoicing", "invoice", "2.0.3.3");
public static final VESID VID_SI_CREDIT_NOTE_V2033 = new VESID ("org.simplerinvoicing", "creditnote", "2.0.3.3");

@Deprecated
public static final VESID VID_SI_INVOICE_20_GACCOUNT_V10 = new VESID ("org.simplerinvoicing", "invoice20.g-account", "1.0");
@Deprecated
public static final VESID VID_SI_INVOICE_20_GACCOUNT_V101 = new VESID ("org.simplerinvoicing", "invoice20.g-account", "1.0.1");
@Deprecated
public static final VESID VID_SI_INVOICE_20_GACCOUNT_V102 = new VESID ("org.simplerinvoicing", "invoice20.g-account", "1.0.2");
public static final VESID VID_SI_INVOICE_20_GACCOUNT_V103 = new VESID ("org.simplerinvoicing", "invoice20.g-account", "1.0.3");

@Deprecated
public static final VESID VID_SI_NLCIUS_CII_V103 = new VESID ("org.simplerinvoicing", "nlcius-cii", "1.0.3");
@Deprecated
public static final VESID VID_SI_NLCIUS_CII_V1031 = new VESID ("org.simplerinvoicing", "nlcius-cii", "1.0.3.1");
public static final VESID VID_SI_NLCIUS_CII_V1032 = new VESID ("org.simplerinvoicing", "nlcius-cii", "1.0.3.2");

@Nonnull
private static ClassLoader _getCL ()
Expand Down Expand Up @@ -133,14 +142,20 @@ private static ClassLoader _getCL ()
public 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 ());

// 2.0.3.1
@Deprecated
public 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 ());

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

private SimplerInvoicingValidation ()
{}

Expand Down Expand Up @@ -268,15 +283,27 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
// 2.0.3.2
aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_V2032,
"Simplerinvoicing Invoice 2.0.3.2",
bNotDeprecated,
bDeprecated,
ValidationExecutorXSD.create (EUBL21DocumentType.INVOICE),
_createXSLT (INVOICE_SI2032)));
aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_CREDIT_NOTE_V2032,
"Simplerinvoicing CreditNote 2.0.3.2",
bNotDeprecated,
bDeprecated,
ValidationExecutorXSD.create (EUBL21DocumentType.CREDIT_NOTE),
_createXSLT (INVOICE_SI2032)));

// 2.0.3.3
aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_V2033,
"Simplerinvoicing Invoice 2.0.3.3",
bNotDeprecated,
ValidationExecutorXSD.create (EUBL21DocumentType.INVOICE),
_createXSLT (INVOICE_SI2033)));
aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_CREDIT_NOTE_V2033,
"Simplerinvoicing CreditNote 2.0.3.3",
bNotDeprecated,
ValidationExecutorXSD.create (EUBL21DocumentType.CREDIT_NOTE),
_createXSLT (INVOICE_SI2033)));

// 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 All @@ -298,12 +325,21 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
// 2.0 G-Account 1.0.2
aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_20_GACCOUNT_V102,
"Simplerinvoicing 2.0 G-Account extension 1.0.2",
bNotDeprecated,
bDeprecated,
ValidationExecutorXSD.create (EUBL21DocumentType.INVOICE),
_createXSLT (new ClassPathResource (PATH_SI +
"si-ubl-2.0-ext-gaccount-1.0.2.xslt",
_getCL ()))));

// 2.0 G-Account 1.0.3
aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_20_GACCOUNT_V103,
"Simplerinvoicing 2.0 G-Account extension 1.0.3",
bNotDeprecated,
ValidationExecutorXSD.create (EUBL21DocumentType.INVOICE),
_createXSLT (new ClassPathResource (PATH_SI +
"si-ubl-2.0-ext-gaccount-1.0.3.xslt",
_getCL ()))));

// NLCIUS 1.0.3
aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_NLCIUS_CII_V103,
"NLCIUS-CII 1.0.3",
Expand All @@ -316,10 +352,18 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
// NLCIUS 1.0.3.1
aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_NLCIUS_CII_V1031,
"NLCIUS-CII 1.0.3.1",
bNotDeprecated,
bDeprecated,
ValidationExecutorXSD.create (ECIID16BDocumentType.CROSS_INDUSTRY_INVOICE),
_createXSLT (new ClassPathResource (PATH_NL_CIUS +
"nlcius-cii-1.0.3.1.xslt",
_getCL ()))));
// NLCIUS 1.0.3.2
aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_NLCIUS_CII_V1032,
"NLCIUS-CII 1.0.3.2",
bNotDeprecated,
ValidationExecutorXSD.create (ECIID16BDocumentType.CROSS_INDUSTRY_INVOICE),
_createXSLT (new ClassPathResource (PATH_NL_CIUS +
"nlcius-cii-1.0.3.2.xslt",
_getCL ()))));
}
}
Loading

0 comments on commit c1c6819

Please sign in to comment.