Merge branch 'ZUGFeRD:master' into master

History.md

@@ -1,3 +1,10 @@
+595
+591
+577
+575
+573
+601
+
 2.15.1
 =======
 - #566 Failed to parse PDF - Could not reproduce the invoice

Mustang-CLI/src/main/java/org/mustangproject/commandline/FileChecker.java

@@ -51,7 +51,9 @@ public class FileChecker {
 		if ((!isPDF) && (!thisRun.shallIgnoreFileExt())) {
 			return false;
 		}
-		ZUGFeRDImporter zi = new ZUGFeRDImporter(filename);
+		ZUGFeRDImporter zi = new ZUGFeRDImporter();
+		zi.doIgnoreCalculationErrors();
+		zi.setPDFFilename(filename);
 		try {
 			if (zi.canParse()) {
 				thisRun.incZUGFeRDCount(zi.getVersion());

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

@@ -72,11 +72,6 @@ public class IncludedNote {
 		return content;
 	}
 
-  public IncludedNote setContent(String content) {
-    this.content = content;
-    return this;
-}
-
 	public SubjectCode getSubjectCode() {
 		return subjectCode;
 	}
@@ -93,9 +88,9 @@ public class IncludedNote {
 	}
 
 
-  public String toCiiXml(){
+	public String toCiiXml() {
 		String result = INCLUDE_START + CONTENT_START +
-        XMLTools.encodeXML(getContent() )+ CONTENT_END;
+			XMLTools.encodeXML(getContent()) + CONTENT_END;
 		if (getSubjectCode() != null) {
 			result += SUBJECT_CODE_START + getSubjectCode() + SUBJECT_CODE_END;
 		}

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

@@ -23,9 +23,9 @@ import java.util.Map;
 
 public class Product implements IZUGFeRDExportableProduct {
 	protected String unit, name, sellerAssignedID, buyerAssignedID;
-	protected String description="";
+	protected String description = "";
-	protected String taxExemptionReason=null;
+	protected String taxExemptionReason = null;
-	protected String taxCategoryCode=null;
+	protected String taxCategoryCode = null;
 	protected BigDecimal VATPercent;
 	protected boolean isReverseCharge = false;
 	protected boolean isIntraCommunitySupply = false;
@@ -61,8 +61,6 @@ public class Product implements IZUGFeRDExportableProduct {
 		});
 
 
-
-
 		nodeMap.getAsString("SellerAssignedID").ifPresent(this::setSellerAssignedID);
 		nodeMap.getAsString("BuyerAssignedID").ifPresent(this::setBuyerAssignedID);
 		nodeMap.getAsString("Name").ifPresent(this::setName);
@@ -304,7 +302,11 @@ public class Product implements IZUGFeRDExportableProduct {
 	 * @return fluent setter
 	 */
 	public Product setVATPercent(BigDecimal VATPercent) {
+		if (VATPercent == null) {
+			this.VATPercent = BigDecimal.ZERO;
+		} else {
 			this.VATPercent = VATPercent;
+		}
 		return this;
 	}
 
@@ -335,7 +337,7 @@ public class Product implements IZUGFeRDExportableProduct {
 		return this;
 	}
 
-	public Product addAttribute(String name, String value ) {
+	public Product addAttribute(String name, String value) {
 		this.attributes.put(name, value);
 		return this;
 	}

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

@@ -44,12 +44,18 @@ public class LineCalculator {
 		BigDecimal multiplicator = vatPercent.divide(BigDecimal.valueOf(100));
 		priceGross = currentItem.getPrice(); // see https://github.com/ZUGFeRD/mustangproject/issues/159
 		price = priceGross.subtract(allowance).add(charge);
+
+		BigDecimal quantity=BigDecimal.ZERO;
+		if ((currentItem!=null)&&(currentItem.getQuantity()!=null)) {
+			quantity=currentItem.getQuantity();
+		}
+
 		// Division/Zero occurred here.
 		// Used the setScale only because that's also done in getBasisQuantity
 		BigDecimal basisQuantity = currentItem.getBasisQuantity().compareTo(BigDecimal.ZERO) == 0
 			? BigDecimal.ONE.setScale(4)
 			: currentItem.getBasisQuantity();
-		itemTotalNetAmount = currentItem.getQuantity().multiply(getPrice()).divide(basisQuantity, 18, RoundingMode.HALF_UP)
+		itemTotalNetAmount = quantity.multiply(getPrice()).divide(basisQuantity, 18, RoundingMode.HALF_UP)
 				.subtract(allowanceItemTotal).setScale(2, RoundingMode.HALF_UP);
 		itemTotalVATAmount = itemTotalNetAmount.multiply(multiplicator);
 	}

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

@@ -167,7 +167,11 @@ public class TransactionCalculator implements IAbsoluteValueProvider {
 		final String vatDueDateTypeCode = trans.getVATDueDateTypeCode();
 
 		for (IZUGFeRDExportableItem currentItem : trans.getZFItems()) {
-			BigDecimal percent = currentItem.getProduct().getVATPercent();
+			BigDecimal percent = null;
+			if (currentItem.getProduct()!=null)
+			{
+				percent=currentItem.getProduct().getVATPercent();
+			}
 			if (percent != null) {
 				LineCalculator lc = new LineCalculator(currentItem);
 				VATAmount itemVATAmount = new VATAmount(lc.getItemTotalNetAmount(), lc.getItemTotalVATAmount(),

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

@@ -558,7 +558,10 @@ public class ZUGFeRDInvoiceImporter {
 			// UBL...
 			number = extractString("//*[local-name()=\"Invoice\"]/*[local-name()=\"ID\"]").trim();
 			typeCode = extractString("//*[local-name()=\"Invoice\"]/*[local-name()=\"InvoiceTypeCode\"]").trim();
-			issueDate = new SimpleDateFormat("yyyy-MM-dd").parse(extractString("//*[local-name()=\"Invoice\"]/*[local-name()=\"IssueDate\"]").trim());
+			String issueDateStr = extractString("//*[local-name()=\"Invoice\"]/*[local-name()=\"IssueDate\"]").trim();
+			if (issueDateStr.length()>0) {
+				issueDate = new SimpleDateFormat("yyyy-MM-dd").parse(issueDateStr);
+			}
 			String dueDt = extractString("//*[local-name()=\"Invoice\"]/*[local-name()=\"DueDate\"]").trim();
 			if (dueDt.length() > 0) {
 				dueDate = new SimpleDateFormat("yyyy-MM-dd").parse(dueDt);
@@ -777,7 +780,7 @@ public class ZUGFeRDInvoiceImporter {
 
 		}
 
-		zpp.setDueDate(dueDate).setDeliveryDate(deliveryDate).setIssueDate(issueDate).setSender(new TradeParty(SellerNodes)).setRecipient(new TradeParty(BuyerNodes)).setNumber(number).setDocumentCode(typeCode);
+		zpp.setIssueDate(issueDate).setDueDate(dueDate).setDeliveryDate(deliveryDate).setSender(new TradeParty(SellerNodes)).setRecipient(new TradeParty(BuyerNodes)).setNumber(number).setDocumentCode(typeCode);
 
 		if ((directDebitMandateID != null) && (IBAN != null)) {
 			DirectDebit d = new DirectDebit(IBAN, directDebitMandateID);

library/src/main/java/org/mustangproject/util/NodeMap.java

@@ -106,7 +106,14 @@ public class NodeMap {
 	 * @return the text content of the matching node, converted to BigDecimal
 	 */
 	public Optional<BigDecimal> getAsBigDecimal(String... localNames) {
-		return getNode(localNames).map(Node::getTextContent).map(s->new BigDecimal(s.trim()));
+		return getNode(localNames).map(Node::getTextContent).map(s->{
+			try {
+				return new BigDecimal(s.trim());
+			} catch (NumberFormatException e) {
+				return null;
+			}
+
+		});
 	}
 
 	/**