louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ZUGFeRD:master' into master

Browse Source
This commit is contained in:
Kemal Taskin
2025-01-09 23:31:13 +01:00
committed by GitHub
parent e88c4e515b 404598bb84
commit ee27ff270a
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
History.md
View File

@@ -8,7 +8,8 @@ allow to add includedNotes with type
- 631 multiple invoice referenced documents - 631 multiple invoice referenced documents
- 629 - 629
- 630 #296 #565 - 630 #296 #565
- - 657
- 658
2.15.2 2.15.2
======= =======

4
library/src/main/java/org/mustangproject/Contact.java
View File

@@ -114,7 +114,9 @@ public class Contact implements IZUGFeRDExportableContact {
if (currentItemNode.getLocalName() != null) { if (currentItemNode.getLocalName() != null) {
if (currentItemNode.getLocalName().equals("PersonName")/*CII*/||currentItemNode.getLocalName().equals("Name")/*UBL*/) { if (currentItemNode.getLocalName().equals("PersonName")/*CII*/||currentItemNode.getLocalName().equals("Name")/*UBL*/) {
setName(currentItemNode.getFirstChild().getNodeValue()); if (currentItemNode.getFirstChild()!=null) {
setName(currentItemNode.getFirstChild().getNodeValue());
}
} }
if (currentItemNode.getLocalName().equals("TelephoneUniversalCommunication")) { /*CII*/ if (currentItemNode.getLocalName().equals("TelephoneUniversalCommunication")) { /*CII*/
NodeList tel = currentItemNode.getChildNodes(); NodeList tel = currentItemNode.getChildNodes();

2
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
View File

@@ -737,7 +737,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
} }
if ((trans.getZFCharges() != null) && (trans.getZFCharges().length > 0)) { if ((trans.getZFCharges() != null) && (trans.getZFCharges().length > 0)) {
if (profile == Profiles.getByName("XRechnung")) { if ((profile == Profiles.getByName("XRechnung")) || (profile == Profiles.getByName("EN16931")) || (profile == Profiles.getByName("EXTENDED"))) {
for (IZUGFeRDAllowanceCharge charge : trans.getZFCharges()) { for (IZUGFeRDAllowanceCharge charge : trans.getZFCharges()) {
xml += "<ram:SpecifiedTradeAllowanceCharge>" + xml += "<ram:SpecifiedTradeAllowanceCharge>" +
"<ram:ChargeIndicator>" + "<ram:ChargeIndicator>" +