Merge branch 'ZUGFeRD:master' into master
This commit is contained in:
@@ -182,7 +182,6 @@ public class Item implements IZUGFeRDExportableItem {
|
||||
icnm.getAllNodes("AdditionalReferencedDocument").map(ReferencedDocument::fromNode).forEach(this::addAdditionalReference);
|
||||
});
|
||||
|
||||
itemMap.getAsString("Note").ifPresent(this::addNote);
|
||||
itemMap.getAsNodeMap("AssociatedDocumentLineDocument").ifPresent(adld -> {
|
||||
List<IncludedNote> includedNotes = new ArrayList<>();
|
||||
adld.getAllNodes("IncludedNote").forEach(item -> {
|
||||
@@ -233,6 +232,11 @@ public class Item implements IZUGFeRDExportableItem {
|
||||
return lineTotalAmount;
|
||||
}
|
||||
|
||||
public Item setNotesWithSubjectCode(List<IncludedNote> theList) {
|
||||
includedNotes=theList;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* should only be set by calculator classes or maybe when reading from XML
|
||||
*
|
||||
@@ -378,6 +382,13 @@ public class Item implements IZUGFeRDExportableItem {
|
||||
notes = new ArrayList<>();
|
||||
}
|
||||
notes.add(text);
|
||||
|
||||
if (includedNotes == null) {
|
||||
includedNotes = new ArrayList<>();
|
||||
}
|
||||
includedNotes.add(IncludedNote.unspecifiedNote(text));
|
||||
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user