From b2e246d3a0ffad226e35f5d6989bcfd897b50d53 Mon Sep 17 00:00:00 2001 From: Sebastian Sieber Date: Thu, 4 Mar 2021 09:57:39 +0100 Subject: [PATCH] Add methods to add SpecifiedProcuringProject --- .../main/java/org/mustangproject/Invoice.java | 26 ++++++++++++++++++- .../ZUGFeRD/IExportableTransaction.java | 8 ++++++ .../ZUGFeRD/ZUGFeRD2PullProvider.java | 9 +++++++ 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/library/src/main/java/org/mustangproject/Invoice.java b/library/src/main/java/org/mustangproject/Invoice.java index 9613ea04..a99752e4 100644 --- a/library/src/main/java/org/mustangproject/Invoice.java +++ b/library/src/main/java/org/mustangproject/Invoice.java @@ -49,7 +49,12 @@ public class Invoice implements IExportableTransaction { protected ArrayList Allowances = new ArrayList<>(), Charges = new ArrayList<>(), LogisticsServiceCharges = new ArrayList<>(); protected IZUGFeRDPaymentTerms paymentTerms = null; - private Date invoiceReferencedIssueDate; + private Date invoiceReferencedIssueDate; + private String specifiedProcuringProjectID = null; + + + + private String specifiedProcuringProjectName = null; public Invoice() { ZFItems = new ArrayList<>(); @@ -647,4 +652,23 @@ public class Invoice implements IExportableTransaction { return this; } + @Override + public String getSpecifiedProcuringProjectID() { + return specifiedProcuringProjectID; + } + + public Invoice setSpecifiedProcuringProjectID(String specifiedProcuringProjectID) { + this.specifiedProcuringProjectID = specifiedProcuringProjectID; + return this; + } + + @Override + public String getSpecifiedProcuringProjectName() { + return specifiedProcuringProjectName; + } + + public Invoice setSpecifiedProcuringProjectName(String specifiedProcuringProjectName) { + this.specifiedProcuringProjectName = specifiedProcuringProjectName; + return this; + } } diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/IExportableTransaction.java b/library/src/main/java/org/mustangproject/ZUGFeRD/IExportableTransaction.java index 8225a71d..1ce056e6 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/IExportableTransaction.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/IExportableTransaction.java @@ -489,4 +489,12 @@ public interface IExportableTransaction { default String[] getNotes() { return null; } + + default String getSpecifiedProcuringProjectName(){ + return null; + } + + default String getSpecifiedProcuringProjectID(){ + return null; + } } diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java index aef5f40c..fb268436 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java @@ -457,6 +457,15 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { } } + if (trans.getSpecifiedProcuringProjectID() != null) { + xml = xml + " \n" + + " " + + XMLTools.encodeXML(trans.getSpecifiedProcuringProjectID()) + "\n"; + if(trans.getSpecifiedProcuringProjectName()!= null) { + xml += " " + XMLTools.encodeXML(trans.getSpecifiedProcuringProjectName()) + "\n"; + } + xml += " \n"; + } xml = xml + " \n" + " \n"; if (this.trans.getDeliveryAddress() != null) {