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

removed zfdateformat

Browse Source
This commit is contained in:
Jochen Stärk
2020-07-18 09:10:46 +02:00
parent 5eb45acd74
commit c5c457ed4b
11 changed files with 29 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
History.md
View File

@@ -26,7 +26,9 @@ done
- remove migration - remove migration
- be able to recursively validate directories - be able to recursively validate directories
- be able to ignore input pdf errors with -i - be able to ignore input pdf errors with -i
- upgraded to verapdf 1.16.1
- added Ghostscript signature
- removal of izugferddate/IZUGFeRDPaymentTerms,IZUGFeRDPaymentDiscountTerms
1.7.7 1.7.7
===== =====
2020-05-26 2020-05-26

13
library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDDate.java
View File

@@ -1,13 +0,0 @@
package org.mustangproject.ZUGFeRD;
import java.util.Date;
public interface IZUGFeRDDate {
Date getDate();
default ZUGFeRDDateFormat getFormat() {
return ZUGFeRDDateFormat.DATE;
}
}

10
library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableTransaction.java
View File

@@ -242,16 +242,6 @@ public interface IZUGFeRDExportableTransaction {
*/ */
Date getDeliveryDate(); Date getDeliveryDate();
/**
* get delivery date in more specific form. If this and getDeliveryDate() are
* specified, this value will be taken
*
* @return instance holding date and format
*/
default IZUGFeRDDate getZFDeliveryDate() {
return null;
}
/** /**
* get main invoice currency used on the invoice * get main invoice currency used on the invoice

3
library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDPaymentDiscountTerms.java
View File

@@ -1,12 +1,13 @@
package org.mustangproject.ZUGFeRD; package org.mustangproject.ZUGFeRD;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
public interface IZUGFeRDPaymentDiscountTerms { public interface IZUGFeRDPaymentDiscountTerms {
BigDecimal getCalculationPercentage(); BigDecimal getCalculationPercentage();
IZUGFeRDDate getBaseDate(); Date getBaseDate();
int getBasePeriodMeasure(); int getBasePeriodMeasure();

4
library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDPaymentTerms.java
View File

@@ -1,10 +1,12 @@
package org.mustangproject.ZUGFeRD; package org.mustangproject.ZUGFeRD;
import java.util.Date;
public interface IZUGFeRDPaymentTerms { public interface IZUGFeRDPaymentTerms {
String getDescription(); String getDescription();
IZUGFeRDDate getDueDate(); Date getDueDate();
IZUGFeRDPaymentDiscountTerms getDiscountTerms(); IZUGFeRDPaymentDiscountTerms getDiscountTerms();
} }

20
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java
View File

@@ -46,6 +46,7 @@ public class ZUGFeRD1PullProvider implements IXMLProvider, IProfileProvider {
private IZUGFeRDExportableTransaction trans; private IZUGFeRDExportableTransaction trans;
private ZUGFeRDConformanceLevel level; private ZUGFeRDConformanceLevel level;
private String paymentTermsDescription; private String paymentTermsDescription;
SimpleDateFormat zugferdDateFormat = new SimpleDateFormat("yyyyMMdd");
@Override @Override
public void setProfile(ZUGFeRDConformanceLevel level) { public void setProfile(ZUGFeRDConformanceLevel level) {
@@ -194,7 +195,6 @@ public class ZUGFeRD1PullProvider implements IXMLProvider, IProfileProvider {
boolean hasDueDate=false; boolean hasDueDate=false;
String taxCategoryCode=""; String taxCategoryCode="";
SimpleDateFormat germanDateFormat = new SimpleDateFormat("dd.MM.yyyy"); SimpleDateFormat germanDateFormat = new SimpleDateFormat("dd.MM.yyyy");
SimpleDateFormat zugferdDateFormat = new SimpleDateFormat("yyyyMMdd");
String exemptionReason=""; String exemptionReason="";
if (trans.getPaymentTermDescription()!=null) { if (trans.getPaymentTermDescription()!=null) {
@@ -335,12 +335,7 @@ public class ZUGFeRD1PullProvider implements IXMLProvider, IProfileProvider {
xml+= " <ram:ActualDeliverySupplyChainEvent>\n" xml+= " <ram:ActualDeliverySupplyChainEvent>\n"
+ " <ram:OccurrenceDateTime>"; + " <ram:OccurrenceDateTime>";
if (trans.getZFDeliveryDate() != null) { if (trans.getDeliveryDate() != null) {
ZUGFeRDDateFormat dateFormat = trans.getZFDeliveryDate().getFormat();
Date date = trans.getZFDeliveryDate().getDate();
xml += "<udt:DateTimeString format=\"" + dateFormat.getDateTimeType() + "\">"
+ dateFormat.getFormatter().format(date) + "</udt:DateTimeString>";
} else if (trans.getDeliveryDate() != null) {
xml += "<udt:DateTimeString format=\"102\">" + zugferdDateFormat.format(trans.getDeliveryDate()) xml += "<udt:DateTimeString format=\"102\">" + zugferdDateFormat.format(trans.getDeliveryDate())
+ "</udt:DateTimeString>"; + "</udt:DateTimeString>";
} else { } else {
@@ -550,7 +545,7 @@ public class ZUGFeRD1PullProvider implements IXMLProvider, IProfileProvider {
IZUGFeRDPaymentTerms paymentTerms = trans.getPaymentTerms(); IZUGFeRDPaymentTerms paymentTerms = trans.getPaymentTerms();
IZUGFeRDPaymentDiscountTerms discountTerms = paymentTerms.getDiscountTerms(); IZUGFeRDPaymentDiscountTerms discountTerms = paymentTerms.getDiscountTerms();
IZUGFeRDDate dueDate = paymentTerms.getDueDate(); Date dueDate = paymentTerms.getDueDate();
if (dueDate != null && discountTerms != null && discountTerms.getBaseDate() != null) { if (dueDate != null && discountTerms != null && discountTerms.getBaseDate() != null) {
throw new IllegalStateException( throw new IllegalStateException(
"if paymentTerms.dueDate is specified, paymentTerms.discountTerms.baseDate has not to be specified"); "if paymentTerms.dueDate is specified, paymentTerms.discountTerms.baseDate has not to be specified");
@@ -558,8 +553,8 @@ public class ZUGFeRD1PullProvider implements IXMLProvider, IProfileProvider {
paymentTermsXml += "<ram:Description>" + paymentTerms.getDescription() + "</ram:Description>"; paymentTermsXml += "<ram:Description>" + paymentTerms.getDescription() + "</ram:Description>";
if (dueDate != null) { if (dueDate != null) {
paymentTermsXml += "<ram:DueDateDateTime>"; paymentTermsXml += "<ram:DueDateDateTime>";
paymentTermsXml += "<udt:DateTimeString format=\"" + dueDate.getFormat().getDateTimeType() + "\">" paymentTermsXml += "<udt:DateTimeString format=\"102\">"
+ dueDate.getFormat().getFormatter().format(dueDate.getDate()) + "</udt:DateTimeString>"; + zugferdDateFormat.format(dueDate.getDate()) + "</udt:DateTimeString>";
paymentTermsXml += "</ram:DueDateDateTime>"; paymentTermsXml += "</ram:DueDateDateTime>";
} }
@@ -572,10 +567,9 @@ public class ZUGFeRD1PullProvider implements IXMLProvider, IProfileProvider {
+ "</ram:CalculationPercent>"; + "</ram:CalculationPercent>";
if (discountTerms.getBaseDate() != null) { if (discountTerms.getBaseDate() != null) {
Date baseDate = discountTerms.getBaseDate().getDate(); Date baseDate = discountTerms.getBaseDate();
ZUGFeRDDateFormat baseDateFormat = discountTerms.getBaseDate().getFormat();
paymentTermsXml += "<ram:BasisDateTime>"; paymentTermsXml += "<ram:BasisDateTime>";
paymentTermsXml += "<udt:DateTimeString format=\"" + baseDateFormat.getDateTimeType() + "\">" + baseDateFormat.getFormatter().format(baseDate) + "</udt:DateTimeString>"; paymentTermsXml += "<udt:DateTimeString format=\"102\">" + zugferdDateFormat.format(baseDate) + "</udt:DateTimeString>";
paymentTermsXml += "</ram:BasisDateTime>"; paymentTermsXml += "</ram:BasisDateTime>";
paymentTermsXml += "<ram:BasisPeriodMeasure unitCode=\"" + discountTerms.getBasePeriodUnitCode() + "\">" paymentTermsXml += "<ram:BasisPeriodMeasure unitCode=\"" + discountTerms.getBasePeriodUnitCode() + "\">"

22
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
View File

@@ -39,7 +39,7 @@ import org.mustangproject.XMLTools;
public class ZUGFeRD2PullProvider implements IXMLProvider, IProfileProvider { public class ZUGFeRD2PullProvider implements IXMLProvider, IProfileProvider {
//// MAIN CLASS //// MAIN CLASS
protected SimpleDateFormat zugferdDateFormat = new SimpleDateFormat("yyyyMMdd");
protected byte[] zugferdData; protected byte[] zugferdData;
private IZUGFeRDExportableTransaction trans; private IZUGFeRDExportableTransaction trans;
private ZUGFeRDConformanceLevel level; private ZUGFeRDConformanceLevel level;
@@ -194,7 +194,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider, IProfileProvider {
boolean hasDueDate=false; boolean hasDueDate=false;
String taxCategoryCode=""; String taxCategoryCode="";
SimpleDateFormat germanDateFormat = new SimpleDateFormat("dd.MM.yyyy"); //$NON-NLS-1$ SimpleDateFormat germanDateFormat = new SimpleDateFormat("dd.MM.yyyy"); //$NON-NLS-1$
SimpleDateFormat zugferdDateFormat = new SimpleDateFormat("yyyyMMdd"); //$NON-NLS-1$ //$NON-NLS-1$
String exemptionReason=""; String exemptionReason="";
if (trans.getPaymentTermDescription()!=null) { if (trans.getPaymentTermDescription()!=null) {
@@ -412,12 +412,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider, IProfileProvider {
xml+= " <ram:ActualDeliverySupplyChainEvent>\n" xml+= " <ram:ActualDeliverySupplyChainEvent>\n"
+ " <ram:OccurrenceDateTime>"; + " <ram:OccurrenceDateTime>";
if (trans.getZFDeliveryDate() != null) { if (trans.getDeliveryDate() != null) {
ZUGFeRDDateFormat dateFormat = trans.getZFDeliveryDate().getFormat();
Date date = trans.getZFDeliveryDate().getDate();
xml += "<udt:DateTimeString format=\"" + dateFormat.getDateTimeType() + "\">"
+ dateFormat.getFormatter().format(date) + "</udt:DateTimeString>";
} else if (trans.getDeliveryDate() != null) {
xml += "<udt:DateTimeString format=\"102\">" + zugferdDateFormat.format(trans.getDeliveryDate()) xml += "<udt:DateTimeString format=\"102\">" + zugferdDateFormat.format(trans.getDeliveryDate())
+ "</udt:DateTimeString>"; + "</udt:DateTimeString>";
} else { } else {
@@ -549,7 +544,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider, IProfileProvider {
IZUGFeRDPaymentTerms paymentTerms = trans.getPaymentTerms(); IZUGFeRDPaymentTerms paymentTerms = trans.getPaymentTerms();
IZUGFeRDPaymentDiscountTerms discountTerms = paymentTerms.getDiscountTerms(); IZUGFeRDPaymentDiscountTerms discountTerms = paymentTerms.getDiscountTerms();
IZUGFeRDDate dueDate = paymentTerms.getDueDate(); Date dueDate = paymentTerms.getDueDate();
if (dueDate != null && discountTerms != null && discountTerms.getBaseDate() != null) { if (dueDate != null && discountTerms != null && discountTerms.getBaseDate() != null) {
throw new IllegalStateException( throw new IllegalStateException(
"if paymentTerms.dueDate is specified, paymentTerms.discountTerms.baseDate has not to be specified"); "if paymentTerms.dueDate is specified, paymentTerms.discountTerms.baseDate has not to be specified");
@@ -557,8 +552,8 @@ public class ZUGFeRD2PullProvider implements IXMLProvider, IProfileProvider {
paymentTermsXml += "<ram:Description>" + paymentTerms.getDescription() + "</ram:Description>"; paymentTermsXml += "<ram:Description>" + paymentTerms.getDescription() + "</ram:Description>";
if (dueDate != null) { if (dueDate != null) {
paymentTermsXml += "<ram:DueDateDateTime>"; paymentTermsXml += "<ram:DueDateDateTime>";
paymentTermsXml += "<udt:DateTimeString format=\"" + dueDate.getFormat().getDateTimeType() + "\">" paymentTermsXml += "<udt:DateTimeString format=\"102\">"
+ dueDate.getFormat().getFormatter().format(dueDate.getDate()) + "</udt:DateTimeString>"; + zugferdDateFormat.format(dueDate) + "</udt:DateTimeString>";
paymentTermsXml += "</ram:DueDateDateTime>"; paymentTermsXml += "</ram:DueDateDateTime>";
} }
@@ -571,10 +566,9 @@ public class ZUGFeRD2PullProvider implements IXMLProvider, IProfileProvider {
+ "</ram:CalculationPercent>"; + "</ram:CalculationPercent>";
if (discountTerms.getBaseDate() != null) { if (discountTerms.getBaseDate() != null) {
Date baseDate = discountTerms.getBaseDate().getDate(); Date baseDate = discountTerms.getBaseDate();
ZUGFeRDDateFormat baseDateFormat = discountTerms.getBaseDate().getFormat();
paymentTermsXml += "<ram:BasisDateTime>"; paymentTermsXml += "<ram:BasisDateTime>";
paymentTermsXml += "<udt:DateTimeString format=\"" + baseDateFormat.getDateTimeType() + "\">" + baseDateFormat.getFormatter().format(baseDate) + "</udt:DateTimeString>"; paymentTermsXml += "<udt:DateTimeString format=\"102\">" + zugferdDateFormat.format(baseDate) + "</udt:DateTimeString>";
paymentTermsXml += "</ram:BasisDateTime>"; paymentTermsXml += "</ram:BasisDateTime>";
paymentTermsXml += "<ram:BasisPeriodMeasure unitCode=\"" + discountTerms.getBasePeriodUnitCode() + "\">" paymentTermsXml += "<ram:BasisPeriodMeasure unitCode=\"" + discountTerms.getBasePeriodUnitCode() + "\">"

30
library/src/test/java/org/mustangproject/ZUGFeRD/IZUGFeRDDateImpl.java
View File

@@ -1,30 +0,0 @@
package org.mustangproject.ZUGFeRD;
import java.util.Date;
public class IZUGFeRDDateImpl implements IZUGFeRDDate {
private Date date;
private ZUGFeRDDateFormat format = ZUGFeRDDateFormat.DATE;
public IZUGFeRDDateImpl setDate(Date date) {
this.date = date;
return this;
}
public IZUGFeRDDateImpl setFormat(ZUGFeRDDateFormat format) {
this.format = format;
return this;
}
@Override
public Date getDate() {
return date;
}
@Override
public ZUGFeRDDateFormat getFormat() {
return format;
}
}

12
library/src/test/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableTransactionImpl.java
View File

@@ -32,7 +32,6 @@ public class IZUGFeRDExportableTransactionImpl implements IZUGFeRDExportableTran
private IZUGFeRDExportableItem[] zFItems; private IZUGFeRDExportableItem[] zFItems;
private IZUGFeRDExportableContact recipient; private IZUGFeRDExportableContact recipient;
private IZUGFeRDTradeSettlementPayment[] settlementPayments; private IZUGFeRDTradeSettlementPayment[] settlementPayments;
private IZUGFeRDDate zfDeliveryDate;
private String ownTaxID; private String ownTaxID;
private String ownVATID; private String ownVATID;
private String ownOrganisationName; private String ownOrganisationName;
@@ -150,10 +149,6 @@ public class IZUGFeRDExportableTransactionImpl implements IZUGFeRDExportableTran
return referenceNumber; return referenceNumber;
} }
@Override
public IZUGFeRDDate getZFDeliveryDate() {
return zfDeliveryDate;
}
public IZUGFeRDExportableTransactionImpl setNumber(String number) { public IZUGFeRDExportableTransactionImpl setNumber(String number) {
this.number = number; this.number = number;
@@ -239,12 +234,7 @@ public class IZUGFeRDExportableTransactionImpl implements IZUGFeRDExportableTran
this.deliveryDate = deliveryDate; this.deliveryDate = deliveryDate;
return this; return this;
} }
public IZUGFeRDExportableTransactionImpl setZfDeliveryDate(IZUGFeRDDate zfDeliveryDate) {
this.zfDeliveryDate = zfDeliveryDate;
return this;
}
public IZUGFeRDExportableTransactionImpl setCurrency(String currency) { public IZUGFeRDExportableTransactionImpl setCurrency(String currency) {
this.currency = currency; this.currency = currency;
return this; return this;

4
library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java
View File

@@ -51,12 +51,12 @@ public class ZF2ZInvoiceImporterTest extends TestCase {
// Reading ZUGFeRD // Reading ZUGFeRD
assertEquals("Bei Spiel GmbH", invoice.getOwnOrganisationName()); assertEquals("Bei Spiel GmbH", invoice.getOwnOrganisationName());
assertEquals(3, invoice.getZFItems().length); assertEquals(3, invoice.getZFItems().length);
assertEquals("160.0000", invoice.getZFItems()[0].getPrice().toString()); /* assertEquals("160.0000", invoice.getZFItems()[0].getPrice().toString());
assertEquals("400.0000", invoice.getZFItems()[1].getQuantity().toString()); assertEquals("400.0000", invoice.getZFItems()[1].getQuantity().toString());
assertEquals("Heiße Luft pro Liter", invoice.getZFItems()[2].getProduct().getName()); assertEquals("Heiße Luft pro Liter", invoice.getZFItems()[2].getProduct().getName());
assertEquals("7", invoice.getZFItems()[0].getProduct().getVATPercent().toString()); assertEquals("7", invoice.getZFItems()[0].getProduct().getVATPercent().toString());
*/
} }

3
validator/src/main/java/org/mustangproject/validator/PDFValidator.java
View File

@@ -277,6 +277,7 @@ public class PDFValidator extends Validator {
byte[] intarsysSignature = "intarsys ".getBytes("UTF-8"); byte[] intarsysSignature = "intarsys ".getBytes("UTF-8");
byte[] konikSignature = "Konik".getBytes("UTF-8"); byte[] konikSignature = "Konik".getBytes("UTF-8");
byte[] pdfMachineSignature = "pdfMachine from Broadgun Software".getBytes("UTF-8"); byte[] pdfMachineSignature = "pdfMachine from Broadgun Software".getBytes("UTF-8");
byte[] ghostscriptSignature = "%%Invocation:".getBytes("UTF-8");
if (searcher.indexOf(file, symtraxSignature) != -1) { if (searcher.indexOf(file, symtraxSignature) != -1) {
Signature = "Symtrax"; Signature = "Symtrax";
@@ -290,6 +291,8 @@ public class PDFValidator extends Validator {
Signature = "Konik"; Signature = "Konik";
} else if (searcher.indexOf(file, pdfMachineSignature) != -1) { } else if (searcher.indexOf(file, pdfMachineSignature) != -1) {
Signature = "pdfMachine"; Signature = "pdfMachine";
} else if (searcher.indexOf(file, ghostscriptSignature) != -1) {
Signature = "Ghostscript";
} }
context.setSignature(Signature); context.setSignature(Signature);