Skip to content

erp5
erp5
Commit 57dcd689 authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

Modified Task, Task Reports and Project forms and actions. 

Task Report starts to use causality workflow.
Included builder to generate invoice from Tasks.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10496 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent dced62ec
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 17786 additions and 1055 deletions
bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Line/view.xml
View file @ 57dcd689
......@@ -81,7 +81,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/DeliveryLine_view</string> </value>
<value> <string>string:${object_url}/TaskLine_view</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/history.xml
View file @ 57dcd689
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>10.0</float> </value>
<value> <float>5.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/metadata.xml
View file @ 57dcd689
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>10.0</float> </value>
<value> <float>6.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/price_view.xml
View file @ 57dcd689
......@@ -56,7 +56,7 @@
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>10.0</float> </value>
<value> <float>2.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/print.xml
View file @ 57dcd689
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>10.0</float> </value>
<value> <float>4.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/quantity_view.xml
View file @ 57dcd689
......@@ -56,7 +56,7 @@
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>10.0</float> </value>
<value> <float>3.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report%20Line/view.xml
View file @ 57dcd689
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>10.0</float> </value>
<value> <float>1.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
......@@ -81,7 +81,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/DeliveryLine_view</string> </value>
<value> <string>string:${object_url}/TaskLine_view</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/history.xml
View file @ 57dcd689
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>10.0</float> </value>
<value> <float>4.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/jump_to_related_purchase_packing_list.xml
View file @ 57dcd689
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>10.0</float> </value>
<value> <float>8.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
......@@ -83,7 +83,7 @@
<key> <string>text</string> </key>
<value> <string encoding="cdata"><![CDATA[
string:${object_url}/Base_jumpToRelatedObject?base_category=causality&portal_type=Purchase+Invoice+Transaction
string:${object_url}/Base_jumpToRelatedObject?base_category=causality&portal_type=Sale+Invoice+Transaction
]]></string> </value>
</item>
......
bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/jump_to_relation_task.xml
View file @ 57dcd689
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>10.0</float> </value>
<value> <float>7.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/metadata.xml
View file @ 57dcd689
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>10.0</float> </value>
<value> <float>6.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/payment_condition.xml
View file @ 57dcd689
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>10.0</float> </value>
<value> <float>3.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/print.xml
View file @ 57dcd689
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>10.0</float> </value>
<value> <float>5.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/profile_view.xml
View file @ 57dcd689
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>10.0</float> </value>
<value> <float>9.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
......@@ -81,7 +81,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/PurchaseTradeCondition_viewProfile</string> </value>
<value> <string>string:${object_url}/TaskTradeCondition_viewProfile</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/view.xml
View file @ 57dcd689
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>10.0</float> </value>
<value> <float>1.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_project/ActionTemplateItem/portal_types/Task%20Report/view_discount.xml
View file @ 57dcd689
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>10.0</float> </value>
<value> <float>11.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_project/ActionTemplateItem/portal_types/Task/profile_view.xml
View file @ 57dcd689
......@@ -81,7 +81,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/PurchaseTradeCondition_viewProfile</string> </value>
<value> <string>string:${object_url}/TaskTradeCondition_viewProfile</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_project/CategoryTemplateItem/portal_categories/predecessor.xml
View file @ 57dcd689
......@@ -31,21 +31,43 @@
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<key> <string>_tree</string> </key>
<value>
<none/>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<key> <string>acquisition_append_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>acquisition_base_category</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
<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>
......@@ -54,20 +76,94 @@
</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>
<none/>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>predecessor</string> </value>
</item>
<item>
<key> <string>id_generator</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id_group</string> </key>
<value>
<none/>
</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>
<none/>
</value>
</item>
<item>
<key> <string>rid</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>Predecessor</string> </value>
......@@ -78,6 +174,12 @@
<none/>
</value>
</item>
<item>
<key> <string>write_permission</string> </key>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
</record>
......
bt5/erp5_project/CategoryTemplateItem/portal_categories/requirement.xml
View file @ 57dcd689
......@@ -31,21 +31,43 @@
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<key> <string>_tree</string> </key>
<value>
<none/>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<key> <string>acquisition_append_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>acquisition_base_category</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
<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>
......@@ -54,20 +76,94 @@
</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>
<none/>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>requirement</string> </value>
</item>
<item>
<key> <string>id_generator</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id_group</string> </key>
<value>
<none/>
</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>
<none/>
</value>
</item>
<item>
<key> <string>rid</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>Requirement</string> </value>
......@@ -78,6 +174,12 @@
<none/>
</value>
</item>
<item>
<key> <string>write_permission</string> </key>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
</record>
......
bt5/erp5_project/ModuleTemplateItem/project_module.xml
View file @ 57dcd689
......@@ -40,9 +40,6 @@
<role>Author</role>
<role>Manager</role>
</permission>
<permission type='list'>
<name>AccessContentsInformation</name>
</permission>
<permission type='tuple'>
<name>Add Accelerated HTTP Cache Managers</name>
<role>Manager</role>
......@@ -67,6 +64,9 @@
<name>Add CMF Caching Policy Managers</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Add CMF Calendar Tools</name>
</permission>
<permission type='tuple'>
<name>Add CMF Core Tools</name>
<role>Manager</role>
......@@ -95,9 +95,6 @@
<name>Add CMFActivity Tools</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Add CMFCalendar Tools</name>
</permission>
<permission type='tuple'>
<name>Add CMFCategory Tools</name>
<role>Manager</role>
......@@ -106,30 +103,6 @@
<name>Add CMFMailIn Tools</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Add CMFWiki Comment</name>
</permission>
<permission type='list'>
<name>Add ChartObject</name>
</permission>
<permission type='list'>
<name>Add ChartTemplate</name>
</permission>
<permission type='list'>
<name>Add Composite Elements</name>
</permission>
<permission type='list'>
<name>Add Composite Slot Classs</name>
</permission>
<permission type='list'>
<name>Add Composite Slots</name>
</permission>
<permission type='list'>
<name>Add Composite Tools</name>
</permission>
<permission type='list'>
<name>Add Composites</name>
</permission>
<permission type='tuple'>
<name>Add Configured CMF Sites</name>
<role>Manager</role>
......@@ -273,9 +246,6 @@
<name>Add Plugin Registrys</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Add PortalTransforms Tools</name>
</permission>
<permission type='tuple'>
<name>Add Python Scripts</name>
<role>Manager</role>
......@@ -288,9 +258,6 @@
<name>Add ReStructuredText Documents</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Add RenderableObject</name>
</permission>
<permission type='tuple'>
<name>Add Session Data Manager</name>
<role>Manager</role>
......@@ -338,9 +305,6 @@
<name>Add ZCatalogs</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Add ZGDCharts</name>
</permission>
<permission type='tuple'>
<name>Add ZMailIn Clients</name>
<role>Manager</role>
......@@ -353,9 +317,6 @@
<name>Add ZODB Mount Points</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Add Zope Schedulers</name>
</permission>
<permission type='tuple'>
<name>Add Zope Tutorials</name>
<role>Manager</role>
......@@ -388,12 +349,6 @@
<name>Change Browser Id Manager</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Change CMFWiki Regulations</name>
</permission>
<permission type='list'>
<name>Change Composites</name>
</permission>
<permission type='tuple'>
<name>Change DTML Documents</name>
<role>Manager</role>
......@@ -454,9 +409,6 @@
<name>Change Versions</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Change ZGDChart</name>
</permission>
<permission type='tuple'>
<name>Change ZMailIn</name>
<role>Manager</role>
......@@ -505,9 +457,6 @@
<name>Copy or Move</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Create CMFWiki Page</name>
</permission>
<permission type='tuple'>
<name>Create Transient Objects</name>
<role>Manager</role>
......@@ -529,9 +478,6 @@
<name>Download ExtFile/ExtImage</name>
<role>Manager</role>
</permission>
<permission type='list'>
<name>Edit CMFWiki Page</name>
</permission>
<permission type='tuple'>
<name>Edit Factories</name>
<role>Manager</role>
......@@ -540,6 +486,9 @@