Configurator and Workflow cleanups

See merge request !1171

Configurator and Workflow cleanups
See merge request !1171
b1da02b9 · Jérome Perrin · d2dedca3 · 414bb6f5 · b1da02b9 · b1da02b9
Commit b1da02b9 authored Jul 06, 2020 by Jérome Perrin
31 changed files
--- a/bt5/erp5_configurator/SkinTemplateItem/portal_skins/erp5_configurator/Base_viewConfiguratorFieldLibrary/my_empty_mode_default_address_region.xml
+++ b/bt5/erp5_configurator/SkinTemplateItem/portal_skins/erp5_configurator/Base_viewConfiguratorFieldLibrary/my_empty_mode_default_address_region.xml
@@ -122,7 +122,7 @@
                </item>
                <item>
                    <key> <string>title</string> </key>
-                    <value> <string>Country</string> </value>
+                    <value> <string>Region</string> </value>
                </item>
              </dictionary>
            </value>

--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/9.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/9.xml
@@ -57,7 +57,7 @@
        </item>
        <item>
            <key> <string>description</string> </key>
-            <value> <string>Fill in detailled information for each ERP5 user.</string> </value>
+            <value> <string>Fill in detailed information for each ERP5 user.</string> </value>
        </item>
        <item>
            <key> <string>id</string> </key>

--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/1.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/1.xml
@@ -42,6 +42,10 @@
            <key> <string>id</string> </key>
            <value> <string>1</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>1</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>State</string> </value>

--- 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
@@ -40,6 +40,10 @@
            <key> <string>id</string> </key>
            <value> <string>11</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>11</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>State</string> </value>

--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/12.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/12.xml
@@ -73,6 +73,10 @@
            <key> <string>id</string> </key>
            <value> <string>12</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>7</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>Transition</string> </value>

--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/14.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/14.xml
@@ -50,6 +50,10 @@
            <key> <string>id</string> </key>
            <value> <string>14</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>10</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>Transition</string> </value>

--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/2.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/2.xml
@@ -63,6 +63,10 @@
            <key> <string>id</string> </key>
            <value> <string>2</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>5</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>State</string> </value>

--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/29.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/29.xml
@@ -63,6 +63,10 @@
            <key> <string>id</string> </key>
            <value> <string>29</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>3</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>State</string> </value>

--- 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
@@ -50,6 +50,10 @@
            <key> <string>id</string> </key>
            <value> <string>3</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>4</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>Transition</string> </value>

--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/30.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/30.xml
@@ -50,6 +50,10 @@
            <key> <string>id</string> </key>
            <value> <string>30</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>2</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>Transition</string> </value>

--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/31.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/31.xml
@@ -40,6 +40,10 @@
            <key> <string>id</string> </key>
            <value> <string>31</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>10</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>State</string> </value>

--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/32.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/32.xml
@@ -73,6 +73,10 @@
            <key> <string>id</string> </key>
            <value> <string>32</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>9</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>Transition</string> </value>

--- 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
@@ -50,6 +50,10 @@
            <key> <string>id</string> </key>
            <value> <string>4</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>5</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>Transition</string> </value>

--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/5.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/5.xml
@@ -63,6 +63,10 @@
            <key> <string>id</string> </key>
            <value> <string>5</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>4</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>State</string> </value>

--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/55.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/55.xml
@@ -42,6 +42,10 @@
            <key> <string>id</string> </key>
            <value> <string>55</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>2</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>State</string> </value>

--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/56.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/56.xml
@@ -77,6 +77,10 @@
            <key> <string>id</string> </key>
            <value> <string>56</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>1</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>Transition</string> </value>

--- 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
@@ -50,6 +50,10 @@
            <key> <string>id</string> </key>
            <value> <string>6</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>3</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>Transition</string> </value>

--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/61.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/61.xml
@@ -40,6 +40,10 @@
            <key> <string>id</string> </key>
            <value> <string>61</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>7</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>State</string> </value>

--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/62.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/62.xml
@@ -50,6 +50,10 @@
            <key> <string>id</string> </key>
            <value> <string>62</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>6</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>Transition</string> </value>

--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/63.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/63.xml
@@ -34,6 +34,10 @@
            <key> <string>id</string> </key>
            <value> <string>63</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>12</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>State</string> </value>

--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/64.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/64.xml
@@ -40,6 +40,10 @@
            <key> <string>id</string> </key>
            <value> <string>64</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>11</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>Transition</string> </value>

--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/65.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/65.xml
@@ -32,6 +32,10 @@
            <key> <string>id</string> </key>
            <value> <string>65</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>8</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>Transition</string> </value>

--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/66.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/66.xml
@@ -22,6 +22,10 @@
            <key> <string>id</string> </key>
            <value> <string>66</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>9</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>State</string> </value>

--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/8.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/8.xml
@@ -63,6 +63,10 @@ nter Number of User</string> </value>
            <key> <string>id</string> </key>
            <value> <string>8</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>6</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>State</string> </value>

--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/9.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/9.xml
@@ -57,12 +57,16 @@
        </item>
        <item>
            <key> <string>description</string> </key>
-            <value> <string>Fill in detailled information for each ERP5 user. At end of configuration process each TioLive user will receive an email containing his username and password.</string> </value>
+            <value> <string>Fill in detailed information for each ERP5 user.</string> </value>
        </item>
        <item>
            <key> <string>id</string> </key>
            <value> <string>9</string> </value>
        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>8</int> </value>
+        </item>
        <item>
            <key> <string>portal_type</string> </key>
            <value> <string>State</string> </value>

--- a/bt5/erp5_configurator_standard_ui_test/PathTemplateItem/test_page_module/user-Howto.Configure.ERP5.for.SMB.With.Configurator.html
+++ b/bt5/erp5_configurator_standard_ui_test/PathTemplateItem/test_page_module/user-Howto.Configure.ERP5.for.SMB.With.Configurator.html
@@ -183,7 +183,7 @@
        <h1>Your Organisation</h1>
        <img type="image/svg+xml" src="http://www.erp5.com/user-Howto.Configure.ERP5.for.SMB.With.Configurator.Organisation?format=png" title="Organisation Configuration Form" alt="Organisation Configuration Form">
        <details open="open">
-          <p>You will then have to fill all the information about your Company. It is important for you to enter the correct information as it wont be possible after the configuration to change them by yourself. Once it is done, just click on "Configure Organisation".</p><p>Note: You are configuring the ERP5 instance for your company, so please use the information of your company, such as Name, Email, Address, Country, and Users' information.</p>
+          <p>You will then have to fill all the information about your Company. It is important for you to enter the correct information as it wont be possible after the configuration to change them by yourself. Once it is done, just click on "Configure Organisation".</p><p>Note: You are configuring the ERP5 instance for your company, so please use the information of your company, such as Name, Email, Address, Region, and Users' information.</p>
        </details>
        <test>
          <table style="display: none;" class="test" cellpadding="1" cellspacing="1" border="1">
@@ -288,7 +288,7 @@
              </tr>
              <tr>
                <td>verifyTextPresent</td>
-                <td>Country</td>
+                <td>Region</td>
                <td>
                  <br>
                </td>
@@ -604,7 +604,7 @@
              </tr>
              <tr>
                <td>verifyTextPresent</td>
-                <td>Country</td>
+                <td>Region</td>
                <td>
                  <br>
                </td>
@@ -842,7 +842,7 @@
              </tr>
              <tr>
                <td>verifyTextPresent</td>
-                <td>Fill in detailled information for each ERP5 user.</td>
+                <td>Fill in detailed information for each ERP5 user.</td>
                <td>
                  <br>
                </td>
@@ -856,7 +856,7 @@
              </tr>
              <tr>
                <td>verifyTextPresent</td>
-                <td>Fill in detailled information for each ERP5 user.</td>
+                <td>Fill in detailed information for each ERP5 user.</td>
                <td>
                  <br>
                </td>

--- a/bt5/erp5_configurator_standard_ui_test/PathTemplateItem/test_page_module/user-Howto.Configure.ERP5.for.SMB.With.Consultant.Configurator.html
+++ b/bt5/erp5_configurator_standard_ui_test/PathTemplateItem/test_page_module/user-Howto.Configure.ERP5.for.SMB.With.Consultant.Configurator.html
@@ -391,7 +391,7 @@
          </tr> 
          <tr> 
            <td>verifyTextPresent</td> 
-            <td>Country</td> 
+            <td>Region</td>
            <td> </td> 
          </tr> 
          <tr> 
@@ -666,7 +666,7 @@
          </tr> 
          <tr> 
            <td>verifyTextPresent</td> 
-            <td>Country</td> 
+            <td>Region</td>
            <td> </td> 
          </tr> 
          <tr> 
@@ -867,7 +867,7 @@
          </tr> 
          <tr> 
            <td>verifyTextPresent</td> 
-            <td>Fill in detailled information for each ERP5 user.</td> 
+            <td>Fill in detailed information for each ERP5 user.</td>
            <td> </td> 
          </tr> 
          <tr> 
@@ -877,7 +877,7 @@
          </tr> 
          <tr> 
            <td>verifyTextPresent</td> 
-            <td>Fill in detailled information for each ERP5 user.</td> 
+            <td>Fill in detailed information for each ERP5 user.</td>
            <td> </td> 
          </tr> 
          <tr> 

--- a/bt5/erp5_l10n_fa/MessageTranslationTemplateItem/fa/erp5_ui/translation.po
+++ b/bt5/erp5_l10n_fa/MessageTranslationTemplateItem/fa/erp5_ui/translation.po
@@ -4398,9 +4398,6 @@ msgstr ""
 msgid "Files committed successfully in revision ${revision}."
 msgstr "پرونده ها با موفقیت در بازبینی شماره ${revision} وارد شد."

-msgid "Fill in detailled information for each ERP5 user. At end of configuration process each TioLive user will receive an email containing his username and password."
-msgstr ""
-
 msgid "Fill your login and new password."
 msgstr "نام کاربری و رمز ورود جدید خود را وارد کنید."


--- a/bt5/erp5_l10n_fr/MessageTranslationTemplateItem/fr/erp5_ui/translation.po
+++ b/bt5/erp5_l10n_fr/MessageTranslationTemplateItem/fr/erp5_ui/translation.po
@@ -5590,7 +5590,7 @@ msgstr "Fichiers et Images"
 msgid "Files commited successfully."
 msgstr "Fichiers commités avec succès"

-msgid "Fill in detailled information for each ERP5 user."
+msgid "Fill in detailed information for each ERP5 user."
 msgstr "Renseignez les informations pour chaque utilisateur."

 msgid "Fill your login and new password."

--- a/product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.Transition.py
+++ b/product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.Transition.py
@@ -53,6 +53,7 @@ class Transition(XMLObject):
             PropertySheet.XMLObject,
             PropertySheet.CategoryCore,
             PropertySheet.DublinCore,
+             PropertySheet.SortIndex,
             PropertySheet.Transition,
  )


--- a/product/ERP5Workflow/Document/State.py
+++ b/product/ERP5Workflow/Document/State.py
@@ -58,6 +58,7 @@ class State(XMLObject):
             PropertySheet.XMLObject,
             PropertySheet.CategoryCore,
             PropertySheet.DublinCore,
+             PropertySheet.SortIndex,
             PropertySheet.State,)

  def getAvailableTransitionList(self, document):