diff --git a/product/ERP5/tests/testTradeCondition.py b/product/ERP5/tests/testTradeCondition.py index ed92c92ce9eece8bc5cc816085327549e0428d00..22b22127ae81a8791291b45e2a5053d1a83263d9 100644 --- a/product/ERP5/tests/testTradeCondition.py +++ b/product/ERP5/tests/testTradeCondition.py @@ -133,11 +133,11 @@ class AccountingBuildTestCase(TradeConditionTestCase): account.validate() itr = self.portal.portal_rules.newContent( - portal_type='Invoice Transaction Rule', + portal_type='Invoice Transaction Simulation Rule', reference='default_invoice_transaction_rule', id='test_invoice_transaction_rule', title='Transaction Rule', - test_method_id='SimulationMovement_testInvoiceTransactionRule', + test_method_id='SimulationMovement_testInvoiceTransactionSimulationRule', version=100) predicate = itr.newContent(portal_type='Predicate',) predicate.edit( diff --git a/product/ERP5/tests/testTradeModelLine.py b/product/ERP5/tests/testTradeModelLine.py index 253080a9916bc346a8793741aa4ca857ac935c6c..bdd45fcbd2d1dae6c96259db65f9810556968f9d 100644 --- a/product/ERP5/tests/testTradeModelLine.py +++ b/product/ERP5/tests/testTradeModelLine.py @@ -154,10 +154,10 @@ class TestTradeModelLine(TestTradeModelLineMixin): portal_type='Simulation Movement'): invoicing_applied_rule = [x for x in line_simulation_movement.objectValues() - if x.getSpecialiseValue().getPortalType() == 'Invoicing Rule'][0] + if x.getSpecialiseValue().getPortalType() == 'Invoice Simulation Rule'][0] invoicing_movement = invoicing_applied_rule.objectValues()[0] trade_model_rule = [x for x in invoicing_movement.objectValues() - if x.getSpecialiseValue().getPortalType() == 'Trade Model Rule'][0] + if x.getSpecialiseValue().getPortalType() == 'Trade Model Simulation Rule'][0] result_list.append(trade_model_rule.objectValues()) return result_list @@ -166,7 +166,7 @@ class TestTradeModelLine(TestTradeModelLineMixin): .objectValues() self.assertEquals(1, len(invoice_transaction_rule_list)) invoice_transaction_rule = invoice_transaction_rule_list[0] - self.assertEqual('Invoice Transaction Rule', + self.assertEqual('Invoice Transaction Simulation Rule', invoice_transaction_rule.getSpecialiseValue().getPortalType()) invoice_transaction_simulation_movement_list = invoice_transaction_rule \