Charges on item level #568
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Adds support for allowances and charges on item level Fixes ZUGFeRD#561 Previously charges/allowances on item level where handled same as header level
InnuceEAN
commented
Nov 21, 2024
| // now handling base64 encoded attachments AttachmentBinaryObject=CII, EmbeddedDocumentBinaryObject=UBL | ||
| xpr = xpath.compile("//*[local-name()=\"AttachmentBinaryObject\"]|//*[local-name()=\"EmbeddedDocumentBinaryObject\"]"); | ||
| NodeList attachmentNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET); | ||
| for (int i = 0; i < attachmentNodes.getLength(); i++) { |
There was a problem hiding this comment.
basically moved everything below to new method parseCharge() without much changes. Ignoring whitespaces should make this diff easier to parse (?w=1)
InnuceEAN
commented
Nov 21, 2024
| // be read, | ||
| // so the invoice remains arithmetically correct | ||
| // -> parse document level charges+allowances | ||
| xpr = xpath.compile("//*[local-name()=\"ApplicableHeaderTradeSettlement\"]//*[local-name()=\"SpecifiedTradeAllowanceCharge\"]"); |
There was a problem hiding this comment.
Added ApplicableHeaderTradeSettlement because we only want to have header level charges here
InnuceEAN
commented
Nov 21, 2024
| reason = XMLTools.trimOrNull(chargeNodeChilds.item(chargeChildIndex)); | ||
| } else if (chargeChildName.equals("ReasonCode")) { | ||
| reasonCode = XMLTools.trimOrNull(chargeNodeChilds.item(chargeChildIndex)); | ||
| } else if (isHeader && chargeChildName.equals("CategoryTradeTax")) { |
There was a problem hiding this comment.
Added condition isHeader
InnuceEAN
commented
Nov 21, 2024
|
|
||
| if (zpp.getZFItems() != null && zpp.getZFItems().length > 0) { |
There was a problem hiding this comment.
This was previously only done for if (nodes.getLength() != 0)
zfItems.length > 0 should basically check the same
Add missing @test Annotation
InnuceEAN
force-pushed
the
position-allowance
branch
from
af6563c to
34afa6a
Compare
|
@jstaerk Do you mind sharing why you have rejected this PR until now? What can I do to improve this? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds support for allowances and charges on item level
Fixes #561
Previously charges/allowances on item level where handled same as header level