[Erp5-report] r9973 - in /erp5/trunk/products/ERP5: bootstrap/erp5_core/SkinTemplateItem/po...

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Sep 15 12:05:46 2006
New Revision: 9973

URL: http://svn.erp5.org?rev=9973&view=rev
Log:
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.


Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
    erp5/trunk/products/ERP5/tests/testInventoryAPI.py

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml?rev=9973&r1=9972&r2=9973&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml Fri Sep 15 12:05:46 2006
@@ -758,7 +758,7 @@
   <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 @@
   <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

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=9973&r1=9972&r2=9973&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Fri Sep 15 12:05:46 2006
@@ -1,1 +1,1 @@
-76
+65

Modified: erp5/trunk/products/ERP5/tests/testInventoryAPI.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testInventoryAPI.py?rev=9973&r1=9972&r2=9973&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testInventoryAPI.py (original)
+++ erp5/trunk/products/ERP5/tests/testInventoryAPI.py Fri Sep 15 12:05:46 2006
@@ -916,7 +916,22 @@
       self.assertEquals(running_total_quantity, brain.running_total_quantity)
       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.
   """