Add a GROUP BY stock.date clause in Resource_zGetMovementHistoryList, to...

Add a GROUP BY stock.date clause in Resource_zGetMovementHistoryList, to display 2 movements when we have a movement from node N to node N with different start date and stop date.



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

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml

@@ -758,7 +758,7 @@ GROUP BY\n
   <dtml-if group_by_expression>\n
     <dtml-var group_by_expression>\n
   <dtml-else>\n
-    stock.uid, stock.node_uid, stock.resource_uid\n
+    stock.uid, stock.node_uid, stock.resource_uid, stock.date\n
   </dtml-if>\n
 \n
 <dtml-if order_by_expression>\n
@@ -910,7 +910,7 @@ GROUP BY\n
   <dtml-if group_by_expression>\n
     <dtml-var group_by_expression>\n
   <dtml-else>\n
-    stock.uid, stock.node_uid, stock.resource_uid\n
+    stock.uid, stock.node_uid, stock.resource_uid, stock.date\n
   </dtml-if>\n
 \n
 <dtml-if order_by_expression>\n

product/ERP5/bootstrap/erp5_core/bt/revision

-76
+65
\ No newline at end of file

product/ERP5/tests/testInventoryAPI.py

@@ -917,6 +917,21 @@ class TestMovementHistoryList(InventoryAPITestCase):
       running_total_price += quantity * quantity # we've set price=quantity
       self.assertEquals(running_total_price, brain.running_total_price)
   
+  # bug #352
+  def testSameNodeDifferentDates(self):
+    getMovementHistoryList = self.getSimulationTool().getMovementHistoryList
+    date = DateTime()
+    mvt = self._makeMovement( quantity=2,
+                              start_date=date,
+                              stop_date=date+1,
+                              source_value=self.node,
+                              destination_value=self.node )
+    
+    mvt_history_list = getMovementHistoryList(
+                            node_uid=self.node.getUid(),)
+    self.assertEquals(2, len(mvt_history_list))
+    self.assertEquals(0, sum([r.total_quantity for r in mvt_history_list]))
+    
 class TestInventoryStat(InventoryAPITestCase):
   """Tests Inventory Stat methods.
   """