Merge pull request #459 from Frgetg/issues/458-multiple-payment-details

Issue #458 Allow Multiple payment details for invoice

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

@@ -56,7 +56,7 @@ public class Invoice implements IExportableTransaction {
 
 	protected ArrayList<IZUGFeRDAllowanceCharge> Allowances = new ArrayList<>(),
 		Charges = new ArrayList<>(), LogisticsServiceCharges = new ArrayList<>();
-	protected IZUGFeRDPaymentTerms paymentTerms = null;
+	protected ArrayList<IZUGFeRDPaymentTerms> paymentTerms = new ArrayList<>();
 
 	protected String invoiceReferencedDocumentID = null;
 	protected Date invoiceReferencedIssueDate;
@@ -646,15 +646,43 @@ public class Invoice implements IExportableTransaction {
 
 	@Override
 	public IZUGFeRDPaymentTerms getPaymentTerms() {
-		return paymentTerms;
+		if (!paymentTerms.isEmpty()) {
+			return paymentTerms.get(0);
+		}
+		return null;
 	}
 
-	public Invoice setPaymentTerms(IZUGFeRDPaymentTerms paymentTerms) {
+	public Invoice setPaymentTerms(IZUGFeRDPaymentTerms paymentTerm) {
-		this.paymentTerms = paymentTerms;
+		if (paymentTerms.isEmpty()) {
+			paymentTerms.add(paymentTerm);
+		}
+		else {
+			paymentTerms.set(0, paymentTerm);
+		}
 		return this;
 	}
 
 	@Override
+	public IZUGFeRDPaymentTerms[] getExtendedPaymentTerms() {
+		return paymentTerms.toArray(new IZUGFeRDPaymentTerms[0]);
+	}
+
+	public Invoice setExtendedPaymentTerms(IZUGFeRDPaymentTerms[] paymentTerms) {
+		this.paymentTerms.clear();
+		this.paymentTerms.addAll(Arrays.asList(paymentTerms));
+		return this;
+	}
+
+	/**
+	 * Set multiple payment terms when using the EXTENDED profile.
+	 * @return
+	 */
+	public Invoice addPaymentTerms(IZUGFeRDPaymentTerms paymentTerm) {
+		paymentTerms.add(paymentTerm);
+		return this;
+	}
+
+
 	public String getPaymentReference() {
 		return paymentReference;
 	}

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

@@ -305,8 +305,7 @@ public interface IExportableTransaction {
 	}
 
 	/**
-	 * get payment terms. if set, getPaymentTermDescription() and getDueDate() are
+	 * get payment terms. if set, getPaymentTermDescription() and getDueDate() are ignored
-	 * ignored
 	 *
 	 * @return the IZUGFeRDPaymentTerms of the invoice
 	 */
@@ -318,6 +317,14 @@ public interface IExportableTransaction {
 		return null;
 	}
 
+	/**
+	 * Get payment terms for the EXTENDED profile (multiple terms are allowed)
+	 * @return
+	 */
+	default IZUGFeRDPaymentTerms[] getExtendedPaymentTerms() {
+		return new IZUGFeRDPaymentTerms[0];
+	}
+
 	/**
 	 * returns if a rebate agreements exists
 	 *

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

@@ -506,36 +506,44 @@ public class OXPullProvider extends ZUGFeRD2PullProvider {
 
 	private String buildPaymentTermsXml() {
 
-		final IZUGFeRDPaymentTerms paymentTerms = trans.getPaymentTerms();
+		final IZUGFeRDPaymentTerms[] paymentTerms = trans.getExtendedPaymentTerms();
-		if (paymentTerms == null) {
+
+		String paymentTermsXml = "";
+		if (paymentTerms == null || paymentTerms.length == 0) {
 			return "";
 		}
-		String paymentTermsXml = "<ram:SpecifiedTradePaymentTerms>";
 
-		final IZUGFeRDPaymentDiscountTerms discountTerms = paymentTerms.getDiscountTerms();
+		for (IZUGFeRDPaymentTerms pt : paymentTerms)
-		paymentTermsXml += "<ram:Description>" + paymentTerms.getDescription() + "</ram:Description>";
+		{
-		if (discountTerms != null) {
+			paymentTermsXml += "<ram:SpecifiedTradePaymentTerms>";
-			paymentTermsXml += "<ram:ApplicableTradePaymentDiscountTerms>";
+
-			final String currency = trans.getCurrency();
+			final IZUGFeRDPaymentDiscountTerms discountTerms = pt.getDiscountTerms();
-			final String basisAmount = currencyFormat(calc.getGrandTotal());
+			paymentTermsXml += "<ram:Description>" + pt.getDescription() + "</ram:Description>";
-			paymentTermsXml += "<ram:BasisAmount currencyID=\"" + currency + "\">" + basisAmount + "</ram:BasisAmount>";
+			if (discountTerms != null)
-			paymentTermsXml += "<ram:CalculationPercent>" + discountTerms.getCalculationPercentage().toString()
+			{
+				paymentTermsXml += "<ram:ApplicableTradePaymentDiscountTerms>";
+				final String currency = trans.getCurrency();
+				final String basisAmount = currencyFormat(calc.getGrandTotal());
+				paymentTermsXml += "<ram:BasisAmount currencyID=\"" + currency + "\">" + basisAmount + "</ram:BasisAmount>";
+				paymentTermsXml += "<ram:CalculationPercent>" + discountTerms.getCalculationPercentage().toString()
 					+ "</ram:CalculationPercent>";
 
-			if (discountTerms.getBaseDate() != null) {
+				if (discountTerms.getBaseDate() != null)
-				final Date baseDate = discountTerms.getBaseDate();
+				{
-				paymentTermsXml += "<ram:BasisDateTime>";
+					final Date baseDate = discountTerms.getBaseDate();
-				paymentTermsXml += DATE.udtFormat(baseDate);
+					paymentTermsXml += "<ram:BasisDateTime>";
-				paymentTermsXml += "</ram:BasisDateTime>";
+					paymentTermsXml += DATE.udtFormat(baseDate);
+					paymentTermsXml += "</ram:BasisDateTime>";
 
-				paymentTermsXml += "<ram:BasisPeriodMeasure unitCode=\"" + discountTerms.getBasePeriodUnitCode() + "\">"
+					paymentTermsXml += "<ram:BasisPeriodMeasure unitCode=\"" + discountTerms.getBasePeriodUnitCode() + "\">"
 						+ discountTerms.getBasePeriodMeasure() + "</ram:BasisPeriodMeasure>";
+				}
+
+				paymentTermsXml += "</ram:ApplicableTradePaymentDiscountTerms>";
 			}
 
-			paymentTermsXml += "</ram:ApplicableTradePaymentDiscountTerms>";
+			paymentTermsXml += "</ram:SpecifiedTradePaymentTerms>";
 		}
-
-		paymentTermsXml += "</ram:SpecifiedTradePaymentTerms>";
 		return paymentTermsXml;
 	}
 

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

@@ -433,44 +433,57 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider {
 	}
 
 	private String buildPaymentTermsXml() {
-		String paymentTermsXml = "<ram:SpecifiedTradePaymentTerms>";
+		final IZUGFeRDPaymentTerms[] paymentTerms = trans.getExtendedPaymentTerms();
 
-		final IZUGFeRDPaymentTerms paymentTerms = trans.getPaymentTerms();
+		String paymentTermsXml = "";
-		final IZUGFeRDPaymentDiscountTerms discountTerms = paymentTerms.getDiscountTerms();
+		if (paymentTerms == null || paymentTerms.length == 0) {
-		final Date dueDate = paymentTerms.getDueDate();
+			return paymentTermsXml;
-		if (dueDate != null && discountTerms != null && discountTerms.getBaseDate() != null) {
+		}
-			throw new IllegalStateException(
+
+		for (IZUGFeRDPaymentTerms pt : paymentTerms)
+		{
+			paymentTermsXml += "<ram:SpecifiedTradePaymentTerms>";
+
+			final IZUGFeRDPaymentDiscountTerms discountTerms = pt.getDiscountTerms();
+			final Date dueDate = pt.getDueDate();
+			if (dueDate != null && discountTerms != null && discountTerms.getBaseDate() != null)
+			{
+				throw new IllegalStateException(
 					"if paymentTerms.dueDate is specified, paymentTerms.discountTerms.baseDate has not to be specified");
-		}
+			}
-		paymentTermsXml += "<ram:Description>" + paymentTerms.getDescription() + "</ram:Description>";
+			paymentTermsXml += "<ram:Description>" + pt.getDescription() + "</ram:Description>";
-		if (dueDate != null) {
+			if (dueDate != null)
-			paymentTermsXml += "<ram:DueDateDateTime>";
+			{
-			paymentTermsXml += DATE.udtFormat(dueDate);
+				paymentTermsXml += "<ram:DueDateDateTime>";
-			paymentTermsXml += "</ram:DueDateDateTime>";
+				paymentTermsXml += DATE.udtFormat(dueDate);
-		}
+				paymentTermsXml += "</ram:DueDateDateTime>";
-
-		if (discountTerms != null) {
-			paymentTermsXml += "<ram:ApplicableTradePaymentDiscountTerms>";
-			final String currency = trans.getCurrency();
-			final String basisAmount = currencyFormat(calc.getGrandTotal());
-			paymentTermsXml += "<ram:BasisAmount currencyID=\"" + currency + "\">" + basisAmount + "</ram:BasisAmount>";
-			paymentTermsXml += "<ram:CalculationPercent>" + discountTerms.getCalculationPercentage().toString()
-					+ "</ram:CalculationPercent>";
-
-			if (discountTerms.getBaseDate() != null) {
-				final Date baseDate = discountTerms.getBaseDate();
-				paymentTermsXml += "<ram:BasisDateTime>";
-				paymentTermsXml += DATE.udtFormat(baseDate);
-				paymentTermsXml += "</ram:BasisDateTime>";
-
-				paymentTermsXml += "<ram:BasisPeriodMeasure unitCode=\"" + discountTerms.getBasePeriodUnitCode() + "\">"
-						+ discountTerms.getBasePeriodMeasure() + "</ram:BasisPeriodMeasure>";
 			}
 
-			paymentTermsXml += "</ram:ApplicableTradePaymentDiscountTerms>";
+			if (discountTerms != null)
-		}
+			{
+				paymentTermsXml += "<ram:ApplicableTradePaymentDiscountTerms>";
+				final String currency = trans.getCurrency();
+				final String basisAmount = currencyFormat(calc.getGrandTotal());
+				paymentTermsXml += "<ram:BasisAmount currencyID=\"" + currency + "\">" + basisAmount + "</ram:BasisAmount>";
+				paymentTermsXml += "<ram:CalculationPercent>" + discountTerms.getCalculationPercentage().toString()
+					+ "</ram:CalculationPercent>";
 
-		paymentTermsXml += "</ram:SpecifiedTradePaymentTerms>";
+				if (discountTerms.getBaseDate() != null)
+				{
+					final Date baseDate = discountTerms.getBaseDate();
+					paymentTermsXml += "<ram:BasisDateTime>";
+					paymentTermsXml += DATE.udtFormat(baseDate);
+					paymentTermsXml += "</ram:BasisDateTime>";
+
+					paymentTermsXml += "<ram:BasisPeriodMeasure unitCode=\"" + discountTerms.getBasePeriodUnitCode() + "\">"
+						+ discountTerms.getBasePeriodMeasure() + "</ram:BasisPeriodMeasure>";
+				}
+
+				paymentTermsXml += "</ram:ApplicableTradePaymentDiscountTerms>";
+			}
+
+			paymentTermsXml += "</ram:SpecifiedTradePaymentTerms>";
+		}
 		return paymentTermsXml;
 	}
 

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

@@ -969,56 +969,70 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 	}
 
 	private String buildPaymentTermsXml() {
-		final IZUGFeRDPaymentTerms paymentTerms = trans.getPaymentTerms();
+		final IZUGFeRDPaymentTerms[] paymentTerms = trans.getExtendedPaymentTerms();
-		if (paymentTerms == null) {
+
+		String paymentTermsXml = "";
+		if (paymentTerms == null || paymentTerms.length == 0) {
 			return "";
 		}
-		String paymentTermsXml = "<ram:SpecifiedTradePaymentTerms>";
 
-		final IZUGFeRDPaymentDiscountTerms discountTerms = paymentTerms.getDiscountTerms();
+		for (IZUGFeRDPaymentTerms pt : paymentTerms)
-		final Date dueDate = paymentTerms.getDueDate();
+		{
-		if (dueDate != null && discountTerms != null && discountTerms.getBaseDate() != null) {
-			throw new IllegalStateException(
-				"if paymentTerms.dueDate is specified, paymentTerms.discountTerms.baseDate has not to be specified");
-		}
-		paymentTermsXml += "<ram:Description>" + paymentTerms.getDescription() + "</ram:Description>";
 
-		if (dueDate != null) {
+			paymentTermsXml += "<ram:SpecifiedTradePaymentTerms>";
-			paymentTermsXml += "<ram:DueDateDateTime>";
-			paymentTermsXml += DATE.udtFormat(dueDate);
-			paymentTermsXml += "</ram:DueDateDateTime>";
-		}
 
-		if (trans.getTradeSettlement() != null) {
+			final IZUGFeRDPaymentDiscountTerms discountTerms = pt.getDiscountTerms();
-			for (final IZUGFeRDTradeSettlement payment : trans.getTradeSettlement()) {
+			final Date dueDate = pt.getDueDate();
-				if ((payment != null) && (payment instanceof IZUGFeRDTradeSettlementDebit)) {
+			if (dueDate != null && discountTerms != null && discountTerms.getBaseDate() != null)
-					paymentTermsXml += payment.getPaymentXML();
+			{
+				throw new IllegalStateException(
+					"if paymentTerms.dueDate is specified, paymentTerms.discountTerms.baseDate has not to be specified");
+			}
+			paymentTermsXml += "<ram:Description>" + pt.getDescription() + "</ram:Description>";
+
+			if (dueDate != null)
+			{
+				paymentTermsXml += "<ram:DueDateDateTime>";
+				paymentTermsXml += DATE.udtFormat(dueDate);
+				paymentTermsXml += "</ram:DueDateDateTime>";
+			}
+
+			if (trans.getTradeSettlement() != null)
+			{
+				for (final IZUGFeRDTradeSettlement payment : trans.getTradeSettlement())
+				{
+					if ((payment != null) && (payment instanceof IZUGFeRDTradeSettlementDebit))
+					{
+						paymentTermsXml += payment.getPaymentXML();
+					}
 				}
 			}
-		}
 
-		if (discountTerms != null) {
+			if (discountTerms != null)
-			paymentTermsXml += "<ram:ApplicableTradePaymentDiscountTerms>";
+			{
-			final String currency = trans.getCurrency();
+				paymentTermsXml += "<ram:ApplicableTradePaymentDiscountTerms>";
-			final String basisAmount = currencyFormat(calc.getGrandTotal());
+				final String currency = trans.getCurrency();
-			paymentTermsXml += "<ram:BasisAmount currencyID=\"" + currency + "\">" + basisAmount + "</ram:BasisAmount>";
+				final String basisAmount = currencyFormat(calc.getGrandTotal());
-			paymentTermsXml += "<ram:CalculationPercent>" + discountTerms.getCalculationPercentage().toString()
+				paymentTermsXml += "<ram:BasisAmount currencyID=\"" + currency + "\">" + basisAmount + "</ram:BasisAmount>";
-				+ "</ram:CalculationPercent>";
+				paymentTermsXml += "<ram:CalculationPercent>" + discountTerms.getCalculationPercentage().toString()
+					+ "</ram:CalculationPercent>";
 
-			if (discountTerms.getBaseDate() != null) {
+				if (discountTerms.getBaseDate() != null)
-				final Date baseDate = discountTerms.getBaseDate();
+				{
-				paymentTermsXml += "<ram:BasisDateTime>";
+					final Date baseDate = discountTerms.getBaseDate();
-				paymentTermsXml += DATE.udtFormat(baseDate);
+					paymentTermsXml += "<ram:BasisDateTime>";
-				paymentTermsXml += "</ram:BasisDateTime>";
+					paymentTermsXml += DATE.udtFormat(baseDate);
+					paymentTermsXml += "</ram:BasisDateTime>";
 
-				paymentTermsXml += "<ram:BasisPeriodMeasure unitCode=\"" + discountTerms.getBasePeriodUnitCode() + "\">"
+					paymentTermsXml += "<ram:BasisPeriodMeasure unitCode=\"" + discountTerms.getBasePeriodUnitCode() + "\">"
-					+ discountTerms.getBasePeriodMeasure() + "</ram:BasisPeriodMeasure>";
+						+ discountTerms.getBasePeriodMeasure() + "</ram:BasisPeriodMeasure>";
+				}
+
+				paymentTermsXml += "</ram:ApplicableTradePaymentDiscountTerms>";
 			}
 
-			paymentTermsXml += "</ram:ApplicableTradePaymentDiscountTerms>";
+			paymentTermsXml += "</ram:SpecifiedTradePaymentTerms>";
 		}
-
-		paymentTermsXml += "</ram:SpecifiedTradePaymentTerms>";
 		return paymentTermsXml;
 	}
 

library/src/test/java/org/mustangproject/ZUGFeRD/ZF2EdgeTest.java

@@ -240,13 +240,11 @@ public class ZF2EdgeTest extends MustangReaderTestCase {
 			e.printStackTrace();
 
 		}
-		return
+		return new PaymentTerms(
-				new PaymentTerms(
+				"14 Tage 2% Skonto, 30 Tage rein netto",
-						"14 Tage 2% Skonto, 30 Tage rein netto",
+				due,// fälligkeitsdatum
-						due,// fälligkeitsdatum
+				paymentDiscountTerms //PaymentDiscountTerms
-						paymentDiscountTerms //PaymentDiscountTerms
+			);
-				);
-
 	}
 
 	@Override