Commit b1da02b9 authored by Jérome Perrin's avatar Jérome Perrin

Configurator and Workflow cleanups

See merge request nexedi/erp5!1171
parents d2dedca3 414bb6f5
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Country</string> </value> <value> <string>Region</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <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>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
...@@ -42,6 +42,10 @@ ...@@ -42,6 +42,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>1</string> </value> <value> <string>1</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>State</string> </value> <value> <string>State</string> </value>
......
...@@ -40,6 +40,10 @@ ...@@ -40,6 +40,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>11</string> </value> <value> <string>11</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>11</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>State</string> </value> <value> <string>State</string> </value>
......
...@@ -73,6 +73,10 @@ ...@@ -73,6 +73,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>12</string> </value> <value> <string>12</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>7</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Transition</string> </value> <value> <string>Transition</string> </value>
......
...@@ -50,6 +50,10 @@ ...@@ -50,6 +50,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>14</string> </value> <value> <string>14</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>10</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Transition</string> </value> <value> <string>Transition</string> </value>
......
...@@ -63,6 +63,10 @@ ...@@ -63,6 +63,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>2</string> </value> <value> <string>2</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>5</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>State</string> </value> <value> <string>State</string> </value>
......
...@@ -63,6 +63,10 @@ ...@@ -63,6 +63,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>29</string> </value> <value> <string>29</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>3</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>State</string> </value> <value> <string>State</string> </value>
......
...@@ -50,6 +50,10 @@ ...@@ -50,6 +50,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>3</string> </value> <value> <string>3</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>4</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Transition</string> </value> <value> <string>Transition</string> </value>
......
...@@ -50,6 +50,10 @@ ...@@ -50,6 +50,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>30</string> </value> <value> <string>30</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>2</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Transition</string> </value> <value> <string>Transition</string> </value>
......
...@@ -40,6 +40,10 @@ ...@@ -40,6 +40,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>31</string> </value> <value> <string>31</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>10</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>State</string> </value> <value> <string>State</string> </value>
......
...@@ -73,6 +73,10 @@ ...@@ -73,6 +73,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>32</string> </value> <value> <string>32</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>9</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Transition</string> </value> <value> <string>Transition</string> </value>
......
...@@ -50,6 +50,10 @@ ...@@ -50,6 +50,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>4</string> </value> <value> <string>4</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>5</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Transition</string> </value> <value> <string>Transition</string> </value>
......
...@@ -63,6 +63,10 @@ ...@@ -63,6 +63,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>5</string> </value> <value> <string>5</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>4</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>State</string> </value> <value> <string>State</string> </value>
......
...@@ -42,6 +42,10 @@ ...@@ -42,6 +42,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>55</string> </value> <value> <string>55</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>2</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>State</string> </value> <value> <string>State</string> </value>
......
...@@ -77,6 +77,10 @@ ...@@ -77,6 +77,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>56</string> </value> <value> <string>56</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Transition</string> </value> <value> <string>Transition</string> </value>
......
...@@ -50,6 +50,10 @@ ...@@ -50,6 +50,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>6</string> </value> <value> <string>6</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>3</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Transition</string> </value> <value> <string>Transition</string> </value>
......
...@@ -40,6 +40,10 @@ ...@@ -40,6 +40,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>61</string> </value> <value> <string>61</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>7</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>State</string> </value> <value> <string>State</string> </value>
......
...@@ -50,6 +50,10 @@ ...@@ -50,6 +50,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>62</string> </value> <value> <string>62</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>6</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Transition</string> </value> <value> <string>Transition</string> </value>
......
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>63</string> </value> <value> <string>63</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>12</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>State</string> </value> <value> <string>State</string> </value>
......
...@@ -40,6 +40,10 @@ ...@@ -40,6 +40,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>64</string> </value> <value> <string>64</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>11</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Transition</string> </value> <value> <string>Transition</string> </value>
......
...@@ -32,6 +32,10 @@ ...@@ -32,6 +32,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>65</string> </value> <value> <string>65</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>8</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Transition</string> </value> <value> <string>Transition</string> </value>
......
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>66</string> </value> <value> <string>66</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>9</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>State</string> </value> <value> <string>State</string> </value>
......
...@@ -63,6 +63,10 @@ nter Number of User</string> </value> ...@@ -63,6 +63,10 @@ nter Number of User</string> </value>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>8</string> </value> <value> <string>8</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>6</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>State</string> </value> <value> <string>State</string> </value>
......
...@@ -57,12 +57,16 @@ ...@@ -57,12 +57,16 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <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>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>9</string> </value> <value> <string>9</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value> <int>8</int> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>State</string> </value> <value> <string>State</string> </value>
......
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
<h1>Your Organisation</h1> <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"> <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"> <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> </details>
<test> <test>
<table style="display: none;" class="test" cellpadding="1" cellspacing="1" border="1"> <table style="display: none;" class="test" cellpadding="1" cellspacing="1" border="1">
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
</tr> </tr>
<tr> <tr>
<td>verifyTextPresent</td> <td>verifyTextPresent</td>
<td>Country</td> <td>Region</td>
<td> <td>
<br> <br>
</td> </td>
...@@ -604,7 +604,7 @@ ...@@ -604,7 +604,7 @@
</tr> </tr>
<tr> <tr>
<td>verifyTextPresent</td> <td>verifyTextPresent</td>
<td>Country</td> <td>Region</td>
<td> <td>
<br> <br>
</td> </td>
...@@ -842,7 +842,7 @@ ...@@ -842,7 +842,7 @@
</tr> </tr>
<tr> <tr>
<td>verifyTextPresent</td> <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>
<br> <br>
</td> </td>
...@@ -856,7 +856,7 @@ ...@@ -856,7 +856,7 @@
</tr> </tr>
<tr> <tr>
<td>verifyTextPresent</td> <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>
<br> <br>
</td> </td>
......
...@@ -391,7 +391,7 @@ ...@@ -391,7 +391,7 @@
</tr> </tr>
<tr> <tr>
<td>verifyTextPresent</td> <td>verifyTextPresent</td>
<td>Country</td> <td>Region</td>
<td> </td> <td> </td>
</tr> </tr>
<tr> <tr>
...@@ -666,7 +666,7 @@ ...@@ -666,7 +666,7 @@
</tr> </tr>
<tr> <tr>
<td>verifyTextPresent</td> <td>verifyTextPresent</td>
<td>Country</td> <td>Region</td>
<td> </td> <td> </td>
</tr> </tr>
<tr> <tr>
...@@ -867,7 +867,7 @@ ...@@ -867,7 +867,7 @@
</tr> </tr>
<tr> <tr>
<td>verifyTextPresent</td> <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> <td> </td>
</tr> </tr>
<tr> <tr>
...@@ -877,7 +877,7 @@ ...@@ -877,7 +877,7 @@
</tr> </tr>
<tr> <tr>
<td>verifyTextPresent</td> <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> <td> </td>
</tr> </tr>
<tr> <tr>
......
...@@ -4398,9 +4398,6 @@ msgstr "" ...@@ -4398,9 +4398,6 @@ msgstr ""
msgid "Files committed successfully in revision ${revision}." msgid "Files committed successfully in revision ${revision}."
msgstr "پرونده ها با موفقیت در بازبینی شماره ${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." msgid "Fill your login and new password."
msgstr "نام کاربری و رمز ورود جدید خود را وارد کنید." msgstr "نام کاربری و رمز ورود جدید خود را وارد کنید."
......
...@@ -5590,7 +5590,7 @@ msgstr "Fichiers et Images" ...@@ -5590,7 +5590,7 @@ msgstr "Fichiers et Images"
msgid "Files commited successfully." msgid "Files commited successfully."
msgstr "Fichiers commités avec succès" 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." msgstr "Renseignez les informations pour chaque utilisateur."
msgid "Fill your login and new password." msgid "Fill your login and new password."
......
...@@ -53,6 +53,7 @@ class Transition(XMLObject): ...@@ -53,6 +53,7 @@ class Transition(XMLObject):
PropertySheet.XMLObject, PropertySheet.XMLObject,
PropertySheet.CategoryCore, PropertySheet.CategoryCore,
PropertySheet.DublinCore, PropertySheet.DublinCore,
PropertySheet.SortIndex,
PropertySheet.Transition, PropertySheet.Transition,
) )
......
...@@ -58,6 +58,7 @@ class State(XMLObject): ...@@ -58,6 +58,7 @@ class State(XMLObject):
PropertySheet.XMLObject, PropertySheet.XMLObject,
PropertySheet.CategoryCore, PropertySheet.CategoryCore,
PropertySheet.DublinCore, PropertySheet.DublinCore,
PropertySheet.SortIndex,
PropertySheet.State,) PropertySheet.State,)
def getAvailableTransitionList(self, document): def getAvailableTransitionList(self, document):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment