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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Eteri
erp5
Commits
7f655439
Commit
7f655439
authored
Dec 16, 2016
by
Cédric Le Ninivin
Committed by
Xiaowu Zhang
Dec 19, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_travel_expense: Remove Expense Validation Item, fix naming, remove skin priority
parent
bd97ec6a
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
98 additions
and
194 deletions
+98
-194
bt5/erp5_travel_expense/ActionTemplateItem/portal_types/Expense%20Validation%20Item%20Module/view.xml
...ortal_types/Expense%20Validation%20Item%20Module/view.xml
+0
-83
bt5/erp5_travel_expense/ActionTemplateItem/portal_types/Expense%20Validation%20Item/view.xml
...ateItem/portal_types/Expense%20Validation%20Item/view.xml
+0
-83
bt5/erp5_travel_expense/PathTemplateItem/portal_alarms/alarm_process_draft_record_list.xml
...ateItem/portal_alarms/alarm_process_draft_record_list.xml
+95
-0
bt5/erp5_travel_expense/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
...eAllowedContentTypeTemplateItem/allowed_content_types.xml
+0
-3
bt5/erp5_travel_expense/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
...PortalTypeBaseCategoryTemplateItem/base_category_list.xml
+0
-3
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/Alarm_processDraftRecordList.py
...rtal_skins/erp5_hr_record/Alarm_processDraftRecordList.py
+0
-0
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/Alarm_processDraftRecordList.xml
...tal_skins/erp5_hr_record/Alarm_processDraftRecordList.xml
+1
-1
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_request.xml
...expense/SkinTemplateItem/portal_skins/erp5_hr_request.xml
+1
-16
bt5/erp5_travel_expense/bt/template_action_path_list
bt5/erp5_travel_expense/bt/template_action_path_list
+0
-2
bt5/erp5_travel_expense/bt/template_path_list
bt5/erp5_travel_expense/bt/template_path_list
+1
-1
bt5/erp5_travel_expense/bt/template_portal_type_allowed_content_type_list
...expense/bt/template_portal_type_allowed_content_type_list
+0
-1
bt5/erp5_travel_expense/bt/template_portal_type_base_category_list
...travel_expense/bt/template_portal_type_base_category_list
+0
-1
No files found.
bt5/erp5_travel_expense/ActionTemplateItem/portal_types/Expense%20Validation%20Item%20Module/view.xml
deleted
100644 → 0
View file @
bd97ec6a
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ActionInformation"
module=
"Products.CMFCore.ActionInformation"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
action
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
categories
</string>
</key>
<value>
<tuple>
<string>
action_type/object_list
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
category
</string>
</key>
<value>
<string>
object_list
</string>
</value>
</item>
<item>
<key>
<string>
condition
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
icon
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
view
</string>
</value>
</item>
<item>
<key>
<string>
permissions
</string>
</key>
<value>
<tuple>
<string>
View
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Action Information
</string>
</value>
</item>
<item>
<key>
<string>
priority
</string>
</key>
<value>
<float>
1.0
</float>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
View
</string>
</value>
</item>
<item>
<key>
<string>
visible
</string>
</key>
<value>
<int>
1
</int>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"Expression"
module=
"Products.CMFCore.Expression"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
text
</string>
</key>
<value>
<string>
string:${object_url}/ExpenseValidationItemModule_viewExpenseValidationItemList
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_travel_expense/ActionTemplateItem/portal_types/Expense%20Validation%20Item/view.xml
deleted
100644 → 0
View file @
bd97ec6a
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ActionInformation"
module=
"Products.CMFCore.ActionInformation"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
action
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
categories
</string>
</key>
<value>
<tuple>
<string>
action_type/object_view
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
category
</string>
</key>
<value>
<string>
object_view
</string>
</value>
</item>
<item>
<key>
<string>
condition
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
icon
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
view
</string>
</value>
</item>
<item>
<key>
<string>
permissions
</string>
</key>
<value>
<tuple>
<string>
View
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Action Information
</string>
</value>
</item>
<item>
<key>
<string>
priority
</string>
</key>
<value>
<float>
1.0
</float>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
View
</string>
</value>
</item>
<item>
<key>
<string>
visible
</string>
</key>
<value>
<int>
1
</int>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"Expression"
module=
"Products.CMFCore.Expression"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
text
</string>
</key>
<value>
<string>
string:${object_url}/ExpenseValidationItem_view
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_travel_expense/PathTemplateItem/portal_alarms/alarm_process_draft_record
s
.xml
→
bt5/erp5_travel_expense/PathTemplateItem/portal_alarms/alarm_process_draft_record
_list
.xml
View file @
7f655439
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
<dictionary>
<dictionary>
<item>
<item>
<key>
<string>
active_sense_method_id
</string>
</key>
<key>
<string>
active_sense_method_id
</string>
</key>
<value>
<string>
Alarm_processDraftRecord
</string>
</value>
<value>
<string>
Alarm_processDraftRecord
List
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
automatic_solve
</string>
</key>
<key>
<string>
automatic_solve
</string>
</key>
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
alarm_process_draft_record
s
</string>
</value>
<value>
<string>
alarm_process_draft_record
_list
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
periodicity_hour
</string>
</key>
<key>
<string>
periodicity_hour
</string>
</key>
...
@@ -87,96 +87,9 @@
...
@@ -87,96 +87,9 @@
</item>
</item>
<item>
<item>
<key>
<string>
title
</string>
</key>
<key>
<string>
title
</string>
</key>
<value>
<string>
Process Draft Records
</string>
</value>
<value>
<string>
Process Draft Record List
</string>
</value>
</item>
<item>
<key>
<string>
workflow_history
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
edit_workflow
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAM=
</string>
</persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"3"
aka=
"AAAAAAAAAAM="
>
<pickle>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.patches.WorkflowTool"
/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key>
<string>
action
</string>
</key>
<value>
<string>
edit
</string>
</value>
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
supercedriclen
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
error_message
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
955.53660.33596.5256
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
<value>
<string>
current
</string>
</value>
</item>
<item>
<key>
<string>
time
</string>
</key>
<value>
<object>
<klass>
<global
name=
"DateTime"
module=
"DateTime.DateTime"
/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>
1481194129.91
</float>
<string>
UTC
</string>
</tuple>
</state>
</object>
</value>
</item>
</item>
</dictionary>
</dictionary>
</list>
</tuple>
</pickle>
</pickle>
</record>
</record>
</ZopeData>
</ZopeData>
bt5/erp5_travel_expense/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
View file @
7f655439
...
@@ -2,9 +2,6 @@
...
@@ -2,9 +2,6 @@
<portal_type
id=
"Expense Record Module"
>
<portal_type
id=
"Expense Record Module"
>
<item>
Expense Record
</item>
<item>
Expense Record
</item>
</portal_type>
</portal_type>
<portal_type
id=
"Expense Validation Item Module"
>
<item>
Expense Validation Item
</item>
</portal_type>
<portal_type
id=
"Expense Validation Request Module"
>
<portal_type
id=
"Expense Validation Request Module"
>
<item>
Expense Validation Request
</item>
<item>
Expense Validation Request
</item>
</portal_type>
</portal_type>
...
...
bt5/erp5_travel_expense/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
View file @
7f655439
...
@@ -2,9 +2,6 @@
...
@@ -2,9 +2,6 @@
<portal_type
id=
"Expense Record Module"
>
<portal_type
id=
"Expense Record Module"
>
<item>
business_application
</item>
<item>
business_application
</item>
</portal_type>
</portal_type>
<portal_type
id=
"Expense Validation Item Module"
>
<item>
business_application
</item>
</portal_type>
<portal_type
id=
"Expense Validation Request Module"
>
<portal_type
id=
"Expense Validation Request Module"
>
<item>
business_application
</item>
<item>
business_application
</item>
</portal_type>
</portal_type>
...
...
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/Alarm_processDraftRecord.py
→
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/Alarm_processDraftRecord
List
.py
View file @
7f655439
File moved
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/Alarm_processDraftRecord.xml
→
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/Alarm_processDraftRecord
List
.xml
View file @
7f655439
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
Alarm_processDraftRecord
</string>
</value>
<value>
<string>
Alarm_processDraftRecord
List
</string>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_request.xml
View file @
7f655439
...
@@ -9,18 +9,7 @@
...
@@ -9,18 +9,7 @@
<item>
<item>
<key>
<string>
_local_properties
</string>
</key>
<key>
<string>
_local_properties
</string>
</key>
<value>
<value>
<tuple>
<tuple/>
<dictionary>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
business_template_skin_layer_priority
</string>
</value>
</item>
<item>
<key>
<string>
type
</string>
</key>
<value>
<string>
float
</string>
</value>
</item>
</dictionary>
</tuple>
</value>
</value>
</item>
</item>
<item>
<item>
...
@@ -29,10 +18,6 @@
...
@@ -29,10 +18,6 @@
<tuple/>
<tuple/>
</value>
</value>
</item>
</item>
<item>
<key>
<string>
business_template_skin_layer_priority
</string>
</key>
<value>
<float>
60.0
</float>
</value>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
erp5_hr_request
</string>
</value>
<value>
<string>
erp5_hr_request
</string>
</value>
...
...
bt5/erp5_travel_expense/bt/template_action_path_list
View file @
7f655439
...
@@ -4,8 +4,6 @@ Expense Record Module | jio_view
...
@@ -4,8 +4,6 @@ Expense Record Module | jio_view
Expense Record Module | view
Expense Record Module | view
Expense Record | jio_view
Expense Record | jio_view
Expense Record | view
Expense Record | view
Expense Validation Item Module | view
Expense Validation Item | view
Expense Validation Request Module | view
Expense Validation Request Module | view
Expense Validation Request | view
Expense Validation Request | view
Leave Request Record | jio_view
Leave Request Record | jio_view
...
...
bt5/erp5_travel_expense/bt/template_path_list
View file @
7f655439
portal_alarms/alarm_process_draft_record
s
portal_alarms/alarm_process_draft_record
_list
web_page_module/gadget_hr_*
web_page_module/gadget_hr_*
web_site_module/officejs_hr
web_site_module/officejs_hr
web_site_module/officejs_hr/**
web_site_module/officejs_hr/**
\ No newline at end of file
bt5/erp5_travel_expense/bt/template_portal_type_allowed_content_type_list
View file @
7f655439
Expense Record Module | Expense Record
Expense Record Module | Expense Record
Expense Validation Item Module | Expense Validation Item
Expense Validation Request Module | Expense Validation Request
Expense Validation Request Module | Expense Validation Request
Record Module | Leave Request Record
Record Module | Leave Request Record
Record Module | Travel Request Record
Record Module | Travel Request Record
...
...
bt5/erp5_travel_expense/bt/template_portal_type_base_category_list
View file @
7f655439
Expense Record Module | business_application
Expense Record Module | business_application
Expense Validation Item Module | business_application
Expense Validation Request Module | business_application
Expense Validation Request Module | business_application
Record Module | business_application
Record Module | business_application
Travel Request Module | business_application
Travel Request Module | business_application
\ 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