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

Merge branch 'ZUGFeRD:master' into fix-log-visualization

Browse Source
This commit is contained in:
Adrian-Devries
2025-01-09 11:37:46 +01:00
committed by GitHub
parent f10798172d 1605d1e2f6
commit cc8defdc9f
3 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java
View File

@@ -310,16 +310,7 @@ public class ZUGFeRDImporter extends ZUGFeRDInvoiceImporter {
* @return the referred document * @return the referred document
*/ */
public String getReference() { public String getReference() {
try { return importedInvoice.getReferenceNumber();
if (getVersion() == 1) {
return extractString("//*[local-name() = 'ApplicableSupplyChainTradeAgreement']/*[local-name() = 'BuyerReference']");
} else {
return extractString("//*[local-name() = 'ApplicableHeaderTradeAgreement']/*[local-name() = 'BuyerReference']");
}
} catch (final Exception e) {
// Exception was already logged
return "";
}
} }

10
library/src/test/java/org/mustangproject/ZUGFeRD/ZF2EdgeTest.java
View File

@@ -274,16 +274,6 @@ public class ZF2EdgeTest extends MustangReaderTestCase {
return "123"; return "123";
} }
@Override
public String getPaymentMeansCode() {
return "42";
}
@Override
public String getPaymentMeansInformation() {
return "Überweisung";
}
/** /**
* Create the test case * Create the test case
* *

1
library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java
View File

@@ -277,6 +277,7 @@ public class ZF2PushTest extends TestCase {
assertEquals("EUR", zi.getInvoiceCurrencyCode()); assertEquals("EUR", zi.getInvoiceCurrencyCode());
assertTrue(zi.getUTF8().contains("0911623562")); // fax number assertTrue(zi.getUTF8().contains("0911623562")); // fax number
assertTrue(zi.getUTF8().contains("ABK"));
// Reading ZUGFeRD // Reading ZUGFeRD
assertEquals("18.33", zi.getAmount()); assertEquals("18.33", zi.getAmount());