Commit 04c85d6b authored by Vincent Pelletier's avatar Vincent Pelletier

erp5_base: Move simulation-related content to erp5_simulation.

As a consequence, reduces portal type duplication: Solver Tool portal type
is also present in erp5_simulation, and does not work without it installed.

Also, install erp5_simulation before erp5_trade in tests.
Note for testFunctionalKM: not moving erp5_simulation_test as this BT also
depends on erp5_trade and not just erp5_simulation.
parent 63f18b7b
......@@ -14,39 +14,6 @@
<portal_type id="Currency Module">
<item>Currency</item>
</portal_type>
<portal_type id="Delivery Builder">
<item>Base Variant Movement Group</item>
<item>Category Movement Group</item>
<item>Causality Assignment Movement Group</item>
<item>Causality Movement Group</item>
<item>Day Movement Group</item>
<item>Delivery Causality Assignment Movement Group</item>
<item>Invoice Movement Group</item>
<item>Monthly Range Movement Group</item>
<item>Nested Line Movement Group</item>
<item>Order Movement Group</item>
<item>Parent Delivery Property Movement Group</item>
<item>Parent Explanation Movement Group</item>
<item>Predicate</item>
<item>Previous Causality Movement Group</item>
<item>Property Assignment Movement Group</item>
<item>Property Grouping Movement Group</item>
<item>Property Movement Group</item>
<item>Quantity Sign Movement Group</item>
<item>Requirement Movement Group</item>
<item>Root Applied Rule Causality Movement Group</item>
<item>Split Movement Group</item>
<item>Title Movement Group</item>
<item>Variant Movement Group</item>
<item>Variation Property Movement Group</item>
</portal_type>
<portal_type id="Delivery Tool">
<item>Delivery Builder</item>
</portal_type>
<portal_type id="Delivery Type">
<item>Action Information</item>
<item>Role Information</item>
</portal_type>
<portal_type id="Embedded Folder">
<item>Embedded File</item>
</portal_type>
......@@ -59,36 +26,6 @@
<portal_type id="Notification Message Module">
<item>Notification Message</item>
</portal_type>
<portal_type id="Order Builder">
<item>Base Variant Movement Group</item>
<item>Category Movement Group</item>
<item>Causality Assignment Movement Group</item>
<item>Causality Movement Group</item>
<item>Day Movement Group</item>
<item>Delivery Causality Assignment Movement Group</item>
<item>First Causality Movement Group</item>
<item>Invoice Movement Group</item>
<item>Monthly Range Movement Group</item>
<item>Nested Line Movement Group</item>
<item>Order Movement Group</item>
<item>Parent Delivery Property Movement Group</item>
<item>Parent Explanation Movement Group</item>
<item>Predicate</item>
<item>Previous Causality Movement Group</item>
<item>Property Assignment Movement Group</item>
<item>Property Grouping Movement Group</item>
<item>Property Movement Group</item>
<item>Quantity Sign Movement Group</item>
<item>Requirement Movement Group</item>
<item>Root Applied Rule Causality Movement Group</item>
<item>Split Movement Group</item>
<item>Title Movement Group</item>
<item>Variant Movement Group</item>
<item>Variation Property Movement Group</item>
</portal_type>
<portal_type id="Order Tool">
<item>Order Builder</item>
</portal_type>
<portal_type id="Organisation">
<item>Address</item>
<item>Bank Account</item>
......@@ -129,7 +66,4 @@
<portal_type id="Rounding Tool">
<item>Rounding Model</item>
</portal_type>
<portal_type id="Solver Tool">
<item>Solver Type</item>
</portal_type>
</allowed_content_type_list>
</allowed_content_type_list>
\ No newline at end of file
......@@ -12,9 +12,6 @@
<portal_type id="Currency Module">
<item>business_application</item>
</portal_type>
<portal_type id="Delivery Type">
<item>ledger</item>
</portal_type>
<portal_type id="Notification Message">
<item>specialise</item>
</portal_type>
......
......@@ -21,9 +21,6 @@
<portal_type id="Preference">
<item>TelephonePreference</item>
</portal_type>
<portal_type id="Previous Causality Movement Group">
<item>PreviousCausalityMovementGroup</item>
</portal_type>
<portal_type id="Query">
<item>TextDocument</item>
</portal_type>
......
......@@ -35,10 +35,6 @@
<type>Currency Exchange Line</type>
<workflow>currency_exchange_line_interaction_workflow, edit_workflow, reindex_object_interaction_workflow, validation_workflow</workflow>
</chain>
<chain>
<type>Delivery Type</type>
<workflow>base_type_interaction_workflow, dynamic_class_generation_interaction_workflow</workflow>
</chain>
<chain>
<type>ERP5 Login</type>
<workflow>edit_workflow, login_validation_workflow</workflow>
......@@ -107,10 +103,6 @@
<type>Rounding Model</type>
<workflow>validation_workflow</workflow>
</chain>
<chain>
<type>Simulation Movement</type>
<workflow>simulation_movement_causality_interaction_workflow</workflow>
</chain>
<chain>
<type>Telephone</type>
<workflow>coordinate_interaction_workflow, edit_workflow, reachability_workflow</workflow>
......
......@@ -7,23 +7,13 @@ Agent | signature
Agent | view
Assignment | view
Bank Account | view
Base Variant Movement Group | view
Career | change_function
Career | view
Category Movement Group | view
Causality Assignment Movement Group | view
Causality Movement Group | view
Chat Address | view
Credit Card | view
Currency Exchange Line | view
Currency Module | view
Currency | view
Day Movement Group | view
Delivery Builder | view
Delivery Builder | view_predicate_group
Delivery Builder | view_profile
Delivery Causality Assignment Movement Group | view
Delivery Tool | view
Delivery Type | action_view
Delivery Type | copy_roles
Delivery Type | delivery_view
......@@ -56,29 +46,19 @@ Image | download
Image | fullsize_view
Image | update_content_from_url
Image | view
Invoice Movement Group | view
Link | view
Mapped Property | view
Monthly Range Movement Group | view
Nested Line Movement Group | view
Notification Message Module | view
Notification Message | list
Notification Message | local_permission
Notification Message | view
Notification Message | view_editor
Order Builder | view
Order Builder | view_predicate_group
Order Builder | view_profile
Order Movement Group | view
Order Tool | view
Organisation Module | view
Organisation | details
Organisation | document_view
Organisation | financial_view
Organisation | jump_to_persons
Organisation | view
Parent Delivery Property Movement Group | view
Parent Explanation Movement Group | view
Person Module | view
Person | assignment
Person | details
......@@ -90,25 +70,14 @@ Person | view
Preference Tool | advanced
Preference | base_preference
Preference | change_password
Previous Causality Movement Group | view
Property Assignment Movement Group | view
Property Grouping Movement Group | view
Property Movement Group | view
Quantity Sign Movement Group | view
Query Module | view
Query | view
Requirement Movement Group | view
Role Definition | view
Root Applied Rule Causality Movement Group | view
Rounding Model | predicate_view
Rounding Model | view
Rounding Tool | view
Split Movement Group | view
Telephone | change_function
Telephone | view
Title Movement Group | view
Variant Movement Group | view
Variation Property Movement Group | view
portal_actions | jump_query
portal_actions | jump_related_object
portal_actions | post_query
agent
agent_privilege
bank_account_type
collect_order_group
conflicting_solver
contributor
creator
currency_exchange_type
delivery_builder
delivery_solver
destination_carrier
destination_referral
destination_region
divergence_scope
economical_class
end_of
follow_up
......@@ -26,11 +21,9 @@ marital_status
market_segment
nationality
natural_parent
order_builder
payment_mode
predecessor
price_currency
property_mapping
region
resource_use
role
......
portal_introspections
portal_memcached/persistent_memcached_plugin
portal_solver_processes
portal_web_services
\ No newline at end of file
portal_web_services
portal_types/Base Variant Movement Group
portal_types/Category Movement Group
portal_types/Causality Assignment Movement Group
portal_types/Causality Movement Group
portal_types/Day Movement Group
portal_types/Delivery Builder
portal_types/Delivery Causality Assignment Movement Group
portal_types/Delivery Tool
portal_types/Invoice Movement Group
portal_types/Monthly Range Movement Group
portal_types/Nested Line Movement Group
portal_types/Order Builder
portal_types/Order Movement Group
portal_types/Order Tool
portal_types/Parent Delivery Property Movement Group
portal_types/Parent Explanation Movement Group
portal_types/Previous Causality Movement Group
portal_types/Property Assignment Movement Group
portal_types/Property Grouping Movement Group
portal_types/Property Movement Group
portal_types/Quantity Sign Movement Group
portal_types/Requirement Movement Group
portal_types/Root Applied Rule Causality Movement Group
portal_types/Solver Tool
portal_types/Split Movement Group
portal_types/Title Movement Group
portal_types/Variant Movement Group
portal_types/Variation Property Movement Group
portal_categories/collect_order_group
portal_categories/collect_order_group/cell
portal_categories/collect_order_group/delivery
portal_categories/collect_order_group/line
portal_categories/conflicting_solver
portal_categories/delivery_builder
portal_categories/delivery_solver
portal_categories/divergence_scope
portal_categories/divergence_scope/category
portal_categories/divergence_scope/property
portal_categories/divergence_scope/quantity
portal_categories/order_builder
portal_categories/property_mapping
portal_roundings
portal_solver_processes
portal_solvers
portal_workflow/delivery_causality_interaction_workflow
portal_workflow/delivery_causality_workflow
portal_workflow/delivery_movement_causality_interaction_workflow
portal_workflow/delivery_movement_simulation_interaction_workflow
portal_workflow/delivery_simulation_interaction_workflow
portal_workflow/simulation_movement_causality_interaction_workflow
\ No newline at end of file
portal_alarms/upgrader_migrate_to_embedded_file
portal_caches/document_cache_factory
portal_caches/document_cache_factory/**
portal_categories/collect_order_group/cell
portal_categories/collect_order_group/delivery
portal_categories/collect_order_group/line
portal_categories/divergence_scope/category
portal_categories/divergence_scope/property
portal_categories/divergence_scope/quantity
portal_contribution_registry/image_extension
portal_contribution_registry/image_mimetype
portal_memcached/persistent_memcached_plugin
\ No newline at end of file
......@@ -3,63 +3,12 @@ Bank Account | Agent
Currency Exchange Line | Currency Exchange Cell
Currency Module | Currency
Currency | Currency Exchange Line
Delivery Builder | Base Variant Movement Group
Delivery Builder | Category Movement Group
Delivery Builder | Causality Assignment Movement Group
Delivery Builder | Causality Movement Group
Delivery Builder | Day Movement Group
Delivery Builder | Delivery Causality Assignment Movement Group
Delivery Builder | Invoice Movement Group
Delivery Builder | Monthly Range Movement Group
Delivery Builder | Nested Line Movement Group
Delivery Builder | Order Movement Group
Delivery Builder | Parent Delivery Property Movement Group
Delivery Builder | Parent Explanation Movement Group
Delivery Builder | Predicate
Delivery Builder | Previous Causality Movement Group
Delivery Builder | Property Assignment Movement Group
Delivery Builder | Property Grouping Movement Group
Delivery Builder | Property Movement Group
Delivery Builder | Quantity Sign Movement Group
Delivery Builder | Requirement Movement Group
Delivery Builder | Root Applied Rule Causality Movement Group
Delivery Builder | Split Movement Group
Delivery Builder | Title Movement Group
Delivery Builder | Variant Movement Group
Delivery Builder | Variation Property Movement Group
Delivery Tool | Delivery Builder
Delivery Type | Action Information
Delivery Type | Role Information
Embedded Folder | Embedded File
Geographical Area | Geographical Location
Notification Message Module | Notification Message
Notification Message | Role Definition
Order Builder | Base Variant Movement Group
Order Builder | Category Movement Group
Order Builder | Causality Assignment Movement Group
Order Builder | Causality Movement Group
Order Builder | Day Movement Group
Order Builder | Delivery Causality Assignment Movement Group
Order Builder | First Causality Movement Group
Order Builder | Invoice Movement Group
Order Builder | Monthly Range Movement Group
Order Builder | Nested Line Movement Group
Order Builder | Order Movement Group
Order Builder | Parent Delivery Property Movement Group
Order Builder | Parent Explanation Movement Group
Order Builder | Predicate
Order Builder | Previous Causality Movement Group
Order Builder | Property Assignment Movement Group
Order Builder | Property Grouping Movement Group
Order Builder | Property Movement Group
Order Builder | Quantity Sign Movement Group
Order Builder | Requirement Movement Group
Order Builder | Root Applied Rule Causality Movement Group
Order Builder | Split Movement Group
Order Builder | Title Movement Group
Order Builder | Variant Movement Group
Order Builder | Variation Property Movement Group
Order Tool | Order Builder
Organisation Module | Organisation
Organisation | Address
Organisation | Bank Account
......@@ -88,4 +37,3 @@ Person | Link
Person | Telephone
Query Module | Query
Rounding Tool | Rounding Model
Solver Tool | Solver Type
......@@ -3,21 +3,13 @@ Agent
Agent Privilege
Assignment
Bank Account
Base Variant Movement Group
Career
Category Movement Group
Causality Assignment Movement Group
Causality Movement Group
Chat Address
Credit Card
Currency
Currency Exchange Cell
Currency Exchange Line
Currency Module
Day Movement Group
Delivery Builder
Delivery Causality Assignment Movement Group
Delivery Tool
Delivery Type
ERP5 Login
Email
......@@ -29,38 +21,18 @@ File
Geographical Area
Geographical Location
Image
Invoice Movement Group
Link
Mapped Property
Monthly Range Movement Group
Nested Line Movement Group
Notification Message
Notification Message Module
OOo Document
Order Builder
Order Movement Group
Order Tool
Organisation
Organisation Module
Parent Delivery Property Movement Group
Parent Explanation Movement Group
Person
Person Module
Previous Causality Movement Group
Property Assignment Movement Group
Property Grouping Movement Group
Property Movement Group
Quantity Sign Movement Group
Query
Query Module
Requirement Movement Group
Role Definition
Root Applied Rule Causality Movement Group
Rounding Model
Rounding Tool
Solver Tool
Split Movement Group
Telephone
Title Movement Group
Variant Movement Group
Variation Property Movement Group
Telephone
\ No newline at end of file
......@@ -8,6 +8,5 @@ Organisation | DefaultImage
Person | DefaultImage
Person | ERP5User
Preference | TelephonePreference
Previous Causality Movement Group | PreviousCausalityMovementGroup
Query | TextDocument
Template Tool | TemplateToolERP5LoginUserManagerConstraint
\ No newline at end of file
......@@ -63,7 +63,6 @@ Query | query_workflow
Role Definition | edit_workflow
Role Definition | local_permission_interaction_workflow
Rounding Model | validation_workflow
Simulation Movement | simulation_movement_causality_interaction_workflow
Telephone | coordinate_interaction_workflow
Telephone | edit_workflow
Telephone | reachability_workflow
\ No newline at end of file
portal_roundings
portal_solver_processes
portal_solvers
\ No newline at end of file
portal_roundings
\ No newline at end of file
......@@ -2,11 +2,6 @@ assignment_workflow
career_workflow
coordinate_interaction_workflow
currency_exchange_line_interaction_workflow
delivery_causality_interaction_workflow
delivery_causality_workflow
delivery_movement_causality_interaction_workflow
delivery_movement_simulation_interaction_workflow
delivery_simulation_interaction_workflow
document_conversion_interaction_workflow
document_security_interaction_workflow
embedded_workflow
......@@ -18,7 +13,6 @@ processing_status_workflow
query_workflow
reachability_workflow
reindex_object_interaction_workflow
simulation_movement_causality_interaction_workflow
solver_process_workflow
solver_workflow
user_account_workflow
\ No newline at end of file
erp5_accounting
\ No newline at end of file
erp5_accounting
erp5_simulation
\ No newline at end of file
<allowed_content_type_list>
<portal_type id="Delivery Builder">
<item>Base Variant Movement Group</item>
<item>Category Movement Group</item>
<item>Causality Assignment Movement Group</item>
<item>Causality Movement Group</item>
<item>Day Movement Group</item>
<item>Delivery Causality Assignment Movement Group</item>
<item>Invoice Movement Group</item>
<item>Monthly Range Movement Group</item>
<item>Nested Line Movement Group</item>
<item>Order Movement Group</item>
<item>Parent Delivery Property Movement Group</item>
<item>Parent Explanation Movement Group</item>
<item>Predicate</item>
<item>Previous Causality Movement Group</item>
<item>Property Assignment Movement Group</item>
<item>Property Grouping Movement Group</item>
<item>Property Movement Group</item>
<item>Quantity Sign Movement Group</item>
<item>Requirement Movement Group</item>
<item>Root Applied Rule Causality Movement Group</item>
<item>Split Movement Group</item>
<item>Title Movement Group</item>
<item>Variant Movement Group</item>
<item>Variation Property Movement Group</item>
</portal_type>
<portal_type id="Delivery Tool">
<item>Delivery Builder</item>
</portal_type>
<portal_type id="Delivery Type">
<item>Action Information</item>
<item>Role Information</item>
</portal_type>
<portal_type id="Order Builder">
<item>Base Variant Movement Group</item>
<item>Category Movement Group</item>
<item>Causality Assignment Movement Group</item>
<item>Causality Movement Group</item>
<item>Day Movement Group</item>
<item>Delivery Causality Assignment Movement Group</item>
<item>First Causality Movement Group</item>
<item>Invoice Movement Group</item>
<item>Monthly Range Movement Group</item>
<item>Nested Line Movement Group</item>
<item>Order Movement Group</item>
<item>Parent Delivery Property Movement Group</item>
<item>Parent Explanation Movement Group</item>
<item>Predicate</item>
<item>Previous Causality Movement Group</item>
<item>Property Assignment Movement Group</item>
<item>Property Grouping Movement Group</item>
<item>Property Movement Group</item>
<item>Quantity Sign Movement Group</item>
<item>Requirement Movement Group</item>
<item>Root Applied Rule Causality Movement Group</item>
<item>Split Movement Group</item>
<item>Title Movement Group</item>
<item>Variant Movement Group</item>
<item>Variation Property Movement Group</item>
</portal_type>
<portal_type id="Order Tool">
<item>Order Builder</item>
</portal_type>
<portal_type id="Solver Process">
<item>Solver Decision</item>
</portal_type>
......
<base_category_list>
<portal_type id="Delivery Type">
<item>ledger</item>
</portal_type>
</base_category_list>
\ No newline at end of file
......@@ -2,6 +2,9 @@
<portal_type id="Net Converted Quantity Divergence Tester">
<item>MultiPropertyEquivalenceTester</item>
</portal_type>
<portal_type id="Previous Causality Movement Group">
<item>PreviousCausalityMovementGroup</item>
</portal_type>
<portal_type id="Specialise Divergence Tester">
<item>SpecialiseEquivalenceTester</item>
</portal_type>
......
......@@ -25,21 +25,17 @@
</dictionary>
</value>
</item>
<item>
<key> <string>acquire_local_roles</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>content_icon</string> </key>
<value> <string>folder_icon.gif</string> </value>
</item>
<item>
<key> <string>content_meta_type</string> </key>
<value> <string>ERP5 Solver Tool</string> </value>
<value> <string>ERP5 Folder</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Solver Tool contains Solver Types</string> </value>
<value> <string>Delivery Tool contains delivery builders.</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
......@@ -49,29 +45,13 @@
<key> <string>filter_content_types</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<tuple>
<string>module</string>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Solver Tool</string> </value>
<value> <string>Delivery Tool</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>permission</string> </key>
<value>
<none/>
</value>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
......@@ -79,7 +59,7 @@
</item>
<item>
<key> <string>type_class</string> </key>
<value> <string>Folder</string> </value>
<value> <string>DeliveryTool</string> </value>
</item>
</dictionary>
</pickle>
......
......@@ -7,6 +7,10 @@
<type>DateTime Divergence Tester</type>
<workflow>edit_workflow</workflow>
</chain>
<chain>
<type>Delivery Type</type>
<workflow>base_type_interaction_workflow, dynamic_class_generation_interaction_workflow</workflow>
</chain>
<chain>
<type>Float Divergence Tester</type>
<workflow>edit_workflow</workflow>
......@@ -15,6 +19,10 @@
<type>Net Converted Quantity Divergence Tester</type>
<workflow>edit_workflow</workflow>
</chain>
<chain>
<type>Simulation Movement</type>
<workflow>simulation_movement_causality_interaction_workflow</workflow>
</chain>
<chain>
<type>Solver Process</type>
<workflow>solver_process_workflow</workflow>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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