Merge pull request #991 from danl-devp/master

859: Remove duplicate paymentTerms

Author: jstaerk

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

@@ -1010,11 +1010,23 @@ public void setProfile(Profile p) {
 
 	private String buildPaymentTermsXml() {
 
-		ArrayList<IZUGFeRDPaymentTerms> paymentTerms = new ArrayList<IZUGFeRDPaymentTerms>(Arrays.asList(trans.getExtendedPaymentTerms()));
+		ArrayList<IZUGFeRDPaymentTerms> paymentTerms = new ArrayList<>();
+		{
+			// add payment terms
+			{
+				IZUGFeRDPaymentTerms izpt = trans.getPaymentTerms();
+				if (izpt != null) {
+					paymentTerms.add(izpt);
+				}
+			}
 
-		IZUGFeRDPaymentTerms izpt= trans.getPaymentTerms();
-		if (izpt!=null) {
-			paymentTerms.add(izpt);
+			// add extended payment terms (except the first one which is already added above)
+			{
+				IZUGFeRDPaymentTerms[] extendedPaymentTerms = trans.getExtendedPaymentTerms();
+				for (int i = 1; i < extendedPaymentTerms.length; i++) {
+					paymentTerms.add(extendedPaymentTerms[i]);
+				}
+			}
 		}
 
 		String paymentTermsXml = "";