diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view.xml index d5953424634e483671e676e28f7ee49637afa675..15ab737c1478a460a5e8dade5156ef971bb3f6d1 100644 --- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view.xml +++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view.xml @@ -107,14 +107,15 @@ <list> <string>my_title</string> <string>my_stop_date</string> - <string>immobilisation_state</string> </list> </value> </item> <item> <key> <string>right</string> </key> <value> - <list/> + <list> + <string>my_translated_immobilisation_state_title</string> + </list> </value> </item> </dictionary> diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_stop_date.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_stop_date.xml index ef56657dca10c4898387aaad197c0bf44f6ef438..2ce8b49c973357a806315d1b91bf9888ae1ce8f7 100644 --- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_stop_date.xml +++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_stop_date.xml @@ -199,9 +199,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> @@ -352,37 +362,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> @@ -455,6 +465,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> @@ -717,7 +746,7 @@ </dictionary> </pickle> </record> - <record id="4" aka="AAAAAAAAAAQ="> + <record id="5" aka="AAAAAAAAAAU="> <pickle> <tuple> <tuple> @@ -972,7 +1001,7 @@ </dictionary> </pickle> </record> - <record id="5" aka="AAAAAAAAAAU="> + <record id="6" aka="AAAAAAAAAAY="> <pickle> <tuple> <tuple> @@ -1227,7 +1256,7 @@ </dictionary> </pickle> </record> - <record id="6" aka="AAAAAAAAAAY="> + <record id="7" aka="AAAAAAAAAAc="> <pickle> <tuple> <tuple> @@ -1482,7 +1511,7 @@ </dictionary> </pickle> </record> - <record id="7" aka="AAAAAAAAAAc="> + <record id="8" aka="AAAAAAAAAAg="> <pickle> <tuple> <tuple> @@ -1737,7 +1766,7 @@ </dictionary> </pickle> </record> - <record id="8" aka="AAAAAAAAAAg="> + <record id="9" aka="AAAAAAAAAAk="> <pickle> <tuple> <tuple> diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_title.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_title.xml index 8582756b98c8cc6a0eb52c2ef26c124acd42659a..2791861df6a13d1850546cab6dd34cded0b3779d 100644 --- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_title.xml +++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_title.xml @@ -217,7 +217,7 @@ </item> <item> <key> <string>display_width</string> </key> - <value> <int>10</int> </value> + <value> <int>40</int> </value> </item> <item> <key> <string>editable</string> </key> diff --git a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/immobilisation_state.xml b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_translated_immobilisation_state_title.xml similarity index 88% rename from bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/immobilisation_state.xml rename to bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_translated_immobilisation_state_title.xml index bfac629526895945819b411d691a49b5133efe31..ccc8810038eab03c8a7c99c8f8cac4a1e050cde7 100644 --- a/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/immobilisation_state.xml +++ b/bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/Immobilisation_view/my_translated_immobilisation_state_title.xml @@ -20,7 +20,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>immobilisation_state</string> </value> + <value> <string>my_translated_immobilisation_state_title</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -130,9 +130,7 @@ </item> <item> <key> <string>default</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> + <value> <string></string> </value> </item> <item> <key> <string>description</string> </key> @@ -152,9 +150,7 @@ </item> <item> <key> <string>enabled</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> - </value> + <value> <string></string> </value> </item> <item> <key> <string>external_validator</string> </key> @@ -273,42 +269,4 @@ </dictionary> </pickle> </record> - <record id="2" aka="AAAAAAAAAAI="> - <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>python: here.getImmobilisationState()</string> </value> - </item> - </dictionary> - </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>python:here.restrictedTraverse(\'immobilisation_module\', None) is not None</string> </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_immobilisation/bt/revision b/bt5/erp5_immobilisation/bt/revision index 8580e7b684b14da5d9f84ab4eaf2f5139d508cbe..b74e882ae378d7e5aae630f48c20dd1e40186d98 100644 --- a/bt5/erp5_immobilisation/bt/revision +++ b/bt5/erp5_immobilisation/bt/revision @@ -1 +1 @@ -30 \ No newline at end of file +31 \ No newline at end of file