diff --git a/History.md b/History.md index 07355b36..943f8c01 100644 --- a/History.md +++ b/History.md @@ -1,3 +1,6 @@ +- allow Bank credentials without BIC +- allow minimum profile without delivery date + 2.6.0 "Joyeux Noël" ======= 2022-12-23 diff --git a/library/src/main/java/org/mustangproject/BankDetails.java b/library/src/main/java/org/mustangproject/BankDetails.java index db7b3ce0..b72817ca 100644 --- a/library/src/main/java/org/mustangproject/BankDetails.java +++ b/library/src/main/java/org/mustangproject/BankDetails.java @@ -13,12 +13,19 @@ public class BankDetails implements IZUGFeRDTradeSettlementPayment { /** * BIC, I believe it's optional */ - protected String BIC; + protected String BIC=null; /** * the "name" of the bank account (holder) */ protected String accountName=null; + /*** + * constructor for IBAN only :-) + * @param IBAN the IBAN as string + */ + public BankDetails(String IBAN) { + this.IBAN = IBAN; + } /*** * constructor for normal use :-) * @param IBAN the IBAN as string diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDTradeSettlementPayment.java b/library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDTradeSettlementPayment.java index 47de83cf..d7c2a498 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDTradeSettlementPayment.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDTradeSettlementPayment.java @@ -72,13 +72,16 @@ public interface IZUGFeRDTradeSettlementPayment extends IZUGFeRDTradeSettlement + "" + "" + XMLTools.encodeXML(getOwnIBAN()) + ""; xml+= accountNameStr; - xml+= "" - + "" - + "" + XMLTools.encodeXML(getOwnBIC()) + "" - // + " "+trans.getOwnBankName()+"" - // - + "" - + ""; + xml+= ""; + if (getOwnBIC()!=null) { + xml+= "" + + "" + XMLTools.encodeXML(getOwnBIC()) + "" + // + " "+trans.getOwnBankName()+"" + // + + "" + + ""; + + } return xml; } diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java index f79ba6d4..53ce58db 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java @@ -563,7 +563,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { xml += " "; } else { - if (trans.getDocumentCode() != DocumentCodeTypeConstants.CREDITNOTE) { + if ((trans.getDocumentCode() != DocumentCodeTypeConstants.CREDITNOTE)&&(getProfile() != Profiles.getByName("Minimum"))) { throw new IllegalStateException("No delivery date provided"); } }