diff --git a/History.md b/History.md index 6f412bce..a22e4f4f 100644 --- a/History.md +++ b/History.md @@ -2,6 +2,8 @@ ======= - PR #217 seller order referenced document +- only deploy library and validator to maven central, not core nor cli +- a correction should reference the original invoice via invoiceReferencedDocument, not buyerOrderReferencedDocument 2.1.0 ======= diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDTradeSettlementPayment.java b/library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDTradeSettlementPayment.java index 65561315..0bc6a335 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDTradeSettlementPayment.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDTradeSettlementPayment.java @@ -63,7 +63,7 @@ public interface IZUGFeRDTradeSettlementPayment extends IZUGFeRDTradeSettlement default String getSettlementXML() { String accountNameStr=""; if (getAccountName()!=null) { - accountNameStr="" + XMLTools.encodeXML(getAccountName()) + "\n"; //$NON-NLS-2$ + accountNameStr="" + XMLTools.encodeXML(getAccountName()) + "\n"; } @@ -71,13 +71,13 @@ public interface IZUGFeRDTradeSettlementPayment extends IZUGFeRDTradeSettlement + " 42\n" + " Bank transfer\n" + " \n" - + " " + XMLTools.encodeXML(getOwnIBAN()) + "\n"; //$NON-NLS-2$ + + " " + XMLTools.encodeXML(getOwnIBAN()) + "\n"; xml+= accountNameStr; xml+= " \n" + " \n" - + " " + XMLTools.encodeXML(getOwnBIC()) + "\n" //$NON-NLS-2$ + + " " + XMLTools.encodeXML(getOwnBIC()) + "\n" // + " "+trans.getOwnBankName()+"\n" - // //$NON-NLS-2$ + // + " \n" + " \n"; return xml; diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java index 325cc9d9..8e035e4b 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java @@ -164,7 +164,7 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLPr + " \n" + " \n" + " \n" - + " " + XMLTools.encodeXML(trans.getNumber()) + "\n" //$NON-NLS-2$ + + " " + XMLTools.encodeXML(trans.getNumber()) + "\n" + " RECHNUNG\n" + " " + typecode + "\n" + " " @@ -236,8 +236,8 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLPr * " 2013-51112\n" + * " \n" */ - + " \n" + " \n" //$NON-NLS-2$ - + " " + XMLTools.encodeXML(trans.getNumber()) + "\n" //$NON-NLS-2$ + + " \n" + " \n" + + " " + XMLTools.encodeXML(trans.getNumber()) + "\n" + " " + trans.getCurrency() + "\n"; if (trans.getTradeSettlementPayment() != null) { @@ -271,7 +271,7 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLPr + " " + currencyFormat(amount.getBasis()) + "\n" // currencyID=\"EUR\" + " " + amount.getCategoryCode() + "\n" + " " + vatFormat(currentTaxPercent) - + "\n" + " \n"; //$NON-NLS-2$ + + "\n" + " \n"; } } @@ -300,23 +300,23 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLPr } xml = xml + " \n" - + " " + currencyFormat(calc.getTotal()) + "\n" //$NON-NLS-2$ + + " " + currencyFormat(calc.getTotal()) + "\n" // currencyID=\"EUR\" + " 0.00\n" // currencyID=\"EUR\" + " 0.00\n" // // currencyID=\"EUR\" // + " 5.80\n" // + " 14.73\n" - + " " + currencyFormat(calc.getTotal()) + "\n" //$NON-NLS-2$ + + " " + currencyFormat(calc.getTotal()) + "\n" // // // currencyID=\"EUR\" + " " + currencyFormat(calc.getGrandTotal().subtract(calc.getTotal())) + "\n" - + " " + currencyFormat(calc.getGrandTotal()) + "\n" //$NON-NLS-2$ + + " " + currencyFormat(calc.getGrandTotal()) + "\n" // // // currencyID=\"EUR\" + " " + currencyFormat(calc.getTotalPrepaid()) + "\n" - + " " + currencyFormat(calc.getGrandTotal().subtract(calc.getTotalPrepaid())) + "\n" //$NON-NLS-2$ + + " " + currencyFormat(calc.getGrandTotal().subtract(calc.getTotalPrepaid())) + "\n" // // // currencyID=\"EUR\" + " \n" @@ -334,7 +334,7 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLPr final LineCalculator lc = new LineCalculator(currentItem); xml = xml + " \n" + " \n" - + " " + lineID + "\n" //$NON-NLS-2$ + + " " + lineID + "\n" + " \n" + " \n" + " \n" @@ -358,7 +358,7 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLPr + " \n" - + " " //$NON-NLS-2$ + + " " + quantityFormat(currentItem.getQuantity()) + "\n" + " \n" + " \n" @@ -389,7 +389,7 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLPr xml = xml + " " + XMLTools.encodeXML(currentItem.getProduct().getBuyerAssignedID()) + "\n"; } - xml = xml + " " + XMLTools.encodeXML(currentItem.getProduct().getName()) + "\n" //$NON-NLS-2$ + xml = xml + " " + XMLTools.encodeXML(currentItem.getProduct().getName()) + "\n" + " " + XMLTools.encodeXML(currentItem.getProduct().getDescription()) + "\n" + " \n" diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java index 3d8b94e9..4883a314 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java @@ -127,7 +127,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { xml = xml + " " + XMLTools.encodeXML(party.getGlobalID()) + "\n"; } - xml += " " + XMLTools.encodeXML(party.getName()) + "\n"; //$NON-NLS-2$ + xml += " " + XMLTools.encodeXML(party.getName()) + "\n"; if ((party.getContact() != null) && (isSender || profile == Profiles.getByName("Extended"))) { xml = xml + "\n" + " " + XMLTools.encodeXML(party.getContact().getName()) @@ -285,7 +285,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { + " \n" + " \n" + " \n" - + " " + XMLTools.encodeXML(trans.getNumber()) + "\n" //$NON-NLS-2$ + + " " + XMLTools.encodeXML(trans.getNumber()) + "\n" // + " RECHNUNG\n" // + " 380\n" + " " + typecode + "\n" @@ -314,7 +314,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { final LineCalculator lc = new LineCalculator(currentItem); xml = xml + " \n" + " \n" - + " " + lineID + "\n" //$NON-NLS-2$ + + " " + lineID + "\n" + notes + " \n" @@ -342,7 +342,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { } - xml = xml + " " + XMLTools.encodeXML(currentItem.getProduct().getName()) + "\n" //$NON-NLS-2$ + xml = xml + " " + XMLTools.encodeXML(currentItem.getProduct().getName()) + "\n" + " " + XMLTools.encodeXML(currentItem.getProduct().getDescription()) + "\n" + " \n" @@ -369,7 +369,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { + " \n" + " \n" - + " " //$NON-NLS-2$ + + " " + quantityFormat(currentItem.getQuantity()) + "\n" + " \n" + " \n" @@ -479,8 +479,8 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { * " 2013-51112\n" + * " \n" */ - + " \n" + " \n" //$NON-NLS-2$ - + " " + XMLTools.encodeXML(trans.getNumber()) + "\n" //$NON-NLS-2$ + + " \n" + " \n" + + " " + XMLTools.encodeXML(trans.getNumber()) + "\n" + " " + trans.getCurrency() + "\n"; if (trans.getTradeSettlementPayment() != null) { @@ -517,7 +517,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { + " " + currencyFormat(amount.getBasis()) + "\n" // currencyID=\"EUR\" + " " + amount.getCategoryCode() + "\n" + " " + vatFormat(currentTaxPercent) - + "\n" + " \n"; //$NON-NLS-2$ + + "\n" + " \n"; } } @@ -578,10 +578,10 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { } - if ((trans.getPaymentTerms() == null)&&((paymentTermsDescription!=null)||(trans.getTradeSettlement()!=null)||(hasDueDate))) { + if ((trans.getPaymentTerms() == null) && ((paymentTermsDescription != null) || (trans.getTradeSettlement() != null) || (hasDueDate))) { xml = xml + "\n"; - if (paymentTermsDescription!=null) { + if (paymentTermsDescription != null) { xml = xml + "" + paymentTermsDescription + "\n"; } @@ -662,7 +662,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { private String buildPaymentTermsXml() { final IZUGFeRDPaymentTerms paymentTerms = trans.getPaymentTerms(); - if (paymentTerms==null) { + if (paymentTerms == null) { return ""; } String paymentTermsXml = ""; diff --git a/validator/src/main/java/org/mustangproject/validator/SchematronPipeline.java b/validator/src/main/java/org/mustangproject/validator/SchematronPipeline.java index 25357634..bda4b7a2 100644 --- a/validator/src/main/java/org/mustangproject/validator/SchematronPipeline.java +++ b/validator/src/main/java/org/mustangproject/validator/SchematronPipeline.java @@ -39,7 +39,7 @@ public class SchematronPipeline { try { return factory.newTemplates(new StreamSource(cl.getResourceAsStream(transName))); } catch (TransformerConfigurationException excep) { - throw new IllegalStateException("Policy Schematron transformer XSL " + transName + " not found.", excep); //$NON-NLS-2$ + throw new IllegalStateException("Policy Schematron transformer XSL " + transName + " not found.", excep); } }