Add new Method to get Tracking History explicitely

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19742 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/Tool/SimulationTool.py

@@ -1496,7 +1496,7 @@ class SimulationTool(BaseTool):
     security.declareProtected(Permissions.AccessContentsInformation, 'getTrackingList')
     def getTrackingList(self, src__=0,
         selection_domain=None, selection_report=None,
-        strict_simulation_state=1, **kw) :
+        strict_simulation_state=1, history=0, **kw) :
       """
       Returns a list of items in the form
 
@@ -1535,6 +1535,8 @@ class SimulationTool(BaseTool):
 
       at_date   (<=) - only take rows which date is <= at_date
 
+      history (boolean) - keep history variations
+
       resource (only in generic API in simulation)
 
       node        -  only take rows in stock table which node_uid is equivalent to node
@@ -1591,10 +1593,10 @@ class SimulationTool(BaseTool):
       new_kw['to_date'] = to_date
 
       # Extra parameters for the SQL Method
-      new_kw['join_on_item'] = new_kw.get('at_date') or \
+      new_kw['join_on_item'] = not history and (new_kw.get('at_date') or \
                                new_kw.get('to_date') or \
                                new_kw.get('input') or \
-                               new_kw.get('output')
+                               new_kw.get('output'))
       new_kw['date_condition_in_join'] = not (new_kw.get('input') or new_kw.get('output'))
 
       # Pass simulation state to request
@@ -1616,6 +1618,22 @@ class SimulationTool(BaseTool):
       kw['item.simulation_state'] = self.getPortalCurrentInventoryStateList()
       return self.getTrackingList(**kw)
     
+    security.declareProtected(Permissions.AccessContentsInformation, 'getCurrentTrackingHistoryList')
+    def getCurrentTrackingHistoryList(self, **kw):
+      """
+      Returns list of current inventory grouped by section or site
+      """
+      kw['item.simulation_state'] = self.getPortalCurrentInventoryStateList()
+      return self.getTrackingHistoryList(**kw)
+    
+    security.declareProtected(Permissions.AccessContentsInformation, 'getTrackingHistoryList')
+    def getTrackingHistoryList(self, **kw):
+      """
+      Returns history list of inventory grouped by section or site
+      """
+      kw['history'] = 1
+      return self.getTrackingList(**kw)
+
     security.declareProtected(Permissions.AccessContentsInformation, 'getFutureTrackingList')
     def getFutureTrackingList(self, **kw):
       """