erp5_wendelin : fix new functionality

bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/ERP5Site_createDataAnalysisList.py

@@ -126,21 +126,33 @@ for movement in portal_catalog(query):
       aggregate_type_set = set(
         [portal.restrictedTraverse(a).getPortalType() for a in aggregate_set])
       for item_type in transformation_line.getAggregatedPortalTypeList():
-        # create item if it does note exist yet.
-        # Except if it is a Data Array Line, then it is currently created by
-        # data operation itself (probably this exception is inconsistent)
+        # if item is not yet aggregated to this line, search it by related project
+        # and source If the item is a data configuration or a device configuration
+        # then we do not care the workflow state nor the related resource, nor
+        # the variation nor the related sensor. Data Array Lines are created
+        # by Data Operation.
 
-        if item_type not in aggregate_type_set and item_type != "Data Array Line":
-          
-          item = portal.portal_catalog.getResultValue(
-            portal_type=item_type,
-            validation_state="validated",
-            item_variation_text=transformation_line.getVariationText(),
-            item_device_relative_url=movement.getAggregateDevice(),
-            item_project_relative_url=data_analysis.getDestinationProject(),
-            item_resource_uid=resource.getUid(),
-            item_source_relative_url=data_analysis.getSource())
+        if item_type not in aggregate_type_set:
         
+          if item_type in portal.getPortalDeviceConfigurationTypeList() + portal.getPortalDataConfigurationTypeList():
+            
+            item = portal.portal_catalog.getResultValue(
+              portal_type=item_type,
+              #validation_state="validated",
+              item_project_relative_url=delivery.getDestinationProject(),
+              item_source_relative_url=delivery.getSource())
+  
+          elif item_type != "Data Array Line":
+            
+            item = portal.portal_catalog.getResultValue(
+              portal_type=item_type,
+              validation_state="validated",
+              item_variation_text=transformation_line.getVariationText(),
+              item_device_relative_url=movement.getAggregateDevice(),
+              item_project_relative_url=data_analysis.getDestinationProject(),
+              item_resource_uid=resource.getUid(),
+              item_source_relative_url=data_analysis.getSource())
+          
           #if transformation_line.getRelativeUrl() == "data_transformation_module/woelfel_r0331_statistic_raw":
           #  raise TypeError("JUST STOP")
           if item is None: