Merge branch 'master' into issues/503-ubl

library/src/main/java/org/mustangproject/Allowance.java

@@ -1,12 +1,16 @@
 package org.mustangproject;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 
 import java.math.BigDecimal;
 
 /***
  * (absolute) allowances on item and document level
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class Allowance extends Charge {
 
 	/***

library/src/main/java/org/mustangproject/BankDetails.java

@@ -2,11 +2,14 @@ package org.mustangproject;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import org.mustangproject.ZUGFeRD.IZUGFeRDTradeSettlementPayment;
 
 /**
  * provides e.g. the IBAN to transfer money to :-)
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class BankDetails implements IZUGFeRDTradeSettlementPayment {
 	/**
 	 * the bank account number

library/src/main/java/org/mustangproject/CalculatedInvoice.java

@@ -2,6 +2,8 @@
 package org.mustangproject;
 
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import org.mustangproject.ZUGFeRD.TransactionCalculator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,15 +11,21 @@ import org.slf4j.LoggerFactory;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class CalculatedInvoice extends Invoice implements Serializable {
 
-	protected BigDecimal grandTotal=null;
 	protected BigDecimal lineTotalAmount=null;
+	protected BigDecimal duePayable=null;
+	protected BigDecimal grandTotal=null;
+	protected BigDecimal taxBasis=null;
 
     public void calculate() {
         TransactionCalculator tc=new TransactionCalculator(this);
         grandTotal=tc.getGrandTotal();
 		lineTotalAmount=tc.getValue();
+		duePayable=tc.getDuePayable();
+		taxBasis= tc.getTaxBasis();
     }
 	public BigDecimal getGrandTotal() {
 		if (grandTotal==null) {
@@ -29,6 +37,28 @@ public class CalculatedInvoice extends Invoice implements Serializable {
 		grandTotal=grand;
 		return this;
 	}
+	public BigDecimal getTaxBasis() {
+		if (taxBasis==null) {
+			calculate();
+		}
+		return taxBasis;
+	}
+	public CalculatedInvoice setTaxBasis(BigDecimal basis) {
+		taxBasis=basis;
+		return this;
+	}
+
+	public BigDecimal getDuePayable() {
+		if (duePayable==null) {
+			calculate();
+		}
+		return duePayable;
+	}
+	public CalculatedInvoice setDuePayable(BigDecimal due) {
+		duePayable=due;
+		return this;
+	}
+
 	public BigDecimal getLineTotalAmount() {
 		if (lineTotalAmount==null) {
 			calculate();

library/src/main/java/org/mustangproject/CashDiscount.java

@@ -1,5 +1,7 @@
 package org.mustangproject;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import org.mustangproject.ZUGFeRD.IZUGFeRDCashDiscount;
 
 import java.math.BigDecimal;
@@ -7,6 +9,8 @@ import java.math.BigDecimal;
 /***
  * A class to represent discounts for early payments ("Skonto")
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class CashDiscount implements IZUGFeRDCashDiscount {
 
 	/***
@@ -31,6 +35,31 @@ public class CashDiscount implements IZUGFeRDCashDiscount {
 		this.days = days;
 	}
 
+	/***
+	 * bean contructor
+	 */
+	public CashDiscount() {
+
+	}
+
+	public BigDecimal getPercent() {
+		return percent;
+	}
+
+	public CashDiscount setPercent(BigDecimal percent) {
+		this.percent = percent;
+		return this;
+	}
+
+	public Integer getDays() {
+		return days;
+	}
+
+	public CashDiscount setDays(Integer days) {
+		this.days = days;
+		return this;
+	}
+
 	/***
 	 * @return this particular cash discount as cross industry invoice XML
 	 */

library/src/main/java/org/mustangproject/Charge.java

@@ -1,6 +1,8 @@
 package org.mustangproject;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import org.mustangproject.ZUGFeRD.IAbsoluteValueProvider;
 import org.mustangproject.ZUGFeRD.IZUGFeRDAllowanceCharge;
 
@@ -9,6 +11,8 @@ import java.math.BigDecimal;
 /***
  * Absolute and relative charges for document and item level
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class Charge implements IZUGFeRDAllowanceCharge {
 
 	/**

library/src/main/java/org/mustangproject/ClassCode.java

@@ -20,12 +20,16 @@
  */
 package org.mustangproject;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 /**
  * A schemed classification for products. The scheme can be anything defined in UNTDID 7143.
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class ClassCode {
 	private final String listID;
 	private final String code;

library/src/main/java/org/mustangproject/Contact.java

@@ -1,6 +1,7 @@
 package org.mustangproject;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import org.mustangproject.ZUGFeRD.IZUGFeRDExportableContact;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -11,6 +12,7 @@ import org.w3c.dom.NodeList;
  * @see TradeParty
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class Contact implements IZUGFeRDExportableContact {
 
 	/**

library/src/main/java/org/mustangproject/DesignatedProductClassification.java

@@ -20,12 +20,16 @@
  */
 package org.mustangproject;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import org.mustangproject.ZUGFeRD.IDesignatedProductClassification;
 
 /**
  * An implementation of {@link IDesignatedProductClassification} for describing a {@link org.mustangproject.Product}
  *
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class DesignatedProductClassification implements IDesignatedProductClassification {
 	private final ClassCode classCode;
 	private String className;

library/src/main/java/org/mustangproject/DirectDebit.java

@@ -1,10 +1,14 @@
 package org.mustangproject;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import org.mustangproject.ZUGFeRD.IZUGFeRDTradeSettlementDebit;
 
 /**
  * provides e.g. the IBAN to transfer money to :-)
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class DirectDebit implements IZUGFeRDTradeSettlementDebit {
 	/**
 	 * Debited account identifier (BT-91)

library/src/main/java/org/mustangproject/FileAttachment.java

@@ -1,5 +1,10 @@
 package org.mustangproject;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class FileAttachment {
 
 	protected String filename;

library/src/main/java/org/mustangproject/IncludedNote.java

@@ -1,75 +1,100 @@
 package org.mustangproject;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 /**
  * A grouping of business terms to indicate accounting-relevant free texts including a qualification of these.
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class IncludedNote {
-  private String content;
-  private SubjectCode subjectCode;
+	private String content;
 
-  private static final String INCLUDE_START = "<ram:IncludedNote>";
-  private static final String INCLUDE_END = "</ram:IncludedNote>";
-  private static final String CONTENT_START = "<ram:Content>";
-  private static final String CONTENT_END = "</ram:Content>";
-  private static final String SUBJECT_CODE_START = "<ram:SubjectCode>";
-  private static final String SUBJECT_CODE_END = "</ram:SubjectCode>";
+	private SubjectCode subjectCode;
 
-  private IncludedNote(String content, SubjectCode subjectCode) {
-    this.content = content;
-    this.subjectCode = subjectCode;
-  }
+	private static final String INCLUDE_START = "<ram:IncludedNote>";
+	private static final String INCLUDE_END = "</ram:IncludedNote>";
+	private static final String CONTENT_START = "<ram:Content>";
+	private static final String CONTENT_END = "</ram:Content>";
+	private static final String SUBJECT_CODE_START = "<ram:SubjectCode>";
+	private static final String SUBJECT_CODE_END = "</ram:SubjectCode>";
+
+	private IncludedNote(String content, SubjectCode subjectCode) {
+		this.content = content;
+		this.subjectCode = subjectCode;
+	}
 
 	/**
 	 * bean constructor
 	 */
-	public  IncludedNote() {
+	public IncludedNote() {
 
 	}
 
-  public static IncludedNote generalNote(String content) {
-    return new IncludedNote(content, SubjectCode.AAI);
-  }
-  public static IncludedNote regulatoryNote(String content) {
-    return new IncludedNote(content, SubjectCode.REG);
-  }
-  public static IncludedNote legalNote(String content) {
-    return new IncludedNote(content, SubjectCode.ABL);
-  }
-  public static IncludedNote customsNote(String content) {
-    return new IncludedNote(content, SubjectCode.CUS);
-  }
-  public static IncludedNote sellerNote(String content) {
-    return new IncludedNote(content, SubjectCode.SUR);
-  }
-  public static IncludedNote taxNote(String content) {
-    return new IncludedNote(content, SubjectCode.TXD);
-  }
-  public static IncludedNote introductionNote(String content) {
-    return new IncludedNote(content, SubjectCode.ACY);
-  }
-  public static IncludedNote discountBonusNote(String content) {
-    return new IncludedNote(content, SubjectCode.AAK);
-  }
+	public static IncludedNote generalNote(String content) {
+		return new IncludedNote(content, SubjectCode.AAI);
+	}
 
-  public static IncludedNote unspecifiedNote(String content) {
-    return new IncludedNote(content, null);
-  }
+	public static IncludedNote regulatoryNote(String content) {
+		return new IncludedNote(content, SubjectCode.REG);
+	}
 
-  public String getContent() {
-    return content;
-  }
+	public static IncludedNote legalNote(String content) {
+		return new IncludedNote(content, SubjectCode.ABL);
+	}
+
+	public static IncludedNote customsNote(String content) {
+		return new IncludedNote(content, SubjectCode.CUS);
+	}
+
+	public static IncludedNote sellerNote(String content) {
+		return new IncludedNote(content, SubjectCode.SUR);
+	}
+
+	public static IncludedNote taxNote(String content) {
+		return new IncludedNote(content, SubjectCode.TXD);
+	}
+
+	public static IncludedNote introductionNote(String content) {
+		return new IncludedNote(content, SubjectCode.ACY);
+	}
+
+	public static IncludedNote discountBonusNote(String content) {
+		return new IncludedNote(content, SubjectCode.AAK);
+	}
+
+	public static IncludedNote unspecifiedNote(String content) {
+		return new IncludedNote(content, null);
+	}
+
+	public String getContent() {
+		return content;
+	}
+
+	public SubjectCode getSubjectCode() {
+		return subjectCode;
+	}
+
+
+	public IncludedNote setSubjectCode(SubjectCode subjectCode) {
+		this.subjectCode = subjectCode;
+		return this;
+	}
+
+	public IncludedNote setContent(String content) {
+		this.content = content;
+		return this;
+	}
+
+
+	public String toCiiXml() {
+		String result = INCLUDE_START + CONTENT_START +
+			XMLTools.encodeXML(getContent()) + CONTENT_END;
+		if (getSubjectCode() != null) {
+			result += SUBJECT_CODE_START + getSubjectCode() + SUBJECT_CODE_END;
+		}
+		return result + INCLUDE_END;
+	}
 
-  public SubjectCode getSubjectCode() {
-    return subjectCode;
-  }
-  
-  public String toCiiXml(){
-    String result = INCLUDE_START + CONTENT_START +
-        XMLTools.encodeXML(getContent() )+ CONTENT_END;
-    if (getSubjectCode() != null) {
-      result += SUBJECT_CODE_START + getSubjectCode() + SUBJECT_CODE_END;
-    }
-    return result + INCLUDE_END;
-  }
-  
 }

library/src/main/java/org/mustangproject/Invoice.java

@@ -413,6 +413,11 @@ public class Invoice implements IExportableTransaction {
 		return includedNotes;
 	}
 
+	public Invoice setNotesWithSubjectCode(List<IncludedNote> theList) {
+		includedNotes=theList;
+		return this;
+	}
+
 	@Override
 	public String getCurrency() {
 		return currency;

library/src/main/java/org/mustangproject/LegalOrganisation.java

@@ -1,6 +1,7 @@
 package org.mustangproject;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import org.mustangproject.ZUGFeRD.*;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -9,6 +10,7 @@ import org.w3c.dom.NodeList;
  * A organisation, i.e. usually a company
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class LegalOrganisation implements IZUGFeRDLegalOrganisation {
 
 	protected SchemedID schemedID = null;

library/src/main/java/org/mustangproject/ReferencedDocument.java

@@ -1,9 +1,13 @@
 package org.mustangproject;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import org.mustangproject.ZUGFeRD.IReferencedDocument;
 import org.mustangproject.util.NodeMap;
 import org.w3c.dom.Node;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class ReferencedDocument implements IReferencedDocument {
 
 	String issuerAssignedID;

library/src/main/java/org/mustangproject/SchemedID.java

@@ -1,5 +1,11 @@
 package org.mustangproject;
 
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class SchemedID {
 	protected String scheme;
 	protected String id;

library/src/main/java/org/mustangproject/ZUGFeRD/TransactionCalculator.java

@@ -149,7 +149,7 @@ public class TransactionCalculator implements IAbsoluteValueProvider {
 	 *
 	 * @return item sum +- charges/allowances
 	 */
-	protected BigDecimal getTaxBasis() {
+	public BigDecimal getTaxBasis() {
 		return getTotal().add(getChargesForPercent(null).setScale(2, RoundingMode.HALF_UP))
 			.subtract(getAllowancesForPercent(null).setScale(2, RoundingMode.HALF_UP))
 			.setScale(2, RoundingMode.HALF_UP);

library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java

@@ -400,6 +400,19 @@ public class ZUGFeRDInvoiceImporter {
 			}
 		}
 
+		xpr = xpath.compile("//*[local-name()=\"TaxBasisTotalAmount\"]|//*[local-name()=\"TaxExclusiveAmount\"]");
+		BigDecimal expectedTaxBasis = null;
+		NodeList basisNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET);
+		if (basisNodes.getLength() > 0) {
+			expectedTaxBasis = new BigDecimal(XMLTools.trimOrNull(basisNodes.item(0)));
+			if (zpp instanceof CalculatedInvoice) {
+				// usually we would re-calculate the invoice to get expectedGrandTotal
+				// however, for "minimal" invoices or other invoices without lines
+				// this will not work
+				((CalculatedInvoice) zpp).setTaxBasis(expectedTaxBasis);
+			}
+		}
+
 		xpr = xpath.compile("//*[local-name()=\"TotalPrepaidAmount\"]|//*[local-name()=\"PrepaidAmount\"]");
 		NodeList prepaidNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET);
 		if (prepaidNodes.getLength() > 0) {
@@ -415,6 +428,14 @@ public class ZUGFeRDInvoiceImporter {
 			}
 		}
 
+		xpr = xpath.compile("//*[local-name()=\"SpecifiedTradeSettlementHeaderMonetarySummation\"]/*[local-name()=\"DuePayableAmount\"]|//*[local-name()=\"LegalMonetaryTotal\"]/*[local-name()=\"PayableAmount\"]");
+		NodeList lineDueNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET);
+		if (lineDueNodes.getLength() > 0) {
+			if (zpp instanceof CalculatedInvoice) {
+				((CalculatedInvoice) zpp).setDuePayable(new BigDecimal(XMLTools.trimOrNull(lineDueNodes.item(0))));
+			}
+		}
+
 		Date issueDate = null;
 		Date dueDate = null;
 		Date deliveryDate = null;