diff --git a/History.md b/History.md
index 49efca87..d3e4e63c 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,8 @@
+
+2.11.0
+=======
+2024-05-15
+
- EN16931 validation 1.3.12 codelists v11 #357
- Fonts removed #358
- xrechnungimporter to read from filename, inputstream
@@ -9,6 +14,8 @@
- upgrade ph-schematron from 6.3.3 to 8
- support inputstreams https://github.com/ZUGFeRD/mustangproject/pull/379
- #314 ZUGFeRDInvoiceImporter additional constructur
+- add XML cash discount (thisn was previously only possible for XRechnung, not ZF Extended, using a manually encoded setPaymentTermDescription)
+- surrendered to XRechnung 3 compromises, e.g. no longer put gross amount if it does not deviate from net
2.10.0
=======
diff --git a/doc/development_documentation.md b/doc/development_documentation.md
index e84890a4..0e86ad8e 100644
--- a/doc/development_documentation.md
+++ b/doc/development_documentation.md
@@ -35,7 +35,7 @@ If e.g. new elements or attributes are added, they are often added
* in the object so that a developer can use them
* in the interface so that a old fashioned developer could use them as well
* in the pullprovider so that it actually finds it's way into the XML
-* in at least one test, after the test has been run this should at least once be
+* in at least one test (the ...edgeTest are supposed to handle edge cases, ~all bells and whistles, maybe it fits there), after the test has been run this should at least once be
* validated. If that works one can start implementing the
* reading part (along with tests), then it needs to be
* documented e.g. on the homepage and
diff --git a/library/src/main/java/org/mustangproject/CashDiscount.java b/library/src/main/java/org/mustangproject/CashDiscount.java
index b88c5517..05c00da3 100644
--- a/library/src/main/java/org/mustangproject/CashDiscount.java
+++ b/library/src/main/java/org/mustangproject/CashDiscount.java
@@ -41,7 +41,7 @@ public class CashDiscount implements IZUGFeRDCashDiscount {
* @return this particular cash discount in proprietary xrechnung format
*/
public String getAsXRechnung() {
- return "#SKONTO#TAGE="+days+"#PROZENT="+XMLTools.nDigitFormat(percent,3)+"#\n";
+ return "#SKONTO#TAGE="+days+"#PROZENT="+XMLTools.nDigitFormat(percent,2)+"#\n";
}
diff --git a/library/src/test/resources/factur-x-vis-ubl.en.html b/library/src/test/resources/factur-x-vis-ubl.en.html
index b081157c..3a22ad90 100644
--- a/library/src/test/resources/factur-x-vis-ubl.en.html
+++ b/library/src/test/resources/factur-x-vis-ubl.en.html
@@ -1 +1 @@
- XRechnung
We accept no liability for the correctness of the data
Buyer Information
Routing ID:
04011000-12345-03
Name:
[Buyer name]
Street / house number:
[Buyer address line 1]
PO Box:
Address Addition:
Postcode:
12345
Place:
[Buyer city]
State/Province:
Country:
DE (Deutschland)
ID:
[Buyer identifier]
ID scheme:
Name:
Phone:
E-mail address:
Seller Information
Company name:
[Seller name]
Street / house number:
[Seller address line 1]
PO Box:
Address Addition:
Code postal:
12345
Place:
[Seller city]
State/Province:
Country code:
DE (Deutschland)
ID:
ID scheme:
Name:
nicht vorhanden
Phone:
+49 1234-5678
E-mail address:
seller@email.de
Invoice details
Seller Information:
123456XX
Invoice date:
4.4.2016
Invoice type:
380 (Commercial invoice)
Currency
EUR (Euro)
Billing period:
from:
to:
Project number:
Contract Number:
Order number:
Order number:
Previous invoices:
Total amounts of the invoice
Line total
netto
314,86
Total discounts
netto
Total charges
netto
Grand total
netto
314,86
VAT amount
22,04
Total VAT
Grand total
brutto
336,90
Amount paid
brutto
rounding amount
brutto
Amount Due
brutto
336,90
Breakdown of VAT at invoice level
VAT category: S (Standard rate)
Grand total
netto
314,86
VAT rate
7%
VAT amount
22,04
Reason for exemption::
ID for the exemption reason::
Payment details
Discount; other payment terms:
Zahlbar sofort ohne Abzug.
Due date:
Code for the means of payment:
58 (SEPA credit transfer)
Means of payment:
Usage:
Card information
Card number:
Card holder:
Direct debit
Mandate Reference No:
IBAN:
Creditor ID:
Transfer
Account holder:
IBAN:
DE75512108001245126199
BIC:
Invoice Comment
Subject:
Comment:
#ADU#Es gelten unsere Allgem. Geschäftsbedingungen, die Sie unter […] finden.
We accept no liability for the correctness of the data
LineZeitschrift [...]
Free text:
Die letzte Lieferung im Rahmen des abgerechneten Abonnements erfolgt in 12/2016 Lieferung erfolgt / erfolgte direkt vom Verlag
Object ID:
Object ID schema:
Order line number:
6171175.1
Account assignment information:
Billing period:
from:
1.1.2016
to:
31.12.2016
Price details
Quantity
1
Unit
XPP (Piece)
Unit price (net)
288,79
Total price (net)
288,79
Discount (net):
Net list price:
Number of units:
Unit of measure code:
VAT:
S (Standard rate)
VAT rate in percent:
7%
Allowances at line level
Charges at invoice line level
Item Information
Name:
Zeitschrift [...]
Description:
Zeitschrift Inland
Part number:
246
Customer's material number:
Article properties:
Item ID:
Item ID schema:
Item classification code:
0721-880X
Identifier to form the schema:
IB (ISBN (International Standard Book Number))
Version for creating the schema:
Country of origin code:
LinePorto + Versandkosten
Free text:
Object ID:
Object ID schema:
Order line number:
Account assignment information:
Billing period:
from:
to:
Price details
Quantity
1
Unit
XPP (Piece)
Unit price (net)
26,07
Total price (net)
26,07
Discount (net):
Net list price:
Number of units:
Unit of measure code:
VAT:
S (Standard rate)
VAT rate in percent:
7%
Allowances at line level
Charges at invoice line level
Item Information
Name:
Porto + Versandkosten
Description:
Part number:
Customer's material number:
Article properties:
Item ID:
Item ID schema:
Item classification code:
Identifier to form the schema:
Version for creating the schema:
Country of origin code:
We accept no liability for the correctness of the data