diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view.xml index 08f4c223a27e91e11797e0e9569d46db151c0038..7016de524084a1b3cc514b37bbe6a4da9f03b376 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view.xml @@ -94,7 +94,6 @@ <string>my_destination_project_title</string> <string>my_start_date</string> <string>my_stop_date</string> - <string>my_translated_validation_state_title</string> </list> </value> </item> @@ -107,6 +106,7 @@ <string>my_activity</string> <string>my_function</string> <string>my_site</string> + <string>my_translated_validation_state_title</string> </list> </value> </item> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_start_date.xml index 11a6cad896fb0bd5a39b2a31ac920da08d29ced9..153abd8f13102206f46e4b74877648560b209bbd 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_start_date.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_start_date.xml @@ -193,9 +193,19 @@ <value> <string></string> </value> </item> <item> - <key> <string>input_order</string> </key> + <key> <string>hidden_day_is_last_day</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hide_day</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>input_order</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> <item> <key> <string>input_style</string> </key> <value> <string></string> </value> @@ -346,37 +356,37 @@ <item> <key> <string>ampm</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> </value> </item> <item> <key> <string>day</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent> </value> </item> <item> <key> <string>hour</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent> </value> </item> <item> <key> <string>minute</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent> </value> </item> <item> <key> <string>month</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent> </value> </item> <item> <key> <string>year</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent> </value> </item> </dictionary> @@ -449,6 +459,25 @@ </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.TALESField</string> + <string>TALESMethod</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>preferences/getPreferredDateOrder | string:ymd</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> <pickle> <tuple> <tuple> @@ -711,7 +740,7 @@ </dictionary> </pickle> </record> - <record id="4" aka="AAAAAAAAAAQ="> + <record id="5" aka="AAAAAAAAAAU="> <pickle> <tuple> <tuple> @@ -966,7 +995,7 @@ </dictionary> </pickle> </record> - <record id="5" aka="AAAAAAAAAAU="> + <record id="6" aka="AAAAAAAAAAY="> <pickle> <tuple> <tuple> @@ -1221,7 +1250,7 @@ </dictionary> </pickle> </record> - <record id="6" aka="AAAAAAAAAAY="> + <record id="7" aka="AAAAAAAAAAc="> <pickle> <tuple> <tuple> @@ -1476,7 +1505,7 @@ </dictionary> </pickle> </record> - <record id="7" aka="AAAAAAAAAAc="> + <record id="8" aka="AAAAAAAAAAg="> <pickle> <tuple> <tuple> @@ -1731,7 +1760,7 @@ </dictionary> </pickle> </record> - <record id="8" aka="AAAAAAAAAAg="> + <record id="9" aka="AAAAAAAAAAk="> <pickle> <tuple> <tuple> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_stop_date.xml index 1699d7968bfaafdb0c30f18b85921d5ab45d760a..bf14cf7378e54c905f4d3184e0dfcfa7845f03a3 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_stop_date.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_stop_date.xml @@ -193,9 +193,19 @@ <value> <string></string> </value> </item> <item> - <key> <string>input_order</string> </key> + <key> <string>hidden_day_is_last_day</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hide_day</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>input_order</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> <item> <key> <string>input_style</string> </key> <value> <string></string> </value> @@ -346,37 +356,37 @@ <item> <key> <string>ampm</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> </value> </item> <item> <key> <string>day</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent> </value> </item> <item> <key> <string>hour</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent> </value> </item> <item> <key> <string>minute</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent> </value> </item> <item> <key> <string>month</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent> </value> </item> <item> <key> <string>year</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent> </value> </item> </dictionary> @@ -449,6 +459,25 @@ </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.TALESField</string> + <string>TALESMethod</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>preferences/getPreferredDateOrder | string:ymd</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> <pickle> <tuple> <tuple> @@ -711,7 +740,7 @@ </dictionary> </pickle> </record> - <record id="4" aka="AAAAAAAAAAQ="> + <record id="5" aka="AAAAAAAAAAU="> <pickle> <tuple> <tuple> @@ -966,7 +995,7 @@ </dictionary> </pickle> </record> - <record id="5" aka="AAAAAAAAAAU="> + <record id="6" aka="AAAAAAAAAAY="> <pickle> <tuple> <tuple> @@ -1221,7 +1250,7 @@ </dictionary> </pickle> </record> - <record id="6" aka="AAAAAAAAAAY="> + <record id="7" aka="AAAAAAAAAAc="> <pickle> <tuple> <tuple> @@ -1476,7 +1505,7 @@ </dictionary> </pickle> </record> - <record id="7" aka="AAAAAAAAAAc="> + <record id="8" aka="AAAAAAAAAAg="> <pickle> <tuple> <tuple> @@ -1731,7 +1760,7 @@ </dictionary> </pickle> </record> - <record id="8" aka="AAAAAAAAAAg="> + <record id="9" aka="AAAAAAAAAAk="> <pickle> <tuple> <tuple> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view.xml index 8089260457a2d36de7138cfd59c30fbde79a06de..21284c74c37b85e92a30dd5c67100fe89c6758ba 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view.xml @@ -97,7 +97,6 @@ <string>my_function</string> <string>my_start_date</string> <string>my_stop_date</string> - <string>my_state_title</string> </list> </value> </item> @@ -109,6 +108,7 @@ <string>my_salary_level</string> <string>my_salary_coefficient</string> <string>my_skill_list</string> + <string>my_state_title</string> </list> </value> </item> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_start_date.xml index 86f50eafc7ee22ed2926fa5af4f6afa885b08dec..ddb8a9c3a7bd45d268c7fa04fe86308b20e6286e 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_start_date.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_start_date.xml @@ -193,9 +193,19 @@ <value> <string></string> </value> </item> <item> - <key> <string>input_order</string> </key> + <key> <string>hidden_day_is_last_day</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hide_day</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>input_order</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> <item> <key> <string>input_style</string> </key> <value> <string></string> </value> @@ -346,37 +356,37 @@ <item> <key> <string>ampm</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> </value> </item> <item> <key> <string>day</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent> </value> </item> <item> <key> <string>hour</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent> </value> </item> <item> <key> <string>minute</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent> </value> </item> <item> <key> <string>month</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent> </value> </item> <item> <key> <string>year</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent> </value> </item> </dictionary> @@ -449,6 +459,25 @@ </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.TALESField</string> + <string>TALESMethod</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>preferences/getPreferredDateOrder | string:ymd</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> <pickle> <tuple> <tuple> @@ -711,7 +740,7 @@ </dictionary> </pickle> </record> - <record id="4" aka="AAAAAAAAAAQ="> + <record id="5" aka="AAAAAAAAAAU="> <pickle> <tuple> <tuple> @@ -966,7 +995,7 @@ </dictionary> </pickle> </record> - <record id="5" aka="AAAAAAAAAAU="> + <record id="6" aka="AAAAAAAAAAY="> <pickle> <tuple> <tuple> @@ -1221,7 +1250,7 @@ </dictionary> </pickle> </record> - <record id="6" aka="AAAAAAAAAAY="> + <record id="7" aka="AAAAAAAAAAc="> <pickle> <tuple> <tuple> @@ -1476,7 +1505,7 @@ </dictionary> </pickle> </record> - <record id="7" aka="AAAAAAAAAAc="> + <record id="8" aka="AAAAAAAAAAg="> <pickle> <tuple> <tuple> @@ -1731,7 +1760,7 @@ </dictionary> </pickle> </record> - <record id="8" aka="AAAAAAAAAAg="> + <record id="9" aka="AAAAAAAAAAk="> <pickle> <tuple> <tuple> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_stop_date.xml index 1699d7968bfaafdb0c30f18b85921d5ab45d760a..bf14cf7378e54c905f4d3184e0dfcfa7845f03a3 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_stop_date.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_stop_date.xml @@ -193,9 +193,19 @@ <value> <string></string> </value> </item> <item> - <key> <string>input_order</string> </key> + <key> <string>hidden_day_is_last_day</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hide_day</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>input_order</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> <item> <key> <string>input_style</string> </key> <value> <string></string> </value> @@ -346,37 +356,37 @@ <item> <key> <string>ampm</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> </value> </item> <item> <key> <string>day</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent> </value> </item> <item> <key> <string>hour</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent> </value> </item> <item> <key> <string>minute</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent> </value> </item> <item> <key> <string>month</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent> </value> </item> <item> <key> <string>year</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent> </value> </item> </dictionary> @@ -449,6 +459,25 @@ </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.TALESField</string> + <string>TALESMethod</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>preferences/getPreferredDateOrder | string:ymd</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> <pickle> <tuple> <tuple> @@ -711,7 +740,7 @@ </dictionary> </pickle> </record> - <record id="4" aka="AAAAAAAAAAQ="> + <record id="5" aka="AAAAAAAAAAU="> <pickle> <tuple> <tuple> @@ -966,7 +995,7 @@ </dictionary> </pickle> </record> - <record id="5" aka="AAAAAAAAAAU="> + <record id="6" aka="AAAAAAAAAAY="> <pickle> <tuple> <tuple> @@ -1221,7 +1250,7 @@ </dictionary> </pickle> </record> - <record id="6" aka="AAAAAAAAAAY="> + <record id="7" aka="AAAAAAAAAAc="> <pickle> <tuple> <tuple> @@ -1476,7 +1505,7 @@ </dictionary> </pickle> </record> - <record id="7" aka="AAAAAAAAAAc="> + <record id="8" aka="AAAAAAAAAAg="> <pickle> <tuple> <tuple> @@ -1731,7 +1760,7 @@ </dictionary> </pickle> </record> - <record id="8" aka="AAAAAAAAAAg="> + <record id="9" aka="AAAAAAAAAAk="> <pickle> <tuple> <tuple> diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision index d2c5ed2124821b21d11dcc57f6a116ed29593583..1bda760653e918fc4fca9a02b046236b0aa02843 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -116 \ No newline at end of file +117 \ No newline at end of file