closes #230
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
- PR #225 exemption reasons only for certain tax category codes thanks to weclapp-dev
|
- PR #225 exemption reasons only for certain tax category codes thanks to weclapp-dev
|
||||||
- allow 1.2 and 2.0 in RDF versions for XRechnung 2.0 Referenzprofil
|
- allow 1.2 and 2.0 in RDF versions for XRechnung 2.0 Referenzprofil
|
||||||
|
- also use shortcut "t" for extended in zf1 #230
|
||||||
|
|
||||||
2.1.1
|
2.1.1
|
||||||
=======
|
=======
|
||||||
|
|||||||
@@ -586,7 +586,7 @@ public class Main {
|
|||||||
if (zfProfile == null) {
|
if (zfProfile == null) {
|
||||||
try {
|
try {
|
||||||
if (format.equals("zf") && (zfIntVersion == 1)) {
|
if (format.equals("zf") && (zfIntVersion == 1)) {
|
||||||
zfProfile = getStringFromUser("Profile b)asic, c)omfort or e)xtended", "e", "B|b|C|c|E|e");
|
zfProfile = getStringFromUser("Profile (b)asic, (c)omfort or ex(t)ended", "t", "B|b|C|c|T|t");
|
||||||
} else {
|
} else {
|
||||||
zfProfile = getStringFromUser(
|
zfProfile = getStringFromUser(
|
||||||
"Profile [M]INIMUM, BASIC [W]L, [B]ASIC,\n" + "[C]IUS, [E]N16931, EX[T]ENDED or [X]RECHNUNG", "E",
|
"Profile [M]INIMUM, BASIC [W]L, [B]ASIC,\n" + "[C]IUS, [E]N16931, EX[T]ENDED or [X]RECHNUNG", "E",
|
||||||
@@ -614,7 +614,7 @@ public class Main {
|
|||||||
zfConformanceLevelProfile = Profiles.getByName("BASIC", zfIntVersion);
|
zfConformanceLevelProfile = Profiles.getByName("BASIC", zfIntVersion);
|
||||||
} else if (zfProfile.equals("c")) {
|
} else if (zfProfile.equals("c")) {
|
||||||
zfConformanceLevelProfile = Profiles.getByName("COMFORT", zfIntVersion);
|
zfConformanceLevelProfile = Profiles.getByName("COMFORT", zfIntVersion);
|
||||||
} else if (zfProfile.equals("e")) {
|
} else if (zfProfile.equals("t")) {
|
||||||
zfConformanceLevelProfile = Profiles.getByName("EXTENDED", zfIntVersion);
|
zfConformanceLevelProfile = Profiles.getByName("EXTENDED", zfIntVersion);
|
||||||
} else {
|
} else {
|
||||||
throw new Exception(String.format("Unknown ZUGFeRD profile '%s'", zfProfile));
|
throw new Exception(String.format("Unknown ZUGFeRD profile '%s'", zfProfile));
|
||||||
|
|||||||
Reference in New Issue
Block a user