diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 7ff04b18aabc3d337da88b7f8b9681f23fd35b37..0c68684bd938629ae28a94aaf217d4c2d8c444f8 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -15,7 +15,7 @@
     </entityField>
     <entityField>
       <name>DISCOUNT</name>
-      <title>Discount</title>
+      <title>Discount %</title>
     </entityField>
     <entityField>
       <name>GROUPCODEID</name>
@@ -85,6 +85,7 @@
       <title>Unit</title>
       <consumer>KeywordQuantityUnits</consumer>
       <state>READONLY</state>
+      <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>VAT</name>
@@ -166,7 +167,7 @@
       <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/info/documentation.adoc</documentation>
       <title>Note</title>
       <contentType>LONG_TEXT</contentType>
-      <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/info/valueProcess.js</valueProcess>
+      <state>READONLY</state>
     </entityField>
     <entityConsumer>
       <name>KeywordProductGroupcodes</name>
diff --git a/entity/Offeritem_entity/entityfields/info/valueProcess.js b/entity/Offeritem_entity/entityfields/info/valueProcess.js
deleted file mode 100644
index 199fc1e677e27d82f50e7728d4e6d9b66cb22c69..0000000000000000000000000000000000000000
--- a/entity/Offeritem_entity/entityfields/info/valueProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("system.db");
-import("system.result");
-import("system.vars");
-import("system.neon");
-import("Sql_lib");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
-    // TODO: loading from db until loading from Consumer is possible.
-    var productId = vars.get("$field.PRODUCT_ID");
-    result.string(db.cell(SqlCondition.begin().andPrepareVars("PRODUCT.PRODUCTID", "$field.PRODUCT_ID").buildSql("select INFO from PRODUCT", "1=2")));
-}
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/optional/valueProcess.js b/entity/Offeritem_entity/entityfields/optional/valueProcess.js
index 31b2531af1ad332b9ab67942d5a89d742c9ab368..58162120400747dada1e4c1e2da49ecd5475054c 100644
--- a/entity/Offeritem_entity/entityfields/optional/valueProcess.js
+++ b/entity/Offeritem_entity/entityfields/optional/valueProcess.js
@@ -2,5 +2,5 @@ import("system.vars");
 import("system.result");
 import("system.neon");
 
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && (vars.get("$this.value") == null || vars.get("$this.value") == ""))
     result.string("0");
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
index 8397a374758cf6eeef923ff6a17b1ec61a2b984e..da456d1c4697abd9410468f34f66713f3a2202b7 100644
--- a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
+++ b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
@@ -12,13 +12,15 @@ if(pid != "")
     
     var PriceListFilter = { currency: curr, quantity: vars.get("$field.QUANTITY"), relationId: contactid };
     
-    var ProductDetails = ProductUtils.getProductDetails(pid, PriceListFilter);
+    //TODO: loading from db until loading from Consumer is possible.
+    var ProductDetails = ProductUtils.getProductDetails(pid, PriceListFilter, ["INFO"]);
     
     if(ProductDetails.productId != undefined)
     {
         neon.setFieldValue("$field.GROUPCODEID", ProductDetails.groupCode);
         neon.setFieldValue("$field.UNIT", ProductDetails.unit);
         neon.setFieldValue("$field.ITEMNAME", ProductDetails.productName);
+        neon.setFieldValue("$field.INFO", ProductDetails.INFO);
 
         if(ProductDetails.PriceListToUse != null)
         {
diff --git a/entity/Offeritem_entity/entityfields/unit/displayValueProcess.js b/entity/Offeritem_entity/entityfields/unit/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..72cb60d083cf7a2ef7a78d11a5fcd7dbcb0c6e6a
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/unit/displayValueProcess.js
@@ -0,0 +1,12 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var unit = vars.get("$field.UNIT");
+var viewValue = "";
+
+if (unit)
+    viewValue = KeywordUtils.getViewValue($KeywordRegistry.quantityUnit(), unit);
+
+result.string(viewValue);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 03ef13d172c0f5a8b9649f0e55fed78bcd5d74ca..84e7cd2b6dc961f06289ba1c2e263d35f6601cbb 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -22,6 +22,10 @@
       <key>Days</key>
       <value>Tage</value>
     </entry>
+    <entry>
+      <key>Discount %</key>
+      <value>Rabatt %</value>
+    </entry>
     <entry>
       <key>E-Mail</key>
       <value>E-Mail</value>