diff --git a/README.md b/README.md
index 237bf49..e84b4d7 100644
--- a/README.md
+++ b/README.md
@@ -94,6 +94,8 @@ CII to UBL Converter for EN 16931 invoices
# News and noteworthy
+* v2.2.6 - 2024-12-23
+ * Supporting all values of the UNTDID 4461 code list. See [issue #34](https://github.com/phax/en16931-cii2ubl/pull/34) - thx @shenazz
* v2.2.5 - 2024-10-22
* Fixed the automatic module name. See [issue #32](https://github.com/phax/en16931-cii2ubl/pull/32) - thx @toherrmann
* v2.2.4 - 2024-06-17
diff --git a/en16931-cii2ubl/generated/toubl21/issues/issue34-ubl.xml b/en16931-cii2ubl/generated/toubl21/issues/issue34-ubl.xml
new file mode 100644
index 0000000..e21351b
--- /dev/null
+++ b/en16931-cii2ubl/generated/toubl21/issues/issue34-ubl.xml
@@ -0,0 +1,438 @@
+
+
+ urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0
+ urn:fdc:peppol.eu:2017:poacc:billing:01:1.0
+ TOSL108
+ 2013-06-30
+ 2013-07-20
+ 380
+ Ordered in our booth at the convention
+ NOK
+ Project cost code 123
+
+ 3
+
+
+
+ SELLER-ORDER-REF1
+
+
+ Contract321
+
+
+ Doc1
+ Timesheet
+
+ SlZCRVJpMHhMalVOQ2lVTkNqRWdNQ0J2WW1vT3k2SlRaWDliY2dSVnhJVkcuLi50Ykxvc0NoVTJYUmY5eGIvb21zY2dUWS9sWEVoVWI=
+
+ http://www.suppliersite.eu/sheet001.html
+
+
+
+
+ 2300000013.PDF
+ PDF
+
+ SlZCRVJpMHhMalVOQ2lVTkNqRWdNQ0J2WW1vT3k2SlRaWDliY2dSVnhJVkcuLi50Ykxvc0NoVTJYUmY5eGIvb21zY2dUWS9sWEVoVWI=
+
+
+
+ test.pdf
+ ein Test Link
+
+
+ https://test.xrechnung-bdr.de/attachments/api/v1/File/...
+
+
+
+
+
+
+ 1238764941386
+
+
+ Main street 34
+ Suite 123
+ Big city
+ 303
+ RegionA
+
+ NO
+
+
+
+ NO123456789MVA
+
+ VAT
+
+
+
+ Salescompany ltd.
+ 123456789
+
+
+ Sales Department
+ 46211230
+ antonio@salescompany.no
+
+
+
+
+
+
+ 3456789012098
+
+
+ Anystreet 8
+ Back door
+ Anytown
+ 101
+ RegionB
+
+ NO
+
+
+
+ NO987654321MVA
+
+ VAT
+
+
+
+ The Buyercompany
+ 987654321
+
+
+ John Doe
+ 5121230
+ john@buyercompany.no
+
+
+
+
+
+ 2298740918237
+
+
+ Ebeneser Scrooge AS
+
+
+
+
+ Tax handling company AS
+
+
+ Regent street
+ Front door
+ Newtown
+ 202
+ RegionC
+
+ NO
+
+
+
+ NO967611265MVA
+
+ VAT
+
+
+
+
+ 2013-06-15
+
+ 6754238987643
+
+ Deliverystreet 2
+ Side door
+ DeliveryCity
+ 523427
+ RegionD
+
+ NO
+
+
+
+
+
+ 10
+ 0003434323213231
+
+
+ 10
+ 0003434323213231
+
+
+ 2 % discount if paid within 2 days
+ Penalty percentage 10% from due date
+
+
+ false
+ 95
+ Promotion discount
+ 100
+
+ S
+ 25
+
+ VAT
+
+
+
+
+ true
+ Freight
+ 100
+
+ S
+ 25
+
+ VAT
+
+
+
+
+ 365.28
+
+ 1460.5
+ 365.13
+
+ S
+ 25
+
+ VAT
+
+
+
+
+ 1
+ 0.15
+
+ S
+ 15
+
+ VAT
+
+
+
+
+ -25
+ 0
+
+ E
+ 0
+ Exempt New Means of Transport
+
+ VAT
+
+
+
+
+
+ 1436.5
+ 1436.5
+ 1801.78
+ 100
+ 100
+ 1000
+ 801.78
+
+
+ 1
+ Scratch on box
+ 1
+ 1273
+ BookingCode001
+
+ 2013-06-01
+ 2013-06-01
+
+
+ 1
+
+
+ false
+ Damage
+ 12
+
+
+ true
+ Testing
+ 12
+
+
+ Processor: Intel Core 2 Duo SU9400 LV (1.4GHz). RAM: 3MB. Screen 1440x900
+ Laptop computer
+
+ JB007
+
+
+ 1234567890128
+
+
+ DE
+
+
+ 65434568
+
+
+ S
+ 25
+
+ VAT
+
+
+
+ Color
+ Black
+
+
+
+ 1273
+ 1498
+
+ false
+ 225
+ 1498
+
+
+
+
+ 2
+ Cover is slightly damaged.
+ -1
+ -3.96
+ BookingCode002
+
+ 5
+
+
+ Returned "Advanced computing" book
+
+ JB008
+
+
+ 1234567890135
+
+
+ 65434567
+
+
+ S
+ 15
+
+ VAT
+
+
+
+
+ 3.96
+ 3.96
+
+
+
+ 3
+ 2
+ 4.96
+ BookingCode003
+
+ 3
+
+
+ "Computing for dummies" book
+
+ JB009
+
+
+ 1234567890142
+
+
+ 65434566
+
+
+ S
+ 15
+
+ VAT
+
+
+
+
+ 2.48
+ 2.75
+
+ false
+ 0.275
+ 2.75
+
+
+
+
+ 4
+ -1
+ -25
+ BookingCode004
+
+ 2
+
+
+ Returned IBM 5150 desktop
+
+ JB010
+
+
+ 1234567890159
+
+
+ 65434565
+
+
+ E
+ 0
+
+ VAT
+
+
+
+
+ 25
+ 25
+
+
+
+ 5
+ 250
+ 187.5
+ BookingCode005
+
+ 4
+
+
+ Network cable
+
+ JB011
+
+
+ 1234567890166
+
+
+ 12344325
+
+
+ S
+ 25
+
+ VAT
+
+
+
+ Type
+ Cat5
+
+
+
+ 0.75
+ 0.75
+
+
+
\ No newline at end of file
diff --git a/en16931-cii2ubl/generated/toubl22/issues/issue34-ubl.xml b/en16931-cii2ubl/generated/toubl22/issues/issue34-ubl.xml
new file mode 100644
index 0000000..e21351b
--- /dev/null
+++ b/en16931-cii2ubl/generated/toubl22/issues/issue34-ubl.xml
@@ -0,0 +1,438 @@
+
+
+ urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0
+ urn:fdc:peppol.eu:2017:poacc:billing:01:1.0
+ TOSL108
+ 2013-06-30
+ 2013-07-20
+ 380
+ Ordered in our booth at the convention
+ NOK
+ Project cost code 123
+
+ 3
+
+
+
+ SELLER-ORDER-REF1
+
+
+ Contract321
+
+
+ Doc1
+ Timesheet
+
+ SlZCRVJpMHhMalVOQ2lVTkNqRWdNQ0J2WW1vT3k2SlRaWDliY2dSVnhJVkcuLi50Ykxvc0NoVTJYUmY5eGIvb21zY2dUWS9sWEVoVWI=
+
+ http://www.suppliersite.eu/sheet001.html
+
+
+
+
+ 2300000013.PDF
+ PDF
+
+ SlZCRVJpMHhMalVOQ2lVTkNqRWdNQ0J2WW1vT3k2SlRaWDliY2dSVnhJVkcuLi50Ykxvc0NoVTJYUmY5eGIvb21zY2dUWS9sWEVoVWI=
+
+
+
+ test.pdf
+ ein Test Link
+
+
+ https://test.xrechnung-bdr.de/attachments/api/v1/File/...
+
+
+
+
+
+
+ 1238764941386
+
+
+ Main street 34
+ Suite 123
+ Big city
+ 303
+ RegionA
+
+ NO
+
+
+
+ NO123456789MVA
+
+ VAT
+
+
+
+ Salescompany ltd.
+ 123456789
+
+
+ Sales Department
+ 46211230
+ antonio@salescompany.no
+
+
+
+
+
+
+ 3456789012098
+
+
+ Anystreet 8
+ Back door
+ Anytown
+ 101
+ RegionB
+
+ NO
+
+
+
+ NO987654321MVA
+
+ VAT
+
+
+
+ The Buyercompany
+ 987654321
+
+
+ John Doe
+ 5121230
+ john@buyercompany.no
+
+
+
+
+
+ 2298740918237
+
+
+ Ebeneser Scrooge AS
+
+
+
+
+ Tax handling company AS
+
+
+ Regent street
+ Front door
+ Newtown
+ 202
+ RegionC
+
+ NO
+
+
+
+ NO967611265MVA
+
+ VAT
+
+
+
+
+ 2013-06-15
+
+ 6754238987643
+
+ Deliverystreet 2
+ Side door
+ DeliveryCity
+ 523427
+ RegionD
+
+ NO
+
+
+
+
+
+ 10
+ 0003434323213231
+
+
+ 10
+ 0003434323213231
+
+
+ 2 % discount if paid within 2 days
+ Penalty percentage 10% from due date
+
+
+ false
+ 95
+ Promotion discount
+ 100
+
+ S
+ 25
+
+ VAT
+
+
+
+
+ true
+ Freight
+ 100
+
+ S
+ 25
+
+ VAT
+
+
+
+
+ 365.28
+
+ 1460.5
+ 365.13
+
+ S
+ 25
+
+ VAT
+
+
+
+
+ 1
+ 0.15
+
+ S
+ 15
+
+ VAT
+
+
+
+
+ -25
+ 0
+
+ E
+ 0
+ Exempt New Means of Transport
+
+ VAT
+
+
+
+
+
+ 1436.5
+ 1436.5
+ 1801.78
+ 100
+ 100
+ 1000
+ 801.78
+
+
+ 1
+ Scratch on box
+ 1
+ 1273
+ BookingCode001
+
+ 2013-06-01
+ 2013-06-01
+
+
+ 1
+
+
+ false
+ Damage
+ 12
+
+
+ true
+ Testing
+ 12
+
+
+ Processor: Intel Core 2 Duo SU9400 LV (1.4GHz). RAM: 3MB. Screen 1440x900
+ Laptop computer
+
+ JB007
+
+
+ 1234567890128
+
+
+ DE
+
+
+ 65434568
+
+
+ S
+ 25
+
+ VAT
+
+
+
+ Color
+ Black
+
+
+
+ 1273
+ 1498
+
+ false
+ 225
+ 1498
+
+
+
+
+ 2
+ Cover is slightly damaged.
+ -1
+ -3.96
+ BookingCode002
+
+ 5
+
+
+ Returned "Advanced computing" book
+
+ JB008
+
+
+ 1234567890135
+
+
+ 65434567
+
+
+ S
+ 15
+
+ VAT
+
+
+
+
+ 3.96
+ 3.96
+
+
+
+ 3
+ 2
+ 4.96
+ BookingCode003
+
+ 3
+
+
+ "Computing for dummies" book
+
+ JB009
+
+
+ 1234567890142
+
+
+ 65434566
+
+
+ S
+ 15
+
+ VAT
+
+
+
+
+ 2.48
+ 2.75
+
+ false
+ 0.275
+ 2.75
+
+
+
+
+ 4
+ -1
+ -25
+ BookingCode004
+
+ 2
+
+
+ Returned IBM 5150 desktop
+
+ JB010
+
+
+ 1234567890159
+
+
+ 65434565
+
+
+ E
+ 0
+
+ VAT
+
+
+
+
+ 25
+ 25
+
+
+
+ 5
+ 250
+ 187.5
+ BookingCode005
+
+ 4
+
+
+ Network cable
+
+ JB011
+
+
+ 1234567890166
+
+
+ 12344325
+
+
+ S
+ 25
+
+ VAT
+
+
+
+ Type
+ Cat5
+
+
+
+ 0.75
+ 0.75
+
+
+
\ No newline at end of file
diff --git a/en16931-cii2ubl/generated/toubl23/issues/issue34-ubl.xml b/en16931-cii2ubl/generated/toubl23/issues/issue34-ubl.xml
new file mode 100644
index 0000000..e21351b
--- /dev/null
+++ b/en16931-cii2ubl/generated/toubl23/issues/issue34-ubl.xml
@@ -0,0 +1,438 @@
+
+
+ urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0
+ urn:fdc:peppol.eu:2017:poacc:billing:01:1.0
+ TOSL108
+ 2013-06-30
+ 2013-07-20
+ 380
+ Ordered in our booth at the convention
+ NOK
+ Project cost code 123
+
+ 3
+
+
+
+ SELLER-ORDER-REF1
+
+
+ Contract321
+
+
+ Doc1
+ Timesheet
+
+ SlZCRVJpMHhMalVOQ2lVTkNqRWdNQ0J2WW1vT3k2SlRaWDliY2dSVnhJVkcuLi50Ykxvc0NoVTJYUmY5eGIvb21zY2dUWS9sWEVoVWI=
+
+ http://www.suppliersite.eu/sheet001.html
+
+
+
+
+ 2300000013.PDF
+ PDF
+
+ SlZCRVJpMHhMalVOQ2lVTkNqRWdNQ0J2WW1vT3k2SlRaWDliY2dSVnhJVkcuLi50Ykxvc0NoVTJYUmY5eGIvb21zY2dUWS9sWEVoVWI=
+
+
+
+ test.pdf
+ ein Test Link
+
+
+ https://test.xrechnung-bdr.de/attachments/api/v1/File/...
+
+
+
+
+
+
+ 1238764941386
+
+
+ Main street 34
+ Suite 123
+ Big city
+ 303
+ RegionA
+
+ NO
+
+
+
+ NO123456789MVA
+
+ VAT
+
+
+
+ Salescompany ltd.
+ 123456789
+
+
+ Sales Department
+ 46211230
+ antonio@salescompany.no
+
+
+
+
+
+
+ 3456789012098
+
+
+ Anystreet 8
+ Back door
+ Anytown
+ 101
+ RegionB
+
+ NO
+
+
+
+ NO987654321MVA
+
+ VAT
+
+
+
+ The Buyercompany
+ 987654321
+
+
+ John Doe
+ 5121230
+ john@buyercompany.no
+
+
+
+
+
+ 2298740918237
+
+
+ Ebeneser Scrooge AS
+
+
+
+
+ Tax handling company AS
+
+
+ Regent street
+ Front door
+ Newtown
+ 202
+ RegionC
+
+ NO
+
+
+
+ NO967611265MVA
+
+ VAT
+
+
+
+
+ 2013-06-15
+
+ 6754238987643
+
+ Deliverystreet 2
+ Side door
+ DeliveryCity
+ 523427
+ RegionD
+
+ NO
+
+
+
+
+
+ 10
+ 0003434323213231
+
+
+ 10
+ 0003434323213231
+
+
+ 2 % discount if paid within 2 days
+ Penalty percentage 10% from due date
+
+
+ false
+ 95
+ Promotion discount
+ 100
+
+ S
+ 25
+
+ VAT
+
+
+
+
+ true
+ Freight
+ 100
+
+ S
+ 25
+
+ VAT
+
+
+
+
+ 365.28
+
+ 1460.5
+ 365.13
+
+ S
+ 25
+
+ VAT
+
+
+
+
+ 1
+ 0.15
+
+ S
+ 15
+
+ VAT
+
+
+
+
+ -25
+ 0
+
+ E
+ 0
+ Exempt New Means of Transport
+
+ VAT
+
+
+
+
+
+ 1436.5
+ 1436.5
+ 1801.78
+ 100
+ 100
+ 1000
+ 801.78
+
+
+ 1
+ Scratch on box
+ 1
+ 1273
+ BookingCode001
+
+ 2013-06-01
+ 2013-06-01
+
+
+ 1
+
+
+ false
+ Damage
+ 12
+
+
+ true
+ Testing
+ 12
+
+
+ Processor: Intel Core 2 Duo SU9400 LV (1.4GHz). RAM: 3MB. Screen 1440x900
+ Laptop computer
+
+ JB007
+
+
+ 1234567890128
+
+
+ DE
+
+
+ 65434568
+
+
+ S
+ 25
+
+ VAT
+
+
+
+ Color
+ Black
+
+
+
+ 1273
+ 1498
+
+ false
+ 225
+ 1498
+
+
+
+
+ 2
+ Cover is slightly damaged.
+ -1
+ -3.96
+ BookingCode002
+
+ 5
+
+
+ Returned "Advanced computing" book
+
+ JB008
+
+
+ 1234567890135
+
+
+ 65434567
+
+
+ S
+ 15
+
+ VAT
+
+
+
+
+ 3.96
+ 3.96
+
+
+
+ 3
+ 2
+ 4.96
+ BookingCode003
+
+ 3
+
+
+ "Computing for dummies" book
+
+ JB009
+
+
+ 1234567890142
+
+
+ 65434566
+
+
+ S
+ 15
+
+ VAT
+
+
+
+
+ 2.48
+ 2.75
+
+ false
+ 0.275
+ 2.75
+
+
+
+
+ 4
+ -1
+ -25
+ BookingCode004
+
+ 2
+
+
+ Returned IBM 5150 desktop
+
+ JB010
+
+
+ 1234567890159
+
+
+ 65434565
+
+
+ E
+ 0
+
+ VAT
+
+
+
+
+ 25
+ 25
+
+
+
+ 5
+ 250
+ 187.5
+ BookingCode005
+
+ 4
+
+
+ Network cable
+
+ JB011
+
+
+ 1234567890166
+
+
+ 12344325
+
+
+ S
+ 25
+
+ VAT
+
+
+
+ Type
+ Cat5
+
+
+
+ 0.75
+ 0.75
+
+
+
\ No newline at end of file
diff --git a/en16931-cii2ubl/generated/toubl24/issues/issue34-ubl.xml b/en16931-cii2ubl/generated/toubl24/issues/issue34-ubl.xml
new file mode 100644
index 0000000..e21351b
--- /dev/null
+++ b/en16931-cii2ubl/generated/toubl24/issues/issue34-ubl.xml
@@ -0,0 +1,438 @@
+
+
+ urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0
+ urn:fdc:peppol.eu:2017:poacc:billing:01:1.0
+ TOSL108
+ 2013-06-30
+ 2013-07-20
+ 380
+ Ordered in our booth at the convention
+ NOK
+ Project cost code 123
+
+ 3
+
+
+
+ SELLER-ORDER-REF1
+
+
+ Contract321
+
+
+ Doc1
+ Timesheet
+
+ SlZCRVJpMHhMalVOQ2lVTkNqRWdNQ0J2WW1vT3k2SlRaWDliY2dSVnhJVkcuLi50Ykxvc0NoVTJYUmY5eGIvb21zY2dUWS9sWEVoVWI=
+
+ http://www.suppliersite.eu/sheet001.html
+
+
+
+
+ 2300000013.PDF
+ PDF
+
+ SlZCRVJpMHhMalVOQ2lVTkNqRWdNQ0J2WW1vT3k2SlRaWDliY2dSVnhJVkcuLi50Ykxvc0NoVTJYUmY5eGIvb21zY2dUWS9sWEVoVWI=
+
+
+
+ test.pdf
+ ein Test Link
+
+
+ https://test.xrechnung-bdr.de/attachments/api/v1/File/...
+
+
+
+
+
+
+ 1238764941386
+
+
+ Main street 34
+ Suite 123
+ Big city
+ 303
+ RegionA
+
+ NO
+
+
+
+ NO123456789MVA
+
+ VAT
+
+
+
+ Salescompany ltd.
+ 123456789
+
+
+ Sales Department
+ 46211230
+ antonio@salescompany.no
+
+
+
+
+
+
+ 3456789012098
+
+
+ Anystreet 8
+ Back door
+ Anytown
+ 101
+ RegionB
+
+ NO
+
+
+
+ NO987654321MVA
+
+ VAT
+
+
+
+ The Buyercompany
+ 987654321
+
+
+ John Doe
+ 5121230
+ john@buyercompany.no
+
+
+
+
+
+ 2298740918237
+
+
+ Ebeneser Scrooge AS
+
+
+
+
+ Tax handling company AS
+
+
+ Regent street
+ Front door
+ Newtown
+ 202
+ RegionC
+
+ NO
+
+
+
+ NO967611265MVA
+
+ VAT
+
+
+
+
+ 2013-06-15
+
+ 6754238987643
+
+ Deliverystreet 2
+ Side door
+ DeliveryCity
+ 523427
+ RegionD
+
+ NO
+
+
+
+
+
+ 10
+ 0003434323213231
+
+
+ 10
+ 0003434323213231
+
+
+ 2 % discount if paid within 2 days
+ Penalty percentage 10% from due date
+
+
+ false
+ 95
+ Promotion discount
+ 100
+
+ S
+ 25
+
+ VAT
+
+
+
+
+ true
+ Freight
+ 100
+
+ S
+ 25
+
+ VAT
+
+
+
+
+ 365.28
+
+ 1460.5
+ 365.13
+
+ S
+ 25
+
+ VAT
+
+
+
+
+ 1
+ 0.15
+
+ S
+ 15
+
+ VAT
+
+
+
+
+ -25
+ 0
+
+ E
+ 0
+ Exempt New Means of Transport
+
+ VAT
+
+
+
+
+
+ 1436.5
+ 1436.5
+ 1801.78
+ 100
+ 100
+ 1000
+ 801.78
+
+
+ 1
+ Scratch on box
+ 1
+ 1273
+ BookingCode001
+
+ 2013-06-01
+ 2013-06-01
+
+
+ 1
+
+
+ false
+ Damage
+ 12
+
+
+ true
+ Testing
+ 12
+
+
+ Processor: Intel Core 2 Duo SU9400 LV (1.4GHz). RAM: 3MB. Screen 1440x900
+ Laptop computer
+
+ JB007
+
+
+ 1234567890128
+
+
+ DE
+
+
+ 65434568
+
+
+ S
+ 25
+
+ VAT
+
+
+
+ Color
+ Black
+
+
+
+ 1273
+ 1498
+
+ false
+ 225
+ 1498
+
+
+
+
+ 2
+ Cover is slightly damaged.
+ -1
+ -3.96
+ BookingCode002
+
+ 5
+
+
+ Returned "Advanced computing" book
+
+ JB008
+
+
+ 1234567890135
+
+
+ 65434567
+
+
+ S
+ 15
+
+ VAT
+
+
+
+
+ 3.96
+ 3.96
+
+
+
+ 3
+ 2
+ 4.96
+ BookingCode003
+
+ 3
+
+
+ "Computing for dummies" book
+
+ JB009
+
+
+ 1234567890142
+
+
+ 65434566
+
+
+ S
+ 15
+
+ VAT
+
+
+
+
+ 2.48
+ 2.75
+
+ false
+ 0.275
+ 2.75
+
+
+
+
+ 4
+ -1
+ -25
+ BookingCode004
+
+ 2
+
+
+ Returned IBM 5150 desktop
+
+ JB010
+
+
+ 1234567890159
+
+
+ 65434565
+
+
+ E
+ 0
+
+ VAT
+
+
+
+
+ 25
+ 25
+
+
+
+ 5
+ 250
+ 187.5
+ BookingCode005
+
+ 4
+
+
+ Network cable
+
+ JB011
+
+
+ 1234567890166
+
+
+ 12344325
+
+
+ S
+ 25
+
+ VAT
+
+
+
+ Type
+ Cat5
+
+
+
+ 0.75
+ 0.75
+
+
+
\ No newline at end of file
diff --git a/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/AbstractCIIToUBLConverter.java b/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/AbstractCIIToUBLConverter.java
index 3703783..2ecd067 100644
--- a/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/AbstractCIIToUBLConverter.java
+++ b/en16931-cii2ubl/src/main/java/com/helger/en16931/cii2ubl/AbstractCIIToUBLConverter.java
@@ -523,6 +523,11 @@ protected static boolean isPaymentMeansCodeDirectDebit (@Nullable final String s
protected static boolean isPaymentMeansCodeOtherKnown (@Nullable final String s)
{
+ // Allow all other codes of UNTDID 4461 (for BT-81)
+ // Based on issue #34
+ if (true)
+ return true;
+
// 1 = Instrument not defined
// 57 = Standing agreement
// 68 = Online payment service
diff --git a/en16931-cii2ubl/src/test/java/com/helger/en16931/cii2ubl/MockSettings.java b/en16931-cii2ubl/src/test/java/com/helger/en16931/cii2ubl/MockSettings.java
index 4aec2df..46f5444 100644
--- a/en16931-cii2ubl/src/test/java/com/helger/en16931/cii2ubl/MockSettings.java
+++ b/en16931-cii2ubl/src/test/java/com/helger/en16931/cii2ubl/MockSettings.java
@@ -50,7 +50,8 @@ final class MockSettings
"issue20.xml",
"issue22.xml",
"issue23.xml",
- "issue28.xml" };
+ "issue28.xml",
+ "issue34.xml" };
private static final String [] TEST_FILES_XRECHNUNG = { "01.01_comprehensive_test_uncefact.xml" };
private static final String [] TEST_FILES_XRECHNUNG_122 = { "01.01a-INVOICE_uncefact.xml",
"01.02a-INVOICE_uncefact.xml",
diff --git a/en16931-cii2ubl/src/test/resources/external/cii/issues/issue34.xml b/en16931-cii2ubl/src/test/resources/external/cii/issues/issue34.xml
new file mode 100644
index 0000000..ee69e73
--- /dev/null
+++ b/en16931-cii2ubl/src/test/resources/external/cii/issues/issue34.xml
@@ -0,0 +1,515 @@
+
+
+
+
+
+ P3
+
+
+ urn:cen.eu:en16931:2017
+
+
+
+ TOSL108
+ 380
+
+ 20130630
+
+
+ Ordered in our booth at the convention
+
+
+
+
+
+ 1
+
+ Scratch on box
+
+
+
+ 1234567890128
+ JB007
+ Laptop computer
+ Processor: Intel Core 2 Duo SU9400 LV (1.4GHz). RAM: 3MB. Screen 1440x900
+
+ Color
+ Black
+
+
+ 65434568
+
+
+ DE
+
+
+
+
+ 1
+
+
+ 1498
+ 1498
+
+
+ false
+
+ 225
+
+
+
+ 1273
+ 1273
+
+
+
+ 1
+
+
+
+ VAT
+ S
+ 25
+
+
+
+ 20130601
+
+
+ 20130601
+
+
+
+
+ false
+
+ 12
+ Damage
+
+
+
+ true
+
+ 12
+ Testing
+
+
+ 1273
+
+
+ BookingCode001
+
+
+
+
+
+ 2
+
+ Cover is slightly damaged.
+
+
+
+ 1234567890135
+ JB008
+ Returned "Advanced computing" book
+
+ 65434567
+
+
+
+
+ 5
+
+
+ 3.96
+ 3.96
+
+
+
+ -1
+
+
+
+ VAT
+ S
+ 15
+
+
+ -3.96
+
+
+ BookingCode002
+
+
+
+
+
+ 3
+
+
+ 1234567890142
+ JB009
+ "Computing for dummies" book
+
+ 65434566
+
+
+
+
+ 3
+
+
+ 2.75
+ 2.75
+
+
+ false
+
+ 0.275
+
+
+
+ 2.48
+ 2.48
+
+
+
+ 2
+
+
+
+ VAT
+ S
+ 15
+
+
+ 4.96
+
+
+ BookingCode003
+
+
+
+
+
+ 4
+
+
+ 1234567890159
+ JB010
+ Returned IBM 5150 desktop
+
+ 65434565
+
+
+
+
+ 2
+
+
+ 25
+ 25
+
+
+
+ -1
+
+
+
+ VAT
+ E
+ 0
+
+
+ -25
+
+
+ BookingCode004
+
+
+
+
+
+ 5
+
+
+ 1234567890166
+ JB011
+ Network cable
+
+ Type
+ Cat5
+
+
+ 12344325
+
+
+
+
+ 4
+
+
+ 0.75
+ 0.75
+
+
+
+ 250
+
+
+
+ VAT
+ S
+ 25
+
+
+ 187.5
+
+
+ BookingCode005
+
+
+
+
+
+ 1238764941386
+ Salescompany ltd.
+
+ 123456789
+
+
+ Sales Department
+
+ 46211230
+
+
+ antonio@salescompany.no
+
+
+
+ 303
+ Main street 34
+ Suite 123
+ Big city
+ NO
+ RegionA
+
+
+ NO123456789MVA
+
+
+
+ 3456789012098
+ The Buyercompany
+
+ 987654321
+
+
+ John Doe
+
+ 5121230
+
+
+ john@buyercompany.no
+
+
+
+ 101
+ Anystreet 8
+ Back door
+ Anytown
+ NO
+ RegionB
+
+
+ NO987654321MVA
+
+
+
+ Tax handling company AS
+
+ 202
+ Regent street
+ Front door
+ Newtown
+ NO
+ RegionC
+
+
+ NO967611265MVA
+
+
+
+
+ SELLER-ORDER-REF1
+
+
+
+ Contract321
+
+
+ Doc1
+ http://www.suppliersite.eu/sheet001.html
+ 916
+ Timesheet
+ SlZCRVJpMHhMalVOQ2lVTkNqRWdNQ0J2WW1vT3k2SlRaWDliY2dSVnhJVkcuLi50Ykxvc0NoVTJYUmY5eGIvb21zY2dUWS9sWEVoVWI=
+
+
+
+
+ 2300000013.PDF
+ 916
+ PDF
+
+ SlZCRVJpMHhMalVOQ2lVTkNqRWdNQ0J2WW1vT3k2SlRaWDliY2dSVnhJVkcuLi50Ykxvc0NoVTJYUmY5eGIvb21zY2dUWS9sWEVoVWI=
+
+
+
+
+ test.pdf
+ https://test.xrechnung-bdr.de/attachments/api/v1/File/...
+ 916
+ ein Test Link
+
+
+
+
+ 6754238987643
+
+ 523427
+ Deliverystreet 2
+ Side door
+ DeliveryCity
+ NO
+ RegionD
+
+
+
+
+ 20130615
+
+
+
+
+ 0003434323213231
+ NOK
+
+ 2298740918237
+ Ebeneser Scrooge AS
+
+ 989823401
+
+
+
+ 10
+
+ NO9386011117947
+
+
+ DNBANOKK
+
+
+
+ 10
+
+ NO9386011117947
+
+
+
+ 365.13
+ VAT
+ 1460.5
+ S
+ 3
+ 25
+
+
+ 0.15
+ VAT
+ 1
+ S
+ 3
+ 15
+
+
+ 0
+ VAT
+ Exempt New Means of Transport
+ -25
+ E
+ 3
+ 0
+
+
+
+ false
+
+ 100
+ 95
+ Promotion discount
+
+ VAT
+ S
+ 25
+
+
+
+
+ true
+
+ 100
+ Freight
+
+ VAT
+ S
+ 25
+
+
+
+ 2 % discount if paid within 2 days
+ Penalty percentage 10% from due date
+
+ 20130720
+
+
+
+ 1436.5
+ 100
+ 100
+ 1436.5
+ 365.28
+ 1801.78
+ 1000
+ 801.78
+
+
+ Project cost code 123
+
+
+
+