diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_init.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_init.xml index 7f98a5c3f65fc154564159fb89ac27a74312b4d8..1c82a4549c142da6f72c20c06d678fa968022179 100644 --- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_init.xml +++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_init.xml @@ -57,12 +57,12 @@ \n base = context.portal_preferences.getPreference(\'preferred_%s_variation_base_category_list\' % portal_type)\n optional = context.portal_preferences.getPreference(\'preferred_%s_optional_variation_base_category_list\' % portal_type)\n -individual = context.portal_preferences.getPreference(\'preferred_%s_individual_variation_base_category\' % portal_type)\n +individual = context.portal_preferences.getPreference(\'preferred_%s_individual_variation_base_category_list\' % portal_type)\n \n if individual:\n context.edit(variation_base_category_list=base,\n optional_variation_base_category_list=optional,\n - individual_variation_base_category=individual)\n + individual_variation_base_category_list=individual)\n else:\n context.edit(variation_base_category_list=base,\n optional_variation_base_category_list=optional)\n diff --git a/bt5/erp5_pdm/bt/revision b/bt5/erp5_pdm/bt/revision index c0db21d808434d1d2d318e959bc4c7c190a76dcf..25685cf6b3219c2f927ca954c6b05dd0f063c510 100644 --- a/bt5/erp5_pdm/bt/revision +++ b/bt5/erp5_pdm/bt/revision @@ -1 +1 @@ -392 \ No newline at end of file +393 diff --git a/product/ERP5/tests/testResource.py b/product/ERP5/tests/testResource.py index aa17006aab41e5a13c5d0c762b7ade59486530ff..69841aa85b027ca04e3dac33edf6f1ea1b14ad03 100644 --- a/product/ERP5/tests/testResource.py +++ b/product/ERP5/tests/testResource.py @@ -85,9 +85,10 @@ class TestResource(ERP5TypeTestCase): 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(('morphology', 'colour',)) if preference.getPreferenceState() == 'disabled': preference.enable() transaction.commit()