[Erp5-report] r32566 kazuhiko - /erp5/trunk/products/ERP5/tests/testConversionInSimulation.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Feb 16 02:58:30 2010
New Revision: 32566

URL: http://svn.erp5.org?rev=32566&view=rev
Log:
* modify the location of invoicing rule according to the new simulation tree.
* packing list lines' order can be different from order lines' order.

Modified:
    erp5/trunk/products/ERP5/tests/testConversionInSimulation.py

Modified: erp5/trunk/products/ERP5/tests/testConversionInSimulation.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testConversionInSimulation.py?rev=32566&r1=32565&r2=32566&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testConversionInSimulation.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testConversionInSimulation.py [utf8] Tue Feb 16 02:58:30 2010
@@ -295,8 +295,9 @@
     
     related_applied_rule = order.getCausalityRelatedValue(
                              portal_type='Applied Rule')
-    delivery_movement = related_applied_rule.contentValues()[0]
-    
+    order_movement = related_applied_rule.contentValues()[0]
+    delivery_applied_rule = order_movement.contentValues()[0]
+    delivery_movement = delivery_applied_rule.contentValues()[0]
     invoice_applied_rule = delivery_movement.contentValues()[0]
     invoice_movement = invoice_applied_rule.contentValues()[0]
     invoice_transaction_applied_rule = invoice_movement.contentValues()[0]
@@ -387,8 +388,9 @@
     
     related_applied_rule = order.getCausalityRelatedValue(
                              portal_type='Applied Rule')
-    delivery_movement = related_applied_rule.contentValues()[0]
-    
+    order_movement = related_applied_rule.contentValues()[0]
+    delivery_applied_rule = order_movement.contentValues()[0]
+    delivery_movement = delivery_applied_rule.contentValues()[0]
     invoice_applied_rule = delivery_movement.contentValues()[0]
     invoice_movement = invoice_applied_rule.contentValues()[0]
     invoice_transaction_applied_rule = invoice_movement.contentValues()[0]
@@ -477,7 +479,9 @@
     self.tic()
     related_applied_rule = order.getCausalityRelatedValue(
                              portal_type='Applied Rule')
-    delivery_movement = related_applied_rule.contentValues()[0]
+    order_movement = related_applied_rule.contentValues()[0]
+    delivery_applied_rule = order_movement.contentValues()[0]
+    delivery_movement = delivery_applied_rule.contentValues()[0]
     related_invoice = related_packing_list.getCausalityRelatedValue(
                             portal_type='Sale Invoice Transaction')
     self.assertNotEquals(related_invoice, None)
@@ -582,7 +586,9 @@
 
     related_applied_rule = order.getCausalityRelatedValue(
                             portal_type='Applied Rule')		
-    delivery_movement = related_applied_rule.contentValues()[0]  
+    order_movement = related_applied_rule.contentValues()[0]
+    delivery_applied_rule = order_movement.contentValues()[0]
+    delivery_movement = delivery_applied_rule.contentValues()[0]
     invoice_applied_rule = delivery_movement.contentValues()[0]
     invoice_movement = invoice_applied_rule.contentValues()[0]
     invoice_transaction_applied_rule = invoice_movement.contentValues()[0]
@@ -683,7 +689,9 @@
 
     related_applied_rule = order.getCausalityRelatedValue(
                              portal_type='Applied Rule')
-    delivery_movement = related_applied_rule.contentValues()[0]  
+    order_movement = related_applied_rule.contentValues()[0]
+    delivery_applied_rule = order_movement.contentValues()[0]
+    delivery_movement = delivery_applied_rule.contentValues()[0]
     invoice_applied_rule = delivery_movement.contentValues()[0]
     invoice_movement = invoice_applied_rule.contentValues()[0]
     invoice_transaction_applied_rule = invoice_movement.contentValues()[0]
@@ -839,6 +847,7 @@
                                 portal_type='Sale Packing List')
     self.assertNotEquals(related_packing_list, None)
     movement_list = related_packing_list.getMovementList()
+    movement_list.sort(key=lambda x:x.getCausalityId())
     self.assertEquals(len(movement_list),2)
     self.assertEquals(movement_list[0].getQuantityUnit(),
                          first_order_line.getQuantityUnit())