diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod index 9162c9654de9ae11fc8509b929d8f764d7497db5..c479324ec12198fed69af55498a8f6bc10d18342 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 d10f509a90cef8f610971115751e446a5dd1d139..74fa0b796d49d26a64f3dc1afebdec42fa58ec9d 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 +}