diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_view.xml index e3db2a35bf6660c88e50c96e31defb294dda1156..3893dfdf03f1c4e2b8a48a84b393462986f66a8b 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_view.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_view.xml @@ -86,7 +86,7 @@ <list> <string>listbox_int_index</string> <string>listbox_tested_property</string> - <string>listbox_force_update</string> + <string>listbox_update_always</string> </list> </value> </item> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_view/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_view/listbox.xml index 109c58b4c11f0ad572d3284fe97dd73da4bf8f5d..a7015374f847e36e30a6dff57dd5736a5656e55b 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_view/listbox.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_view/listbox.xml @@ -116,8 +116,8 @@ <string>Tested Property</string> </tuple> <tuple> - <string>force_update</string> - <string>Force Update</string> + <string>update_always</string> + <string>Update</string> </tuple> <tuple> <string>int_index</string> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_view/listbox_force_update.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_view/listbox_update_always.xml similarity index 98% rename from bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_view/listbox_force_update.xml rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_view/listbox_update_always.xml index 6d00e6be0df627b20f5ae7b6af3473ccc1342b1a..06247e0e0248e45900313dea903e8145032c9f35 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_view/listbox_force_update.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/DeliveryBuilder_view/listbox_update_always.xml @@ -19,7 +19,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>listbox_force_update</string> </value> + <value> <string>listbox_update_always</string> </value> </item> <item> <key> <string>message_values</string> </key> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view.xml index bcd1b198baf3f486f37b3439321f78a2d42ee4c1..e9eb9407a00db8a7b0e3a844af29d495bbf10e91 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view.xml @@ -94,7 +94,7 @@ <string>my_collect_order_group</string> <string>my_int_index</string> <string>my_tested_property_list</string> - <string>my_force_update</string> + <string>my_update_always</string> <string>my_divergence_scope</string> </list> </value> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_force_update.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_update_always.xml similarity index 96% rename from bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_force_update.xml rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_update_always.xml index a741139933b4041181fba25f34547b5fda8d9687..20ff39b554559eccaff3f5f714e3a5ce86f2b487 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_force_update.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_update_always.xml @@ -20,7 +20,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>my_force_update</string> </value> + <value> <string>my_update_always</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -93,7 +93,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Force Update</string> </value> + <value> <string>Update</string> </value> </item> </dictionary> </value> diff --git a/bt5/erp5_base/bt/change_log b/bt5/erp5_base/bt/change_log index 4594445aa346ebd47def537b0aa4a14395739ee2..9371ae41f70332458c2621a131b9c589747d3010 100644 --- a/bt5/erp5_base/bt/change_log +++ b/bt5/erp5_base/bt/change_log @@ -1,3 +1,6 @@ +2010-05-28 kazuhiko +* Rename 'force_update' property to 'update_always'. + 2010-05-24 kazuhiko * Improve activity dependencies for Delivery_updateAppliedRule, eg. delivery.activate(tag='(path)_updateAppliedRule', after_tag='(path)_expand').Delivery_updateAppliedRule(activate_kw={'tag':'(path)_expand'}) diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision index d6ee760bad3d1421bf9759d292d09f786ec13e54..475fbacb43f1e37932f5cd9aa9ba871e283891c2 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -762 \ No newline at end of file +763 \ No newline at end of file diff --git a/product/ERP5/PropertySheet/MovementGroup.py b/product/ERP5/PropertySheet/MovementGroup.py index 969b4377d3e591c6ac78b9cafc5fb2c2bb9d49fb..bf18411b760fc6c232dd713fb6b94f5b68e258f7 100644 --- a/product/ERP5/PropertySheet/MovementGroup.py +++ b/product/ERP5/PropertySheet/MovementGroup.py @@ -32,8 +32,8 @@ class MovementGroup: 'type' : 'lines', 'default' : (), 'mode' : 'w' }, - { 'id' : 'force_update', - 'description' : 'Update always if enabled', + { 'id' : 'update_always', + 'description' : 'Update existing document always if enabled', 'type' : 'boolean', 'mode' : 'w' }, )