apply r30943 to testOrder.py, change the order between colour and morphology

(order is important at cell creation step)


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

product/ERP5/tests/testOrder.py

@@ -79,9 +79,11 @@ class TestOrderMixin:
       if preference.getPreferenceState() == 'disabled':
         preference.enable()
 
-    preference.setPreferredApparelModelVariationBaseCategoryList(('colour', 'size', 'morphology', 'industrial_phase',))
+    preference.setPreferredApparelModelVariationBaseCategoryList(('size', 'industrial_phase',))
     preference.setPreferredApparelClothVariationBaseCategoryList(('size',))
     preference.setPreferredApparelComponentVariationBaseCategoryList(('variation',))
+    preference.setPreferredApparelModelIndividualVariationBaseCategoryList(('colour', 'morphology'))
+
     if preference.getPreferenceState() == 'disabled':
       preference.enable()
     transaction.commit()

product/ERP5/tests/testResource.py

@@ -53,8 +53,8 @@ class TestResource(ERP5TypeTestCase):
   purchase_supply_line_portal_type = 'Purchase Supply Line'
   internal_supply_line_portal_type = 'Internal Supply Line'
   sale_supply_cell_portal_type = 'Sale Supply Cell'
-  variation_base_category_list = ['colour', 'size', 'morphology',
-                                  'industrial_phase']
+  variation_base_category_list = ['size', 'industrial_phase', 'colour',
+                                  'morphology']
   size_list = ['size/Child','size/Man']
   variation_property_list = []
 
@@ -88,7 +88,7 @@ class TestResource(ERP5TypeTestCase):
     preference.setPreferredApparelModelVariationBaseCategoryList(('size', 'industrial_phase',))
     preference.setPreferredApparelClothVariationBaseCategoryList(('size',))
     preference.setPreferredApparelComponentVariationBaseCategoryList(('variation',))
-    preference.setPreferredApparelModelIndividualVariationBaseCategoryList(('morphology', 'colour',))
+    preference.setPreferredApparelModelIndividualVariationBaseCategoryList(('colour', 'morphology'))
     if preference.getPreferenceState() == 'disabled':
       preference.enable()
     transaction.commit()