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
d1c94d6a
Commit
d1c94d6a
authored
Jan 25, 2017
by
Cédric Le Ninivin
Committed by
Xiaowu Zhang
Jan 25, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_travel_expense: Harmonise front page list to display all documents necessary
parent
012c6828
Changes
16
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
48 additions
and
45 deletions
+48
-45
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_js.js
...eItem/web_page_module/gadget_hr_expense_record_view_js.js
+4
-1
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_js.xml
...Item/web_page_module/gadget_hr_expense_record_view_js.xml
+3
-3
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_leave_request_view_js.js
...teItem/web_page_module/gadget_hr_leave_request_view_js.js
+3
-0
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_leave_request_view_js.xml
...eItem/web_page_module/gadget_hr_leave_request_view_js.xml
+3
-3
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_mission_request_record_view_js.js
...b_page_module/gadget_hr_mission_request_record_view_js.js
+3
-0
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_mission_request_record_view_js.xml
..._page_module/gadget_hr_mission_request_record_view_js.xml
+3
-3
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_page_front_html.html
...mplateItem/web_page_module/gadget_hr_page_front_html.html
+2
-2
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_page_front_html.xml
...emplateItem/web_page_module/gadget_hr_page_front_html.xml
+3
-3
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_page_front_js.js
...thTemplateItem/web_page_module/gadget_hr_page_front_js.js
+4
-18
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_page_front_js.xml
...hTemplateItem/web_page_module/gadget_hr_page_front_js.xml
+3
-3
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/ExpenseRecord_viewAsJio.xml
...m/portal_skins/erp5_hr_record/ExpenseRecord_viewAsJio.xml
+1
-1
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/ExpenseRecord_viewAsJio/your_sync_flag.xml
...erp5_hr_record/ExpenseRecord_viewAsJio/your_sync_flag.xml
+2
-2
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/LeaveRequestRecord_viewAsJio.xml
...tal_skins/erp5_hr_record/LeaveRequestRecord_viewAsJio.xml
+1
-1
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/LeaveRequestRecord_viewAsJio/your_sync_flag.xml
...hr_record/LeaveRequestRecord_viewAsJio/your_sync_flag.xml
+6
-2
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/TravelRequestRecord_viewAsJio.xml
...al_skins/erp5_hr_record/TravelRequestRecord_viewAsJio.xml
+1
-1
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/TravelRequestRecord_viewAsJio/your_sync_flag.xml
...r_record/TravelRequestRecord_viewAsJio/your_sync_flag.xml
+6
-2
No files found.
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_js.js
View file @
d1c94d6a
...
...
@@ -359,7 +359,7 @@
return
getData
(
gadget
)
.
push
(
function
(
doc
)
{
var
key
;
if
(
doc
.
sync_flag
===
'
1
'
)
{
if
(
doc
.
sync_flag
===
'
1
'
&&
doc
.
simulation_state
===
"
draft
"
)
{
sync
=
1
;
}
return
gadget
.
put
(
gadget
.
options
.
jio_key
,
doc
);
...
...
@@ -372,6 +372,9 @@
})
.
push
(
function
()
{
return
gadget
.
props
.
geoGadget
.
createGeoLocationRecord
();
})
.
push
(
function
()
{
return
gadget
.
redirect
();
});
}
})
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_js.xml
View file @
d1c94d6a
...
...
@@ -228,7 +228,7 @@
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zope
</string>
</value>
<value>
<string>
supercedriclen
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
...
...
@@ -242,7 +242,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
956.57
356.32253.30464
</string>
</value>
<value>
<string>
956.57
543.33928.60006
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -260,7 +260,7 @@
</tuple>
<state>
<tuple>
<float>
14853
41787.05
</float>
<float>
14853
52808.19
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_leave_request_view_js.js
View file @
d1c94d6a
...
...
@@ -268,6 +268,9 @@
})
.
push
(
function
()
{
alertify
.
success
(
"
Saved
"
);
if
(
sync
===
1
)
{
return
gadget
.
redirect
();
}
});
}
)
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_leave_request_view_js.xml
View file @
d1c94d6a
...
...
@@ -230,7 +230,7 @@
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zope
</string>
</value>
<value>
<string>
supercedriclen
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
...
...
@@ -244,7 +244,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
956.57
480.16314.62344
</string>
</value>
<value>
<string>
956.57
517.36246.49305
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -262,7 +262,7 @@
</tuple>
<state>
<tuple>
<float>
14853
49157.61
</float>
<float>
14853
52429.99
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_mission_request_record_view_js.js
View file @
d1c94d6a
...
...
@@ -277,6 +277,9 @@
})
.
push
(
function
()
{
alertify
.
success
(
"
Saved
"
);
if
(
sync
)
{
return
gadget
.
redirect
();
}
});
}
)
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_mission_request_record_view_js.xml
View file @
d1c94d6a
...
...
@@ -230,7 +230,7 @@
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zope
</string>
</value>
<value>
<string>
supercedriclen
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
...
...
@@ -244,7 +244,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
956.57
361.9593.1092
</string>
</value>
<value>
<string>
956.57
502.32307.34304
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -262,7 +262,7 @@
</tuple>
<state>
<tuple>
<float>
14853
41897.0
3
</float>
<float>
14853
51571.4
3
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_page_front_html.html
View file @
d1c94d6a
...
...
@@ -54,7 +54,7 @@
<section
class=
""
>
<h3
class=
"ui-body-c"
>
<span
class=
"ui-icon ui-icon-custom ui-icon-exchange"
>
</span>
E
xpense
s to Answer
E
lement
s to Answer
</h3>
</section>
<section
class=
"ui-body-c ui-content-section"
>
...
...
@@ -63,7 +63,7 @@
<section
class=
""
>
<h3
class=
"ui-body-c"
>
<span
class=
"ui-icon ui-icon-custom ui-icon-exchange"
>
</span>
E
xpense
s to Post
E
lement
s to Post
</h3>
</section>
<section
class=
"ui-body-c ui-content-section"
>
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_page_front_html.xml
View file @
d1c94d6a
...
...
@@ -228,7 +228,7 @@
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zope
</string>
</value>
<value>
<string>
supercedriclen
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
...
...
@@ -242,7 +242,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
956.5
4794.17747.54920
</string>
</value>
<value>
<string>
956.5
7534.1636.37307
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -260,7 +260,7 @@
</tuple>
<state>
<tuple>
<float>
14853
42857.58
</float>
<float>
14853
52210.95
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_page_front_js.js
View file @
d1c94d6a
...
...
@@ -97,7 +97,7 @@
title
:
'
State
'
}],
query
:
{
query
:
'
portal_type:("
'
+
gadget
.
props
.
portal_type
+
'
") AND state:"Suspended"
'
,
query
:
'
portal_type:("
% Record
") AND state:"Suspended"
'
,
select_list
:
[
'
doc_id
'
,
'
quantity
'
,
'
resource_title
'
,
'
comment
'
,
'
date
'
,
'
type_title
'
,
'
state
'
],
...
...
@@ -109,29 +109,15 @@
select
:
'
comment
'
,
title
:
'
Description
'
},
{
select
:
'
type_titl
e
'
,
select
:
'
portal_typ
e
'
,
title
:
'
Type
'
},
{
select
:
'
quantity
'
,
title
:
'
Total Price
'
},
{
select
:
'
resource_title
'
,
title
:
'
Currency
'
},
{
select
:
'
date
'
,
title
:
'
Input Date
'
},
{
select
:
'
doc_id
'
,
title
:
'
ID
'
},
{
select
:
'
state
'
,
title
:
'
State
'
}],
query
:
{
query
:
'
portal_type:("
'
+
gadget
.
props
.
portal_type
+
'
" OR "Expense Record Temp") AND sync_flag:"0"
'
,
select_list
:
[
'
doc_id
'
,
'
quantity
'
,
'
resource_title
'
,
'
comment
'
,
'
date
'
,
'
type_title
'
,
'
state
'
],
query
:
'
(simulation_state:"draft" OR sync_flag:"0")
'
,
select_list
:
[
'
comment
'
,
'
portal_type
'
,
'
state
'
],
sort_on
:
[[
"
modification_date
"
,
"
descending
"
]]
}
})
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_page_front_js.xml
View file @
d1c94d6a
...
...
@@ -256,7 +256,7 @@
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zope
</string>
</value>
<value>
<string>
supercedriclen
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
...
...
@@ -270,7 +270,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
956.57
372.34651.59340
</string>
</value>
<value>
<string>
956.57
556.539.5205
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -288,7 +288,7 @@
</tuple>
<state>
<tuple>
<float>
14853
42563.92
</float>
<float>
14853
53656.91
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/ExpenseRecord_viewAsJio.xml
View file @
d1c94d6a
...
...
@@ -79,7 +79,7 @@
<string>
my_quantity
</string>
<string>
my_date
</string>
<string>
my_comment
</string>
<string>
my
_sync_flag
</string>
<string>
your
_sync_flag
</string>
<string>
my_source_reference
</string>
<string>
my_copy_of
</string>
<string>
my_record_revision
</string>
...
...
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/ExpenseRecord_viewAsJio/
my
_sync_flag.xml
→
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/ExpenseRecord_viewAsJio/
your
_sync_flag.xml
View file @
d1c94d6a
...
...
@@ -8,7 +8,7 @@
<dictionary>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
my
_sync_flag
</string>
</value>
<value>
<string>
your
_sync_flag
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
...
...
@@ -193,7 +193,7 @@
</item>
<item>
<key>
<string>
default
</string>
</key>
<value>
<string></string>
</value>
<value>
<string>
-1
</string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
...
...
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/LeaveRequestRecord_viewAsJio.xml
View file @
d1c94d6a
...
...
@@ -85,7 +85,7 @@
<string>
your_simulation_state
</string>
<string>
my_title
</string>
<string>
your_state
</string>
<string>
my
_sync_flag
</string>
<string>
your
_sync_flag
</string>
</list>
</value>
</item>
...
...
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/LeaveRequestRecord_viewAsJio/
my
_sync_flag.xml
→
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/LeaveRequestRecord_viewAsJio/
your
_sync_flag.xml
View file @
d1c94d6a
...
...
@@ -8,7 +8,7 @@
<dictionary>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
my
_sync_flag
</string>
</value>
<value>
<string>
your
_sync_flag
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
...
...
@@ -152,6 +152,10 @@
<key>
<string>
hidden
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
input_type
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
max_length
</string>
</key>
<value>
<string></string>
</value>
...
...
@@ -193,7 +197,7 @@
</item>
<item>
<key>
<string>
default
</string>
</key>
<value>
<string></string>
</value>
<value>
<string>
-1
</string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
...
...
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/TravelRequestRecord_viewAsJio.xml
View file @
d1c94d6a
...
...
@@ -79,7 +79,7 @@
<string>
my_quantity
</string>
<string>
my_stop_date
</string>
<string>
my_comment
</string>
<string>
my
_sync_flag
</string>
<string>
your
_sync_flag
</string>
<string>
my_source_reference
</string>
<string>
my_copy_of
</string>
<string>
my_record_revision
</string>
...
...
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/TravelRequestRecord_viewAsJio/
my
_sync_flag.xml
→
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/TravelRequestRecord_viewAsJio/
your
_sync_flag.xml
View file @
d1c94d6a
...
...
@@ -8,7 +8,7 @@
<dictionary>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
my
_sync_flag
</string>
</value>
<value>
<string>
your
_sync_flag
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
...
...
@@ -152,6 +152,10 @@
<key>
<string>
hidden
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
input_type
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
max_length
</string>
</key>
<value>
<string></string>
</value>
...
...
@@ -193,7 +197,7 @@
</item>
<item>
<key>
<string>
default
</string>
</key>
<value>
<string></string>
</value>
<value>
<string>
-1
</string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
...
...
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