From 4fa7a9f9fccc966fe8b1ca62208bf65a827f0fa7 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 22 Feb 2019 16:27:11 +0100
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1034899][Auswertung
- Produktgruppen - Auswertung bis auf Produktgruppenebene]
---
entity/Orderitem_entity/Orderitem_entity.aod | 8 ++++----
.../recordcontainers/jdito/contentProcess.js | 5 +++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 9162c9654d..c479324ec1 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -235,10 +235,6 @@
<name>ASSIGNEDTO.value</name>
<recordfield>SALESORDERITEM.ASSIGNEDTO</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DESCRIPTION.value</name>
- <recordfield>SALESORDERITEM.DESCRIPTION</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DISCOUNT.value</name>
<recordfield>SALESORDERITEM.DISCOUNT</recordfield>
@@ -303,6 +299,10 @@
<name>PRODUCT_ID.displayValue</name>
<expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>INFO.value</name>
+ <recordfield>SALESORDERITEM.INFO</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js b/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
index d10f509a90..74fa0b796d 100644
--- a/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
@@ -130,6 +130,7 @@ function _addProducts(pYear, pMonth, pData, pCategory)
for (let groupcode in groupcodeSums)
{
- chartData.add(pCategory + pYear + pMonth + groupcode, pCategory + pYear + pMonth, [pCategory, groupcodeSums[groupcode]["name"], groupcodeSums[groupcode]["sum"]]);
+ if (groupcodeSums[groupcode]["sum"])
+ chartData.add(pCategory + pYear + pMonth + groupcode, pCategory + pYear + pMonth, [pCategory, groupcodeSums[groupcode]["name"], groupcodeSums[groupcode]["sum"]]);
}
-}
\ No newline at end of file
+}
--
GitLab