[Erp5-report] r33207 kazuhiko - /erp5/trunk/products/ERP5/tests/testInvoice.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Mar  2 04:55:07 2010
New Revision: 33207

URL: http://svn.erp5.org?rev=33207&view=rev
Log:
follow the change in r33163.

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

Modified: erp5/trunk/products/ERP5/tests/testInvoice.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testInvoice.py?rev=33207&r1=33206&r2=33207&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testInvoice.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testInvoice.py [utf8] Tue Mar  2 04:55:07 2010
@@ -341,7 +341,7 @@
     for order_rule in order_rule_list :
       for order_simulation_movement in order_rule.objectValues() :
         temp_invoicing_rule_list = [ar for ar in order_simulation_movement.objectValues()[0].objectValues()[0].objectValues()
-          if ar.getSpecialiseValue().getPortalType() == 'Invoicing Rule']
+          if ar.getSpecialiseValue().getPortalType() == 'Invoice Simulation Rule']
         self.assertEquals(len(temp_invoicing_rule_list), 1)
         invoicing_rule_list.extend(temp_invoicing_rule_list)
     sequence.edit(invoicing_rule_list=invoicing_rule_list)
@@ -358,7 +358,7 @@
         invoice_transaction_rule_list.extend([applied_rule for applied_rule
           in simulation_movement.objectValues() if applied_rule \
               .getSpecialiseValue().getPortalType()
-              == 'Invoice Transaction Rule'])
+              == 'Invoice Transaction Simulation Rule'])
         resource_list = sequence.get('resource_list')
         self.assertEquals(simulation_movement.getPortalType(),
                           'Simulation Movement')
@@ -1263,28 +1263,28 @@
         applied_rule_set.add(sm.getRootAppliedRule())
 
     rule_dict = {
-        'Order Rule': {
+        'Order Root Simulation Rule': {
           'movement_type_list': ['Sale Order Line', 'Sale Order Cell'],
-          'next_rule_list': ['Delivering Rule', ],
+          'next_rule_list': ['Delivery Simulation Rule', ],
           },
-        'Delivering Rule': {
+        'Delivery Simulation Rule': {
           'movement_type_list': ['Sale Packing List Line', 'Sale Packing List Cell'],
-          'next_rule_list': ['Invoicing Rule', ],
+          'next_rule_list': ['Invoice Simulation Rule', ],
           },
-        'Invoicing Rule': {
+        'Invoice Simulation Rule': {
           'movement_type_list': invoice.getPortalInvoiceMovementTypeList(),
-          'next_rule_list': ['Invoice Transaction Rule', 'Trade Model Rule'],
+          'next_rule_list': ['Invoice Transaction Simulation Rule', 'Trade Model Simulation Rule'],
           },
-        'Trade Model Rule': {
-          'next_rule_list': ['Invoice Transaction Rule'],
+        'Trade Model Simulation Rule': {
+          'next_rule_list': ['Invoice Transaction Simulation Rule'],
           },
-        'Invoice Rule': {
+        'Invoice Simulation Rule': {
           'movement_type_list': invoice.getPortalInvoiceMovementTypeList() \
               + invoice.getPortalAccountingMovementTypeList(),
-          'next_rule_list': ['Invoice Transaction Rule', 'Payment Simulation Rule',
-            'Trade Model Rule'],
+          'next_rule_list': ['Invoice Transaction Simulation Rule', 'Payment Simulation Rule',
+            'Trade Model Simulation Rule'],
           },
-        'Invoice Transaction Rule': {
+        'Invoice Transaction Simulation Rule': {
           'parent_movement_type_list': invoice.getPortalInvoiceMovementTypeList(),
           'movement_type_list': invoice.getPortalAccountingMovementTypeList(),
           'next_rule_list': ['Payment Simulation Rule'],