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

Don't write "null" as paymentDescription if no Bank account is specified

Browse Source
This commit is contained in:
jstaerk
2020-12-01 18:32:46 +01:00
parent 744ffca12a
commit 57d53af39f
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
History.md
View File

@@ -3,6 +3,8 @@
- #201 correct embedded files in XRechnung - #201 correct embedded files in XRechnung
- transaction calculator getGrandTotal now public - transaction calculator getGrandTotal now public
- corrected sample in docs thanks to tweimer PR #204
- don't write "null" as paymentDescription if no Bank account is specified
2.0.2 2.0.2
======= =======

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

@@ -571,9 +571,12 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
} }
if (trans.getPaymentTerms() == null) { if ((trans.getPaymentTerms() == null)&&((paymentTermsDescription!=null)||(trans.getTradeSettlement()!=null)||(hasDueDate))) {
xml = xml + " <ram:SpecifiedTradePaymentTerms>\n" xml = xml + "<ram:SpecifiedTradePaymentTerms>\n";
+ " <ram:Description>" + paymentTermsDescription + "</ram:Description>\n";
if (paymentTermsDescription!=null) {
xml = xml + "<ram:Description>" + paymentTermsDescription + "</ram:Description>\n";
}
if (trans.getTradeSettlement() != null) { if (trans.getTradeSettlement() != null) {
for (IZUGFeRDTradeSettlement payment : trans.getTradeSettlement()) { for (IZUGFeRDTradeSettlement payment : trans.getTradeSettlement()) {
@@ -645,9 +648,13 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
} }
private String buildPaymentTermsXml() { private String buildPaymentTermsXml() {
String paymentTermsXml = "<ram:SpecifiedTradePaymentTerms>";
IZUGFeRDPaymentTerms paymentTerms = trans.getPaymentTerms(); IZUGFeRDPaymentTerms paymentTerms = trans.getPaymentTerms();
if (paymentTerms==null) {
return "";
}
String paymentTermsXml = "<ram:SpecifiedTradePaymentTerms>";
IZUGFeRDPaymentDiscountTerms discountTerms = paymentTerms.getDiscountTerms(); IZUGFeRDPaymentDiscountTerms discountTerms = paymentTerms.getDiscountTerms();
Date dueDate = paymentTerms.getDueDate(); Date dueDate = paymentTerms.getDueDate();
if (dueDate != null && discountTerms != null && discountTerms.getBaseDate() != null) { if (dueDate != null && discountTerms != null && discountTerms.getBaseDate() != null) {