Merge branch 'dev'

jenkins · jenkins · commit 57d7995dfe39 · 2024-05-10T10:09:58.000+02:00
diff --git a/mes-application/conf/dev/.esapi/ESAPI.properties b/mes-application/conf/dev/.esapi/ESAPI.properties
@@ -322,7 +322,7 @@ HttpUtilities.ForceSecureCookies=true
 # Maximum size of HTTP headers
 HttpUtilities.MaxHeaderSize=4096
 # File upload configuration
-HttpUtilities.ApprovedUploadExtensions=.zip,.pdf,.doc,.docx,.ppt,.pptx,.tar,.gz,.tgz,.rar,.xls,.rtf,.properties,.java,.txt,.xml,.btw,.dxf,.stp,.ezpx
+HttpUtilities.ApprovedUploadExtensions=.zip,.pdf,.doc,.docx,.ppt,.pptx,.tar,.gz,.tgz,.rar,.xls,.rtf,.properties,.java,.txt,.xml,.btw,.dxf,.stp,.ezpx,.plt
 HttpUtilities.MaxUploadFileBytes=500000000
 # Using UTF-8 throughout your stack is highly recommended. That includes your database driver,
 # container, and any other technologies you may be using. Failure to do this may expose you
diff --git a/mes-application/conf/dev/connectors.properties b/mes-application/conf/dev/connectors.properties
@@ -38,3 +38,4 @@ ftp.pass=
 plannerServiceLocation=planner_service_location
 plannerServiceUsername=planner_service_username
 plannerServicePassword=planner_service_password
+plannerServiceResponseUrl=planner_service_response_url
diff --git a/mes-application/conf/package/.esapi/ESAPI.properties b/mes-application/conf/package/.esapi/ESAPI.properties
@@ -322,7 +322,7 @@ HttpUtilities.ForceSecureCookies=true
 # Maximum size of HTTP headers
 HttpUtilities.MaxHeaderSize=4096
 # File upload configuration
-HttpUtilities.ApprovedUploadExtensions=.zip,.pdf,.doc,.docx,.ppt,.pptx,.tar,.gz,.tgz,.rar,.xls,.rtf,.properties,.java,.txt,.xml,.btw,.dxf,.stp,.ezpx
+HttpUtilities.ApprovedUploadExtensions=.zip,.pdf,.doc,.docx,.ppt,.pptx,.tar,.gz,.tgz,.rar,.xls,.rtf,.properties,.java,.txt,.xml,.btw,.dxf,.stp,.ezpx,.plt
 HttpUtilities.MaxUploadFileBytes=500000000
 # Using UTF-8 throughout your stack is highly recommended. That includes your database driver,
 # container, and any other technologies you may be using. Failure to do this may expose you
diff --git a/mes-application/conf/package/connectors.properties b/mes-application/conf/package/connectors.properties
@@ -38,3 +38,4 @@ ftp.pass=
 plannerServiceLocation=
 plannerServiceUsername=
 plannerServicePassword=
+plannerServiceResponseUrl=
diff --git a/mes-application/conf/partner/.esapi/ESAPI.properties b/mes-application/conf/partner/.esapi/ESAPI.properties
@@ -322,7 +322,7 @@ HttpUtilities.ForceSecureCookies=true
 # Maximum size of HTTP headers
 HttpUtilities.MaxHeaderSize=4096
 # File upload configuration
-HttpUtilities.ApprovedUploadExtensions=.zip,.pdf,.doc,.docx,.ppt,.pptx,.tar,.gz,.tgz,.rar,.xls,.rtf,.properties,.java,.txt,.xml,.btw,.dxf,.stp,.ezpx
+HttpUtilities.ApprovedUploadExtensions=.zip,.pdf,.doc,.docx,.ppt,.pptx,.tar,.gz,.tgz,.rar,.xls,.rtf,.properties,.java,.txt,.xml,.btw,.dxf,.stp,.ezpx,.plt
 HttpUtilities.MaxUploadFileBytes=500000000
 # Using UTF-8 throughout your stack is highly recommended. That includes your database driver,
 # container, and any other technologies you may be using. Failure to do this may expose you
diff --git a/mes-application/conf/partner/connectors.properties b/mes-application/conf/partner/connectors.properties
@@ -38,3 +38,4 @@ ftp.pass=
 plannerServiceLocation=
 plannerServiceUsername=
 plannerServicePassword=
+plannerServiceResponseUrl=
diff --git a/mes-application/conf/prod/.esapi/ESAPI.properties b/mes-application/conf/prod/.esapi/ESAPI.properties
@@ -322,7 +322,7 @@ HttpUtilities.ForceSecureCookies=true
 # Maximum size of HTTP headers
 HttpUtilities.MaxHeaderSize=4096
 # File upload configuration
-HttpUtilities.ApprovedUploadExtensions=.zip,.pdf,.doc,.docx,.ppt,.pptx,.tar,.gz,.tgz,.rar,.xls,.rtf,.properties,.java,.txt,.xml,.btw,.dxf,.stp,.ezpx
+HttpUtilities.ApprovedUploadExtensions=.zip,.pdf,.doc,.docx,.ppt,.pptx,.tar,.gz,.tgz,.rar,.xls,.rtf,.properties,.java,.txt,.xml,.btw,.dxf,.stp,.ezpx,.plt
 HttpUtilities.MaxUploadFileBytes=500000000
 # Using UTF-8 throughout your stack is highly recommended. That includes your database driver,
 # container, and any other technologies you may be using. Failure to do this may expose you
diff --git a/mes-application/conf/prod/connectors.properties b/mes-application/conf/prod/connectors.properties
@@ -39,3 +39,4 @@ ftp.pass=ftp_pass
 plannerServiceLocation=planner_service_location
 plannerServiceUsername=planner_service_username
 plannerServicePassword=planner_service_password
+plannerServiceResponseUrl=planner_service_response_url
diff --git a/mes-application/conf/tomcat/.esapi/ESAPI.properties b/mes-application/conf/tomcat/.esapi/ESAPI.properties
@@ -322,7 +322,7 @@ HttpUtilities.ForceSecureCookies=true
 # Maximum size of HTTP headers
 HttpUtilities.MaxHeaderSize=4096
 # File upload configuration
-HttpUtilities.ApprovedUploadExtensions=.zip,.pdf,.doc,.docx,.ppt,.pptx,.tar,.gz,.tgz,.rar,.xls,.rtf,.properties,.java,.txt,.xml,.btw,.dxf,.stp,.ezpx
+HttpUtilities.ApprovedUploadExtensions=.zip,.pdf,.doc,.docx,.ppt,.pptx,.tar,.gz,.tgz,.rar,.xls,.rtf,.properties,.java,.txt,.xml,.btw,.dxf,.stp,.ezpx,.plt
 HttpUtilities.MaxUploadFileBytes=500000000
 # Using UTF-8 throughout your stack is highly recommended. That includes your database driver,
 # container, and any other technologies you may be using. Failure to do this may expose you
diff --git a/mes-application/conf/tomcat/connectors.properties b/mes-application/conf/tomcat/connectors.properties
@@ -37,4 +37,5 @@ ftp.user=
 ftp.pass=
 plannerServiceLocation=
 plannerServiceUsername=
-plannerServicePassword=
+plannerServicePassword=
+plannerServiceResponseUrl=
diff --git a/mes-application/src/main/resources/schema/demo_db_cn.sql b/mes-application/src/main/resources/schema/demo_db_cn.sql
@@ -43542,6 +43542,7 @@ COPY public.qcadooplugin_plugin (id, identifier, version, state, issystem, entit
 159	mobileWMS	1.5.0	DISABLED	f	0	\N	\N
 161	optimizeCutting	1.5.0	DISABLED	f	0	\N	\N
 162	moldrew	1.5.0	DISABLED	f	0	\N	\N
+163	productionPlans	1.5.0	DISABLED	f	0	\N	\N
 \.
 
 
@@ -49542,7 +49543,7 @@ SELECT pg_catalog.setval('public.qcadoomodel_unitconversionitem_id_seq', 10, fal
 -- Name: qcadooplugin_plugin_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
 --
 
-SELECT pg_catalog.setval('public.qcadooplugin_plugin_id_seq', 162, true);
+SELECT pg_catalog.setval('public.qcadooplugin_plugin_id_seq', 163, true);
 
 
 --
diff --git a/mes-application/src/main/resources/schema/demo_db_en.sql b/mes-application/src/main/resources/schema/demo_db_en.sql
@@ -43542,6 +43542,7 @@ COPY public.qcadooplugin_plugin (id, identifier, version, state, issystem, entit
 159	mobileWMS	1.5.0	DISABLED	f	0	\N	\N
 161	optimizeCutting	1.5.0	DISABLED	f	0	\N	\N
 162	moldrew	1.5.0	DISABLED	f	0	\N	\N
+163	productionPlans	1.5.0	DISABLED	f	0	\N	\N
 \.
 
 
@@ -49542,7 +49543,7 @@ SELECT pg_catalog.setval('public.qcadoomodel_unitconversionitem_id_seq', 10, fal
 -- Name: qcadooplugin_plugin_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
 --
 
-SELECT pg_catalog.setval('public.qcadooplugin_plugin_id_seq', 162, true);
+SELECT pg_catalog.setval('public.qcadooplugin_plugin_id_seq', 163, true);
 
 
 --
diff --git a/mes-application/src/main/resources/schema/demo_db_fr.sql b/mes-application/src/main/resources/schema/demo_db_fr.sql
@@ -43542,6 +43542,7 @@ COPY public.qcadooplugin_plugin (id, identifier, version, state, issystem, entit
 159	mobileWMS	1.5.0	DISABLED	f	0	\N	\N
 161	optimizeCutting	1.5.0	DISABLED	f	0	\N	\N
 162	moldrew	1.5.0	DISABLED	f	0	\N	\N
+163	productionPlans	1.5.0	DISABLED	f	0	\N	\N
 \.
 
 
@@ -49542,7 +49543,7 @@ SELECT pg_catalog.setval('public.qcadoomodel_unitconversionitem_id_seq', 10, fal
 -- Name: qcadooplugin_plugin_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
 --
 
-SELECT pg_catalog.setval('public.qcadooplugin_plugin_id_seq', 162, true);
+SELECT pg_catalog.setval('public.qcadooplugin_plugin_id_seq', 163, true);
 
 
 --
diff --git a/mes-application/src/main/resources/schema/demo_db_pl.sql b/mes-application/src/main/resources/schema/demo_db_pl.sql
@@ -43542,6 +43542,7 @@ COPY public.qcadooplugin_plugin (id, identifier, version, state, issystem, entit
 159	mobileWMS	1.5.0	DISABLED	f	0	\N	\N
 161	optimizeCutting	1.5.0	DISABLED	f	0	\N	\N
 162	moldrew	1.5.0	DISABLED	f	0	\N	\N
+163	productionPlans	1.5.0	DISABLED	f	0	\N	\N
 \.
 
 
@@ -49542,7 +49543,7 @@ SELECT pg_catalog.setval('public.qcadoomodel_unitconversionitem_id_seq', 10, fal
 -- Name: qcadooplugin_plugin_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
 --
 
-SELECT pg_catalog.setval('public.qcadooplugin_plugin_id_seq', 162, true);
+SELECT pg_catalog.setval('public.qcadooplugin_plugin_id_seq', 163, true);
 
 
 --
diff --git a/mes-plugins/mes-plugins-basic/src/main/java/com/qcadoo/mes/basic/MultiUploadHelper.java b/mes-plugins/mes-plugins-basic/src/main/java/com/qcadoo/mes/basic/MultiUploadHelper.java
@@ -10,5 +10,5 @@ public class MultiUploadHelper {
 
     public static final List<String> EXTS = Lists
             .newArrayList("GIF", "JPG", "JPEG", "PNG", "PDF", "XLS", "XLSX", "DWG", "IPT", "IAM", "IDW", "DOC", "DOCX", "TXT",
-                    "CSV", "XML", "ODT", "ODS", "TIFF", "TIF", "ZIP", "BTW", "DXF", "STP", "EZPX");
+                    "CSV", "XML", "ODT", "ODS", "TIFF", "TIF", "ZIP", "BTW", "DXF", "STP", "EZPX", "PLT");
 }
diff --git a/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/model/masterOrderProduct.xml b/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/model/masterOrderProduct.xml
@@ -87,7 +87,7 @@
 
         <boolean name="isUpdateTechnologiesOnPendingOrders" persistent="false" default="false"/>
         <datetime name="deliveryDate"/>
-        <string name="vendorInfo" copyable="false"/>
+        <string name="vendorInfo"/>
     </fields>
 
     <hooks>
diff --git a/mes-plugins/mes-plugins-orders/src/main/java/com/qcadoo/mes/orders/controllers/TechnologyCreationService.java b/mes-plugins/mes-plugins-orders/src/main/java/com/qcadoo/mes/orders/controllers/TechnologyCreationService.java
@@ -1,18 +1,13 @@
 package com.qcadoo.mes.orders.controllers;
 
-import static com.qcadoo.mes.timeNormsForOperations.constants.TechnologyOperationComponentFieldsTNFO.ALL;
-import static com.qcadoo.mes.timeNormsForOperations.constants.TechnologyOperationComponentFieldsTNFO.NEXT_OPERATION_AFTER_PRODUCED_QUANTITY;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.qcadoo.commons.functional.Either;
 import com.qcadoo.localization.api.TranslationService;
 import com.qcadoo.mes.basic.ParameterService;
 import com.qcadoo.mes.basic.constants.*;
 import com.qcadoo.mes.orders.controllers.dto.TechnologyOperationDto;
-import com.qcadoo.mes.orders.controllers.requests.OrderCreationRequest;
 import com.qcadoo.mes.orders.controllers.requests.TechnologyCreationRequest;
-import com.qcadoo.mes.orders.controllers.responses.OrderCreationResponse;
 import com.qcadoo.mes.orders.controllers.responses.TechnologyCreationResponse;
 import com.qcadoo.mes.states.StateChangeContext;
 import com.qcadoo.mes.states.service.StateChangeContextBuilder;
@@ -22,7 +17,6 @@
 import com.qcadoo.mes.technologies.states.aop.TechnologyStateChangeAspect;
 import com.qcadoo.mes.technologies.states.constants.TechnologyState;
 import com.qcadoo.mes.technologies.states.constants.TechnologyStateStringValues;
-import com.qcadoo.mes.technologies.tree.builder.api.TechnologyOperationComponent;
 import com.qcadoo.mes.timeNormsForOperations.constants.TechnologyOperationComponentFieldsTNFO;
 import com.qcadoo.model.api.DataDefinition;
 import com.qcadoo.model.api.DataDefinitionService;
@@ -41,6 +35,9 @@
 import java.util.Objects;
 import java.util.Set;
 
+import static com.qcadoo.mes.timeNormsForOperations.constants.TechnologyOperationComponentFieldsTNFO.ALL;
+import static com.qcadoo.mes.timeNormsForOperations.constants.TechnologyOperationComponentFieldsTNFO.NEXT_OPERATION_AFTER_PRODUCED_QUANTITY;
+
 @Service
 public class TechnologyCreationService {
 
@@ -134,22 +131,24 @@ private Either<String, Entity> createTechnologyForEachOperation(final Technology
 
         if ("01oneDivision".equals(range)) {
             Entity division = technology.getBelongsToField("division");
-            Entity componentsLocation = division.getBelongsToField(COMPONENTS_LOCATION);
-            technology.setField(COMPONENTS_LOCATION, componentsLocation);
+            if (division != null) {
+                Entity componentsLocation = division.getBelongsToField(COMPONENTS_LOCATION);
+                technology.setField(COMPONENTS_LOCATION, componentsLocation);
 
-            Entity componentsOutput = division.getBelongsToField(COMPONENTS_OUTPUT_LOCATION);
-            technology.setField(COMPONENTS_OUTPUT_LOCATION, componentsOutput);
+                Entity componentsOutput = division.getBelongsToField(COMPONENTS_OUTPUT_LOCATION);
+                technology.setField(COMPONENTS_OUTPUT_LOCATION, componentsOutput);
 
-            Entity productsInput = division.getBelongsToField(PRODUCTS_INPUT_LOCATION);
-            technology.setField(PRODUCTS_INPUT_LOCATION, productsInput);
+                Entity productsInput = division.getBelongsToField(PRODUCTS_INPUT_LOCATION);
+                technology.setField(PRODUCTS_INPUT_LOCATION, productsInput);
 
-            Entity productsWaste = division.getBelongsToField(WASTE_RECEPTION_WAREHOUSE);
-            technology.setField(WASTE_RECEPTION_WAREHOUSE, productsWaste);
+                Entity productsWaste = division.getBelongsToField(WASTE_RECEPTION_WAREHOUSE);
+                technology.setField(WASTE_RECEPTION_WAREHOUSE, productsWaste);
 
-            Entity productsFlow = division.getBelongsToField(PRODUCTS_FLOW_LOCATION);
-            technology.setField(PRODUCTS_FLOW_LOCATION, productsFlow);
+                Entity productsFlow = division.getBelongsToField(PRODUCTS_FLOW_LOCATION);
+                technology.setField(PRODUCTS_FLOW_LOCATION, productsFlow);
 
-            technology = technology.getDataDefinition().save(technology);
+                technology = technology.getDataDefinition().save(technology);
+            }
         }
 
         Entity parent = null;
diff --git a/mes-plugins/mes-plugins-orders/src/main/java/com/qcadoo/mes/orders/services/WorkstationChangeoverService.java b/mes-plugins/mes-plugins-orders/src/main/java/com/qcadoo/mes/orders/services/WorkstationChangeoverService.java
@@ -52,8 +52,7 @@ public List<Entity> findWorkstationChangeoversForSchedulePosition(final Date sta
                 previousProduct = previousSchedulePosition.getBelongsToField(SchedulePositionFields.ORDER).getBelongsToField(OrderFields.PRODUCT);
             } else {
                 previousOperationalTask = getPreviousOperationalTask(workstation, startDate);
-                if (previousOperationalTask != null
-                        && OperationalTaskType.EXECUTION_OPERATION_IN_ORDER.getStringValue().equals(previousOperationalTask.getStringField(OperationalTaskFields.TYPE))) {
+                if (previousOperationalTask != null) {
                     previousProduct = previousOperationalTask.getBelongsToField(OperationalTaskFields.ORDER).getBelongsToField(OrderFields.PRODUCT);
                 }
             }
@@ -379,6 +378,7 @@ private void addWorkstationAndDateSearchRestrictions(final SearchCriteriaBuilder
         searchCriteriaBuilder.add(SearchRestrictions.eq(OperationalTaskFields.WORKSTATION + L_DOT + L_ID, workstation.getId()));
         searchCriteriaBuilder.add(SearchRestrictions.ne(OperationalTaskFields.STATE, OperationalTaskState.REJECTED.getStringValue()));
         searchCriteriaBuilder.add(SearchRestrictions.le(OperationalTaskFields.FINISH_DATE, startDate));
+        searchCriteriaBuilder.add(SearchRestrictions.eq(OperationalTaskFields.TYPE, OperationalTaskType.EXECUTION_OPERATION_IN_ORDER.getStringValue()));
     }
 
     public boolean hasWorkstationChangeoverForOperationalTasks(final Entity workstationChangeoverNorm) {
diff --git a/mes-plugins/mes-plugins-production-counting/src/main/java/com/qcadoo/mes/productionCounting/criteriaModifiers/BatchCriteriaModifierPC.java b/mes-plugins/mes-plugins-production-counting/src/main/java/com/qcadoo/mes/productionCounting/criteriaModifiers/BatchCriteriaModifierPC.java
@@ -5,14 +5,14 @@
 import com.qcadoo.model.api.Entity;
 import com.qcadoo.model.api.search.SearchCriteriaBuilder;
 import com.qcadoo.model.api.search.SearchRestrictions;
+import com.qcadoo.plugin.api.PluginUtils;
 import com.qcadoo.view.api.components.lookup.FilterValueHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 @Service
 public class BatchCriteriaModifierPC {
 
@@ -23,7 +23,7 @@ public class BatchCriteriaModifierPC {
 
     public void filterByOrder(final SearchCriteriaBuilder scb, final FilterValueHolder filterValue) {
 
-        if (filterValue.has(ORDER_ID)) {
+        if (filterValue.has(ORDER_ID) && PluginUtils.isEnabled("advancedGenealogyForOrders")) {
             Long orderId = filterValue.getLong(ORDER_ID);
             List<Entity> entities = dataDefinitionService
                     .get(AdvancedGenealogyConstants.PLUGIN_IDENTIFIER, AdvancedGenealogyConstants.MODEL_TRACKING_RECORD)
diff --git a/mes-plugins/mes-plugins-production-counting/src/main/java/com/qcadoo/mes/productionCounting/listeners/ProductionTrackingDetailsListeners.java b/mes-plugins/mes-plugins-production-counting/src/main/java/com/qcadoo/mes/productionCounting/listeners/ProductionTrackingDetailsListeners.java
@@ -23,19 +23,6 @@
  */
 package com.qcadoo.mes.productionCounting.listeners;
 
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-import com.qcadoo.mes.productionCounting.states.constants.ProductionTrackingStateStringValues;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
@@ -54,29 +41,34 @@
 import com.qcadoo.mes.orders.constants.OperationalTaskFields;
 import com.qcadoo.mes.orders.constants.OrderFields;
 import com.qcadoo.mes.productionCounting.ProductionTrackingService;
-import com.qcadoo.mes.productionCounting.constants.ParameterFieldsPC;
-import com.qcadoo.mes.productionCounting.constants.ProductionCountingConstants;
-import com.qcadoo.mes.productionCounting.constants.ProductionTrackingFields;
-import com.qcadoo.mes.productionCounting.constants.TrackingOperationProductInComponentDtoFields;
-import com.qcadoo.mes.productionCounting.constants.TrackingOperationProductInComponentFields;
+import com.qcadoo.mes.productionCounting.constants.*;
 import com.qcadoo.mes.productionCounting.newstates.ProductionTrackingStateServiceMarker;
+import com.qcadoo.mes.productionCounting.states.constants.ProductionTrackingStateStringValues;
 import com.qcadoo.mes.productionCounting.utils.ProductionTrackingDocumentsHelper;
 import com.qcadoo.mes.productionCounting.utils.StaffTimeCalculator;
-import com.qcadoo.model.api.BigDecimalUtils;
-import com.qcadoo.model.api.DataDefinitionService;
-import com.qcadoo.model.api.Entity;
-import com.qcadoo.model.api.EntityList;
-import com.qcadoo.model.api.NumberService;
+import com.qcadoo.model.api.*;
 import com.qcadoo.model.api.search.SearchRestrictions;
 import com.qcadoo.model.api.units.PossibleUnitConversions;
 import com.qcadoo.model.api.units.UnitConversionService;
+import com.qcadoo.plugin.api.PluginUtils;
 import com.qcadoo.view.api.ComponentState;
 import com.qcadoo.view.api.ViewDefinitionState;
 import com.qcadoo.view.api.components.FieldComponent;
 import com.qcadoo.view.api.components.FormComponent;
 import com.qcadoo.view.api.components.GridComponent;
 import com.qcadoo.view.api.components.LookupComponent;
 import com.qcadoo.view.constants.QcadooViewConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 @Service
 public class ProductionTrackingDetailsListeners {
@@ -374,7 +366,7 @@ private void fillOrderedProductBatch(final ViewDefinitionState view) {
 
         Entity order = orderLookup.getEntity();
 
-        if (Objects.nonNull(order)) {
+        if (Objects.nonNull(order) && PluginUtils.isEnabled("advancedGenealogyForOrders")) {
             List<Entity> records = dataDefinitionService
                     .get(AdvancedGenealogyConstants.PLUGIN_IDENTIFIER, AdvancedGenealogyConstants.MODEL_TRACKING_RECORD).find()
                     .add(SearchRestrictions.belongsTo(L_ORDER, order)).list().getEntities();
diff --git a/pom.xml b/pom.xml
@@ -41,7 +41,7 @@
     </modules>
 
     <properties>
-        <qcadoo.buildVersionForUser>2.5.14</qcadoo.buildVersionForUser>
+        <qcadoo.buildVersionForUser>2.5.15</qcadoo.buildVersionForUser>
         <qcadoo.version>${project.version}</qcadoo.version>
         <qcadoo.plugin.version>1.5</qcadoo.plugin.version>
         <qcadoo.maven.plugin.version>1.5-SNAPSHOT</qcadoo.maven.plugin.version>
