diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDTradeSettlementDebit.java b/library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDTradeSettlementDebit.java index 6dae1fa8..bc5f3533 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDTradeSettlementDebit.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDTradeSettlementDebit.java @@ -31,11 +31,11 @@ public interface IZUGFeRDTradeSettlementDebit extends IZUGFeRDTradeSettlement { String xml = "" + "59" - + " " + + "" + ""+XMLTools.encodeXML(getIBAN())+"" + ""; - xml = xml + ""; + xml += ""; return xml; } diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/OXPullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/OXPullProvider.java index 91f9d1bf..035231d9 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/OXPullProvider.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/OXPullProvider.java @@ -147,7 +147,7 @@ public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider } } final LineCalculator lc = new LineCalculator(currentItem); - xml = xml + "" + + xml += "" + "" + "" + lineID + "" + notes @@ -156,11 +156,11 @@ public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider + ""; // + " 4012345001235" if (currentItem.getProduct().getSellerAssignedID() != null) { - xml = xml + "" + xml += "" + XMLTools.encodeXML(currentItem.getProduct().getSellerAssignedID()) + ""; } if (currentItem.getProduct().getBuyerAssignedID() != null) { - xml = xml + "" + xml += "" + XMLTools.encodeXML(currentItem.getProduct().getBuyerAssignedID()) + ""; } String allowanceChargeStr = ""; @@ -177,7 +177,7 @@ public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider } - xml = xml + "" + XMLTools.encodeXML(currentItem.getProduct().getName()) + "" + xml += "" + XMLTools.encodeXML(currentItem.getProduct().getName()) + "" + "" + XMLTools.encodeXML(currentItem.getProduct().getDescription()) + "" + "" @@ -185,7 +185,7 @@ public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider + ""; /* if (currentItem.getReferencedDocuments() != null) { for (IReferencedDocument currentReferencedDocument : currentItem.getReferencedDocuments()) { - xml = xml + "\n" + + xml += "\n" + "" + XMLTools.encodeXML(currentReferencedDocument.getIssuerAssignedID()) + "\n" + "" + XMLTools.encodeXML(currentReferencedDocument.getTypeCode()) + "\n" + "" + XMLTools.encodeXML(currentReferencedDocument.getReferenceTypeCode()) + "\n" + @@ -196,12 +196,12 @@ public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider }*/ if (currentItem.getBuyerOrderReferencedDocumentLineID() != null) { - xml = xml + " \n" + xml += " \n" + "" + XMLTools.encodeXML(currentItem.getBuyerOrderReferencedDocumentLineID()) + "" + ""; } - xml = xml + "" + xml += "" + "" + priceFormat(lc.getPriceGross()) + "" //currencyID=\"EUR\" + "0.6667\n" // + " Rabatt\n" // + " \n" - + "\n" - + "\n" + + "" + + "" + "" + priceFormat(lc.getPrice()) + "" // currencyID=\"EUR\" + "" + ""; if ((currentItem.getDetailedDeliveryPeriodFrom() != null) || (currentItem.getDetailedDeliveryPeriodTo() != null)) { - xml = xml + ""; + xml += ""; if (currentItem.getDetailedDeliveryPeriodFrom() != null) { - xml = xml + "" + DATE.udtFormat(currentItem.getDetailedDeliveryPeriodFrom()) + ""; + xml += "" + DATE.udtFormat(currentItem.getDetailedDeliveryPeriodFrom()) + ""; } if (currentItem.getDetailedDeliveryPeriodTo() != null) { - xml = xml + "" + DATE.udtFormat(currentItem.getDetailedDeliveryPeriodTo()) + ""; + xml += "" + DATE.udtFormat(currentItem.getDetailedDeliveryPeriodTo()) + ""; } - xml = xml + ""; + xml += ""; } - xml = xml + "" + xml += "" + "" + currencyFormat(lc.getItemTotalNetAmount()) + "" // currencyID=\"EUR\" + ""; /* if (currentItem.getAdditionalReferencedDocumentID() != null) { - xml = xml + "" + currentItem.getAdditionalReferencedDocumentID() + "130"; + xml += "" + currentItem.getAdditionalReferencedDocumentID() + "130"; }*/ - xml = xml + "" + xml += "" + ""; } - xml = xml + ""; + xml += ""; if (trans.getReferenceNumber() != null) { - xml = xml + "" + XMLTools.encodeXML(trans.getReferenceNumber()) + ""; + xml += "" + XMLTools.encodeXML(trans.getReferenceNumber()) + ""; } - xml = xml + "" + xml += "" + getTradePartyAsXML(trans.getSender(), true, false) + "" + ""; @@ -275,19 +275,19 @@ public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider xml += ""; if (trans.getSellerOrderReferencedDocumentID() != null) { - xml = xml + "" + xml += "" + "" + XMLTools.encodeXML(trans.getSellerOrderReferencedDocumentID()) + "" + ""; } if (trans.getBuyerOrderReferencedDocumentID() != null) { - xml = xml + "" + xml += "" + "" + XMLTools.encodeXML(trans.getBuyerOrderReferencedDocumentID()) + "" + ""; } if (trans.getContractReferencedDocument() != null) { - xml = xml + "" + xml += "" + "" + XMLTools.encodeXML(trans.getContractReferencedDocument()) + "" + ""; @@ -297,7 +297,7 @@ public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider if (trans.getAdditionalReferencedDocuments() != null) { for (final FileAttachment f : trans.getAdditionalReferencedDocuments()) { final String documentContent = new String(Base64.getEncoder().encodeToString(f.getData())); - xml = xml + "" + xml += "" + "" + f.getFilename() + "" + "916" + "" + f.getDescription() + "" @@ -308,7 +308,7 @@ public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider } if (trans.getSpecifiedProcuringProjectID() != null) { - xml = xml + "" + xml += "" + "" + XMLTools.encodeXML(trans.getSpecifiedProcuringProjectID()) + ""; if (trans.getSpecifiedProcuringProjectName() != null) { @@ -316,7 +316,7 @@ public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider } xml += ""; } - xml = xml + "" + xml += "" + ""; if (this.trans.getDeliveryAddress() != null) { xml += "" + @@ -388,14 +388,14 @@ public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider } } if ((trans.getDetailedDeliveryPeriodFrom() != null) || (trans.getDetailedDeliveryPeriodTo() != null)) { - xml = xml + ""; + xml += ""; if (trans.getDetailedDeliveryPeriodFrom() != null) { - xml = xml + "" + DATE.udtFormat(trans.getDetailedDeliveryPeriodFrom()) + ""; + xml += "" + DATE.udtFormat(trans.getDetailedDeliveryPeriodFrom()) + ""; } if (trans.getDetailedDeliveryPeriodTo() != null) { - xml = xml + "" + DATE.udtFormat(trans.getDetailedDeliveryPeriodTo()) + ""; + xml += "" + DATE.udtFormat(trans.getDetailedDeliveryPeriodTo()) + ""; } - xml = xml + ""; + xml += ""; } @@ -406,7 +406,7 @@ public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider if (calc.getChargesForPercent(currentTaxPercent).compareTo(BigDecimal.ZERO) != 0) { - xml = xml + " " + + xml += " " + "" + "true" + "" + @@ -417,7 +417,7 @@ public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider "" + VATPercentAmountMap.get(currentTaxPercent).getCategoryCode() + "" + "" + vatFormat(currentTaxPercent) + "" + "" + - " \n"; + ""; } } @@ -427,7 +427,7 @@ public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider if ((trans.getZFAllowances() != null) && (trans.getZFAllowances().length > 0)) { for (final BigDecimal currentTaxPercent : VATPercentAmountMap.keySet()) { if (calc.getAllowancesForPercent(currentTaxPercent).compareTo(BigDecimal.ZERO) != 0) { - xml = xml + " " + + xml += "" + "" + "false" + "" + @@ -445,10 +445,10 @@ public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider if ((trans.getPaymentTerms() == null) && ((paymentTermsDescription != null) || (trans.getTradeSettlement() != null) || (hasDueDate))) { - xml = xml + ""; + xml += ""; if (paymentTermsDescription != null) { - xml = xml + "" + paymentTermsDescription + ""; + xml += "" + paymentTermsDescription + ""; } if (trans.getTradeSettlement() != null) { @@ -460,14 +460,14 @@ public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider } if (hasDueDate && (trans.getDueDate() != null)) { - xml = xml + "" // $NON-NLS-2$ + xml += "" // $NON-NLS-2$ + DATE.udtFormat(trans.getDueDate()) + "";// 20130704 } - xml = xml + ""; + xml += ""; } else { - xml = xml + buildPaymentTermsXml(); + xml += buildPaymentTermsXml(); } @@ -475,7 +475,7 @@ public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider final String chargesTotalLine = "" + currencyFormat(calc.getChargesForPercent(null)) + ""; - xml = xml + "" + xml += "" + "" + currencyFormat(calc.getTotal()) + "" + chargesTotalLine + allowanceTotalLine @@ -491,7 +491,7 @@ public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider //+ "" + currencyFormat(calc.getGrandTotal().subtract(calc.getTotalPrepaid())) + "" + ""; if (trans.getInvoiceReferencedDocumentID() != null) { - xml = xml + "" + xml += "" + "" + XMLTools.encodeXML(trans.getInvoiceReferencedDocumentID()) + ""; if (trans.getInvoiceReferencedIssueDate() != null) { @@ -502,7 +502,7 @@ public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider xml += ""; } - xml = xml + ""; + xml += ""; // + " " // + " " // + " " @@ -512,7 +512,7 @@ public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider // + " \n" // + " \n"; - xml = xml + "" + xml += "" + ""; final byte[] zugferdRaw; diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java index 20b4f816..d10cf8c6 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java @@ -25,8 +25,8 @@ import static org.mustangproject.ZUGFeRD.model.TaxCategoryCodeTypeConstants.CATE import java.io.IOException; import java.io.StringWriter; -import java.io.UnsupportedEncodingException; import java.math.BigDecimal; +import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; @@ -186,12 +186,12 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLPr + "" + ""; - xml = xml + ""; + xml += ""; if (trans.getReferenceNumber() != null) { - xml = xml + "" + XMLTools.encodeXML(trans.getReferenceNumber()) + ""; + xml += "" + XMLTools.encodeXML(trans.getReferenceNumber()) + ""; } - xml = xml + ""; + xml += ""; xml += getTradePartyAsXML(trans.getSender(), true, false); xml += "" + ""; @@ -200,7 +200,7 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLPr xml += getTradePartyAsXML(trans.getRecipient(), false, false); if ((trans.getOwnVATID() != null) && (trans.getOwnOrganisationName() != null)) { - xml = xml + "\n" + xml += "" + XMLTools.encodeXML(trans.getOwnVATID()) + "" + ""; } @@ -208,18 +208,18 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLPr xml += ""; if (trans.getSellerOrderReferencedDocumentID() != null) { - xml = xml + "" + xml += "" + "" + XMLTools.encodeXML(trans.getSellerOrderReferencedDocumentID()) + "" + ""; } if (trans.getBuyerOrderReferencedDocumentID() != null) { - xml = xml + "" + xml += "" + "" + XMLTools.encodeXML(trans.getBuyerOrderReferencedDocumentID()) + "" + ""; } - xml = xml + "" + xml += "" + ""; if (this.trans.getDeliveryAddress() != null) { xml += "" + @@ -243,7 +243,7 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLPr * "2013-51112" + * "" */ - + "\n" + + "" + "" + XMLTools.encodeXML(trans.getNumber()) + "" + "" + trans.getCurrency() + ""; @@ -280,12 +280,12 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLPr + "" + currencyFormat(amount.getBasis()) + "" // currencyID=\"EUR\" + "" + amount.getCategoryCode() + "" + "" + vatFormat(currentTaxPercent) - + "\n"; + + ""; } } if (trans.getPaymentTerms() == null) { - xml = xml + "" + xml += "" + "" + paymentTermsDescription + ""; if (trans.getTradeSettlement() != null) { @@ -297,17 +297,17 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLPr } if (hasDueDate && (trans.getDueDate() != null)) { - xml = xml + "" // $NON-NLS-2$ + xml += "" // $NON-NLS-2$ + DATE.udtFormat(trans.getDueDate()) + "";// 20130704 } - xml = xml + ""; + xml += ""; } else { - xml = xml + buildPaymentTermsXml(); + xml += buildPaymentTermsXml(); } - xml = xml + "" + xml += "" + "" + currencyFormat(calc.getTotal()) + "" // currencyID=\"EUR\" + "0.00" // currencyID=\"EUR\" @@ -340,7 +340,7 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLPr final LineCalculator lc = new LineCalculator(currentItem); - xml = xml + "" + + xml += "" + "" + "" + lineID + "" + "" @@ -383,27 +383,25 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLPr + "" + ""; if (currentItem.getAdditionalReferencedDocumentID() != null) { - xml = xml + "" + currentItem.getAdditionalReferencedDocumentID() + "130"; + xml += "" + currentItem.getAdditionalReferencedDocumentID() + "130"; } - xml = xml + "" + xml += "" + ""; // + " 4012345001235" if (currentItem.getProduct().getSellerAssignedID() != null) { - xml = xml + "" + xml += "" + XMLTools.encodeXML(currentItem.getProduct().getSellerAssignedID()) + ""; } if (currentItem.getProduct().getBuyerAssignedID() != null) { - xml = xml + "" + xml += "" + XMLTools.encodeXML(currentItem.getProduct().getBuyerAssignedID()) + ""; } - xml = xml + "" + XMLTools.encodeXML(currentItem.getProduct().getName()) + "" + xml += "" + XMLTools.encodeXML(currentItem.getProduct().getName()) + "" + "" + XMLTools.encodeXML(currentItem.getProduct().getDescription()) + "" + "" - + ""; - } // + " \n" @@ -415,17 +413,13 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLPr // + " \n" // + " \n"; - xml = xml + "" + xml += "" + ""; final byte[] zugferdRaw; - try { - zugferdRaw = xml.getBytes("UTF-8"); - zugferdData = XMLTools.removeBOM(zugferdRaw); - } catch (final UnsupportedEncodingException e) { - Logger.getLogger(ZUGFeRD1PullProvider.class.getName()).log(Level.SEVERE, null, e); - } - } + zugferdRaw = xml.getBytes(StandardCharsets.UTF_8); + zugferdData = XMLTools.removeBOM(zugferdRaw); + } @Override public void setProfile(Profile p) { diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java index 8042e24a..63718561 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java @@ -126,7 +126,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { if (party.getID() != null) { xml += "" + XMLTools.encodeXML(party.getID()) + ""; } else if ((party.getGlobalIDScheme() != null) && (party.getGlobalID() != null)) { - xml = xml + "" + xml += "" + XMLTools.encodeXML(party.getGlobalID()) + ""; } xml += "" + XMLTools.encodeXML(party.getName()) + ""; @@ -138,31 +138,31 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { } if ((party.getContact() != null) && (isSender || profile == Profiles.getByName("Extended") || profile == Profiles.getByName("XRechnung"))) { - xml = xml + ""; + xml += ""; if (party.getContact().getName() != null) { - xml = xml + "" + XMLTools.encodeXML(party.getContact().getName()) + xml += "" + XMLTools.encodeXML(party.getContact().getName()) + ""; } if (party.getContact().getPhone() != null) { - xml = xml + "" + xml += "" + XMLTools.encodeXML(party.getContact().getPhone()) + "" + ""; } if ((party.getContact().getFax() != null) && (profile == Profiles.getByName("Extended"))) { - xml = xml + "" + xml += "" + XMLTools.encodeXML(party.getContact().getFax()) + "" + ""; } if (party.getContact().getEMail() != null) { - xml = xml + "" + xml += "" + XMLTools.encodeXML(party.getContact().getEMail()) + "" + ""; } - xml = xml + ""; + xml += ""; } xml += "" @@ -252,20 +252,20 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { if (trans.getOwnOrganisationFullPlaintextInfo() != null) { senderReg = "" + XMLTools.encodeXML(trans.getOwnOrganisationFullPlaintextInfo()) + "" - + "REG\n"; + + "REG"; } String rebateAgreement = ""; if (trans.rebateAgreementExists()) { - rebateAgreement = "\n" + rebateAgreement = "" + "Es bestehen Rabatt- und Bonusvereinbarungen." - + "AAK\n"; + + "AAK"; } String subjectNote = ""; if (trans.getSubjectNote() != null) { - subjectNote = "\n" + subjectNote = "" + XMLTools.encodeXML(trans.getSubjectNote()) + "" + ""; } @@ -327,7 +327,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { } } final LineCalculator lc = new LineCalculator(currentItem); - xml = xml + "" + + xml += "" + "" + "" + lineID + "" + notes @@ -336,11 +336,11 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { + ""; // + " 4012345001235" if (currentItem.getProduct().getSellerAssignedID() != null) { - xml = xml + "" + xml += "" + XMLTools.encodeXML(currentItem.getProduct().getSellerAssignedID()) + ""; } if (currentItem.getProduct().getBuyerAssignedID() != null) { - xml = xml + "" + xml += "" + XMLTools.encodeXML(currentItem.getProduct().getBuyerAssignedID()) + ""; } String allowanceChargeStr = ""; @@ -357,7 +357,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { } - xml = xml + "" + XMLTools.encodeXML(currentItem.getProduct().getName()) + "" + xml += "" + XMLTools.encodeXML(currentItem.getProduct().getName()) + "" + "" + XMLTools.encodeXML(currentItem.getProduct().getDescription()) + "" + "" @@ -365,7 +365,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { + ""; if (currentItem.getReferencedDocuments() != null) { for (final IReferencedDocument currentReferencedDocument : currentItem.getReferencedDocuments()) { - xml = xml + "" + + xml += "" + "" + XMLTools.encodeXML(currentReferencedDocument.getIssuerAssignedID()) + "" + "" + XMLTools.encodeXML(currentReferencedDocument.getTypeCode()) + "" + "" + XMLTools.encodeXML(currentReferencedDocument.getReferenceTypeCode()) + "" + @@ -376,12 +376,12 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { } if (currentItem.getBuyerOrderReferencedDocumentLineID() != null) { - xml = xml + " \n" + xml += " " + "" + XMLTools.encodeXML(currentItem.getBuyerOrderReferencedDocumentLineID()) + "" + ""; } - xml = xml + "" + xml += "" + "" + priceFormat(lc.getPriceGross()) + "" //currencyID=\"EUR\" + "" + quantityFormat(currentItem.getBasisQuantity()) + "" + "" + "" - + "" + "" + quantityFormat(currentItem.getQuantity()) + "" @@ -410,41 +409,39 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { + "VAT" + exemptionReason + "" + currentItem.getProduct().getTaxCategoryCode() + "" - + "" + vatFormat(currentItem.getProduct().getVATPercent()) + "" + ""; if ((currentItem.getDetailedDeliveryPeriodFrom() != null) || (currentItem.getDetailedDeliveryPeriodTo() != null)) { - xml = xml + ""; + xml += ""; if (currentItem.getDetailedDeliveryPeriodFrom() != null) { - xml = xml + "" + DATE.udtFormat(currentItem.getDetailedDeliveryPeriodFrom()) + ""; + xml += "" + DATE.udtFormat(currentItem.getDetailedDeliveryPeriodFrom()) + ""; } if (currentItem.getDetailedDeliveryPeriodTo() != null) { - xml = xml + "" + DATE.udtFormat(currentItem.getDetailedDeliveryPeriodTo()) + ""; + xml += "" + DATE.udtFormat(currentItem.getDetailedDeliveryPeriodTo()) + ""; } - xml = xml + ""; - + xml += ""; } - xml = xml + "" + xml += "" + "" + currencyFormat(lc.getItemTotalNetAmount()) + "" // currencyID=\"EUR\" + ""; if (currentItem.getAdditionalReferencedDocumentID() != null) { - xml = xml + "" + currentItem.getAdditionalReferencedDocumentID() + "130"; + xml += "" + currentItem.getAdditionalReferencedDocumentID() + "130"; } - xml = xml + "" + xml += "" + ""; } - xml = xml + ""; + xml += ""; if (trans.getReferenceNumber() != null) { - xml = xml + "" + XMLTools.encodeXML(trans.getReferenceNumber()) + ""; + xml += "" + XMLTools.encodeXML(trans.getReferenceNumber()) + ""; } - xml = xml + "" + xml += "" + getTradePartyAsXML(trans.getSender(), true, false) + "" + ""; @@ -455,19 +452,19 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { xml += ""; if (trans.getSellerOrderReferencedDocumentID() != null) { - xml = xml + " " + xml += " " + " " + XMLTools.encodeXML(trans.getSellerOrderReferencedDocumentID()) + "" + " "; } if (trans.getBuyerOrderReferencedDocumentID() != null) { - xml = xml + " " + xml += " " + " " + XMLTools.encodeXML(trans.getBuyerOrderReferencedDocumentID()) + "" + " "; } if (trans.getContractReferencedDocument() != null) { - xml = xml + " " + xml += " " + " " + XMLTools.encodeXML(trans.getContractReferencedDocument()) + "" + " "; @@ -477,7 +474,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { if (trans.getAdditionalReferencedDocuments() != null) { for (final FileAttachment f : trans.getAdditionalReferencedDocuments()) { final String documentContent = new String(Base64.getEncoder().encodeToString(f.getData())); - xml = xml + " " + xml += " " + " " + f.getFilename() + "" + " 916" + " " + f.getDescription() + "" @@ -488,7 +485,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { } if (trans.getSpecifiedProcuringProjectID() != null) { - xml = xml + " " + xml += " " + " " + XMLTools.encodeXML(trans.getSpecifiedProcuringProjectID()) + ""; if (trans.getSpecifiedProcuringProjectName() != null) { @@ -496,7 +493,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { } xml += " "; } - xml = xml + "" + xml += "" + ""; if (this.trans.getDeliveryAddress() != null) { xml += "" + @@ -526,7 +523,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { xml += ""; } - xml += " \n " + xml += " " + " " + XMLTools.encodeXML(trans.getNumber()) + "" + " " + trans.getCurrency() + ""; @@ -566,18 +563,18 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { + "" + currencyFormat(amount.getBasis()) + "" // currencyID=\"EUR\" + "" + amountCategoryCode + "" + "" - + vatFormat(currentTaxPercent) + "\n"; + + vatFormat(currentTaxPercent) + ""; } } if ((trans.getDetailedDeliveryPeriodFrom() != null) || (trans.getDetailedDeliveryPeriodTo() != null)) { - xml = xml + ""; + xml += ""; if (trans.getDetailedDeliveryPeriodFrom() != null) { - xml = xml + "" + DATE.udtFormat(trans.getDetailedDeliveryPeriodFrom()) + ""; + xml += "" + DATE.udtFormat(trans.getDetailedDeliveryPeriodFrom()) + ""; } if (trans.getDetailedDeliveryPeriodTo() != null) { - xml = xml + "" + DATE.udtFormat(trans.getDetailedDeliveryPeriodTo()) + ""; + xml += "" + DATE.udtFormat(trans.getDetailedDeliveryPeriodTo()) + ""; } - xml = xml + ""; + xml += ""; } @@ -586,51 +583,47 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { for (final BigDecimal currentTaxPercent : VATPercentAmountMap.keySet()) { if (calc.getChargesForPercent(currentTaxPercent).compareTo(BigDecimal.ZERO) != 0) { - - - xml = xml + " " + - " " + - " true" + - " " + - " " + currencyFormat(calc.getChargesForPercent(currentTaxPercent)) + "" + - " " + XMLTools.encodeXML(calc.getChargeReasonForPercent(currentTaxPercent)) + "" + - " " + - " VAT" + - " " + VATPercentAmountMap.get(currentTaxPercent).getCategoryCode() + "" + - " " + vatFormat(currentTaxPercent) + "" + - " " + - " \n"; - + xml += " " + + "" + + "true" + + "" + + "" + currencyFormat(calc.getChargesForPercent(currentTaxPercent)) + "" + + "" + XMLTools.encodeXML(calc.getChargeReasonForPercent(currentTaxPercent)) + "" + + "" + + "VAT" + + "" + VATPercentAmountMap.get(currentTaxPercent).getCategoryCode() + "" + + "" + vatFormat(currentTaxPercent) + "" + + "" + + " "; } } - } if ((trans.getZFAllowances() != null) && (trans.getZFAllowances().length > 0)) { for (final BigDecimal currentTaxPercent : VATPercentAmountMap.keySet()) { if (calc.getAllowancesForPercent(currentTaxPercent).compareTo(BigDecimal.ZERO) != 0) { - xml = xml + " " + - " " + - " false" + - " " + - " " + currencyFormat(calc.getAllowancesForPercent(currentTaxPercent)) + "" + - " " + XMLTools.encodeXML(calc.getAllowanceReasonForPercent(currentTaxPercent)) + "" + - " " + - " VAT" + - " " + VATPercentAmountMap.get(currentTaxPercent).getCategoryCode() + "" + - " " + vatFormat(currentTaxPercent) + "" + - " " + - " \n"; + xml += "" + + "" + + "false" + + "" + + "" + currencyFormat(calc.getAllowancesForPercent(currentTaxPercent)) + "" + + "" + XMLTools.encodeXML(calc.getAllowanceReasonForPercent(currentTaxPercent)) + "" + + "" + + "VAT" + + "" + VATPercentAmountMap.get(currentTaxPercent).getCategoryCode() + "" + + "" + vatFormat(currentTaxPercent) + "" + + "" + + " "; } } } if ((trans.getPaymentTerms() == null) && ((paymentTermsDescription != null) || (trans.getTradeSettlement() != null) || (hasDueDate))) { - xml = xml + ""; + xml += ""; if (paymentTermsDescription != null) { - xml = xml + "" + paymentTermsDescription + ""; + xml += "" + paymentTermsDescription + ""; } if (trans.getTradeSettlement() != null) { @@ -642,14 +635,14 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { } if (hasDueDate && (trans.getDueDate() != null)) { - xml = xml + "" // $NON-NLS-2$ + xml += "" // $NON-NLS-2$ + DATE.udtFormat(trans.getDueDate()) + "";// 20130704 } - xml = xml + ""; + xml += ""; } else { - xml = xml + buildPaymentTermsXml(); + xml += buildPaymentTermsXml(); } @@ -657,7 +650,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { final String chargesTotalLine = "" + currencyFormat(calc.getChargesForPercent(null)) + ""; - xml = xml + "" + xml += "" + "" + currencyFormat(calc.getTotal()) + "" + chargesTotalLine + allowanceTotalLine @@ -673,7 +666,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { + "" + currencyFormat(calc.getGrandTotal().subtract(calc.getTotalPrepaid())) + "" + ""; if (trans.getInvoiceReferencedDocumentID() != null) { - xml = xml + " " + xml += " " + " " + XMLTools.encodeXML(trans.getInvoiceReferencedDocumentID()) + ""; if (trans.getInvoiceReferencedIssueDate() != null) { @@ -684,7 +677,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { xml += " "; } - xml = xml + ""; + xml += ""; // + " \n" // + " \n" // + " \n" @@ -694,7 +687,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { // + " \n" // + " \n"; - xml = xml + "" + xml += "" + ""; final byte[] zugferdRaw;