From cfe75a30a21d96d472255dbe298b073ddf2c89c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com> Date: Wed, 16 Apr 2008 15:34:49 +0000 Subject: [PATCH] allow user to choose simulation state of documents displayed in report git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20587 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../OrderModule_getOrderReportSectionList.xml | 5 +- .../OrderModule_getOrderStatList.xml | 6 +- .../OrderModule_viewOrderReport.xml | 11 +- .../your_aggregation_level.xml | 16 +-- .../your_delivery_mode.xml | 16 +-- .../your_group.xml | 16 +-- .../your_group_by.xml | 16 +-- .../your_incoterm.xml | 16 +-- .../your_order.xml | 8 +- .../your_simulation_state.xml | 123 +++++++++++++++++ .../OrderModule_viewOrderReportDialog.xml | 11 +- .../your_aggregation_level.xml | 6 +- .../your_delivery_mode.xml | 6 +- .../your_group.xml | 6 +- .../your_group_by.xml | 6 +- .../your_incoterm.xml | 6 +- .../your_order.xml | 12 +- .../your_simulation_state.xml | 128 ++++++++++++++++++ .../OrderModule_viewOrderStatList.xml | 10 +- .../OrderModule_viewOrderStatList/listbox.xml | 14 +- bt5/erp5_trade/bt/revision | 2 +- 21 files changed, 349 insertions(+), 91 deletions(-) create mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_simulation_state.xml create mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_simulation_state.xml diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_getOrderReportSectionList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_getOrderReportSectionList.xml index f3112d506f..ee7a601a77 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_getOrderReportSectionList.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_getOrderReportSectionList.xml @@ -75,6 +75,7 @@ aggregation_level = context.REQUEST.get(\'aggregation_level\')\n from_date = context.REQUEST.get(\'from_date\')\n to_date = context.REQUEST.get(\'at_date\')\n group_by = context.REQUEST.get(\'group_by\')\n +simulation_state = context.REQUEST.get(\'simulation_state\')\n \n selection_columns = [(\'group_by\', "Group by")]\n if from_date is None:\n @@ -132,7 +133,8 @@ else:\n raise ValueError, "unknown type for report"\n \n params=dict(period_list=interval_list, report_type=report_type,\n - doc_portal_type=doc_portal_type, line_portal_type=line_portal_type)\n + doc_portal_type=doc_portal_type, line_portal_type=line_portal_type,\n + simulation_state=simulation_state)\n \n # stat columns of the listbox\n stat_columns = stat_columns + interval_column_list + total_stat_list\n @@ -208,6 +210,7 @@ return result\n <string>from_date</string> <string>to_date</string> <string>group_by</string> + <string>simulation_state</string> <string>selection_columns</string> <string>None</string> <string>Products.ZSQLCatalog.SQLCatalog</string> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_getOrderStatList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_getOrderStatList.xml index f67807e5fa..c192e17156 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_getOrderStatList.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_getOrderStatList.xml @@ -127,6 +127,7 @@ elif to_date is not None:\n sort_on_list = [ (\'delivery.destination_section_uid\', \'ASC\'), (\'delivery.start_date\',\'ASC\')]\n result_list = context.portal_catalog.searchResults(limit=None,query=query,\n portal_type=doc_portal_type,\n + simulation_state=simulation_state,\n sort_on=sort_on_list,\n **catalog_params)\n \n @@ -325,7 +326,7 @@ return line_list\n </item> <item> <key> <string>_params</string> </key> - <value> <string>period_list, report_type, doc_portal_type, line_portal_type, **kw</string> </value> + <value> <string>period_list, report_type, doc_portal_type, line_portal_type, simulation_state,**kw</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -345,7 +346,7 @@ return line_list\n <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>4</int> </value> + <value> <int>5</int> </value> </item> <item> <key> <string>co_varnames</string> </key> @@ -355,6 +356,7 @@ return line_list\n <string>report_type</string> <string>doc_portal_type</string> <string>line_portal_type</string> + <string>simulation_state</string> <string>kw</string> <string>Products.PythonScripts.standard</string> <string>Object</string> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport.xml index 68374947fc..5f001b3ff7 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport.xml @@ -87,36 +87,37 @@ <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/> </value> </item> <item> - <key> <string>hidden</string> </key> + <key> <string>hidden</string> </key> <value> <list/> </value> </item> <item> - <key> <string>left</string> </key> + <key> <string>left</string> </key> <value> <list> <string>your_order</string> <string>your_group</string> <string>your_delivery_mode</string> <string>your_incoterm</string> + <string>your_simulation_state</string> </list> </value> </item> <item> - <key> <string>right</string> </key> + <key> <string>right</string> </key> <value> <list> <string>your_from_date</string> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_aggregation_level.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_aggregation_level.xml index 84e6a5719d..3e9f92fa76 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_aggregation_level.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_aggregation_level.xml @@ -59,7 +59,7 @@ <value> <dictionary> <item> - <key> <string>default</string> </key> + <key> <string>default</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> @@ -73,11 +73,11 @@ <value> <string></string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>size</string> </key> + <key> <string>size</string> </key> <value> <string></string> </value> </item> <item> @@ -85,7 +85,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -96,7 +96,7 @@ <value> <dictionary> <item> - <key> <string>default</string> </key> + <key> <string>default</string> </key> <value> <string></string> </value> </item> <item> @@ -108,7 +108,7 @@ <value> <string>Base_viewReportFieldLibrary</string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <list> <tuple> @@ -131,7 +131,7 @@ </value> </item> <item> - <key> <string>size</string> </key> + <key> <string>size</string> </key> <value> <int>1</int> </value> </item> <item> @@ -139,7 +139,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Aggregation Level</string> </value> </item> </dictionary> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_delivery_mode.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_delivery_mode.xml index c52d7c17e5..4dc79aa7db 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_delivery_mode.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_delivery_mode.xml @@ -59,7 +59,7 @@ <value> <dictionary> <item> - <key> <string>default</string> </key> + <key> <string>default</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> @@ -73,13 +73,13 @@ <value> <string></string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> </item> <item> - <key> <string>size</string> </key> + <key> <string>size</string> </key> <value> <string></string> </value> </item> <item> @@ -87,7 +87,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -98,7 +98,7 @@ <value> <dictionary> <item> - <key> <string>default</string> </key> + <key> <string>default</string> </key> <value> <string></string> </value> </item> <item> @@ -110,13 +110,13 @@ <value> <string>Base_viewReportFieldLibrary</string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <list/> </value> </item> <item> - <key> <string>size</string> </key> + <key> <string>size</string> </key> <value> <int>1</int> </value> </item> <item> @@ -124,7 +124,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Delivery Mode</string> </value> </item> </dictionary> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_group.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_group.xml index 37c110c094..33f7b8c36e 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_group.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_group.xml @@ -59,7 +59,7 @@ <value> <dictionary> <item> - <key> <string>default</string> </key> + <key> <string>default</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> @@ -73,13 +73,13 @@ <value> <string></string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> </item> <item> - <key> <string>size</string> </key> + <key> <string>size</string> </key> <value> <string></string> </value> </item> <item> @@ -87,7 +87,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -98,7 +98,7 @@ <value> <dictionary> <item> - <key> <string>default</string> </key> + <key> <string>default</string> </key> <value> <string></string> </value> </item> <item> @@ -110,13 +110,13 @@ <value> <string>Base_viewReportFieldLibrary</string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <list/> </value> </item> <item> - <key> <string>size</string> </key> + <key> <string>size</string> </key> <value> <int>1</int> </value> </item> <item> @@ -124,7 +124,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Group</string> </value> </item> </dictionary> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_group_by.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_group_by.xml index df231d1920..202a646a23 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_group_by.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_group_by.xml @@ -59,7 +59,7 @@ <value> <dictionary> <item> - <key> <string>default</string> </key> + <key> <string>default</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> @@ -73,11 +73,11 @@ <value> <string></string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>size</string> </key> + <key> <string>size</string> </key> <value> <string></string> </value> </item> <item> @@ -85,7 +85,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -96,7 +96,7 @@ <value> <dictionary> <item> - <key> <string>default</string> </key> + <key> <string>default</string> </key> <value> <string></string> </value> </item> <item> @@ -108,7 +108,7 @@ <value> <string>Base_viewReportFieldLibrary</string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <list> <tuple> @@ -127,7 +127,7 @@ </value> </item> <item> - <key> <string>size</string> </key> + <key> <string>size</string> </key> <value> <int>1</int> </value> </item> <item> @@ -135,7 +135,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Group By</string> </value> </item> </dictionary> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_incoterm.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_incoterm.xml index 7df984b99f..7bd1f3aacd 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_incoterm.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_incoterm.xml @@ -59,7 +59,7 @@ <value> <dictionary> <item> - <key> <string>default</string> </key> + <key> <string>default</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> @@ -73,13 +73,13 @@ <value> <string></string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> </item> <item> - <key> <string>size</string> </key> + <key> <string>size</string> </key> <value> <string></string> </value> </item> <item> @@ -87,7 +87,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -98,7 +98,7 @@ <value> <dictionary> <item> - <key> <string>default</string> </key> + <key> <string>default</string> </key> <value> <string></string> </value> </item> <item> @@ -110,13 +110,13 @@ <value> <string>Base_viewReportFieldLibrary</string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <list/> </value> </item> <item> - <key> <string>size</string> </key> + <key> <string>size</string> </key> <value> <int>1</int> </value> </item> <item> @@ -124,7 +124,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Incoterm</string> </value> </item> </dictionary> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_order.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_order.xml index cd3e340c1d..741c910d2f 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_order.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_order.xml @@ -98,7 +98,7 @@ <value> <dictionary> <item> - <key> <string>default</string> </key> + <key> <string>default</string> </key> <value> <string></string> </value> </item> <item> @@ -110,13 +110,13 @@ <value> <string>Base_viewReportFieldLibrary</string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <list/> </value> </item> <item> - <key> <string>size</string> </key> + <key> <string>size</string> </key> <value> <int>1</int> </value> </item> <item> @@ -124,7 +124,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Order Type</string> </value> </item> </dictionary> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_simulation_state.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_simulation_state.xml new file mode 100644 index 0000000000..73e0c7fe72 --- /dev/null +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReport/your_simulation_state.xml @@ -0,0 +1,123 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>items</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>your_simulation_state</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> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string>your_simulation_state</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Base_viewReportFieldLibrary</string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python:here.Base_getTranslatedWorkflowStateItemList(wf_id=\'order_workflow\')</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog.xml index 70910b9442..99fc5515ca 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog.xml @@ -87,13 +87,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>your_portal_skin</string> @@ -102,24 +102,25 @@ </value> </item> <item> - <key> <string>hidden</string> </key> + <key> <string>hidden</string> </key> <value> <list/> </value> </item> <item> - <key> <string>left</string> </key> + <key> <string>left</string> </key> <value> <list> <string>your_delivery_mode</string> <string>your_group</string> <string>your_incoterm</string> <string>your_order</string> + <string>your_simulation_state</string> </list> </value> </item> <item> - <key> <string>right</string> </key> + <key> <string>right</string> </key> <value> <list> <string>your_from_date</string> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_aggregation_level.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_aggregation_level.xml index a0d1d37a18..eef80467c1 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_aggregation_level.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_aggregation_level.xml @@ -97,7 +97,7 @@ <value> <string>Base_viewDialogFieldLibrary</string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <list> <tuple> @@ -120,7 +120,7 @@ </value> </item> <item> - <key> <string>size</string> </key> + <key> <string>size</string> </key> <value> <int>1</int> </value> </item> <item> @@ -128,7 +128,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Aggregation Level</string> </value> </item> </dictionary> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_delivery_mode.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_delivery_mode.xml index cf54391b59..f96295e75c 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_delivery_mode.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_delivery_mode.xml @@ -99,13 +99,13 @@ <value> <string>Base_viewDialogFieldLibrary</string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <list/> </value> </item> <item> - <key> <string>size</string> </key> + <key> <string>size</string> </key> <value> <int>1</int> </value> </item> <item> @@ -113,7 +113,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Delivery Mode</string> </value> </item> </dictionary> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_group.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_group.xml index abf0891f20..fac4bd1eb6 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_group.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_group.xml @@ -99,13 +99,13 @@ <value> <string>Base_viewDialogFieldLibrary</string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <list/> </value> </item> <item> - <key> <string>size</string> </key> + <key> <string>size</string> </key> <value> <int>1</int> </value> </item> <item> @@ -113,7 +113,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Group</string> </value> </item> </dictionary> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_group_by.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_group_by.xml index c99bd9682a..1f689084e1 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_group_by.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_group_by.xml @@ -97,7 +97,7 @@ <value> <string>Base_viewDialogFieldLibrary</string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <list> <tuple> @@ -116,7 +116,7 @@ </value> </item> <item> - <key> <string>size</string> </key> + <key> <string>size</string> </key> <value> <int>1</int> </value> </item> <item> @@ -124,7 +124,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Kind of report</string> </value> </item> </dictionary> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_incoterm.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_incoterm.xml index e1c0e2dcd1..7f9db02467 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_incoterm.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_incoterm.xml @@ -99,13 +99,13 @@ <value> <string>Base_viewDialogFieldLibrary</string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <list/> </value> </item> <item> - <key> <string>size</string> </key> + <key> <string>size</string> </key> <value> <int>1</int> </value> </item> <item> @@ -113,7 +113,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Incoterm</string> </value> </item> </dictionary> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_order.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_order.xml index 87deaa9f13..87d0f695b5 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_order.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_order.xml @@ -66,13 +66,13 @@ <value> <string></string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> - <key> <string>size</string> </key> + <key> <string>size</string> </key> <value> <string></string> </value> </item> <item> @@ -80,7 +80,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -99,13 +99,13 @@ <value> <string>Base_viewDialogFieldLibrary</string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <list/> </value> </item> <item> - <key> <string>size</string> </key> + <key> <string>size</string> </key> <value> <int>1</int> </value> </item> <item> @@ -113,7 +113,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Order Type</string> </value> </item> </dictionary> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_simulation_state.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_simulation_state.xml new file mode 100644 index 0000000000..fa269e1932 --- /dev/null +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderReportDialog/your_simulation_state.xml @@ -0,0 +1,128 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>title</string> + <string>items</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>your_simulation_state</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> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string>your_simulation_state</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Base_viewDialogFieldLibrary</string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <list/> + </value> + </item> + <item> + <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> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python:here.Base_getTranslatedWorkflowStateItemList(wf_id=\'order_workflow\')</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderStatList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderStatList.xml index 52374c77de..72c2ed96cd 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderStatList.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderStatList.xml @@ -77,7 +77,7 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> @@ -85,25 +85,25 @@ </value> </item> <item> - <key> <string>center</string> </key> + <key> <string>center</string> </key> <value> <list/> </value> </item> <item> - <key> <string>hidden</string> </key> + <key> <string>hidden</string> </key> <value> <list/> </value> </item> <item> - <key> <string>left</string> </key> + <key> <string>left</string> </key> <value> <list/> </value> </item> <item> - <key> <string>right</string> </key> + <key> <string>right</string> </key> <value> <list/> </value> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderStatList/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderStatList/listbox.xml index 316c0820a3..d4969dbc08 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderStatList/listbox.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_viewOrderStatList/listbox.xml @@ -121,7 +121,7 @@ </value> </item> <item> - <key> <string>columns</string> </key> + <key> <string>columns</string> </key> <value> <list> <tuple> @@ -132,7 +132,7 @@ </value> </item> <item> - <key> <string>count_method</string> </key> + <key> <string>count_method</string> </key> <value> <string></string> </value> </item> <item> @@ -152,7 +152,7 @@ <value> <string>ORGANISATION_LIST</string> </value> </item> <item> - <key> <string>list_method</string> </key> + <key> <string>list_method</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> @@ -162,17 +162,17 @@ <value> <int>0</int> </value> </item> <item> - <key> <string>selection_name</string> </key> + <key> <string>selection_name</string> </key> <value> <string>order_module_stat_report_selection</string> </value> </item> <item> - <key> <string>stat_columns</string> </key> + <key> <string>stat_columns</string> </key> <value> <list/> </value> </item> <item> - <key> <string>stat_method</string> </key> + <key> <string>stat_method</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> </value> @@ -182,7 +182,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Orders</string> </value> </item> <item> diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index 2c136b29b5..55663e5ead 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -302 \ No newline at end of file +304 \ No newline at end of file -- 2.30.9