I was wrong, we never wanted to drop omit_simulation support.

Add tests for omit_simulation



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

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

@@ -78,6 +78,12 @@
                                   <dictionary/>
                                 </value>
                             </item>
+                            <item>
+                                <key> <string>omit_simulation</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
                             <item>
                                 <key> <string>order_by_expression</string> </key>
                                 <value>
@@ -126,18 +132,19 @@
                         <key> <string>_keys</string> </key>
                         <value>
                           <list>
-                            <string>from_table_list</string>
-                            <string>where_expression</string>
-                            <string>order_by_expression</string>
-                            <string>selection_domain</string>
-                            <string>selection_report</string>
-                            <string>ignore_variation</string>
-                            <string>standardize</string>
-                            <string>omit_input</string>
-                            <string>omit_output</string>
-                            <string>input_simulation_state</string>
-                            <string>output_simulation_state</string>
-                            <string>group_by_expression</string>
+<string>from_table_list</string>
+<string>where_expression</string>
+<string>order_by_expression</string>
+<string>selection_domain</string>
+<string>selection_report</string>
+<string>ignore_variation</string>
+<string>standardize</string>
+<string>omit_simulation</string>
+<string>omit_input</string>
+<string>omit_output</string>
+<string>input_simulation_state</string>
+<string>output_simulation_state</string>
+<string>group_by_expression</string>
                           </list>
                         </value>
                     </item>
@@ -167,6 +174,7 @@ selection_domain\r\n
 selection_report\r\n
 ignore_variation\r\n
 standardize\r\n
+omit_simulation\r\n
 omit_input\r\n
 omit_output\r\n
 input_simulation_state:list\r\n
@@ -249,6 +257,10 @@ WHERE\n
   AND node.uid = stock.node_uid\n
   AND resource.uid = stock.resource_uid\n
 \n
+<dtml-if omit_simulation>\n
+  AND catalog.portal_type != \'Simulation Movement\'\n
+</dtml-if>\n
+\n
 <dtml-if omit_input>\n
   AND stock.quantity < 0\n
   AND (  stock.node_uid <> stock.mirror_node_uid\n
@@ -375,6 +387,10 @@ WHERE\n
   AND node.uid = stock.node_uid\n
   AND resource.uid = stock.resource_uid\n
 \n
+<dtml-if omit_simulation>\n
+  AND catalog.portal_type != \'Simulation Movement\'\n
+</dtml-if>\n
+\n
 <dtml-if omit_input>\n
   AND stock.quantity < 0\n
   AND (  stock.node_uid <> stock.mirror_node_uid\n

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

@@ -86,6 +86,12 @@
                                   <dictionary/>
                                 </value>
                             </item>
+                            <item>
+                                <key> <string>omit_simulation</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
                             <item>
                                 <key> <string>order_by_expression</string> </key>
                                 <value>
@@ -134,18 +140,19 @@
                         <key> <string>_keys</string> </key>
                         <value>
                           <list>
-                            <string>from_table_list</string>
-                            <string>where_expression</string>
-                            <string>order_by_expression</string>
-                            <string>group_by_expression</string>
-                            <string>selection_domain</string>
-                            <string>selection_report</string>
-                            <string>ignore_variation</string>
-                            <string>standardize</string>
-                            <string>omit_input</string>
-                            <string>omit_output</string>
-                            <string>input_simulation_state</string>
-                            <string>output_simulation_state</string>
+<string>from_table_list</string>
+<string>where_expression</string>
+<string>order_by_expression</string>
+<string>group_by_expression</string>
+<string>selection_domain</string>
+<string>selection_report</string>
+<string>ignore_variation</string>
+<string>standardize</string>
+<string>omit_simulation</string>
+<string>omit_input</string>
+<string>omit_output</string>
+<string>input_simulation_state</string>
+<string>output_simulation_state</string>
                           </list>
                         </value>
                     </item>
@@ -176,6 +183,7 @@ selection_domain\r\n
 selection_report\r\n
 ignore_variation\r\n
 standardize\r\n
+omit_simulation\r\n
 omit_input\r\n
 omit_output\r\n
 input_simulation_state:list\r\n
@@ -258,6 +266,10 @@ WHERE\n
   AND node.uid = stock.node_uid\n
   AND resource.uid = stock.resource_uid\n
 \n
+<dtml-if omit_simulation>\n
+  AND catalog.portal_type != \'Simulation Movement\'\n
+</dtml-if>\n
+\n
 <dtml-if omit_input>\n
   AND stock.quantity < 0\n
   AND ( stock.node_uid <> stock.mirror_node_uid\n
@@ -391,6 +403,10 @@ WHERE\n
   AND node.uid = stock.node_uid\n
   AND resource.uid = stock.resource_uid\n
 \n
+<dtml-if omit_simulation>\n
+  AND catalog.portal_type != \'Simulation Movement\'\n
+</dtml-if>\n
+\n
 <dtml-if omit_input>\n
   AND stock.quantity < 0\n
   AND ( stock.node_uid <> stock.mirror_node_uid\n

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

@@ -78,6 +78,12 @@
                                   <dictionary/>
                                 </value>
                             </item>
+                            <item>
+                                <key> <string>omit_simulation</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
                             <item>
                                 <key> <string>order_by_expression</string> </key>
                                 <value>
@@ -126,18 +132,19 @@
                         <key> <string>_keys</string> </key>
                         <value>
                           <list>
-                            <string>from_table_list</string>
-                            <string>where_expression</string>
-                            <string>order_by_expression</string>
-                            <string>group_by_expression</string>
-                            <string>selection_domain</string>
-                            <string>selection_report</string>
-                            <string>ignore_variation</string>
-                            <string>standardize</string>
-                            <string>omit_input</string>
-                            <string>omit_output</string>
-                            <string>input_simulation_state</string>
-                            <string>output_simulation_state</string>
+<string>from_table_list</string>
+<string>where_expression</string>
+<string>order_by_expression</string>
+<string>group_by_expression</string>
+<string>selection_domain</string>
+<string>selection_report</string>
+<string>ignore_variation</string>
+<string>standardize</string>
+<string>omit_simulation</string>
+<string>omit_input</string>
+<string>omit_output</string>
+<string>input_simulation_state</string>
+<string>output_simulation_state</string>
                           </list>
                         </value>
                     </item>
@@ -577,6 +584,7 @@ selection_domain\r\n
 selection_report\r\n
 ignore_variation\r\n
 standardize\r\n
+omit_simulation\r\n
 omit_input\r\n
 omit_output\r\n
 input_simulation_state:list\r\n
@@ -656,6 +664,10 @@ WHERE\n
   AND node.uid = stock.node_uid\n
   AND resource.uid = stock.resource_uid\n
 \n
+<dtml-if omit_simulation>\n
+  AND catalog.portal_type != \'Simulation Movement\'\n
+</dtml-if>\n
+\n
 <dtml-if omit_input>\n
   AND stock.quantity < 0\n
   AND ( stock.node_uid <> stock.mirror_node_uid\n
@@ -786,6 +798,10 @@ WHERE\n
   AND node.uid = stock.node_uid\n
   AND resource.uid = stock.resource_uid\n
 \n
+<dtml-if omit_simulation>\n
+  AND catalog.portal_type != \'Simulation Movement\'\n
+</dtml-if>\n
+\n
 <dtml-if omit_input>\n
   AND stock.quantity < 0\n
   AND ( stock.node_uid <> stock.mirror_node_uid\n

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

@@ -76,6 +76,12 @@
                                   <dictionary/>
                                 </value>
                             </item>
+                            <item>
+                                <key> <string>omit_simulation</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
                             <item>
                                 <key> <string>query</string> </key>
                                 <value>
@@ -152,21 +158,22 @@
                         <key> <string>_keys</string> </key>
                         <value>
                           <list>
-                            <string>query</string>
-                            <string>resource_uid</string>
-                            <string>from_date</string>
-                            <string>at_date</string>
-                            <string>to_date</string>
-                            <string>omit_input</string>
-                            <string>omit_output</string>
-                            <string>simulation_state</string>
-                            <string>section_category</string>
-                            <string>selection_domain</string>
-                            <string>selection_report</string>
-                            <string>closed_summary</string>
-                            <string>where_expression</string>
-                            <string>from_table_list</string>
-                            <string>selection_uids</string>
+<string>query</string>
+<string>resource_uid</string>
+<string>from_date</string>
+<string>at_date</string>
+<string>to_date</string>
+<string>omit_simulation</string>
+<string>omit_input</string>
+<string>omit_output</string>
+<string>simulation_state</string>
+<string>section_category</string>
+<string>selection_domain</string>
+<string>selection_report</string>
+<string>closed_summary</string>
+<string>where_expression</string>
+<string>from_table_list</string>
+<string>selection_uids</string>
                           </list>
                         </value>
                     </item>
@@ -194,6 +201,7 @@ resource_uid:list\r\n
 from_date\r\n
 at_date\r\n
 to_date\r\n
+omit_simulation\r\n
 omit_input\r\n
 omit_output\r\n
 simulation_state:list\r\n
@@ -295,6 +303,9 @@ WHERE\n
   <dtml-if to_date>\n
     AND stock.date < <dtml-sqlvar to_date type="datetime">\n
   </dtml-if>\n
+  <dtml-if omit_simulation>\n
+    AND catalog.portal_type != \'Simulation Movement\'\n
+  </dtml-if>\n
   <dtml-if omit_input>\n
     AND stock.quantity < 0\n
     AND (stock.node_uid <> stock.mirror_node_uid\n
@@ -435,6 +446,9 @@ WHERE\n
   <dtml-if to_date>\n
     AND stock.date < <dtml-sqlvar to_date type="datetime">\n
   </dtml-if>\n
+  <dtml-if omit_simulation>\n
+    AND catalog.portal_type != \'Simulation Movement\'\n
+  </dtml-if>\n
   <dtml-if omit_input>\n
     AND stock.quantity < 0\n
     AND (stock.node_uid <> stock.mirror_node_uid\n

product/ERP5/bootstrap/erp5_core/bt/change_log

-2006-09-04 jerome
-* remove omit_simulation parameter in all inventory API ZSQLMethods.
-
 2006-08-25 Stefan
 * Update naming convention script.
 

product/ERP5/bootstrap/erp5_core/bt/revision

-55
+56
\ No newline at end of file

product/ERP5/tests/testInventoryAPI.py

@@ -271,6 +271,15 @@ class TestInventory(InventoryAPITestCase):
     get_transaction().commit(); self.tic() # (after reindexing of course)
     self.assertEquals(100, getInventory(section_uid=self.section.getUid()))
   
+  def test_OmitSimulation(self, quiet=0, run=RUN_ALL_TESTS):
+    """Test omit_simulation argument to getInventory.
+    """
+    getInventory = self.getSimulationTool().getInventory
+    self._makeSimulationMovement(quantity=100)
+    self._makeMovement(quantity=100)
+    self.assertEquals(100, getInventory(section_uid=self.section.getUid(),
+                                        omit_simulation=1))
+
   def test_SectionCategory(self, quiet=0, run=RUN_ALL_TESTS):
     """Tests inventory on section category. """
     getInventory = self.getSimulationTool().getInventory
@@ -819,6 +828,27 @@ class TestMovementHistoryList(InventoryAPITestCase):
                               section_uid=self.section.getUid())
     self.assertEquals(len(movement_history_list), 2)
 
+  def test_SimulationMovement(self, quiet=0, run=RUN_ALL_TESTS):
+    """Test simulation movement are listed in getMovementHistoryList
+    """
+    getMovementHistoryList = self.getSimulationTool().getMovementHistoryList
+    self._makeSimulationMovement(quantity=100)
+    self._makeMovement(quantity=100)
+    movement_history_list = getMovementHistoryList(
+                                    section_uid=self.section.getUid())
+    self.assertEquals(2, len(movement_history_list))
+  
+  def test_OmitSimulation(self, quiet=0, run=RUN_ALL_TESTS):
+    """Test omit_simulation argument to getMovementHistoryList.
+    """
+    getMovementHistoryList = self.getSimulationTool().getMovementHistoryList
+    self._makeSimulationMovement(quantity=100)
+    self._makeMovement(quantity=100)
+    movement_history_list = getMovementHistoryList(
+                                    section_uid=self.section.getUid(),
+                                    omit_simulation=1)
+    self.assertEquals(1, len(movement_history_list))
+    self.assertEquals(100, movement_history_list[0].quantity)
     
 class TestInventoryStat(InventoryAPITestCase):
   """Tests Inventory Stat methods.