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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xiaowu Zhang
erp5
Commits
7dc1b2b8
Commit
7dc1b2b8
authored
Jan 03, 2022
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_travel_expense&test: user can input holiday quantity
parent
e7f70ed7
Changes
7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
553 additions
and
6 deletions
+553
-6
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_leave_request_view_html.html
...em/web_page_module/gadget_hr_leave_request_view_html.html
+5
-0
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_leave_request_view_html.xml
...tem/web_page_module/gadget_hr_leave_request_view_html.xml
+4
-6
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/LeaveRequestRecord_view.xml
...m/portal_skins/erp5_hr_record/LeaveRequestRecord_view.xml
+1
-0
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/LeaveRequestRecord_view/my_quantity.xml
...ns/erp5_hr_record/LeaveRequestRecord_view/my_quantity.xml
+264
-0
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/LeaveRequestRecord_viewAsJio.xml
...tal_skins/erp5_hr_record/LeaveRequestRecord_viewAsJio.xml
+1
-0
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/LeaveRequestRecord_viewAsJio/my_quantity.xml
...p5_hr_record/LeaveRequestRecord_viewAsJio/my_quantity.xml
+272
-0
bt5/erp5_travel_expense_ui_test/PathTemplateItem/portal_tests/officejs_ui_travel_expense_ui_test_zuite/testOfficeJSTravelExpenseSyncLeave.zpt
...ense_ui_test_zuite/testOfficeJSTravelExpenseSyncLeave.zpt
+6
-0
No files found.
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_leave_request_view_html.html
View file @
7dc1b2b8
...
@@ -47,6 +47,11 @@
...
@@ -47,6 +47,11 @@
<
input
type
=
"
date
"
name
=
"
stop_date
"
value
=
"
{{stop_date}}
"
required
>
<
input
type
=
"
date
"
name
=
"
stop_date
"
value
=
"
{{stop_date}}
"
required
>
<
/div
>
<
/div
>
<
div
class
=
"
ui-field-contain
"
>
<
label
data
-
i18n
=
"
Leave Days
"
>
Leave
Days
<
/label
>
<
input
type
=
"
number
"
step
=
"
0.5
"
name
=
"
quantity
"
value
=
"
{{quantity}}
"
required
>
<
/div
>
<
div
class
=
"
ui-field-contain
"
>
<
div
class
=
"
ui-field-contain
"
>
<
label
data
-
i18n
=
"
Comment
"
>
Comment
<
/label
>
<
label
data
-
i18n
=
"
Comment
"
>
Comment
<
/label
>
<
textarea
name
=
"
comment
"
>
{{
comment
}}
<
/textarea
>
<
textarea
name
=
"
comment
"
>
{{
comment
}}
<
/textarea
>
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_leave_request_view_html.xml
View file @
7dc1b2b8
...
@@ -66,9 +66,7 @@
...
@@ -66,9 +66,7 @@
<item>
<item>
<key>
<string>
categories
</string>
</key>
<key>
<string>
categories
</string>
</key>
<value>
<value>
<tuple>
<tuple/>
<string>
contributor/person_module/2
</string>
</tuple>
</value>
</value>
</item>
</item>
<item>
<item>
...
@@ -238,7 +236,7 @@
...
@@ -238,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
actor
</string>
</key>
<key>
<string>
actor
</string>
</key>
<value>
<string>
supercedriclen
</string>
</value>
<value>
<string>
zope
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
comment
</string>
</key>
<key>
<string>
comment
</string>
</key>
...
@@ -252,7 +250,7 @@
...
@@ -252,7 +250,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
56.44329.14852.21316
</string>
</value>
<value>
<string>
9
96.48047.61964.64477
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -270,7 +268,7 @@
...
@@ -270,7 +268,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1
484576952.21
</float>
<float>
1
639131875.82
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/LeaveRequestRecord_view.xml
View file @
7dc1b2b8
...
@@ -81,6 +81,7 @@
...
@@ -81,6 +81,7 @@
<string>
my_source_reference
</string>
<string>
my_source_reference
</string>
<string>
my_start_date
</string>
<string>
my_start_date
</string>
<string>
my_stop_date
</string>
<string>
my_stop_date
</string>
<string>
my_quantity
</string>
</list>
</list>
</value>
</value>
</item>
</item>
...
...
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/LeaveRequestRecord_view/my_quantity.xml
0 → 100644
View file @
7dc1b2b8
This diff is collapsed.
Click to expand it.
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/LeaveRequestRecord_viewAsJio.xml
View file @
7dc1b2b8
...
@@ -86,6 +86,7 @@
...
@@ -86,6 +86,7 @@
<string>
my_title
</string>
<string>
my_title
</string>
<string>
your_state
</string>
<string>
your_state
</string>
<string>
your_sync_flag
</string>
<string>
your_sync_flag
</string>
<string>
my_quantity
</string>
</list>
</list>
</value>
</value>
</item>
</item>
...
...
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/LeaveRequestRecord_viewAsJio/my_quantity.xml
0 → 100644
View file @
7dc1b2b8
This diff is collapsed.
Click to expand it.
bt5/erp5_travel_expense_ui_test/PathTemplateItem/portal_tests/officejs_ui_travel_expense_ui_test_zuite/testOfficeJSTravelExpenseSyncLeave.zpt
View file @
7dc1b2b8
...
@@ -109,6 +109,12 @@
...
@@ -109,6 +109,12 @@
<td>
Test
</td>
<td>
Test
</td>
</tr>
</tr>
<tr>
<td>
type
</td>
<td>
//input[@name='quantity']
</td>
<td>
1
</td>
</tr>
<tr>
<tr>
<td>
click
</td>
<td>
click
</td>
<td>
//input[@name='sync_flag']
</td>
<td>
//input[@name='sync_flag']
</td>
...
...
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