From 76991ef6c51996d3d70d501982bf3239b9abfd7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Thu, 16 Aug 2007 08:23:48 +0000 Subject: [PATCH] XML changes git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15690 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_core/Alarm_zGetAlarmDate.xml | 4 +-- .../erp5_core/Alarm_zUpdateAlarmDate.xml | 4 +-- .../erp5_core/Base_checkPermission.xml | 2 +- .../Base_getLastUserIdByTransition.xml | 2 +- .../erp5_core/Base_getOwnerId.xml | 2 +- .../erp5_core/Base_setDefaultSecurity.xml | 7 ++-- .../erp5_core/Base_zGetAllFromStock.xml | 2 +- ...se_zSearchRelatedObjectsByCategoryList.xml | 10 +++--- .../BusinessTemplate_viewPortalTypes.xml | 6 ++-- .../erp5_core/ERP5Site_checkStockTable.xml | 2 +- .../erp5_core/ERP5Site_getHelpUrl.xml | 2 +- .../InventoryModule_reindexMovementList.xml | 2 +- ...ovement_getPriceCalculationOperandDict.xml | 2 +- .../erp5_core/Resource_zGetInventory.xml | 30 ++++++++-------- .../erp5_core/Resource_zGetInventoryList.xml | 34 +++++++++---------- .../Resource_zGetMovementHistoryList.xml | 34 +++++++++---------- .../erp5_core/Resource_zStatInventory.xml | 32 ++++++++--------- ...mplateTool_viewMultiInstallationDialog.xml | 2 +- product/ERP5/bootstrap/erp5_core/bt/revision | 2 +- 19 files changed, 92 insertions(+), 89 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_zGetAlarmDate.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_zGetAlarmDate.xml index 6eb2e777d5..04cbd5a1e5 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_zGetAlarmDate.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_zGetAlarmDate.xml @@ -51,8 +51,8 @@ <key> <string>_keys</string> </key> <value> <list> -<string>uid</string> -<string>alarm_date</string> + <string>uid</string> + <string>alarm_date</string> </list> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_zUpdateAlarmDate.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_zUpdateAlarmDate.xml index d386d27160..515153473d 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_zUpdateAlarmDate.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_zUpdateAlarmDate.xml @@ -51,8 +51,8 @@ <key> <string>_keys</string> </key> <value> <list> -<string>uid</string> -<string>alarm_date</string> + <string>uid</string> + <string>alarm_date</string> </list> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_checkPermission.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_checkPermission.xml index f1f81a4b2d..b815c50125 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_checkPermission.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_checkPermission.xml @@ -127,7 +127,7 @@ return 0\n <string>path</string> <string>permission</string> <string>_getattr_</string> -<string>context</string> + <string>context</string> <string>portal</string> <string>None</string> <string>ob</string> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getLastUserIdByTransition.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getLastUserIdByTransition.xml index bf94e9d06d..bcecf3693c 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getLastUserIdByTransition.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getLastUserIdByTransition.xml @@ -120,7 +120,7 @@ return None\n <string>workflow_id</string> <string>transition_id</string> <string>_getattr_</string> -<string>context</string> + <string>context</string> <string>workflow_item_list</string> <string>_getiter_</string> <string>workflow_item</string> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getOwnerId.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getOwnerId.xml index 7151e7b3c6..d2d909a07c 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getOwnerId.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getOwnerId.xml @@ -117,7 +117,7 @@ raise ValueError, \'Context (%s) has no owner (see local roles).\' % (repr(conte <value> <tuple> <string>_getattr_</string> -<string>context</string> + <string>context</string> <string>local_role_list</string> <string>_getiter_</string> <string>group</string> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_setDefaultSecurity.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_setDefaultSecurity.xml index 7aea108a8c..76a87fe146 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_setDefaultSecurity.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_setDefaultSecurity.xml @@ -3,8 +3,11 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - <tuple/> + <tuple> + <string>Products.PythonScripts.PythonScript</string> + <string>PythonScript</string> + </tuple> + <none/> </tuple> </pickle> <pickle> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zGetAllFromStock.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zGetAllFromStock.xml index 61e20a00d1..98d99ee3c0 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zGetAllFromStock.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zGetAllFromStock.xml @@ -45,7 +45,7 @@ <key> <string>_keys</string> </key> <value> <list> -<string>limit</string> + <string>limit</string> </list> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zSearchRelatedObjectsByCategoryList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zSearchRelatedObjectsByCategoryList.xml index 5272eb8bde..fb220885a4 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zSearchRelatedObjectsByCategoryList.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_zSearchRelatedObjectsByCategoryList.xml @@ -69,11 +69,11 @@ <key> <string>_keys</string> </key> <value> <list> -<string>category_list</string> -<string>portal_type</string> -<string>strict_membership</string> -<string>where_expression</string> -<string>order_by_expression</string> + <string>category_list</string> + <string>portal_type</string> + <string>strict_membership</string> + <string>where_expression</string> + <string>order_by_expression</string> </list> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewPortalTypes.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewPortalTypes.xml index 4ce8c08629..272d2181a1 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewPortalTypes.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewPortalTypes.xml @@ -79,13 +79,13 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> + <key> <string>bottom</string> </key> <value> <list/> </value> </item> <item> - <key> <string>center</string> </key> + <key> <string>center</string> </key> <value> <list> <string>my_template_portal_type_id_list</string> @@ -105,7 +105,7 @@ </value> </item> <item> - <key> <string>right</string> </key> + <key> <string>right</string> </key> <value> <list/> </value> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_checkStockTable.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_checkStockTable.xml index 64ba600922..8f24cdb3c5 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_checkStockTable.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_checkStockTable.xml @@ -226,7 +226,7 @@ else:\n <string>None</string> <string>null_value_list</string> <string>_getattr_</string> -<string>context</string> + <string>context</string> <string>portal_catalog</string> <string>property_override_dict</string> <string>getattr</string> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getHelpUrl.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getHelpUrl.xml index a7fc8f4d55..5b4e2c327b 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getHelpUrl.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getHelpUrl.xml @@ -122,7 +122,7 @@ return \'%s/%s\' % (context.portal_preferences.getPreferredHtmlStyleDocumentatio <string>current_form_id</string> <string>workflow_action</string> <string>_getattr_</string> -<string>context</string> + <string>context</string> <string>help</string> <string>None</string> <string>_getitem_</string> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InventoryModule_reindexMovementList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InventoryModule_reindexMovementList.xml index cde940a9fe..7bd5c547e5 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InventoryModule_reindexMovementList.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InventoryModule_reindexMovementList.xml @@ -80,7 +80,7 @@ for o in [ x.getObject() for x in context.portal_catalog(\n , sort_on = [(\'movement.start_date\',\'ascending\')]\n , sql_catalog_id = sql_catalog_id\n )\n - ]:\n +]:\n o.reindexObject( after_tag = \'inventory_%i\' % count\n , tag = \'inventory_%i\' % (count+1)\n , sql_catalog_id = sql_catalog_id\n diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Movement_getPriceCalculationOperandDict.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Movement_getPriceCalculationOperandDict.xml index e164cf63dd..c1af5ffc5d 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Movement_getPriceCalculationOperandDict.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Movement_getPriceCalculationOperandDict.xml @@ -124,7 +124,7 @@ else:\n <string>default</string> <string>kw</string> <string>_getattr_</string> -<string>context</string> + <string>context</string> <string>resource</string> <string>None</string> <string>_apply_</string> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml index a791030ae5..5ef5e82226 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml @@ -144,21 +144,21 @@ <key> <string>_keys</string> </key> <value> <list> -<string>from_table_list</string> -<string>where_expression</string> -<string>order_by_expression</string> -<string>selection_domain</string> -<string>selection_report</string> -<string>ignore_variation</string> -<string>standardize</string> -<string>omit_simulation</string> -<string>omit_input</string> -<string>omit_output</string> -<string>section_filtered</string> -<string>input_simulation_state</string> -<string>output_simulation_state</string> -<string>group_by_expression</string> -<string>precision</string> + <string>from_table_list</string> + <string>where_expression</string> + <string>order_by_expression</string> + <string>selection_domain</string> + <string>selection_report</string> + <string>ignore_variation</string> + <string>standardize</string> + <string>omit_simulation</string> + <string>omit_input</string> + <string>omit_output</string> + <string>section_filtered</string> + <string>input_simulation_state</string> + <string>output_simulation_state</string> + <string>group_by_expression</string> + <string>precision</string> </list> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml index 3bb54d0cd7..fe268df884 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml @@ -164,23 +164,23 @@ <key> <string>_keys</string> </key> <value> <list> -<string>from_table_list</string> -<string>where_expression</string> -<string>order_by_expression</string> -<string>group_by_expression</string> -<string>selection_domain</string> -<string>selection_report</string> -<string>ignore_variation</string> -<string>standardize</string> -<string>omit_simulation</string> -<string>section_filtered</string> -<string>omit_input</string> -<string>omit_output</string> -<string>input_simulation_state</string> -<string>output_simulation_state</string> -<string>precision</string> -<string>inventory_list</string> -<string>statistic</string> + <string>from_table_list</string> + <string>where_expression</string> + <string>order_by_expression</string> + <string>group_by_expression</string> + <string>selection_domain</string> + <string>selection_report</string> + <string>ignore_variation</string> + <string>standardize</string> + <string>omit_simulation</string> + <string>section_filtered</string> + <string>omit_input</string> + <string>omit_output</string> + <string>input_simulation_state</string> + <string>output_simulation_state</string> + <string>precision</string> + <string>inventory_list</string> + <string>statistic</string> </list> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml index 18ca306f58..72b1c17b67 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml @@ -156,23 +156,23 @@ <key> <string>_keys</string> </key> <value> <list> -<string>from_table_list</string> -<string>where_expression</string> -<string>order_by_expression</string> -<string>group_by_expression</string> -<string>selection_domain</string> -<string>selection_report</string> -<string>ignore_variation</string> -<string>standardize</string> -<string>omit_simulation</string> -<string>omit_input</string> -<string>omit_output</string> -<string>section_filtered</string> -<string>initial_running_total_quantity</string> -<string>initial_running_total_price</string> -<string>input_simulation_state</string> -<string>output_simulation_state</string> -<string>precision</string> + <string>from_table_list</string> + <string>where_expression</string> + <string>order_by_expression</string> + <string>group_by_expression</string> + <string>selection_domain</string> + <string>selection_report</string> + <string>ignore_variation</string> + <string>standardize</string> + <string>omit_simulation</string> + <string>omit_input</string> + <string>omit_output</string> + <string>section_filtered</string> + <string>initial_running_total_quantity</string> + <string>initial_running_total_price</string> + <string>input_simulation_state</string> + <string>output_simulation_state</string> + <string>precision</string> </list> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml index 436fe2bd76..d54a51d548 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml @@ -158,22 +158,22 @@ <key> <string>_keys</string> </key> <value> <list> -<string>query</string> -<string>resource_uid</string> -<string>from_date</string> -<string>at_date</string> -<string>to_date</string> -<string>omit_simulation</string> -<string>omit_input</string> -<string>omit_output</string> -<string>simulation_state</string> -<string>section_category</string> -<string>selection_domain</string> -<string>selection_report</string> -<string>closed_summary</string> -<string>where_expression</string> -<string>from_table_list</string> -<string>selection_uids</string> + <string>query</string> + <string>resource_uid</string> + <string>from_date</string> + <string>at_date</string> + <string>to_date</string> + <string>omit_simulation</string> + <string>omit_input</string> + <string>omit_output</string> + <string>simulation_state</string> + <string>section_category</string> + <string>selection_domain</string> + <string>selection_report</string> + <string>closed_summary</string> + <string>where_expression</string> + <string>from_table_list</string> + <string>selection_uids</string> </list> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewMultiInstallationDialog.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewMultiInstallationDialog.xml index b07f6e6ad3..efd0da1489 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewMultiInstallationDialog.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewMultiInstallationDialog.xml @@ -86,7 +86,7 @@ </value> </item> <item> - <key> <string>center</string> </key> + <key> <string>center</string> </key> <value> <list> <string>your_form_title</string> diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index 93168a9d7c..5f7b1b0513 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -398 \ No newline at end of file +399 \ No newline at end of file -- 2.30.9