diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Expense_view/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Expense_view/listbox.xml index 78e58672e236b52da14234ccdf99270e8fed9e9d..9f21d54f38bc347d4828c361bba60ce2fc78faeb 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Expense_view/listbox.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Expense_view/listbox.xml @@ -14,13 +14,14 @@ <value> <list> <string>all_columns</string> - <string>title</string> - <string>selection_name</string> <string>columns</string> + <string>count_method</string> <string>editable_columns</string> - <string>search</string> <string>lines</string> <string>portal_types</string> + <string>search</string> + <string>selection_name</string> + <string>title</string> </list> </value> </item> @@ -135,6 +136,10 @@ </list> </value> </item> + <item> + <key> <string>count_method</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>editable_columns</string> </key> <value> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_addTaskFastInput/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_addTaskFastInput/listbox.xml index 0f1c9387431a5597177649adbe7a9bbcffc538d6..a9a7ef43c8753111d8c565e6a861ed824399815b 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_addTaskFastInput/listbox.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_addTaskFastInput/listbox.xml @@ -14,15 +14,16 @@ <value> <list> <string>all_columns</string> - <string>title</string> - <string>select</string> - <string>selection_name</string> <string>columns</string> - <string>sort</string> + <string>count_method</string> <string>editable_columns</string> + <string>lines</string> <string>list_method</string> <string>search</string> - <string>lines</string> + <string>select</string> + <string>selection_name</string> + <string>sort</string> + <string>title</string> </list> </value> </item> @@ -133,6 +134,10 @@ </list> </value> </item> + <item> + <key> <string>count_method</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>editable_columns</string> </key> <value> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewReport/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewReport/listbox.xml index b733742a18d92d201403c901c70c0123c16dcde6..aa9be48b8ca677bb509f0a881ab88d72efff69f8 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewReport/listbox.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewReport/listbox.xml @@ -13,13 +13,14 @@ <key> <string>delegated_list</string> </key> <value> <list> - <string>title</string> - <string>select</string> - <string>selection_name</string> <string>columns</string> + <string>count_method</string> + <string>lines</string> <string>list_method</string> <string>search</string> - <string>lines</string> + <string>select</string> + <string>selection_name</string> + <string>title</string> </list> </value> </item> @@ -107,6 +108,10 @@ </list> </value> </item> + <item> + <key> <string>count_method</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>field_id</string> </key> <value> <string>my_list_mode_listbox</string> </value> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewODSMonthlyReport/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewODSMonthlyReport/listbox.xml index 0f111bda7a3107aabeb0becef392601e0f917b09..c892a5b37bfe283d9f9470b3276090181b87a3dd 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewODSMonthlyReport/listbox.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewODSMonthlyReport/listbox.xml @@ -13,17 +13,18 @@ <key> <string>delegated_list</string> </key> <value> <list> - <string>title</string> - <string>report_tree</string> - <string>report_root_list</string> - <string>select</string> - <string>selection_name</string> + <string>columns</string> + <string>count_method</string> <string>default_params</string> - <string>list_method</string> - <string>search</string> <string>lines</string> + <string>list_method</string> <string>portal_types</string> - <string>columns</string> + <string>report_root_list</string> + <string>report_tree</string> + <string>search</string> + <string>select</string> + <string>selection_name</string> + <string>title</string> </list> </value> </item> @@ -90,6 +91,10 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>count_method</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>default_params</string> </key> <value> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewPlanning/planning_box.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewPlanning/planning_box.xml index 640e4c1dd409da3b989dd45363a87a3e01206a6c..64adfcf4cff7cfb06b987d659bf55f36a1094f68 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewPlanning/planning_box.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewPlanning/planning_box.xml @@ -14,10 +14,10 @@ <value> <list> <string>list_method</string> - <string>title</string> + <string>portal_types</string> <string>report_root_list</string> + <string>title</string> <string>y_size_block</string> - <string>portal_types</string> </list> </value> </item> @@ -148,7 +148,7 @@ </item> <item> <key> <string>y_size_block</string> </key> - <value> <string>quantity</string> </value> + <value> <string></string> </value> </item> </dictionary> </value> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addDocumentFastInput/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addDocumentFastInput/listbox.xml index 66d5f8d25e02a5ba8eac3ad65e8cfc2b0e7dc4ea..8bdb897ae9ddb3c60ea54b7113076fdff3fb39cd 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addDocumentFastInput/listbox.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addDocumentFastInput/listbox.xml @@ -14,15 +14,16 @@ <value> <list> <string>all_columns</string> - <string>title</string> - <string>select</string> - <string>selection_name</string> <string>columns</string> - <string>sort</string> + <string>count_method</string> <string>editable_columns</string> + <string>lines</string> <string>list_method</string> <string>search</string> - <string>lines</string> + <string>select</string> + <string>selection_name</string> + <string>sort</string> + <string>title</string> </list> </value> </item> @@ -121,6 +122,10 @@ </list> </value> </item> + <item> + <key> <string>count_method</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>editable_columns</string> </key> <value> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewPlanningReport/planning_box.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewPlanningReport/planning_box.xml index ebf71d568edda443c4e9313a75599128254b6dff..e99d01a539bfbed196f5d7e4685295214423b0a5 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewPlanningReport/planning_box.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewPlanningReport/planning_box.xml @@ -13,13 +13,13 @@ <key> <string>delegated_list</string> </key> <value> <list> - <string>round_script</string> <string>list_method</string> - <string>title</string> + <string>portal_types</string> <string>report_root_list</string> + <string>round_script</string> <string>selection_name</string> + <string>title</string> <string>y_size_block</string> - <string>portal_types</string> </list> </value> </item> @@ -150,7 +150,7 @@ </item> <item> <key> <string>y_size_block</string> </key> - <value> <string>quantity</string> </value> + <value> <string></string> </value> </item> </dictionary> </value> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewPlanningReport/planning_box.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewPlanningReport/planning_box.xml index 61760c0935c5cdbbe356ff5445815f2a6dc74841..1a487cd89ee82a75c621286f28ad54a9bf71a7d3 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewPlanningReport/planning_box.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewPlanningReport/planning_box.xml @@ -13,13 +13,13 @@ <key> <string>delegated_list</string> </key> <value> <list> - <string>round_script</string> <string>list_method</string> - <string>title</string> + <string>portal_types</string> <string>report_root_list</string> + <string>round_script</string> <string>selection_name</string> + <string>title</string> <string>y_size_block</string> - <string>portal_types</string> </list> </value> </item> @@ -142,7 +142,7 @@ </item> <item> <key> <string>y_size_block</string> </key> - <value> <string>quantity</string> </value> + <value> <string></string> </value> </item> </dictionary> </value> diff --git a/bt5/erp5_project/bt/change_log b/bt5/erp5_project/bt/change_log index 3182c957af5e8bfdecb03e8cc8e14427b09c4805..02c36c8456a12677515bb1293183e37aad9428dd 100644 --- a/bt5/erp5_project/bt/change_log +++ b/bt5/erp5_project/bt/change_log @@ -1,3 +1,6 @@ +2009-05-19 yusei +* Fix some proxy fields. count_method and y_size_block should not be inherited from template field. + 2009-05-11 yusei * Bump up the version. * Simplify field libraries and proxy fields. Old field libraries are kept for backward compatibility. diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision index c3282600a47c138af5401a9733cee2ed706d3023..0905ea78aba8dbc76598cb3610907683a1cb4525 100644 --- a/bt5/erp5_project/bt/revision +++ b/bt5/erp5_project/bt/revision @@ -1 +1 @@ -640 \ No newline at end of file +642 \ No newline at end of file