From 7f6485388129e1e1caa880d011dafef0b18e3a32 Mon Sep 17 00:00:00 2001
From: jstaerk <jstaerk@usegroup.de>
Date: Thu, 12 Jan 2023 14:52:04 +0100
Subject: [PATCH] switch to code 30 for bank transfer

---
 .../mustangproject/ZUGFeRD/IZUGFeRDTradeSettlementDebit.java  | 4 ++--
 .../java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDTradeSettlementDebit.java b/library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDTradeSettlementDebit.java
index bc5f3533..2a44b311 100644
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDTradeSettlementDebit.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDTradeSettlementDebit.java
@@ -27,10 +27,10 @@ public interface IZUGFeRDTradeSettlementDebit extends IZUGFeRDTradeSettlement {
 	@Override
 	default String getSettlementXML() {
 		
-	
+	//30=generic bank transfer, 59=sepa transfer
 		
 		String xml = "<ram:SpecifiedTradeSettlementPaymentMeans>"
-				+ "<ram:TypeCode>59</ram:TypeCode>"
+				+ "<ram:TypeCode>30</ram:TypeCode>"
 				+ "<ram:PayerPartyDebtorFinancialAccount>"
       		    + "<ram:IBANID>"+XMLTools.encodeXML(getIBAN())+"</ram:IBANID>"
       		    + "</ram:PayerPartyDebtorFinancialAccount>";
diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
index 53ce58db..b0d9c1e7 100644
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
@@ -282,7 +282,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 		}
 
 		if ((paymentTermsDescription == null) && (trans.getDocumentCode() != DocumentCodeTypeConstants.CORRECTEDINVOICE) && (trans.getDocumentCode() != DocumentCodeTypeConstants.CREDITNOTE)) {
-			paymentTermsDescription = "Zahlbar ohne Abzug bis " + germanDateFormat.format(trans.getDueDate());
+			paymentTermsDescription = "Zahlbar ohne Abzug bis/Please remit until " + germanDateFormat.format(trans.getDueDate());
 
 		}
 
@@ -297,7 +297,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 		String rebateAgreement = "";
 		if (trans.rebateAgreementExists()) {
 			rebateAgreement = "<ram:IncludedNote><ram:Content>"
-					+ "Es bestehen Rabatt- und Bonusvereinbarungen.</ram:Content>"
+					+ "Es bestehen Rabatt- und Bonusvereinbarungen/Existing allowance/bonus agreements</ram:Content>"
 					+ "<ram:SubjectCode>AAK</ram:SubjectCode></ram:IncludedNote>";
 		}