diff --git a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponent.py b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponent.py index b1f2410128f99888f0aa0c8d1aa21837dfc98865..d336112e59610a1325657a8a2294fb7bab4537e9 100644 --- a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponent.py +++ b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponent.py @@ -33,8 +33,8 @@ class ApparelComponent: """ _properties = ( - { 'id' : 'color_count', - 'description' : 'Number of colors', + { 'id' : 'colour_count', + 'description' : 'Number of colours', 'type' : 'int', 'mode' : 'w' }, # Override default value XXX diff --git a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabric.py b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabric.py index 217028ac8cbe01f190a67201d761b586defac54e..a1193388502c505d10963c14b73498a46f213d53 100644 --- a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabric.py +++ b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabric.py @@ -41,8 +41,8 @@ class ApparelFabric: 'description' : 'The useful width of the fabric', 'type' : 'float', 'mode' : 'w' }, - { 'id' : 'color_count', # XXXX - 'description' : 'Number of colors', + { 'id' : 'colour_count', # XXXX + 'description' : 'Number of colours', 'type' : 'int', 'mode' : 'w' }, { 'id' : 'quality_reference', diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/my_title.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/my_title.xml index 659aa8d96880198ec6dd54ba202565b508a18ea6..6b82ce9ff254a0f838fcd98a53be0e0ebfbd6a96 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/my_title.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/my_title.xml @@ -240,7 +240,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Apparel Colour Range Variation</string> </value> + <value> <string>Title</string> </value> </item> <item> <key> <string>truncate</string> </key> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view.xml index c006fc91cd1cb2e60184f775280cdf406ce39976..902898b5eb62ab4e0181ff2557c51c8384c19d5c 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view.xml @@ -100,7 +100,7 @@ <value> <list> <string>my_variation_category_list</string> - <string>my_color_count</string> + <string>my_colour_count</string> <string>my_comment</string> <string>my_translated_validation_state_title</string> </list> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/my_color_count.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/my_colour_count.xml similarity index 98% rename from bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/my_color_count.xml rename to bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/my_colour_count.xml index 2102c8d8bd65a847c556d10247c8cdf00d871db1..2b2eabee936b5738288f52dbd489aad85975f85d 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/my_color_count.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/my_colour_count.xml @@ -11,7 +11,7 @@ <dictionary> <item> <key> <string>id</string> </key> - <value> <string>my_color_count</string> </value> + <value> <string>my_colour_count</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -240,7 +240,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Color Count</string> </value> + <value> <string>Colour Count</string> </value> </item> <item> <key> <string>whitespace_preserve</string> </key> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricModule_viewApparelFabricList/listbox.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricModule_viewApparelFabricList/listbox.xml index 1eb1f53bfb41ed4cbb5a350979cbfb43ea94d231..705d88438882071fa0552013059c0d77c63bb3ac 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricModule_viewApparelFabricList/listbox.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricModule_viewApparelFabricList/listbox.xml @@ -335,11 +335,11 @@ <string>Apparel Fabric Template</string> </tuple> <tuple> - <string>resource</string> + <string>resource_title</string> <string>Resource</string> </tuple> <tuple> - <string>visual_pattern</string> + <string>visual_pattern_title</string> <string>Motive</string> </tuple> <tuple> @@ -412,11 +412,11 @@ <string>Drawing Reference</string> </tuple> <tuple> - <string>resource</string> + <string>resource_title</string> <string>Resource</string> </tuple> <tuple> - <string>visual_pattern</string> + <string>visual_pattern_title</string> <string>Motive</string> </tuple> <tuple> @@ -613,11 +613,11 @@ <string>Drawing Reference</string> </tuple> <tuple> - <string>resource</string> + <string>resource_title</string> <string>Resource</string> </tuple> <tuple> - <string>visual_pattern</string> + <string>visual_pattern_title</string> <string>Motive</string> </tuple> <tuple> @@ -671,11 +671,11 @@ <string>Drawing Reference</string> </tuple> <tuple> - <string>resource</string> + <string>resource_title</string> <string>Resource</string> </tuple> <tuple> - <string>visual_pattern</string> + <string>visual_pattern_title</string> <string>Motive</string> </tuple> <tuple> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view.xml index d6d0bc8a9e404cf9b223ce95ea701b9a841ae4a7..8f546e4300843ec6775c72375d2e082e08090551 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view.xml @@ -100,7 +100,7 @@ <string>my_resource</string> <string>my_visual_pattern</string> <string>my_trade_description</string> - <string>my_color_count</string> + <string>my_colour_count</string> <string>my_raw_width</string> <string>my_net_width</string> <string>my_base_weight</string> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_color_count.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_colour_count.xml similarity index 98% rename from bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_color_count.xml rename to bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_colour_count.xml index 2102c8d8bd65a847c556d10247c8cdf00d871db1..2b2eabee936b5738288f52dbd489aad85975f85d 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_color_count.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_colour_count.xml @@ -11,7 +11,7 @@ <dictionary> <item> <key> <string>id</string> </key> - <value> <string>my_color_count</string> </value> + <value> <string>my_colour_count</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -240,7 +240,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Color Count</string> </value> + <value> <string>Colour Count</string> </value> </item> <item> <key> <string>whitespace_preserve</string> </key> diff --git a/bt5/erp5_apparel/bt/revision b/bt5/erp5_apparel/bt/revision index 8bfa2f5ecdcecb29a2a68f2b68907198364f6c90..eaf7a13d15e02e082b62c96f10b881336ece332c 100644 --- a/bt5/erp5_apparel/bt/revision +++ b/bt5/erp5_apparel/bt/revision @@ -1 +1 @@ -86 \ No newline at end of file +87 \ No newline at end of file