diff --git a/src/com/yourcompany/babydatenbank/model/Article.java b/src/com/yourcompany/babydatenbank/model/Article.java
index aff9fc8..3410f7a 100644
--- a/src/com/yourcompany/babydatenbank/model/Article.java
+++ b/src/com/yourcompany/babydatenbank/model/Article.java
@@ -3,6 +3,7 @@ package com.yourcompany.babydatenbank.model;
 import javax.persistence.*;
 
 import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.validator.constraints.*;
 import org.openxava.annotations.*;
 
 import com.yourcompany.babydatenbank.actions.*;
@@ -88,11 +89,11 @@ public class Article {
 	@Stereotype("DATE")
 	private LocalDate sellDate;
 	
-	@Digits(integer=3, fraction = 0)
-	//@Max(value=100)
-	//@Stereotype("PERCENTAGE")
-	//@Column(length=11)
-	private BigDecimal discount;
+
+	@Stereotype("PERCENTAGE")
+	@Range(min=0, max=100)
+	@DisplaySize(value=8)
+	private int discount;
 
 	public String getOid() {
 		return oid;
@@ -206,11 +207,11 @@ public class Article {
 		this.sellDate = sellDate;
 	}
 
-	public BigDecimal getDiscount() {
+	public int getDiscount() {
 		return discount;
 	}
 
-	public void setDiscount(BigDecimal discount) {
+	public void setDiscount(int discount) {
 		this.discount = discount;
 	}
 	
@@ -219,7 +220,7 @@ public class Article {
 	@Column(length=8)
 	public BigDecimal getDiscountedSellPrice() {
 		try {
-			return getOriginalPrice().multiply(BigDecimal.ONE.subtract(getDiscount().divide(new BigDecimal(100), 2, RoundingMode.HALF_EVEN)));
+			return getOriginalPrice().multiply(BigDecimal.ONE.subtract(new BigDecimal(getDiscount()).divide(new BigDecimal(100), 2, RoundingMode.HALF_EVEN)));
 		} catch(Exception e) {
 			//Log.error(e);
 			return BigDecimal.ZERO;
diff --git a/src/com/yourcompany/babydatenbank/model/Condition.java b/src/com/yourcompany/babydatenbank/model/Condition.java
index 6eeef82..940c0a4 100644
--- a/src/com/yourcompany/babydatenbank/model/Condition.java
+++ b/src/com/yourcompany/babydatenbank/model/Condition.java
@@ -6,6 +6,7 @@ import javax.persistence.*;
 import javax.validation.constraints.*;
 
 import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.validator.constraints.*;
 import org.openxava.annotations.*;
 
 @Entity
@@ -24,11 +25,10 @@ public class Condition {
 	@Column(length=32)
 	private String description;
 	
-	//@Column(length=8)
-	//@Max(value=100)
-	@Digits(integer=3, fraction=0)
+	@Range(min=0, max=100)
 	@Stereotype("PERCENTAGE")
-	private BigDecimal defaultDiscount;
+	@DisplaySize(value=8)
+	private int defaultDiscount;
 
 	public String getOid() {
 		return oid;
@@ -54,11 +54,11 @@ public class Condition {
 		this.number = number;
 	}
 
-	public BigDecimal getDefaultDiscount() {
+	public int getDefaultDiscount() {
 		return defaultDiscount;
 	}
 
-	public void setDefaultDiscount(BigDecimal defaultDiscount) {
+	public void setDefaultDiscount(int defaultDiscount) {
 		this.defaultDiscount = defaultDiscount;
 	}