Skip to content

Commit

Permalink
working on ZUGFeRD#347
Browse files Browse the repository at this point in the history
  • Loading branch information
jstaerk committed Nov 24, 2023
1 parent 860d934 commit d2ae077
Show file tree
Hide file tree
Showing 5 changed files with 1,555 additions and 10 deletions.
3 changes: 3 additions & 0 deletions History.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@

Missing closing tag in BankDetails when there's no BIC number #339
Have a way to merge to PDF file without knowing if it is A-1 or A-3 #341
Be able to validate XR 3.0 #347

2.8.0
=======
Expand Down
8 changes: 4 additions & 4 deletions doc/development_documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ You may already start developing what you wanted. Of course you can use any edit

2. fork

Once you can build, the idea is that you contribute patches via pull requests. For this you need a GitHub account and a personal copy of the repository to store your changes in. Just click fork on the mustangproject. On your copy you will have git write access. My suggestion as git client is sourcetree (I can send you instructions how to set it up).
Once you can build, the idea is that you contribute patches via pull requests. For this you need a GitHub account and a personal copy of the repository to store your changes in. Just click fork on the mustangproject. On your copy you will have git write access. My suggestion as git client is sourcetree.
There is a documentation [how to create pull requests from forks to the original repo](https://docs.github.com/de/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork).

3. branch

Expand Down Expand Up @@ -212,9 +213,8 @@ Afterwards you can access the release page and update the documentation, e.g. up

## Regular updates

XRechnung from https://github.com/itplr-kosit/xrechnung-schematron,
put in schematro, have xslt generated, potentially manually include
the included file
Take the most recent XRechnung release from https://github.com/itplr-kosit/xrechnung-schematron,
extract, rename xsl file to xslt, move to new version dir and add a if where the version is determined :-)

## Release process

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,9 @@ out from git with arbitrary options (which may include CSRF changes)
assertEquals(expected, result);
}

public void testPDFVisualization() {
/* public void testPDFVisualization() {
// the writing part
// the writing part
CIIToUBL c2u = new CIIToUBL();
String sourceFilename = "factur-x.xml";
File CIIinputFile = getResourceAsFile(sourceFilename);
Expand All @@ -157,7 +157,7 @@ public void testPDFVisualization() {
ZUGFeRDVisualizer zvi = new ZUGFeRDVisualizer();
/* remove file endings so that tests can also pass after checking
out from git with arbitrary options (which may include CSRF changes)
*/
*
zvi.toPDF(CIIinputFile.getAbsolutePath(), "c:\\users\\jstaerk\\temp\\fopy2.pdf");
} catch (UnsupportedOperationException e) {
fail("UnsupportedOperationException should not happen: "+e.getMessage());
Expand All @@ -168,6 +168,6 @@ out from git with arbitrary options (which may include CSRF changes)
// assertNotNull(result);
// Reading ZUGFeRD
// assertEquals(expected, result);
}
}*/

}
Original file line number Diff line number Diff line change
Expand Up @@ -377,9 +377,10 @@ public void validateXR(String xml, ESeverity errorImpact) throws IrrecoverableVa
validateSchematron(xml, "/xslt/XR_21/XRechnung-CII-validation.xslt", 27, errorImpact);
} else if (xml.contains(":xrechnung_2.2")) { // This is the default check which is also run on en16931 files to generate notices.
validateSchematron(xml, "/xslt/XR_22/XRechnung-CII-validation.xslt", 27, errorImpact);
} else { // This is the default check which is also run on en16931 files to generate notices.
// As of the next version this should probably if (xml.contains(":xrechnung_2.3"))
} else if (xml.contains(":xrechnung_2.3")) { // This is the default check which is also run on en16931 files to generate notices.
validateSchematron(xml, "/xslt/XR_23/XRechnung-CII-validation.xslt", 27, errorImpact);
} else { // This is the default check which is also run on en16931 files to generate notices.
validateSchematron(xml, "/xslt/XR_30/XRechnung-CII-validation.xslt", 27, errorImpact);
}

}
Expand Down
Loading

0 comments on commit d2ae077

Please sign in to comment.