louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed testIndicator in migration from v1 to v2

Browse Source
This commit is contained in:
Jochen Stärk
2019-08-09 18:44:43 +02:00
parent 21b081f180
commit 6cb647cd47
6 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
View File

@@ -124,7 +124,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider, IProfileProvider {
byte[] res = zugferdData; byte[] res = zugferdData;
StringWriter sw = new StringWriter(); /*StringWriter sw = new StringWriter();
Document document=null; Document document=null;
try { try {
document = DocumentHelper.parseText(new String(zugferdData)); document = DocumentHelper.parseText(new String(zugferdData));
@@ -140,14 +140,18 @@ public class ZUGFeRD2PullProvider implements IXMLProvider, IProfileProvider {
} catch (IOException e) { } catch (IOException e) {
Logger.getLogger(ZUGFeRD2PullProvider.class.getName()).log(Level.SEVERE, null, e); Logger.getLogger(ZUGFeRD2PullProvider.class.getName()).log(Level.SEVERE, null, e);
} }
*/
return res; return res;
} }
private BigDecimal getTotalPrepaid() { private BigDecimal getTotalPrepaid() {
if (trans.getTotalPrepaidAmount()==null) {
return new BigDecimal(0);
} else {
return trans.getTotalPrepaidAmount(); return trans.getTotalPrepaidAmount();
} }
}
private BigDecimal getTotalGross() { private BigDecimal getTotalGross() {

7
src/main/resources/COMFORTtoEN16931.xsl
View File

@@ -63,7 +63,12 @@ Migrated by Mustangproject XSLT
<!-- xsl:template match="//*[local-name() = 'HeaderExchangedDocument']"> <!-- xsl:template match="//*[local-name() = 'HeaderExchangedDocument']">
<xsl:copy> <xsl:apply-templates select="@*|node()" /> </xsl:copy> </xsl:template> --> <xsl:copy> <xsl:apply-templates select="@*|node()" /> </xsl:copy> </xsl:template> -->
<!-- attribute rename --> <!-- element remode -->
<xsl:template match="//*[local-name() = 'TestIndicator']">
<!-- Testindicator element has been removed -->
</xsl:template>
<!-- element rename -->
<xsl:template match="//*[local-name() = 'SpecifiedExchangedDocumentContext']"> <xsl:template match="//*[local-name() = 'SpecifiedExchangedDocumentContext']">
<xsl:element name="rsm:ExchangedDocumentContext"> <xsl:element name="rsm:ExchangedDocumentContext">
<xsl:apply-templates select="@*|node()" /> <xsl:apply-templates select="@*|node()" />

3
src/test/resources/migration/reference/ZUGFeRD2-invoice-adjusted.xml
View File

@@ -21,9 +21,6 @@
xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"><!-- xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"><!--
Migrated by Mustangproject XSLT Migrated by Mustangproject XSLT
--><rsm:ExchangedDocumentContext> --><rsm:ExchangedDocumentContext>
<ram:TestIndicator>
<udt:Indicator>false</udt:Indicator>
</ram:TestIndicator>
<ram:GuidelineSpecifiedDocumentContextParameter> <ram:GuidelineSpecifiedDocumentContextParameter>
<ram:ID>urn:cen.eu:en16931:2017#conformant#urn:zugferd.de:2p0:extended</ram:ID> <ram:ID>urn:cen.eu:en16931:2017#conformant#urn:zugferd.de:2p0:extended</ram:ID>
</ram:GuidelineSpecifiedDocumentContextParameter> </ram:GuidelineSpecifiedDocumentContextParameter>

3
src/test/resources/migration/reference/ZUGFeRD2-invoice.xml
View File

@@ -21,9 +21,6 @@
xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"> xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
<!--Migrated by Mustangproject XSLT--> <!--Migrated by Mustangproject XSLT-->
<rsm:ExchangedDocumentContext> <rsm:ExchangedDocumentContext>
<ram:TestIndicator>
<udt:Indicator>false</udt:Indicator>
</ram:TestIndicator>
<ram:GuidelineSpecifiedDocumentContextParameter> <ram:GuidelineSpecifiedDocumentContextParameter>
<ram:ID>urn:cen.eu:en16931:2017#conformant#urn:zugferd.de:2p0:extended</ram:ID> <ram:ID>urn:cen.eu:en16931:2017#conformant#urn:zugferd.de:2p0:extended</ram:ID>
</ram:GuidelineSpecifiedDocumentContextParameter> </ram:GuidelineSpecifiedDocumentContextParameter>

4
src/test/resources/migration/reference/ZUGFeRD2_COMFORT_Einfach.xml
View File

@@ -50,10 +50,6 @@ Kosten, Verluste bzw. Schäden hätte normalerweise vorhergesehen werden können
xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"><!-- xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"><!--
Migrated by Mustangproject XSLT Migrated by Mustangproject XSLT
--><rsm:ExchangedDocumentContext> --><rsm:ExchangedDocumentContext>
<ram:TestIndicator>
<udt:Indicator>true</udt:Indicator>
</ram:TestIndicator>
<!-- Im Echtbetrieb muss der TestIndicator entweder vollständig entfallen oder auf false stehen. -->
<ram:GuidelineSpecifiedDocumentContextParameter> <ram:GuidelineSpecifiedDocumentContextParameter>
<ram:ID>urn:cen.eu:en16931:2017</ram:ID> <ram:ID>urn:cen.eu:en16931:2017</ram:ID>
</ram:GuidelineSpecifiedDocumentContextParameter> </ram:GuidelineSpecifiedDocumentContextParameter>

3
src/test/resources/migration/reference/ZUGFeRD2_EXTENDED_Warenrechnung.xml
View File

@@ -50,9 +50,6 @@ Kosten, Verluste bzw. Schäden hätte normalerweise vorhergesehen werden können
xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"><!-- xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"><!--
Migrated by Mustangproject XSLT Migrated by Mustangproject XSLT
--><rsm:ExchangedDocumentContext> --><rsm:ExchangedDocumentContext>
<ram:TestIndicator>
<udt:Indicator>true</udt:Indicator>
</ram:TestIndicator>
<!-- Im Echtbetrieb muss der TestIndicator entweder vollständig entfallen oder auf false stehen. --> <!-- Im Echtbetrieb muss der TestIndicator entweder vollständig entfallen oder auf false stehen. -->
<ram:GuidelineSpecifiedDocumentContextParameter> <ram:GuidelineSpecifiedDocumentContextParameter>
<ram:ID>urn:cen.eu:en16931:2017#conformant#urn:zugferd.de:2p0:extended</ram:ID> <ram:ID>urn:cen.eu:en16931:2017#conformant#urn:zugferd.de:2p0:extended</ram:ID>