diff --git a/src/com/yourcompany/babydatenbank/model/Article.java b/src/com/yourcompany/babydatenbank/model/Article.java index 48ba5dd..994903d 100644 --- a/src/com/yourcompany/babydatenbank/model/Article.java +++ b/src/com/yourcompany/babydatenbank/model/Article.java @@ -93,6 +93,20 @@ public class Article { @Column(length=12) private Integer discount; + @Stereotype("MONEY") + @Calculation("(100 - discount) / 100 * originalPrice") + @Column(length=8) + @ReadOnly + private BigDecimal discountedSellPrice; + + public BigDecimal getDiscountedSellPrice() { + return discountedSellPrice; + } + + public void setDiscountedSellPrice(BigDecimal discountedSellPrice) { + this.discountedSellPrice = discountedSellPrice; + } + public String getOid() { return oid; } @@ -213,7 +227,7 @@ public class Article { this.discount = discount; } - @Stereotype("MONEY") + /*@Stereotype("MONEY") @Calculation("(100 - discount) / 100 * originalPrice") @Column(length=8) public BigDecimal getDiscountedSellPrice() { @@ -224,5 +238,5 @@ public class Article { return BigDecimal.ZERO; } - } + }*/ } diff --git a/web/WEB-INF/lib/addons.jar b/web/WEB-INF/lib/addons.jar index 6f97993..cfe72ae 100644 Binary files a/web/WEB-INF/lib/addons.jar and b/web/WEB-INF/lib/addons.jar differ