Commit bf4856f9 authored by Rafael Monnerat's avatar Rafael Monnerat

Refactor workflow to elimate initial dependencies and install dependencies...

Refactor workflow to elimate initial dependencies and install dependencies during the configuration process.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44324 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c0658002
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Base Category" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_folders_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Copy_or_Move_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>acquisition_append_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>acquisition_copy_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>acquisition_mask_value</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>acquisition_object_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>acquisition_portal_type</string> </key>
<value> <string>python: []</string> </value>
</item>
<item>
<key> <string>acquisition_sync_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>category_type</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>criterion_property</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>WARNING: do not modify Ids for this base category. Id is used in many places in accounting. This base category should be read-only.\n
You can still safely change Title or (better) translate it using Localizer</string> </value>
</item>
<item>
<key> <string>fallback_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>account_type</string> </value>
</item>
<item>
<key> <string>id_generator</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id_group</string> </key>
<value> <string>None</string> </value>
</item>
<item>
<key> <string>last_id</string> </key>
<value> <string>1</string> </value>
</item>
<item>
<key> <string>membership_criterion_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>membership_criterion_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>multimembership_criterion_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Base Category</string> </value>
</item>
<item>
<key> <string>read_permission</string> </key>
<value> <string>None</string> </value>
</item>
<item>
<key> <string>rid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>short_title</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>sid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>test_method_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Account Type</string> </value>
</item>
<item>
<key> <string>write_permission</string> </key>
<value> <string>None</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Base Category" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_folders_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Copy_or_Move_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>acquisition_append_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>acquisition_copy_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>acquisition_mask_value</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>acquisition_object_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>acquisition_portal_type</string> </key>
<value> <string>python: []</string> </value>
</item>
<item>
<key> <string>acquisition_sync_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>category_type</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>criterion_property</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>fallback_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>financial_section</string> </value>
</item>
<item>
<key> <string>id_generator</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id_group</string> </key>
<value> <string>None</string> </value>
</item>
<item>
<key> <string>last_id</string> </key>
<value> <string>1</string> </value>
</item>
<item>
<key> <string>membership_criterion_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>membership_criterion_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>multimembership_criterion_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Base Category</string> </value>
</item>
<item>
<key> <string>read_permission</string> </key>
<value> <string>None</string> </value>
</item>
<item>
<key> <string>rid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>short_title</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>sid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>test_method_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Financial Section</string> </value>
</item>
<item>
<key> <string>write_permission</string> </key>
<value> <string>None</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Base Category" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_folders_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Copy_or_Move_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>acquisition_append_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>acquisition_copy_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>acquisition_mask_value</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>acquisition_object_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>acquisition_portal_type</string> </key>
<value> <string>python: []</string> </value>
</item>
<item>
<key> <string>acquisition_sync_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>gap</string>
</tuple>
</value>
</item>
<item>
<key> <string>category_type</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>criterion_property</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>fallback_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>gap</string> </value>
</item>
<item>
<key> <string>id_generator</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id_group</string> </key>
<value> <string>None</string> </value>
</item>
<item>
<key> <string>last_id</string> </key>
<value> <string>1</string> </value>
</item>
<item>
<key> <string>membership_criterion_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>membership_criterion_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>multimembership_criterion_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Base Category</string> </value>
</item>
<item>
<key> <string>read_permission</string> </key>
<value> <string>None</string> </value>
</item>
<item>
<key> <string>rid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>short_title</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>sid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>test_method_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>General Accounting Plan</string> </value>
</item>
<item>
<key> <string>write_permission</string> </key>
<value> <string>None</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
...@@ -53,7 +53,20 @@ ...@@ -53,7 +53,20 @@
<value> <string>configuration_save = context.restrictedTraverse(configuration_save_url)\n <value> <string>configuration_save = context.restrictedTraverse(configuration_save_url)\n
\n \n
# specify is bt5 is a public or not\n # specify is bt5 is a public or not\n
bt5_installation_list = ((\'erp5_configurator_standard_categories\', True,),\n bt5_installation_list = ((\'erp5_simulation\', True,),\n
(\'erp5_dhtml_style\', True,),\n
(\'erp5_jquery\', True,),\n
(\'erp5_jquery_ui\', True,),\n
(\'erp5_xhtml_jquery_style\', True,),\n
(\'erp5_crm\', True,), \n
(\'erp5_pdm\', True,),\n
(\'erp5_trade\', True),\n
(\'erp5_knowledge_pad\', True),\n
(\'erp5_accounting\', True),\n
(\'erp5_tax_resource\', True),\n
(\'erp5_discount_resource\',True),\n
(\'erp5_invoicing\', True),\n
(\'erp5_configurator_standard_categories\', True,),\n
)\n )\n
\n \n
for name in bt5_installation_list:\n for name in bt5_installation_list:\n
......
...@@ -46,31 +46,30 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase): ...@@ -46,31 +46,30 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase):
""" """
# The list of standard business templates that the configurator should force # The list of standard business templates that the configurator should force
# to install # to install
standard_bt5_list = ('erp5_configurator_standard_categories',) standard_bt5_list = ('erp5_simulation',
def getBusinessTemplateList(self):
return ('erp5_core_proxy_field_legacy',
'erp5_base',
'erp5_simulation',
'erp5_dhtml_style', 'erp5_dhtml_style',
'erp5_jquery', 'erp5_jquery',
'erp5_jquery_ui', 'erp5_jquery_ui',
'erp5_xhtml_jquery_style', 'erp5_xhtml_jquery_style',
'erp5_web',
'erp5_ingestion',
'erp5_ingestion_mysql_innodb_catalog',
'erp5_accounting',
'erp5_dms',
'erp5_knowledge_pad',
'erp5_pdm',
'erp5_crm', 'erp5_crm',
'erp5_pdm',
'erp5_trade', 'erp5_trade',
'erp5_knowledge_pad',
'erp5_accounting',
'erp5_tax_resource', 'erp5_tax_resource',
'erp5_discount_resource', 'erp5_discount_resource',
'erp5_invoicing', 'erp5_invoicing',
'erp5_configurator_standard_categories')
def getBusinessTemplateList(self):
return ('erp5_core_proxy_field_legacy',
'erp5_base',
'erp5_web',
'erp5_ingestion_mysql_innodb_catalog',
'erp5_ingestion',
'erp5_dms',
'erp5_workflow', 'erp5_workflow',
'erp5_configurator', 'erp5_configurator',
'erp5_configurator_standard_categories',
'erp5_configurator_standard',) 'erp5_configurator_standard',)
def stepLogin(self, quiet=0, run=1, **kw): def stepLogin(self, quiet=0, run=1, **kw):
...@@ -222,7 +221,8 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase): ...@@ -222,7 +221,8 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase):
sequence.edit(next_dict=next_dict) sequence.edit(next_dict=next_dict)
def stepCheckMultiplePersonConfigurationItem(self, sequence=None, sequence_list=None, **kw): def stepCheckMultiplePersonConfigurationItem(self, sequence=None, sequence_list=None, **kw):
"""Check if multiple Person Configuration Item of the Business """
Check if multiple Person Configuration Item of the Business
Configuration have been created successfully. Configuration have been created successfully.
""" """
business_configuration = sequence.get("business_configuration") business_configuration = sequence.get("business_configuration")
...@@ -240,6 +240,7 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase): ...@@ -240,6 +240,7 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase):
person_business_configuration_save = configuration_save person_business_configuration_save = configuration_save
break break
self.assertEquals(int(self.company_employees_number), self.assertEquals(int(self.company_employees_number),
len(person_business_configuration_save.contentValues())) len(person_business_configuration_save.contentValues()))
return person_business_configuration_save return person_business_configuration_save
...@@ -493,6 +494,7 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase): ...@@ -493,6 +494,7 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase):
expected_list = self.standard_bt5_list + bt5_tuple expected_list = self.standard_bt5_list + bt5_tuple
self.assertEquals([i for i in expected_list if i not in bt5_title_list], []) self.assertEquals([i for i in expected_list if i not in bt5_title_list], [])
self.assertFalse(bc_id in bt5_title_list) self.assertFalse(bc_id in bt5_title_list)
bt = business_configuration.getSpecialiseValue(portal_type="Business Template") bt = business_configuration.getSpecialiseValue(portal_type="Business Template")
...@@ -500,14 +502,6 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase): ...@@ -500,14 +502,6 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase):
self.assertEquals(bt.getInstallationState(), 'not_installed') self.assertEquals(bt.getInstallationState(), 'not_installed')
self.assertEquals(bt.getBuildingState(), 'built') self.assertEquals(bt.getBuildingState(), 'built')
# check for links
link_list = business_configuration.searchFolder(portal_type="Link")
self.assertEquals(3, len(link_list))
expected_link_title_list = list(bt5_tuple) +\
['erp5_configurator_standard_categories']
self.assertSameSet(["%s.bt5" % i for i in expected_link_title_list],
[i.getTitle() for i in link_list])
# check for links # check for links
file_list = business_configuration.searchFolder(portal_type="File") file_list = business_configuration.searchFolder(portal_type="File")
...@@ -1231,8 +1225,8 @@ class TestStandardConfiguratorWorkflow(TestLiveConfiguratorWorkflowMixin): ...@@ -1231,8 +1225,8 @@ class TestStandardConfiguratorWorkflow(TestLiveConfiguratorWorkflowMixin):
self.assertEquals(10, preference_tool.getPreferredMoneyQuantityFieldWidth()) self.assertEquals(10, preference_tool.getPreferredMoneyQuantityFieldWidth())
self.assertTrue(preference_tool.getPreferredHtmlStyleAccessTab()) self.assertTrue(preference_tool.getPreferredHtmlStyleAccessTab())
# on Business Configuration # on Business Configuration
self.assertEquals('localhost', preference_tool.getPreferredOoodocServerAddress()) #self.assertEquals('localhost', preference_tool.getPreferredOoodocServerAddress())
self.assertEquals(8011, preference_tool.getPreferredOoodocServerPortNumber()) #self.assertEquals(8011, preference_tool.getPreferredOoodocServerPortNumber())
# accounting # accounting
self.assertEquals('currency_module/EUR', self.assertEquals('currency_module/EUR',
......
erp5_simulation
erp5_accounting
erp5_configurator erp5_configurator
\ No newline at end of file
erp5_workflow
\ No newline at end of file
573 574
\ No newline at end of file \ No newline at end of file
account_type
configurator_function
configurator_region
financial_section
gap
\ No newline at end of file
business_configuration_module/default_standard_configuration business_configuration_module/default_standard_configuration
portal_categories/configurator_function
portal_categories/configurator_function/** portal_categories/configurator_function/**
portal_categories/configurator_region
portal_categories/configurator_region/** portal_categories/configurator_region/**
workflow_module/erp5_consulting_workflow workflow_module/erp5_consulting_workflow
workflow_module/erp5_consulting_workflow/** workflow_module/erp5_consulting_workflow/**
......
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