diff --git a/bt5/erp5_immobilisation/ModuleTemplateItem/immobilisation_module.xml b/bt5/erp5_immobilisation/ModuleTemplateItem/immobilisation_module.xml index 1cb0725d7cb5222f581cab313cb99884d4f6f12c..e77becf10565dd5fd1b97699d6a1e4d46d573f31 100755 --- a/bt5/erp5_immobilisation/ModuleTemplateItem/immobilisation_module.xml +++ b/bt5/erp5_immobilisation/ModuleTemplateItem/immobilisation_module.xml @@ -403,9 +403,6 @@ <permission> <name>Manage users</name> </permission> - <permission> - <name>Manage_messages</name> - </permission> <permission> <name>Modify Cookie Crumblers</name> </permission> diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getAmortisationMethodDisplayList.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getAmortisationMethodDisplayList.xml index 4522325c12aa9a34cbe64fab0ee6717484793a07..fb18b7b30ac7c9bb6045b0c983e7617d59b33395 100755 --- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getAmortisationMethodDisplayList.xml +++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_getAmortisationMethodDisplayList.xml @@ -66,12 +66,14 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>return_list = [(\'No Change\', \'no_change\'), (\'Unimmobilise\', \'unimmobilise\')]\n + <value> <string>return_list = [(context.Base_translateString(\'No Change\', \'content\'), \'no_change\'),\n + (context.Base_translateString(\'Unimmobilise\', \'content\'), \'unimmobilise\')]\n \n amortisation_method_list = context.Immobilisation_getAmortisationMethodList()\n for method in amortisation_method_list:\n id = method[1].getId()\n display = method[1].title or id\n + display = context.Base_translateString(display, \'content\')\n return_list.append( (\'(%s) %s\' % (method[0], display), \'%s/%s\' % (method[0], id) ) )\n \n return [(\'\',\'\')] + return_list\n @@ -123,9 +125,9 @@ return [(\'\',\'\')] + return_list\n <key> <string>co_varnames</string> </key> <value> <tuple> - <string>return_list</string> <string>_getattr_</string> <string>context</string> + <string>return_list</string> <string>amortisation_method_list</string> <string>_getiter_</string> <string>method</string> diff --git a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/Immobilisation_paste.xml b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/Immobilisation_paste.xml index 85d6aad57741748ae5c7a4b5a1c944c354afa9e3..f2f54d7cc6f17dbddfd43bfe599f7da3942550a6 100755 --- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/Immobilisation_paste.xml +++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_movement_interaction_workflow/interactions/Immobilisation_paste.xml @@ -40,6 +40,7 @@ <key> <string>after_script_name</string> </key> <value> <list> + <string>Immobilisation_updateFutureMovementsImmobilisationState</string> <string>Immobilisation_updateImmobilisationState</string> </list> </value> diff --git a/bt5/erp5_immobilisation/bt/change_log b/bt5/erp5_immobilisation/bt/change_log index d826ac80b3273e8b99ffaa159157ae32ecc17bb4..e69511ae774a617e55f62b3c838bbe18b266cd59 100755 --- a/bt5/erp5_immobilisation/bt/change_log +++ b/bt5/erp5_immobilisation/bt/change_log @@ -1,3 +1,6 @@ +2006-03-10 Guillaume +* Translated amortisation method titles + 2006-03-09 Guillaume * Removed result table item * Handle errors in Item_viewImmobilisationPeriods