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

Merge branch 'ZUGFeRD:master' into fix-hyphenation

Browse Source
This commit is contained in:
Adrian-Devries
2025-01-11 21:03:03 +01:00
committed by GitHub
parent d0f5774516 51eb9d5229
commit 017e26c97a
3 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
History.md
View File

@@ -1,21 +1,25 @@
- 639
- 633 2.16.0
-626, =======
-622, 2025-01-10
-356 - #657 allow allowancechargereasoncodes on document level
allow to add includedNotes with type - allow to add includedNotes with type
- - 645 - #356 print version of xml report
- 631 multiple invoice referenced documents - #645 Fix visualization of validation logs
- 629 - #639 Fix invoice calculation if rounding amount is present
- 630 #296 #565 - #633 Bump ch.qos.logback:logback-core from 1.2.13 to 1.5.13
- 657 - #626 Fix minor java issues
- 658 - #622 Fix FOP config
- 648 - #631 multiple invoice referenced documents
- 651 - #629 Visualizing xml
- 652 - #630 Fix issue #296 (Validation-Error: Ungültiger Content wurde beginnend mit Element 'ram:DueDateDateTime' ) (duplicate of #565)
- -620 - #658 prevent nullpointerexception
- 653 - #648 Fix log visualization
- 654 - #651 ZUGFeRDInvoiceImporter: Item-Allowances not imported
- #652 Discount VAT is not subtracted from duepayable
- #620 Fix logback config
- #653 ZF2EdgeTest: methods 'getPaymentMeansCode()' & 'getPaymentMeansInformation()' does not override super methods
- #654 remove wrong test methods
2.15.2 2.15.2
======= =======

2
Mustang-CLI/pom.xml
View File

@@ -40,7 +40,7 @@
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId> <artifactId>logback-core</artifactId>
<version>1.5.13</version> <version>1.5.16</version>
</dependency> </dependency>
<dependency> <dependency>
<!-- This library is needed so that logback stderr output is sent to, well, stderr, otherwise it lands in stdout --> <!-- This library is needed so that logback stderr output is sent to, well, stderr, otherwise it lands in stdout -->

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

@@ -478,8 +478,8 @@ public class ZF2PushTest extends TestCase {
.addItem(new Item(new Product("Testprodukt", "", "C62", new BigDecimal(19)), amount, new BigDecimal(1.0))) .addItem(new Item(new Product("Testprodukt", "", "C62", new BigDecimal(19)), amount, new BigDecimal(1.0)))
.addItem(new Item(new Product("Testprodukt", "", "C62", new BigDecimal(19)), amount, new BigDecimal(1.0))) .addItem(new Item(new Product("Testprodukt", "", "C62", new BigDecimal(19)), amount, new BigDecimal(1.0)))
.addItem(new Item(new Product("Testprodukt", "", "C62", new BigDecimal(19)), amount, new BigDecimal(1.0))) .addItem(new Item(new Product("Testprodukt", "", "C62", new BigDecimal(19)), amount, new BigDecimal(1.0)))
.addCharge(new Charge(new BigDecimal(0.5)).setTaxPercent(new BigDecimal(19))) .addCharge(new Charge(new BigDecimal(0.5)).setTaxPercent(new BigDecimal(19)).setReasonCode("ABK"))
.addAllowance(new Allowance(new BigDecimal(0.2)).setTaxPercent(new BigDecimal(19))) .addAllowance(new Allowance(new BigDecimal(0.2)).setTaxPercent(new BigDecimal(19)).setReasonCode("ABK"))
); );
String theXML = new String(ze.getProvider().getXML()); String theXML = new String(ze.getProvider().getXML());
assertTrue(theXML.contains("<rsm:CrossIndustryInvoice")); assertTrue(theXML.contains("<rsm:CrossIndustryInvoice"));