From 3303f28b5cd8986d11db581f89ea208bff55276b Mon Sep 17 00:00:00 2001 From: Mame Coumba Sall <mame@nexedi.com> Date: Thu, 23 May 2013 10:45:37 +0000 Subject: [PATCH] Again more fixup in field proxification --- .../erp5_project/Base_viewProjectFieldLibrary.xml | 6 +++--- .../{your_at_date.xml => my_at_date.xml} | 2 +- .../{your_from_date.xml => my_from_date.xml} | 2 +- ...your_simulation_state.xml => my_simulation_state.xml} | 2 +- .../my_at_date.xml | 8 +++++++- .../my_from_date.xml | 8 +++++++- .../your_at_date.xml | 2 +- .../your_from_date.xml | 2 +- .../your_simulation_state.xml | 2 +- .../your_preferred_at_date.xml | 4 ++-- .../your_preferred_from_date.xml | 4 ++-- .../your_preferred_simulation_state.xml | 9 ++------- .../your_at_date.xml | 2 +- .../your_from_date.xml | 2 +- .../your_simulation_state.xml | 2 +- .../Project_viewTaskReportListDialog/your_at_date.xml | 2 +- .../Project_viewTaskReportListDialog/your_from_date.xml | 2 +- .../your_simulation_state.xml | 2 +- bt5/erp5_project/bt/revision | 2 +- 19 files changed, 36 insertions(+), 29 deletions(-) rename bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/{your_at_date.xml => my_at_date.xml} (98%) rename bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/{your_from_date.xml => my_from_date.xml} (97%) rename bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/{your_simulation_state.xml => my_simulation_state.xml} (98%) diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary.xml index 52a65a8a0e..fa2b7df4be 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary.xml @@ -108,9 +108,9 @@ <string>my_stop_date_range_max</string> <string>my_stop_date_range_min</string> <string>my_task_line_quantity_unit</string> - <string>your_at_date</string> - <string>your_from_date</string> - <string>your_simulation_state</string> + <string>my_at_date</string> + <string>my_from_date</string> + <string>my_simulation_state</string> <string>my_destination_decision_title</string> <string>my_destination_section_title</string> <string>my_requirement_title</string> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/your_at_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/my_at_date.xml similarity index 98% rename from bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/your_at_date.xml rename to bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/my_at_date.xml index 1886b84a7a..003615f54a 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/your_at_date.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/my_at_date.xml @@ -14,7 +14,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>your_at_date</string> </value> + <value> <string>my_at_date</string> </value> </item> <item> <key> <string>message_values</string> </key> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/your_from_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/my_from_date.xml similarity index 97% rename from bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/your_from_date.xml rename to bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/my_from_date.xml index 1cd09928cd..7d5b900773 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/your_from_date.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/my_from_date.xml @@ -14,7 +14,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>your_from_date</string> </value> + <value> <string>my_from_date</string> </value> </item> <item> <key> <string>message_values</string> </key> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/your_simulation_state.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/my_simulation_state.xml similarity index 98% rename from bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/your_simulation_state.xml rename to bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/my_simulation_state.xml index 94fc8ca10f..0cbbac6b3a 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/your_simulation_state.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/my_simulation_state.xml @@ -19,7 +19,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>your_simulation_state</string> </value> + <value> <string>my_simulation_state</string> </value> </item> <item> <key> <string>message_values</string> </key> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_generateMilestoneReportDialog/my_at_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_generateMilestoneReportDialog/my_at_date.xml index 371a165e7f..ee342092bb 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_generateMilestoneReportDialog/my_at_date.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_generateMilestoneReportDialog/my_at_date.xml @@ -6,6 +6,12 @@ </pickle> <pickle> <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list/> + </value> + </item> <item> <key> <string>id</string> </key> <value> <string>my_at_date</string> </value> @@ -65,7 +71,7 @@ <dictionary> <item> <key> <string>field_id</string> </key> - <value> <string>my_stop_date</string> </value> + <value> <string>my_at_date</string> </value> </item> <item> <key> <string>form_id</string> </key> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_generateMilestoneReportDialog/my_from_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_generateMilestoneReportDialog/my_from_date.xml index 1add5acb23..cdeff3f3e0 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_generateMilestoneReportDialog/my_from_date.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_generateMilestoneReportDialog/my_from_date.xml @@ -6,6 +6,12 @@ </pickle> <pickle> <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list/> + </value> + </item> <item> <key> <string>id</string> </key> <value> <string>my_from_date</string> </value> @@ -65,7 +71,7 @@ <dictionary> <item> <key> <string>field_id</string> </key> - <value> <string>my_start_date</string> </value> + <value> <string>my_from_date</string> </value> </item> <item> <key> <string>form_id</string> </key> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewODSMonthlyReportPrintDialog/your_at_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewODSMonthlyReportPrintDialog/your_at_date.xml index 45650dc443..c9bd8504d3 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewODSMonthlyReportPrintDialog/your_at_date.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewODSMonthlyReportPrintDialog/your_at_date.xml @@ -73,7 +73,7 @@ <dictionary> <item> <key> <string>field_id</string> </key> - <value> <string>your_at_date</string> </value> + <value> <string>my_at_date</string> </value> </item> <item> <key> <string>form_id</string> </key> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewODSMonthlyReportPrintDialog/your_from_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewODSMonthlyReportPrintDialog/your_from_date.xml index d95d305c76..a092a276bf 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewODSMonthlyReportPrintDialog/your_from_date.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewODSMonthlyReportPrintDialog/your_from_date.xml @@ -73,7 +73,7 @@ <dictionary> <item> <key> <string>field_id</string> </key> - <value> <string>your_from_date</string> </value> + <value> <string>my_from_date</string> </value> </item> <item> <key> <string>form_id</string> </key> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewODSMonthlyReportPrintDialog/your_simulation_state.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewODSMonthlyReportPrintDialog/your_simulation_state.xml index 990d772ab9..3379b1b357 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewODSMonthlyReportPrintDialog/your_simulation_state.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewODSMonthlyReportPrintDialog/your_simulation_state.xml @@ -71,7 +71,7 @@ <dictionary> <item> <key> <string>field_id</string> </key> - <value> <string>your_simulation_state</string> </value> + <value> <string>my_simulation_state</string> </value> </item> <item> <key> <string>form_id</string> </key> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewAccountingTransactionList/your_preferred_at_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewAccountingTransactionList/your_preferred_at_date.xml index 61cd8eb4b1..613f9030fc 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewAccountingTransactionList/your_preferred_at_date.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewAccountingTransactionList/your_preferred_at_date.xml @@ -91,11 +91,11 @@ </item> <item> <key> <string>field_id</string> </key> - <value> <string>my_dialog_mode_at_date</string> </value> + <value> <string>my_at_date</string> </value> </item> <item> <key> <string>form_id</string> </key> - <value> <string>Base_viewFieldLibrary</string> </value> + <value> <string>Base_viewProjectFieldLibrary</string> </value> </item> <item> <key> <string>target</string> </key> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewAccountingTransactionList/your_preferred_from_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewAccountingTransactionList/your_preferred_from_date.xml index d8a6535f89..8ad78955b1 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewAccountingTransactionList/your_preferred_from_date.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewAccountingTransactionList/your_preferred_from_date.xml @@ -91,11 +91,11 @@ </item> <item> <key> <string>field_id</string> </key> - <value> <string>my_dialog_mode_from_date</string> </value> + <value> <string>my_from_date</string> </value> </item> <item> <key> <string>form_id</string> </key> - <value> <string>Base_viewFieldLibrary</string> </value> + <value> <string>Base_viewProjectFieldLibrary</string> </value> </item> <item> <key> <string>target</string> </key> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewAccountingTransactionList/your_preferred_simulation_state.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewAccountingTransactionList/your_preferred_simulation_state.xml index 2713a88536..1fddad42ad 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewAccountingTransactionList/your_preferred_simulation_state.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewAccountingTransactionList/your_preferred_simulation_state.xml @@ -12,7 +12,6 @@ <list> <string>view_separator</string> <string>size</string> - <string>title</string> <string>default</string> <string>items</string> <string>enabled</string> @@ -96,11 +95,11 @@ <dictionary> <item> <key> <string>field_id</string> </key> - <value> <string>my_multi_list_field</string> </value> + <value> <string>my_simulation_state</string> </value> </item> <item> <key> <string>form_id</string> </key> - <value> <string>Base_viewFieldLibrary</string> </value> + <value> <string>Base_viewProjectFieldLibrary</string> </value> </item> <item> <key> <string>size</string> </key> @@ -110,10 +109,6 @@ <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> </item> - <item> - <key> <string>title</string> </key> - <value> <string>Simulation State</string> </value> - </item> <item> <key> <string>view_separator</string> </key> <value> <string encoding="cdata"><![CDATA[ diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewODSMonthlyReportPrintDialog/your_at_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewODSMonthlyReportPrintDialog/your_at_date.xml index f72d518013..e87bdb0095 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewODSMonthlyReportPrintDialog/your_at_date.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewODSMonthlyReportPrintDialog/your_at_date.xml @@ -71,7 +71,7 @@ <dictionary> <item> <key> <string>field_id</string> </key> - <value> <string>your_at_date</string> </value> + <value> <string>my_at_date</string> </value> </item> <item> <key> <string>form_id</string> </key> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewODSMonthlyReportPrintDialog/your_from_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewODSMonthlyReportPrintDialog/your_from_date.xml index aeb96fb524..bc97bcf604 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewODSMonthlyReportPrintDialog/your_from_date.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewODSMonthlyReportPrintDialog/your_from_date.xml @@ -71,7 +71,7 @@ <dictionary> <item> <key> <string>field_id</string> </key> - <value> <string>your_from_date</string> </value> + <value> <string>my_from_date</string> </value> </item> <item> <key> <string>form_id</string> </key> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewODSMonthlyReportPrintDialog/your_simulation_state.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewODSMonthlyReportPrintDialog/your_simulation_state.xml index 990d772ab9..3379b1b357 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewODSMonthlyReportPrintDialog/your_simulation_state.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewODSMonthlyReportPrintDialog/your_simulation_state.xml @@ -71,7 +71,7 @@ <dictionary> <item> <key> <string>field_id</string> </key> - <value> <string>your_simulation_state</string> </value> + <value> <string>my_simulation_state</string> </value> </item> <item> <key> <string>form_id</string> </key> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportListDialog/your_at_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportListDialog/your_at_date.xml index f72d518013..e87bdb0095 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportListDialog/your_at_date.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportListDialog/your_at_date.xml @@ -71,7 +71,7 @@ <dictionary> <item> <key> <string>field_id</string> </key> - <value> <string>your_at_date</string> </value> + <value> <string>my_at_date</string> </value> </item> <item> <key> <string>form_id</string> </key> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportListDialog/your_from_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportListDialog/your_from_date.xml index aeb96fb524..bc97bcf604 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportListDialog/your_from_date.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportListDialog/your_from_date.xml @@ -71,7 +71,7 @@ <dictionary> <item> <key> <string>field_id</string> </key> - <value> <string>your_from_date</string> </value> + <value> <string>my_from_date</string> </value> </item> <item> <key> <string>form_id</string> </key> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportListDialog/your_simulation_state.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportListDialog/your_simulation_state.xml index 990d772ab9..3379b1b357 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportListDialog/your_simulation_state.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportListDialog/your_simulation_state.xml @@ -71,7 +71,7 @@ <dictionary> <item> <key> <string>field_id</string> </key> - <value> <string>your_simulation_state</string> </value> + <value> <string>my_simulation_state</string> </value> </item> <item> <key> <string>form_id</string> </key> diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision index 779a8736e2..cb22560331 100644 --- a/bt5/erp5_project/bt/revision +++ b/bt5/erp5_project/bt/revision @@ -1 +1 @@ -826 \ No newline at end of file +827 \ No newline at end of file -- 2.30.9