inventory_api: rely on catalog to add slot_index in the query

instead of implementing this logic in ZSQL's DTML

product/ERP5/Tool/SimulationTool.py

@@ -511,6 +511,14 @@ class SimulationTool(BaseTool):
         # catalog
         new_kw.pop('ignore_group_by', None)
 
+        # When group_by_time_sequence_list is used, the ZSQL method template
+        # will use a variable slot_index, we want to select it, group and order
+        # by it.
+        if sql_kw.get('group_by_time_sequence_list'):
+          new_kw['group_by_list'] = new_kw.get('group_by_list', []) + ['slot_index']
+          new_kw['order_by_list'] = new_kw.get('order_by_list', []) + [('slot_index', )]
+          new_kw.setdefault('select_dict', {})['slot_index'] = 'slot_index'
+
         sql_kw.update(ctool.buildSQLQuery(**new_kw))
         return sql_kw
 

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.sql

@@ -77,7 +77,6 @@ SELECT
   COUNT(DISTINCT <dtml-var stock_table_id>.uid) AS stock_uid,
   MAX(<dtml-var stock_table_id>.date) AS date
 </dtml-if>
-<dtml-if group_by_time_sequence_list>, slot_index </dtml-if> <dtml-comment>XXX is this really needed? are empty slots returned ? </dtml-comment>
 
 <dtml-if select_expression>, <dtml-var select_expression></dtml-if>
 
@@ -188,16 +187,11 @@ WHERE
 <dtml-if group_by_expression>
 GROUP BY
     <dtml-if transformed_uid>transformation.transformed_uid,</dtml-if>
-    <dtml-if group_by_time_sequence_list>slot_index,</dtml-if>
     <dtml-var group_by_expression>
 
 </dtml-if>
 <dtml-if order_by_expression>
 ORDER BY
   <dtml-var order_by_expression>
-<dtml-else>
-  <dtml-if group_by_time_sequence_list>
-    ORDER BY slot_index
-  </dtml-if>
 </dtml-if>
 </dtml-let>