Data Supply is a Delivery as it "delivers" a service between two parties.

bt5/erp5_wendelin/PortalTypeTemplateItem/portal_types/Data%20Supply.xml

@@ -50,7 +50,7 @@ It is used by Ingestion Policy.</string> </value>
         </item>
         <item>
             <key> <string>type_class</string> </key>
-            <value> <string>Supply</string> </value>
+            <value> <string>Delivery</string> </value>
         </item>
         <item>
             <key> <string>type_interface</string> </key>

bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/ERP5Site_handleDefaultFluentdIngestion.xml

@@ -80,10 +80,8 @@ if data_chunk is not None and reference is not None:\n
   query=ComplexQuery(Query(portal_type = \'Data Supply\'),\n
                      Query(reference = reference),\n
                      Query(validation_state = \'validated\'),\n
-                     # XXX: enable when final decision made if Data Supply is a\n
-                     # Delivery or Supply\n
-                     #Query( **{\'delivery.stop_date\':now,  \'range\': \'max\'}),\n
-                     #Query( **{\'delivery.start_date\':now,  \'range\': \'min\'}),\n
+                     Query( **{\'delivery.stop_date\':now,  \'range\': \'min\'}),\n
+                     Query( **{\'delivery.start_date\':now,  \'range\': \'max\'}),\n
                      operator="AND")\n
   data_supply = portal_catalog.getResultValue(query=query)\n
 \n
@@ -127,7 +125,7 @@ if data_chunk is not None and reference is not None:\n
   else:\n
     raise NotFound(\'No data supply configuration found.\')\n
 else:\n
-  raise NotFound(\'No data or any configuration not found.\')\n
+  raise NotFound(\'No data or any configuration found.\')\n
 
 
 ]]></string> </value>