From b30ba669517030d402197aba847a932c01819432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Wed, 19 Dec 2007 13:46:14 +0000
Subject: [PATCH] Merge the features provided by old "ODS Report" as options in
"ODS Export" action.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18413 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../portal_properties/ods_export.xml | 2 +-
.../portal_properties/ods_report.xml | 83 ---------
.../Base_getExportModeItemList.xml | 155 ++++++++++++++++
.../erp5_ods_core/Base_viewAsODS.xml | 23 ++-
.../erp5_ods_core/Base_viewAsODSDialog.xml | 8 +-
.../Base_viewAsODSDialog/your_landscape.xml | 9 +-
.../your_print_mode.xml} | 151 ++++++++++++++-
.../your_target_language.xml} | 108 +++++------
...r_getContentListAsODSReportSectionList.xml | 2 +-
...older_viewContentListAsODSReportDialog.xml | 154 ----------------
.../your_format.xml | 147 ---------------
.../your_sheet_per_report_section.xml | 174 ------------------
bt5/erp5_ods_style/bt/revision | 2 +-
.../bt/template_action_path_list | 3 +-
14 files changed, 386 insertions(+), 635 deletions(-)
delete mode 100644 bt5/erp5_ods_style/ActionTemplateItem/portal_types/portal_properties/ods_report.xml
create mode 100644 bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_getExportModeItemList.xml
rename bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/{Folder_viewContentListAsODSReportDialog/your_landscape.xml => Base_viewAsODSDialog/your_print_mode.xml} (53%)
rename bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/{Folder_viewContentListAsODSReportDialog/portal_skin.xml => Base_viewAsODSDialog/your_target_language.xml} (84%)
delete mode 100644 bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog.xml
delete mode 100644 bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_format.xml
delete mode 100644 bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_sheet_per_report_section.xml
diff --git a/bt5/erp5_ods_style/ActionTemplateItem/portal_types/portal_properties/ods_export.xml b/bt5/erp5_ods_style/ActionTemplateItem/portal_types/portal_properties/ods_export.xml
index 8e101a876c..99875d37ad 100644
--- a/bt5/erp5_ods_style/ActionTemplateItem/portal_types/portal_properties/ods_export.xml
+++ b/bt5/erp5_ods_style/ActionTemplateItem/portal_types/portal_properties/ods_export.xml
@@ -55,7 +55,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Export Content As Spread Sheet</string> </value>
+ <value> <string>Export to SpreadSheet</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
diff --git a/bt5/erp5_ods_style/ActionTemplateItem/portal_types/portal_properties/ods_report.xml b/bt5/erp5_ods_style/ActionTemplateItem/portal_types/portal_properties/ods_report.xml
deleted file mode 100644
index 8d65b11d83..0000000000
--- a/bt5/erp5_ods_style/ActionTemplateItem/portal_types/portal_properties/ods_report.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>action</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>category</string> </key>
- <value> <string>object_report</string> </value>
- </item>
- <item>
- <key> <string>condition</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>icon</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>ods_report</string> </value>
- </item>
- <item>
- <key> <string>permissions</string> </key>
- <value>
- <tuple>
- <string>View</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>priority</string> </key>
- <value> <float>1.0</float> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Export Report As Spread Sheet</string> </value>
- </item>
- <item>
- <key> <string>visible</string> </key>
- <value> <int>0</int> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="Expression" module="Products.CMFCore.Expression"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>text</string> </key>
- <value> <string>string:${object_url}/Folder_viewContentListAsODSReportDialog</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_getExportModeItemList.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_getExportModeItemList.xml
new file mode 100644
index 0000000000..bc0339c5ec
--- /dev/null
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_getExportModeItemList.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Python_magic</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>from Products.ERP5Type.Message import Message\n
+N_ = lambda msg: Message(\'erp5_ui\', msg)\n
+\n
+return [\n
+ (\'\', \'\'),\n
+ ( N_(\'List of Documents\'), \'list\'),\n
+ ( N_(\'Default Export of each Document\'), \'list_view\' ),\n
+ ( N_(\'Default Export of each Document (one sheet per view)\'), \'list_view_separate_sheet\'),\n
+]\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_filepath</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>Products.ERP5Type.Message</string>
+ <string>Message</string>
+ <string>N_</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Base_getExportModeItemList</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODS.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODS.xml
index 5f7d33fd3c..1a0e80d22c 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODS.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODS.xml
@@ -66,7 +66,17 @@
<item>
<key> <string>_body</string> </key>
<value> <string>context.getPortalObject().portal_skins.changeSkin(\'ODS\')\n
-container.REQUEST.set(\'portal_skin\', \'ODS\') # Some TALES expressions checks this\n
+request = container.REQUEST\n
+request.set(\'portal_skin\', \'ODS\') # Some TALES expressions checks this\n
+\n
+if target_language:\n
+ request[\'AcceptLanguage\'].set(target_language, 10)\n
+\n
+if print_mode == \'list_view\' or print_mode == \'list_view_separate_sheet\':\n
+ if print_mode == \'list_view_separate_sheet\':\n
+ request.set(\'sheet_per_report_section\', 1)\n
+ return context.Folder_viewContentListAsODSReport()\n
+\n
return getattr(context, form_id)()\n
</string> </value>
</item>
@@ -84,7 +94,7 @@ return getattr(context, form_id)()\n
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>form_id=\'\'</string> </value>
+ <value> <string>form_id=\'\', target_language=\'\', print_mode=\'\', **kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -104,16 +114,21 @@ return getattr(context, form_id)()\n
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>1</int> </value>
+ <value> <int>3</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>form_id</string>
+ <string>target_language</string>
+ <string>print_mode</string>
+ <string>kw</string>
<string>_getattr_</string>
<string>context</string>
<string>container</string>
+ <string>request</string>
+ <string>_getitem_</string>
<string>getattr</string>
</tuple>
</value>
@@ -128,6 +143,8 @@ return getattr(context, form_id)()\n
<value>
<tuple>
<string></string>
+ <string></string>
+ <string></string>
</tuple>
</value>
</item>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODSDialog.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODSDialog.xml
index 80e6aa86e0..b0cd3c06ca 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODSDialog.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODSDialog.xml
@@ -46,6 +46,10 @@
<key> <string>action</string> </key>
<value> <string>Base_viewAsODS</string> </value>
</item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value>
@@ -72,6 +76,8 @@
<list>
<string>your_format</string>
<string>your_landscape</string>
+ <string>your_print_mode</string>
+ <string>your_target_language</string>
</list>
</value>
</item>
@@ -104,7 +110,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Export OpenOffice Spreadsheet</string> </value>
+ <value> <string>Export to Spreadsheet</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODSDialog/your_landscape.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODSDialog/your_landscape.xml
index aacca7060a..89e107b4fb 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODSDialog/your_landscape.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODSDialog/your_landscape.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>CheckBoxField</string>
- </tuple>
- <none/>
+ <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -163,7 +160,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Page Preview : Landscape</string> </value>
+ <value> <string>Landscape</string> </value>
</item>
</dictionary>
</value>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_landscape.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODSDialog/your_print_mode.xml
similarity index 53%
rename from bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_landscape.xml
rename to bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODSDialog/your_print_mode.xml
index aacca7060a..4cb8310ee8 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_landscape.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODSDialog/your_print_mode.xml
@@ -3,18 +3,21 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>CheckBoxField</string>
- </tuple>
- <none/>
+ <global name="ListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
<item>
<key> <string>id</string> </key>
- <value> <string>your_landscape</string> </value>
+ <value> <string>your_print_mode</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
@@ -24,6 +27,14 @@
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
+ <item>
+ <key> <string>required_not_found</string> </key>
+ <value> <string>Input is required but no input given.</string> </value>
+ </item>
+ <item>
+ <key> <string>unknown_selection</string> </key>
+ <value> <string>You selected an item that was not in the list.</string> </value>
+ </item>
</dictionary>
</value>
</item>
@@ -63,14 +74,42 @@
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>extra_item</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>first_item</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>items</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>size</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>whitespace_preserve</string> </key>
+ <value> <string></string> </value>
+ </item>
</dictionary>
</value>
</item>
@@ -100,7 +139,9 @@
</item>
<item>
<key> <string>enabled</string> </key>
- <value> <string></string> </value>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
</item>
<item>
<key> <string>external_validator</string> </key>
@@ -110,14 +151,44 @@
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>extra_item</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>first_item</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>size</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>whitespace_preserve</string> </key>
+ <value> <string></string> </value>
+ </item>
</dictionary>
</value>
</item>
@@ -135,7 +206,7 @@
</item>
<item>
<key> <string>default</string> </key>
- <value> <int>0</int> </value>
+ <value> <string>list</string> </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -157,13 +228,43 @@
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>extra_item</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>first_item</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>size</string> </key>
+ <value> <int>1</int> </value>
+ </item>
<item>
<key> <string>title</string> </key>
- <value> <string>Page Preview : Landscape</string> </value>
+ <value> <string>Export Mode</string> </value>
+ </item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>whitespace_preserve</string> </key>
+ <value> <int>0</int> </value>
</item>
</dictionary>
</value>
@@ -171,4 +272,36 @@
</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: getattr(context, request[\'form_id\']).pt == \'form_list\'</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>context/Base_getExportModeItemList</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/portal_skin.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODSDialog/your_target_language.xml
similarity index 84%
rename from bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/portal_skin.xml
rename to bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODSDialog/your_target_language.xml
index 7dac095569..b9d47b9fa2 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/portal_skin.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODSDialog/your_target_language.xml
@@ -3,18 +3,21 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>StringField</string>
- </tuple>
- <none/>
+ <global name="ListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
<item>
<key> <string>id</string> </key>
- <value> <string>portal_skin</string> </value>
+ <value> <string>your_target_language</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
@@ -29,8 +32,8 @@
<value> <string>Input is required but no input given.</string> </value>
</item>
<item>
- <key> <string>too_long</string> </key>
- <value> <string>Too much input was given.</string> </value>
+ <key> <string>unknown_selection</string> </key>
+ <value> <string>You selected an item that was not in the list.</string> </value>
</item>
</dictionary>
</value>
@@ -56,27 +59,27 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>display_maxwidth</string> </key>
+ <key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>display_width</string> </key>
+ <key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>editable</string> </key>
+ <key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>enabled</string> </key>
+ <key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>external_validator</string> </key>
+ <key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>extra</string> </key>
+ <key> <string>first_item</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -84,7 +87,7 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>max_length</string> </key>
+ <key> <string>items</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -92,11 +95,11 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>title</string> </key>
+ <key> <string>size</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>truncate</string> </key>
+ <key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -124,36 +127,34 @@
</item>
<item>
<key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>display_maxwidth</string> </key>
+ <key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>display_width</string> </key>
+ <key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>editable</string> </key>
+ <key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>enabled</string> </key>
+ <key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>external_validator</string> </key>
+ <key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>extra</string> </key>
+ <key> <string>first_item</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -161,19 +162,21 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
+ <key> <string>items</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>title</string> </key>
+ <key> <string>size</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>truncate</string> </key>
+ <key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -197,24 +200,16 @@
</item>
<item>
<key> <string>css_class</string> </key>
- <value> <string>hidden</string> </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
- <value> <string>ODS</string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>display_maxwidth</string> </key>
+ <key> <string>description</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <int>20</int> </value>
- </item>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
@@ -231,25 +226,35 @@
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>extra_item</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>first_item</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>hidden</string> </key>
- <value> <int>1</int> </value>
+ <value> <int>0</int> </value>
</item>
<item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
+ <key> <string>items</string> </key>
+ <value>
+ <list/>
+ </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>title</string> </key>
- <value> <string>Portal Skin</string> </value>
+ <key> <string>size</string> </key>
+ <value> <int>1</int> </value>
</item>
<item>
- <key> <string>truncate</string> </key>
- <value> <int>0</int> </value>
+ <key> <string>title</string> </key>
+ <value> <string>Language</string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
@@ -268,18 +273,15 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>here/portal_preferences/getPreferredReportStyle</string> </value>
+ <value> <string>python: [(\'\', \'\')] + [(lang[\'title\'], lang[\'id\']) for lang in here.Localizer.get_languages_map()]</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_getContentListAsODSReportSectionList.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_getContentListAsODSReportSectionList.xml
index 273b3a87c3..31857d5d4d 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_getContentListAsODSReportSectionList.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_getContentListAsODSReportSectionList.xml
@@ -98,7 +98,7 @@ if selection_name is not None:\n
if checked_uid_list:\n
getObject = portal.portal_catalog.getObject\n
for uid in checked_uid_list:\n
- report_section_list.extend(getReportSectionListForObject(getObject(doc)))\n
+ report_section_list.extend(getReportSectionListForObject(getObject(uid)))\n
else:\n
# get all documents in the selection\n
for doc in portal.portal_selections.callSelectionFor(selection_name, context=form):\n
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog.xml
deleted file mode 100644
index dabb2bbb12..0000000000
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ERP5Form" module="Products.ERP5Form.Form"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_bind_names</string> </key>
- <value>
- <object>
- <klass>
- <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_asgns</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_objects</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>action</string> </key>
- <value> <string>Folder_viewContentListAsODSReport</string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>encoding</string> </key>
- <value> <string>UTF-8</string> </value>
- </item>
- <item>
- <key> <string>enctype</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>group_list</string> </key>
- <value>
- <list>
- <string>left</string>
- <string>right</string>
- <string>center</string>
- <string>bottom</string>
- <string>hidden</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>groups</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>bottom</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>center</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>left</string> </key>
- <value>
- <list>
- <string>portal_skin</string>
- <string>your_format</string>
- <string>your_sheet_per_report_section</string>
- <string>your_landscape</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>right</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>Folder_viewContentListAsODSReportDialog</string> </value>
- </item>
- <item>
- <key> <string>method</string> </key>
- <value> <string>POST</string> </value>
- </item>
- <item>
- <key> <string>name</string> </key>
- <value> <string>Folder_viewContentListAsODSReportDialog</string> </value>
- </item>
- <item>
- <key> <string>pt</string> </key>
- <value> <string>form_dialog</string> </value>
- </item>
- <item>
- <key> <string>row_length</string> </key>
- <value> <int>4</int> </value>
- </item>
- <item>
- <key> <string>stored_encoding</string> </key>
- <value> <string>UTF-8</string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Export Content</string> </value>
- </item>
- <item>
- <key> <string>unicode_mode</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>update_action</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_format.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_format.xml
deleted file mode 100644
index 5a66663c1f..0000000000
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_format.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <tuple>
- <string>Products.ERP5Form.ProxyField</string>
- <string>ProxyField</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>delegated_list</string> </key>
- <value>
- <list>
- <string>title</string>
- <string>description</string>
- <string>items</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>your_format</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>description</string> </key>
- <value> <string></string> </value>
- </item>
- <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>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>description</string> </key>
- <value> <string>Conversion Format for reports.</string> </value>
- </item>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string>my_category</string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string>Base_viewFieldLibrary</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>Report Format</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: context.portal_preferences.Preference_getReportFormatItemList()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_sheet_per_report_section.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_sheet_per_report_section.xml
deleted file mode 100644
index c63a2f66e5..0000000000
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_sheet_per_report_section.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>CheckBoxField</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>id</string> </key>
- <value> <string>your_sheet_per_report_section</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>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>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>title</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>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>title</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> <int>0</int> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </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>title</string> </key>
- <value> <string>Export A Sheet Per ReportSection</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_ods_style/bt/revision b/bt5/erp5_ods_style/bt/revision
index 97a55e1d74..dec4c59e4a 100644
--- a/bt5/erp5_ods_style/bt/revision
+++ b/bt5/erp5_ods_style/bt/revision
@@ -1 +1 @@
-101
\ No newline at end of file
+104
\ No newline at end of file
diff --git a/bt5/erp5_ods_style/bt/template_action_path_list b/bt5/erp5_ods_style/bt/template_action_path_list
index db359443ef..2c6cdc4e69 100644
--- a/bt5/erp5_ods_style/bt/template_action_path_list
+++ b/bt5/erp5_ods_style/bt/template_action_path_list
@@ -1,2 +1 @@
-portal_properties | ods_export
-portal_properties | ods_report
\ No newline at end of file
+portal_properties | ods_export
\ No newline at end of file
--
2.30.9