Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
fc5c3f6d
Commit
fc5c3f6d
authored
Oct 29, 2013
by
Sebastien Robin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_project: add journal category to task and task reports
This is useful for some reporting
parent
4be80b4b
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
343 additions
and
2 deletions
+343
-2
bt5/erp5_project/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
...PortalTypeBaseCategoryTemplateItem/base_category_list.xml
+4
-0
bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Line.xml
...oject/PortalTypeTemplateItem/portal_types/Task%20Line.xml
+12
-0
bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Report%20Line.xml
...talTypeTemplateItem/portal_types/Task%20Report%20Line.xml
+16
-0
bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Report.xml
...ect/PortalTypeTemplateItem/portal_types/Task%20Report.xml
+15
-1
bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task.xml
...erp5_project/PortalTypeTemplateItem/portal_types/Task.xml
+12
-0
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary.xml
...ortal_skins/erp5_project/Base_viewProjectFieldLibrary.xml
+1
-0
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/my_view_mode_journal.xml
...ect/Base_viewProjectFieldLibrary/my_view_mode_journal.xml
+96
-0
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_view.xml
...emplateItem/portal_skins/erp5_project/TaskReport_view.xml
+1
-0
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_view/my_journal.xml
.../portal_skins/erp5_project/TaskReport_view/my_journal.xml
+90
-0
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_view.xml
.../SkinTemplateItem/portal_skins/erp5_project/Task_view.xml
+1
-0
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_view/my_journal.xml
...teItem/portal_skins/erp5_project/Task_view/my_journal.xml
+90
-0
bt5/erp5_project/bt/revision
bt5/erp5_project/bt/revision
+1
-1
bt5/erp5_project/bt/template_portal_type_base_category_list
bt5/erp5_project/bt/template_portal_type_base_category_list
+4
-0
No files found.
bt5/erp5_project/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
View file @
fc5c3f6d
...
@@ -40,10 +40,12 @@
...
@@ -40,10 +40,12 @@
<item>
requirement
</item>
<item>
requirement
</item>
</portal_type>
</portal_type>
<portal_type
id=
"Task"
>
<portal_type
id=
"Task"
>
<item>
journal
</item>
<item>
predecessor
</item>
<item>
predecessor
</item>
<item>
requirement
</item>
<item>
requirement
</item>
</portal_type>
</portal_type>
<portal_type
id=
"Task Line"
>
<portal_type
id=
"Task Line"
>
<item>
journal
</item>
<item>
requirement
</item>
<item>
requirement
</item>
</portal_type>
</portal_type>
<portal_type
id=
"Task Module"
>
<portal_type
id=
"Task Module"
>
...
@@ -51,10 +53,12 @@
...
@@ -51,10 +53,12 @@
</portal_type>
</portal_type>
<portal_type
id=
"Task Report"
>
<portal_type
id=
"Task Report"
>
<item>
aggregate
</item>
<item>
aggregate
</item>
<item>
journal
</item>
<item>
predecessor
</item>
<item>
predecessor
</item>
<item>
requirement
</item>
<item>
requirement
</item>
</portal_type>
</portal_type>
<portal_type
id=
"Task Report Line"
>
<portal_type
id=
"Task Report Line"
>
<item>
journal
</item>
<item>
requirement
</item>
<item>
requirement
</item>
</portal_type>
</portal_type>
<portal_type
id=
"Task Report Module"
>
<portal_type
id=
"Task Report Module"
>
...
...
bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Line.xml
View file @
fc5c3f6d
...
@@ -62,6 +62,18 @@
...
@@ -62,6 +62,18 @@
<key>
<string>
type_class
</string>
</key>
<key>
<string>
type_class
</string>
</key>
<value>
<string>
OrderLine
</string>
</value>
<value>
<string>
OrderLine
</string>
</value>
</item>
</item>
<item>
<key>
<string>
type_interface
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
type_mixin
</string>
</key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
</record>
</record>
...
...
bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Report%20Line.xml
View file @
fc5c3f6d
...
@@ -58,6 +58,22 @@
...
@@ -58,6 +58,22 @@
<key>
<string>
title
</string>
</key>
<key>
<string>
title
</string>
</key>
<value>
<string></string>
</value>
<value>
<string></string>
</value>
</item>
</item>
<item>
<key>
<string>
type_class
</string>
</key>
<value>
<string>
DeliveryLine
</string>
</value>
</item>
<item>
<key>
<string>
type_interface
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
type_mixin
</string>
</key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
</record>
</record>
...
...
bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task%20Report.xml
View file @
fc5c3f6d
...
@@ -48,7 +48,9 @@
...
@@ -48,7 +48,9 @@
</item>
</item>
<item>
<item>
<key>
<string>
permission
</string>
</key>
<key>
<string>
permission
</string>
</key>
<value>
<string></string>
</value>
<value>
<none/>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
title
</string>
</key>
<key>
<string>
title
</string>
</key>
...
@@ -58,6 +60,18 @@
...
@@ -58,6 +60,18 @@
<key>
<string>
type_class
</string>
</key>
<key>
<string>
type_class
</string>
</key>
<value>
<string>
PackingList
</string>
</value>
<value>
<string>
PackingList
</string>
</value>
</item>
</item>
<item>
<key>
<string>
type_interface
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
type_mixin
</string>
</key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
</record>
</record>
...
...
bt5/erp5_project/PortalTypeTemplateItem/portal_types/Task.xml
View file @
fc5c3f6d
...
@@ -79,6 +79,18 @@
...
@@ -79,6 +79,18 @@
<key>
<string>
type_class
</string>
</key>
<key>
<string>
type_class
</string>
</key>
<value>
<string>
Order
</string>
</value>
<value>
<string>
Order
</string>
</value>
</item>
</item>
<item>
<key>
<string>
type_interface
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
type_mixin
</string>
</key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
</record>
</record>
...
...
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary.xml
View file @
fc5c3f6d
...
@@ -89,6 +89,7 @@
...
@@ -89,6 +89,7 @@
<string>
my_source_payment
</string>
<string>
my_source_payment
</string>
<string>
my_destination_reference
</string>
<string>
my_destination_reference
</string>
<string>
my_source_reference
</string>
<string>
my_source_reference
</string>
<string>
my_view_mode_journal
</string>
</list>
</list>
</value>
</value>
</item>
</item>
...
...
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_viewProjectFieldLibrary/my_view_mode_journal.xml
0 → 100644
View file @
fc5c3f6d
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list>
<string>
title
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_view_mode_journal
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_view_mode_category
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Journal
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_view.xml
View file @
fc5c3f6d
...
@@ -116,6 +116,7 @@
...
@@ -116,6 +116,7 @@
<string>
my_stop_date
</string>
<string>
my_stop_date
</string>
<string>
my_total_price
</string>
<string>
my_total_price
</string>
<string>
my_price_currency
</string>
<string>
my_price_currency
</string>
<string>
my_journal
</string>
<string>
my_comment
</string>
<string>
my_comment
</string>
<string>
my_translated_simulation_state_title
</string>
<string>
my_translated_simulation_state_title
</string>
<string>
my_translated_causality_state_title
</string>
<string>
my_translated_causality_state_title
</string>
...
...
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_view/my_journal.xml
0 → 100644
View file @
fc5c3f6d
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_journal
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_view_mode_journal
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewProjectFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_view.xml
View file @
fc5c3f6d
...
@@ -118,6 +118,7 @@
...
@@ -118,6 +118,7 @@
<string>
my_task_line_price
</string>
<string>
my_task_line_price
</string>
<string>
my_total_price
</string>
<string>
my_total_price
</string>
<string>
my_price_currency
</string>
<string>
my_price_currency
</string>
<string>
my_journal
</string>
<string>
my_translated_simulation_state_title
</string>
<string>
my_translated_simulation_state_title
</string>
</list>
</list>
</value>
</value>
...
...
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_view/my_journal.xml
0 → 100644
View file @
fc5c3f6d
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_journal
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_view_mode_journal
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewProjectFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_project/bt/revision
View file @
fc5c3f6d
833
835
\ No newline at end of file
\ No newline at end of file
bt5/erp5_project/bt/template_portal_type_base_category_list
View file @
fc5c3f6d
...
@@ -16,12 +16,16 @@ Sale Order Milestone | requirement
...
@@ -16,12 +16,16 @@ Sale Order Milestone | requirement
Sale Order | requirement
Sale Order | requirement
Sale Packing List Line | predecessor
Sale Packing List Line | predecessor
Sale Packing List Line | requirement
Sale Packing List Line | requirement
Task Line | journal
Task Line | requirement
Task Line | requirement
Task Module | business_application
Task Module | business_application
Task Report Line | journal
Task Report Line | requirement
Task Report Line | requirement
Task Report Module | business_application
Task Report Module | business_application
Task Report | aggregate
Task Report | aggregate
Task Report | journal
Task Report | predecessor
Task Report | predecessor
Task Report | requirement
Task Report | requirement
Task | journal
Task | predecessor
Task | predecessor
Task | requirement
Task | requirement
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment