louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "switch to code 30 for bank transfer"

Browse Source 
This reverts commit 7f64853881.
This commit is contained in:
jstaerk
2023-02-11 18:33:03 +01:00
parent df8940b42e
commit a3fc468129
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDTradeSettlementDebit.java
View File

@@ -27,10 +27,10 @@ public interface IZUGFeRDTradeSettlementDebit extends IZUGFeRDTradeSettlement {
@Override @Override
default String getSettlementXML() { default String getSettlementXML() {
//30=generic bank transfer, 59=sepa transfer
String xml = "<ram:SpecifiedTradeSettlementPaymentMeans>" String xml = "<ram:SpecifiedTradeSettlementPaymentMeans>"
+ "<ram:TypeCode>30</ram:TypeCode>" + "<ram:TypeCode>59</ram:TypeCode>"
+ "<ram:PayerPartyDebtorFinancialAccount>" + "<ram:PayerPartyDebtorFinancialAccount>"
+ "<ram:IBANID>"+XMLTools.encodeXML(getIBAN())+"</ram:IBANID>" + "<ram:IBANID>"+XMLTools.encodeXML(getIBAN())+"</ram:IBANID>"
+ "</ram:PayerPartyDebtorFinancialAccount>"; + "</ram:PayerPartyDebtorFinancialAccount>";

4
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
View File

@@ -282,7 +282,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
} }
if ((paymentTermsDescription == null) && (trans.getDocumentCode() != DocumentCodeTypeConstants.CORRECTEDINVOICE) && (trans.getDocumentCode() != DocumentCodeTypeConstants.CREDITNOTE)) { if ((paymentTermsDescription == null) && (trans.getDocumentCode() != DocumentCodeTypeConstants.CORRECTEDINVOICE) && (trans.getDocumentCode() != DocumentCodeTypeConstants.CREDITNOTE)) {
paymentTermsDescription = "Zahlbar ohne Abzug bis/Please remit until " + germanDateFormat.format(trans.getDueDate()); paymentTermsDescription = "Zahlbar ohne Abzug bis " + germanDateFormat.format(trans.getDueDate());
} }
@@ -297,7 +297,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
String rebateAgreement = ""; String rebateAgreement = "";
if (trans.rebateAgreementExists()) { if (trans.rebateAgreementExists()) {
rebateAgreement = "<ram:IncludedNote><ram:Content>" rebateAgreement = "<ram:IncludedNote><ram:Content>"
+ "Es bestehen Rabatt- und Bonusvereinbarungen/Existing allowance/bonus agreements</ram:Content>" + "Es bestehen Rabatt- und Bonusvereinbarungen.</ram:Content>"
+ "<ram:SubjectCode>AAK</ram:SubjectCode></ram:IncludedNote>"; + "<ram:SubjectCode>AAK</ram:SubjectCode></ram:IncludedNote>";
} }