diff --git a/bt5/erp5_hr/PortalTypeBaseCategoryTemplateItem/base_category_list.xml b/bt5/erp5_hr/PortalTypeBaseCategoryTemplateItem/base_category_list.xml index 07d374821327c1391df1368caca484c6afd0eed9..6036b43b512302ee53abdb0ad17ad5725c61cf94 100644 --- a/bt5/erp5_hr/PortalTypeBaseCategoryTemplateItem/base_category_list.xml +++ b/bt5/erp5_hr/PortalTypeBaseCategoryTemplateItem/base_category_list.xml @@ -1,9 +1,9 @@ <base_category_list> <portal_type id="Assignment"> - <item>specialise</item> + <item>agent</item> </portal_type> <portal_type id="Career"> - <item>specialise</item> + <item>agent</item> </portal_type> <portal_type id="Position"> <item>agent</item> diff --git a/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr.xml b/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr.xml index 310bd2c423d9b553e863232a2ecc1cedf6c1da6a..4c86375fa0e2f0bf14137d13a00a1c7284c95282 100644 --- a/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr.xml +++ b/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr.xml @@ -6,12 +6,33 @@ </pickle> <pickle> <dictionary> + <item> + <key> <string>_local_properties</string> </key> + <value> + <tuple> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>business_template_skin_layer_priority</string> </value> + </item> + <item> + <key> <string>type</string> </key> + <value> <string>float</string> </value> + </item> + </dictionary> + </tuple> + </value> + </item> <item> <key> <string>_objects</string> </key> <value> <tuple/> </value> </item> + <item> + <key> <string>business_template_skin_layer_priority</string> </key> + <value> <float>10.0</float> </value> + </item> <item> <key> <string>id</string> </key> <value> <string>erp5_hr</string> </value> diff --git a/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Assignment_view.xml b/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Assignment_view.xml index 1c92a3079a380e21ec4e4f5afaf6eb79515577e4..ff9e12a691c3d1f475ee31049937a3853c298419 100644 --- a/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Assignment_view.xml +++ b/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Assignment_view.xml @@ -73,7 +73,7 @@ <list> <string>my_title</string> <string>my_destination_project_title</string> - <string>my_specialise_title</string> + <string>my_agent_title</string> <string>my_start_date</string> <string>my_stop_date</string> <string>my_calendar_title_list</string> diff --git a/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Assignment_view/my_specialise_title.xml b/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Assignment_view/my_agent_title.xml similarity index 96% rename from bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Assignment_view/my_specialise_title.xml rename to bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Assignment_view/my_agent_title.xml index c923be824d7db14b60bd72b7e48a36b2744d3ae6..54d0d0f2228ce4d76270c788b39db187a536df75 100644 --- a/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Assignment_view/my_specialise_title.xml +++ b/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Assignment_view/my_agent_title.xml @@ -19,7 +19,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>my_specialise_title</string> </value> + <value> <string>my_agent_title</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -76,7 +76,7 @@ <dictionary> <item> <key> <string>base_category</string> </key> - <value> <string>specialise</string> </value> + <value> <string>agent</string> </value> </item> <item> <key> <string>description</string> </key> diff --git a/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Career_view.xml b/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Career_view.xml index 8f0940991df3b2e3c6b420b281f7c35966693afb..8d3c4900edf8dbf63184643ee99697e836f9d99a 100644 --- a/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Career_view.xml +++ b/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Career_view.xml @@ -74,7 +74,7 @@ <string>my_title</string> <string>my_reference</string> <string>my_subordination_title</string> - <string>my_specialise_title</string> + <string>my_agent_title</string> <string>my_role_list</string> <string>my_function</string> <string>my_activity</string> diff --git a/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Career_view/my_specialise_title.xml b/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Career_view/my_agent_title.xml similarity index 96% rename from bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Career_view/my_specialise_title.xml rename to bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Career_view/my_agent_title.xml index c923be824d7db14b60bd72b7e48a36b2744d3ae6..54d0d0f2228ce4d76270c788b39db187a536df75 100644 --- a/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Career_view/my_specialise_title.xml +++ b/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Career_view/my_agent_title.xml @@ -19,7 +19,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>my_specialise_title</string> </value> + <value> <string>my_agent_title</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -76,7 +76,7 @@ <dictionary> <item> <key> <string>base_category</string> </key> - <value> <string>specialise</string> </value> + <value> <string>agent</string> </value> </item> <item> <key> <string>description</string> </key> diff --git a/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Position_getCareerList.xml b/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Position_getCareerList.xml index 781f00c17e73fb8624fe182b077defbd6fc272e8..83953f5f77d67dd705e6f731163acc0410644971 100644 --- a/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Position_getCareerList.xml +++ b/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Position_getCareerList.xml @@ -54,7 +54,7 @@ XXX: Return list of Persons who belong to a position.\n """\n kw[\'portal_type\'] = \'Career\'\n -kw[\'specialise_uid\'] = context.getUid()\n +kw[\'agent_uid\'] = context.getUid()\n return context.portal_catalog(**kw)\n </string> </value> </item> diff --git a/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Position_getPersonList.xml b/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Position_getPersonList.xml new file mode 100644 index 0000000000000000000000000000000000000000..a4656580da7519064b12712caecebf8a006ca6b9 --- /dev/null +++ b/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/Position_getPersonList.xml @@ -0,0 +1,72 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>Script_magic</string> </key> + <value> <int>3</int> </value> + </item> + <item> + <key> <string>_bind_names</string> </key> + <value> + <object> + <klass> + <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>_asgns</string> </key> + <value> + <dictionary> + <item> + <key> <string>name_container</string> </key> + <value> <string>container</string> </value> + </item> + <item> + <key> <string>name_context</string> </key> + <value> <string>context</string> </value> + </item> + <item> + <key> <string>name_m_self</string> </key> + <value> <string>script</string> </value> + </item> + <item> + <key> <string>name_subpath</string> </key> + <value> <string>traverse_subpath</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>_body</string> </key> + <value> <string>"""\n + Return list of Persons that have this position in their Career.\n +"""\n +kw[\'portal_type\'] = \'Career\'\n +kw[\'agent_uid\'] = context.getUid()\n +return [x.getParentValue() for x in context.portal_catalog(**kw)]\n +</string> </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string>**kw</string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>Position_getPersonList</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_hr/bt/revision b/bt5/erp5_hr/bt/revision index 3f10ffe7a4c473619c926cfb1e8d95e726e5a0ec..19c7bdba7b1e9bfe80365a50420a6d538ca503c3 100644 --- a/bt5/erp5_hr/bt/revision +++ b/bt5/erp5_hr/bt/revision @@ -1 +1 @@ -15 \ No newline at end of file +16 \ No newline at end of file diff --git a/bt5/erp5_hr/bt/template_portal_type_base_category_list b/bt5/erp5_hr/bt/template_portal_type_base_category_list index 6bdc3fd5b6190d803451a6acef054fecb0824ac7..080856eb2451f7aa078ecd0d1c86e1419c447519 100644 --- a/bt5/erp5_hr/bt/template_portal_type_base_category_list +++ b/bt5/erp5_hr/bt/template_portal_type_base_category_list @@ -1,5 +1,5 @@ -Assignment | specialise -Career | specialise +Assignment | agent +Career | agent Position Announcement | aggregate Position Announcement | classification Position Announcement | destination