diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination.xml index e401d750c12ed5bcf39921e0390c6322cf49dfcd..3872e3a7094295f315a945a5a027023d187e73c3 100755 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination.xml @@ -388,7 +388,7 @@ </item> <item> <key> <string>acquisition_portal_type</string> </key> - <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList())</string> </value> + <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList() + portal.getPortalSupplyTypeList())</string> </value> </item> <item> <key> <string>acquisition_portal_type_list</string> </key> @@ -468,7 +468,9 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> + <none/> + </value> </item> <item> <key> <string>id</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewWorkflowHistory/listbox.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewWorkflowHistory/listbox.xml index 364a83a18e54a636c4d171e8dc1bd35056d2b5dd..74a503bff1a572cfbbe8d7f50c8f873afbbdfafd 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewWorkflowHistory/listbox.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewWorkflowHistory/listbox.xml @@ -448,7 +448,7 @@ </item> <item> <key> <string>lines</string> </key> - <value> <int>300</int> </value> + <value> <int>600</int> </value> </item> <item> <key> <string>list_action</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Currency_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Currency_view.xml index bf1d3ab3e6b431e19f8eca26658ddc32df02df14..fdf4d212db0fc349a81fee61d63a9b69508692b3 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Currency_view.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Currency_view.xml @@ -108,7 +108,9 @@ <item> <key> <string>right</string> </key> <value> - <list/> + <list> + <string>my_base_unit_quantity</string> + </list> </value> </item> </dictionary> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Currency_view/my_base_unit_quantity.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Currency_view/my_base_unit_quantity.xml new file mode 100755 index 0000000000000000000000000000000000000000..ca20322968d4dd9292f6668e134b68724442ad50 --- /dev/null +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Currency_view/my_base_unit_quantity.xml @@ -0,0 +1,268 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.StandardFields</string> + <string>FloatField</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>my_base_unit_quantity</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + <item> + <key> <string>not_float</string> </key> + <value> <string>You did not enter a floating point number.</string> </value> + </item> + <item> + <key> <string>required_not_found</string> </key> + <value> <string>Input is required but no input given.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>precision</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>precision</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +This field is limited to 6 characters because of float precision:\n +>>> 0.0001\n +0.0001\n +>>> 0.00001\n +1.0000000000000001e-05 + +]]></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <int>6</int> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>6</int> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> <string>-1234.5</string> </value> + </item> + <item> + <key> <string>precision</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Precision</string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>0</int> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OrganisationModule_viewOrganisationList/listbox.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OrganisationModule_viewOrganisationList/listbox.xml index 5583777bd84387b3b5f8321a81b51bf65149c570..380acecc33c0c53c3dc72ca8fc636ce0027f03b9 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OrganisationModule_viewOrganisationList/listbox.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OrganisationModule_viewOrganisationList/listbox.xml @@ -454,23 +454,23 @@ <value> <list> <tuple> - <string>portal_categories/activity</string> + <string>activity</string> <string>Activity</string> </tuple> <tuple> - <string>portal_categories/function</string> + <string>function</string> <string>Function</string> </tuple> <tuple> - <string>portal_categories/role</string> + <string>role</string> <string>Role</string> </tuple> <tuple> - <string>portal_categories/region</string> + <string>region</string> <string>Region</string> </tuple> <tuple> - <string>portal_categories/group</string> + <string>group</string> <string>Group</string> </tuple> </list> @@ -478,7 +478,7 @@ </item> <item> <key> <string>domain_tree</string> </key> - <value> <int>0</int> </value> + <value> <int>1</int> </value> </item> <item> <key> <string>editable</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PersonModule_viewPersonList/listbox.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PersonModule_viewPersonList/listbox.xml index c62c13b437b91ac51134996c4988eceb6e9d51d4..c55cff185e6e6ad3d6662f112f7f66b2422cedde 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PersonModule_viewPersonList/listbox.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PersonModule_viewPersonList/listbox.xml @@ -438,19 +438,19 @@ <value> <list> <tuple> - <string>portal_categories/group</string> + <string>group</string> <string>Group</string> </tuple> <tuple> - <string>portal_categories/region</string> + <string>region</string> <string>Region</string> </tuple> <tuple> - <string>portal_categories/role</string> + <string>role</string> <string>Role</string> </tuple> <tuple> - <string>portal_categories/skill</string> + <string>skill</string> <string>Skill</string> </tuple> <tuple> @@ -466,7 +466,7 @@ Role & Region </item> <item> <key> <string>domain_tree</string> </key> - <value> <int>0</int> </value> + <value> <int>1</int> </value> </item> <item> <key> <string>editable</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Person_viewDetails/my_password.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Person_viewDetails/my_password.xml index 4351f58388c49492206bddb2abb97af60eea7daf..fb7c9e074d3aa45838f7a302476514d44bf174b4 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Person_viewDetails/my_password.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Person_viewDetails/my_password.xml @@ -5,13 +5,19 @@ <tuple> <tuple> <string>Products.Formulator.StandardFields</string> - <string>StringField</string> + <string>PasswordField</string> </tuple> <none/> </tuple> </pickle> <pickle> <dictionary> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>id</string> </key> <value> <string>my_password</string> </value> diff --git a/product/ERP5/bootstrap/erp5_core/bt/change_log b/product/ERP5/bootstrap/erp5_core/bt/change_log index badafb726c36bcbe5a57130f2854564e35b5ab34..92ee49c239d3972ada02c7df649c8a14b53aa598 100755 --- a/product/ERP5/bootstrap/erp5_core/bt/change_log +++ b/product/ERP5/bootstrap/erp5_core/bt/change_log @@ -1,3 +1,12 @@ +2006-02-24 yo +* Use PasswordField instead of StringField for User Password in Person_viewDetails. + +2006-02-23 kevin +* Add precision on currencies. + +2006-02-22 kevin +* Fix bad default lisbox parameters. + 2006-02-22 jerome * reraise error in allowed content type drop down menu