[17267] added complementary reduced vat type to ArticleSubTyp

bundles/ch.elexis.core.l10n/src/ch/elexis/core/l10n/Messages.java

@@ -1984,6 +1984,7 @@ public class Messages extends NLS {
 	public static String ArticleSubTyp_PHARMA;
 	public static String ArticleSubTyp_UNKNOWN;
 	public static String ArticleSubTyp_COMPLEMENTARY;
+	public static String ArticleSubTyp_COMPLEMENTARY_REDUCED;
 	public static String ArticleSubTyp_ADDITIVE;
 	public static String EigendiagnoseSelector_Shortcut_Label;
 	public static String EigendiagnoseSelector_Text_Label;

bundles/ch.elexis.core.l10n/src/ch/elexis/core/l10n/messages.properties

@@ -413,6 +413,8 @@ ArticleSubTyp_ADDITIVE = additive
 
 ArticleSubTyp_COMPLEMENTARY = complementary
 
+ArticleSubTyp_COMPLEMENTARY_REDUCED = complementary (Vat red.)
+
 ArticleSubTyp_MAGISTERY = magistery
 
 ArticleSubTyp_NONPHARMA = non-pharma\n

bundles/ch.elexis.core.l10n/src/ch/elexis/core/l10n/messages_de.properties

@@ -413,6 +413,8 @@ ArticleSubTyp_ADDITIVE = Hilfsmittel
 
 ArticleSubTyp_COMPLEMENTARY = Heilmittel der Kompl.-Med.
 
+ArticleSubTyp_COMPLEMENTARY_REDUCED = Heilmittel der Kompl.-Med. (Mwst red.)
+
 ArticleSubTyp_MAGISTERY = Magistralrezeptur
 
 ArticleSubTyp_NONPHARMA = Non-Pharma

bundles/ch.elexis.core.l10n/src/ch/elexis/core/l10n/messages_en.properties

@@ -413,6 +413,8 @@ ArticleSubTyp_ADDITIVE = additive
 
 ArticleSubTyp_COMPLEMENTARY = Remedies of compl. Med.
 
+ArticleSubTyp_COMPLEMENTARY_REDUCED = Remedies of compl. Med. (Vat red.)
+
 ArticleSubTyp_MAGISTERY = extemporaneous
 
 ArticleSubTyp_NONPHARMA = Non-pharmaceutical

bundles/ch.elexis.core.l10n/src/ch/elexis/core/l10n/messages_fr.properties

@@ -413,6 +413,8 @@ ArticleSubTyp_ADDITIVE = Agent auxiliaire
 
 ArticleSubTyp_COMPLEMENTARY = Rem\u00E8des de compl.
 
+ArticleSubTyp_COMPLEMENTARY_REDUCED = Rem\u00E8des de compl. (Vat red.)
+
 ArticleSubTyp_MAGISTERY = Formule magistrale
 
 ArticleSubTyp_NONPHARMA = Non pharmaceutique

bundles/ch.elexis.core.l10n/src/ch/elexis/core/l10n/messages_it.properties

@@ -413,6 +413,8 @@ ArticleSubTyp_ADDITIVE = aiuto
 
 ArticleSubTyp_COMPLEMENTARY = Rimedi di compl. Med.
 
+ArticleSubTyp_COMPLEMENTARY_REDUCED = Rimedi di compl. Med. (Vat red.)
+
 ArticleSubTyp_MAGISTERY = estemporaneo
 
 ArticleSubTyp_NONPHARMA = Non-farmaceutica

bundles/ch.elexis.core.model/src/ch/elexis/core/model/TypedArticle.java

@@ -41,7 +41,8 @@ public class TypedArticle extends AbstractIdDeleteModelAdapter<ch.elexis.core.jp
 		ArticleTyp typ = getTyp();
 		if (typ == ArticleTyp.EIGENARTIKEL) {
 			ArticleSubTyp subTyp = getSubTyp();
-			if (subTyp == ArticleSubTyp.COMPLEMENTARY) {
+			if (subTyp == ArticleSubTyp.COMPLEMENTARY
+				|| subTyp == ArticleSubTyp.COMPLEMENTARY_REDUCED) {
 				return "590";
 			} else if (subTyp == ArticleSubTyp.ADDITIVE) {
 				return "406";
@@ -204,6 +205,7 @@ public class TypedArticle extends AbstractIdDeleteModelAdapter<ch.elexis.core.jp
 			switch (subTyp) {
 			case PHARMA:
 			case MAGISTERY:
+			case COMPLEMENTARY_REDUCED:
 				return VatInfo.VAT_CH_ISMEDICAMENT;
 			case NONPHARMA:
 			case COMPLEMENTARY:

bundles/ch.elexis.core/src/ch/elexis/core/types/ArticleSubTyp.java

@@ -7,7 +7,7 @@ import ch.elexis.core.interfaces.ILocalizedEnum;
 public enum ArticleSubTyp implements ILocalizedEnum {
 	
 		UNKNOWN('U'), PHARMA('P'), NONPHARMA('N'), MAGISTERY('M'), COMPLEMENTARY('C'),
-		ADDITIVE('A'), PRODUCT('X');
+		COMPLEMENTARY_REDUCED('K'), ADDITIVE('A'), PRODUCT('X');
 	
 	final char type;