From 2f16f8dcb5186dae387c800e8df26760a02e5a1f Mon Sep 17 00:00:00 2001
From: Socrates <socrates@engels>
Date: Wed, 10 Jun 2020 23:06:05 +0200
Subject: [PATCH] Changed discountedSellPrice from calculated to regular
 property.

---
 .../babydatenbank/model/Article.java          |  18 ++++++++++++++++--
 web/WEB-INF/lib/addons.jar                    | Bin 42572 -> 42572 bytes
 2 files changed, 16 insertions(+), 2 deletions(-)

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 6f9799348d0d3409f53cb1e200ed93728a728486..cfe72ae560aad49ba024e2a44d790dd72ad32d06 100644
GIT binary patch
delta 44
zcmX?ehUv^1CY}IqW)?061`Y;>cWWo|XfnNByU|>1GSj=Yll>=K0(qOeCLa<409U#Z
A4gdfE

delta 44
zcmX?ehUv^1CY}IqW)?061`Y;>&J`1RG?_Y9Y%~{}%+$GJvj1dDAa8Tm<U>LLJ3J3&