From 85d90cee02ff77bb7c741f556e8681bba96737c2 Mon Sep 17 00:00:00 2001
From: Wenjie Zheng <wenjie.zheng@tiolive.com>
Date: Tue, 28 Jul 2015 08:42:52 +0000
Subject: [PATCH] erp5_configurator_standard: rapair converted configuration
workflow erp5_consulting_workflow.
---
.../erp5_consulting_workflow/14.xml | 9 +++++---
.../erp5_standard_workflow/11.xml | 23 +++++++++++++++++++
.../erp5_standard_workflow/18.xml | 6 ++++-
.../erp5_standard_workflow/3.xml | 21 +++++++++++++++++
.../erp5_standard_workflow/4.xml | 21 +++++++++++++++++
.../erp5_standard_workflow/6.xml | 21 +++++++++++++++++
6 files changed, 97 insertions(+), 4 deletions(-)
diff --git a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/14.xml b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/14.xml
index d35aaecaf1..b4b80f8786 100644
--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/14.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/14.xml
@@ -24,9 +24,12 @@
</item>
<item>
<key> <string>description</string> </key>
- <value>
- <none/>
- </value>
+ <value> <string>Finalize configuration and get ready for installation process.\n
+We don\'t use ExpressConfiguration_displayDownload script, because it would create categories and default roles which we do not want here.</string> </value>
+ </item>
+ <item>
+ <key> <string>guard_expression</string> </key>
+ <value> <string>python: True</string> </value>
</item>
<item>
<key> <string>id</string> </key>
diff --git a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/11.xml b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/11.xml
index 27c41b4847..a59923f69d 100644
--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/11.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/11.xml
@@ -6,6 +6,23 @@
</pickle>
<pickle>
<dictionary>
+ <item>
+ <key> <string>_local_properties</string> </key>
+ <value>
+ <tuple>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>comment</string> </value>
+ </item>
+ <item>
+ <key> <string>type</string> </key>
+ <value> <string>text</string> </value>
+ </item>
+ </dictionary>
+ </tuple>
+ </value>
+ </item>
<item>
<key> <string>categories</string> </key>
<value>
@@ -14,6 +31,12 @@
</tuple>
</value>
</item>
+ <item>
+ <key> <string>comment</string> </key>
+ <value> <string>Omit enetring number of users.\n
+BEFORE for possible transitions was: E\n
+nter Number of User</string> </value>
+ </item>
<item>
<key> <string>description</string> </key>
<value> <string>Configure your organisation.</string> </value>
diff --git a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/18.xml b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/18.xml
index d6371059b6..cfe1fe5475 100644
--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/18.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/18.xml
@@ -28,6 +28,10 @@
<none/>
</value>
</item>
+ <item>
+ <key> <string>guard_expression</string> </key>
+ <value> <string>python: True</string> </value>
+ </item>
<item>
<key> <string>id</string> </key>
<value> <string>18</string> </value>
@@ -42,7 +46,7 @@
</item>
<item>
<key> <string>transition_form_id</string> </key>
- <value> <string>BusinessConfiguration_viewConsultingConfigureOrganisationDialog</string> </value>
+ <value> <string>BusinessConfiguration_setupOrganisationForm</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/3.xml b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/3.xml
index 6e086ee845..c992428c76 100644
--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/3.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/3.xml
@@ -6,6 +6,23 @@
</pickle>
<pickle>
<dictionary>
+ <item>
+ <key> <string>_local_properties</string> </key>
+ <value>
+ <tuple>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>comment</string> </value>
+ </item>
+ <item>
+ <key> <string>type</string> </key>
+ <value> <string>string</string> </value>
+ </item>
+ </dictionary>
+ </tuple>
+ </value>
+ </item>
<item>
<key> <string>categories</string> </key>
<value>
@@ -14,6 +31,10 @@
</tuple>
</value>
</item>
+ <item>
+ <key> <string>comment</string> </key>
+ <value> <string>Configure Roles</string> </value>
+ </item>
<item>
<key> <string>description</string> </key>
<value>
diff --git a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/4.xml b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/4.xml
index 90820ab204..0ff6c7ac13 100644
--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/4.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/4.xml
@@ -6,6 +6,23 @@
</pickle>
<pickle>
<dictionary>
+ <item>
+ <key> <string>_local_properties</string> </key>
+ <value>
+ <tuple>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>comment</string> </value>
+ </item>
+ <item>
+ <key> <string>type</string> </key>
+ <value> <string>string</string> </value>
+ </item>
+ </dictionary>
+ </tuple>
+ </value>
+ </item>
<item>
<key> <string>categories</string> </key>
<value>
@@ -14,6 +31,10 @@
</tuple>
</value>
</item>
+ <item>
+ <key> <string>comment</string> </key>
+ <value> <string>Configure Preference</string> </value>
+ </item>
<item>
<key> <string>description</string> </key>
<value>
diff --git a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/6.xml b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/6.xml
index 5c28cf7965..28a5e4b5ba 100644
--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/6.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/6.xml
@@ -6,6 +6,23 @@
</pickle>
<pickle>
<dictionary>
+ <item>
+ <key> <string>_local_properties</string> </key>
+ <value>
+ <tuple>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>comment</string> </value>
+ </item>
+ <item>
+ <key> <string>type</string> </key>
+ <value> <string>string</string> </value>
+ </item>
+ </dictionary>
+ </tuple>
+ </value>
+ </item>
<item>
<key> <string>categories</string> </key>
<value>
@@ -14,6 +31,10 @@
</tuple>
</value>
</item>
+ <item>
+ <key> <string>comment</string> </key>
+ <value> <string>Configure Preference</string> </value>
+ </item>
<item>
<key> <string>description</string> </key>
<value>
--
2.30.9