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
Kasra Jamshidi
erp5
Commits
596083cc
Commit
596083cc
authored
8 years ago
by
Cédric Le Ninivin
Committed by
Xiaowu Zhang
8 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_travel_expense: Have Left leaves days displayed in the application
parent
ec251e8e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
316 additions
and
8 deletions
+316
-8
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_jio_js.js
...ense/PathTemplateItem/web_page_module/gadget_hr_jio_js.js
+1
-0
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_jio_js.xml
...nse/PathTemplateItem/web_page_module/gadget_hr_jio_js.xml
+3
-3
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_leave_request_list_js.js
...teItem/web_page_module/gadget_hr_leave_request_list_js.js
+22
-3
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_leave_request_list_js.xml
...eItem/web_page_module/gadget_hr_leave_request_list_js.xml
+2
-2
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/LeaveReportRecord_viewAsJio.xml
...rtal_skins/erp5_hr_record/LeaveReportRecord_viewAsJio.xml
+1
-0
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/LeaveReportRecord_viewAsJio/your_confirmed_leaves_days_left.xml
...eportRecord_viewAsJio/your_confirmed_leaves_days_left.xml
+287
-0
No files found.
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_jio_js.js
View file @
596083cc
...
@@ -291,6 +291,7 @@
...
@@ -291,6 +291,7 @@
query
:
{
query
:
{
query
:
'
(portal_type: "Expense Record" AND simulation_state:("draft","sent","stopped"))
'
+
query
:
'
(portal_type: "Expense Record" AND simulation_state:("draft","sent","stopped"))
'
+
'
OR (portal_type: "Travel Request Record" AND simulation_state:("draft","sent","stopped"))
'
+
'
OR (portal_type: "Travel Request Record" AND simulation_state:("draft","sent","stopped"))
'
+
'
OR (portal_type: "Leave Report Record" AND simulation_state:"stopped")
'
+
'
OR (portal_type: "Leave Request Record" AND simulation_state:("draft","sent","stopped"))
'
+
'
OR (portal_type: "Leave Request Record" AND simulation_state:("draft","sent","stopped"))
'
+
'
OR (portal_type: "Localisation Record" AND simulation_state:("draft","stopped"))
'
+
'
OR (portal_type: "Localisation Record" AND simulation_state:("draft","stopped"))
'
+
'
OR (portal_type: "Currency" AND validation_state:"validated")
'
+
'
OR (portal_type: "Currency" AND validation_state:"validated")
'
+
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_jio_js.xml
View file @
596083cc
...
@@ -224,7 +224,7 @@
...
@@ -224,7 +224,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
actor
</string>
</key>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zope
</string>
</value>
<value>
<string>
supercedriclen
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
comment
</string>
</key>
<key>
<string>
comment
</string>
</key>
...
@@ -238,7 +238,7 @@
...
@@ -238,7 +238,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
956.
48987.17944.33809
</string>
</value>
<value>
<string>
956.
55783.61341.2013
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -256,7 +256,7 @@
...
@@ -256,7 +256,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1485
178892.56
</float>
<float>
1485
339651.94
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_leave_request_list_js.js
View file @
596083cc
/*globals window, RSVP, rJS*/
/*globals window, RSVP, rJS
, document
*/
/*jslint indent: 2, nomen: true, maxlen: 80*/
/*jslint indent: 2, nomen: true, maxlen: 80*/
(
function
(
window
,
RSVP
,
rJS
)
{
(
function
(
window
,
RSVP
,
rJS
,
document
)
{
"
use strict
"
;
"
use strict
"
;
rJS
(
window
)
rJS
(
window
)
...
@@ -96,7 +96,26 @@
...
@@ -96,7 +96,26 @@
sort_on
:
[[
"
start_date
"
,
"
descending
"
]]
sort_on
:
[[
"
start_date
"
,
"
descending
"
]]
}
}
});
});
})
.
push
(
function
()
{
return
gadget
.
jio_allDocs
({
query
:
'
portal_type: "Leave Report Record"
'
,
select_list
:
[
"
confirmed_leaves_days_left
"
],
});
})
.
push
(
function
(
result
)
{
var
p
;
if
(
result
.
data
.
total_rows
!=
1
)
{
return
;
}
p
=
document
.
createElement
(
"
p
"
);
p
.
textContent
=
"
Leaves days left:
"
+
result
.
data
.
rows
[
0
].
value
.
confirmed_leaves_days_left
;
gadget
.
props
.
element
.
insertBefore
(
p
,
gadget
.
props
.
element
.
querySelector
(
"
div
"
)
);
});
});
});
});
}(
window
,
RSVP
,
rJS
));
}(
window
,
RSVP
,
rJS
,
document
));
\ No newline at end of file
\ No newline at end of file
This diff is collapsed.
Click to expand it.
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_leave_request_list_js.xml
View file @
596083cc
...
@@ -270,7 +270,7 @@
...
@@ -270,7 +270,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
956.
4266.40527.32802
</string>
</value>
<value>
<string>
956.
57347.13686.32631
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -288,7 +288,7 @@
...
@@ -288,7 +288,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
148
2923348
.1
</float>
<float>
148
5341013
.1
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/LeaveReportRecord_viewAsJio.xml
View file @
596083cc
...
@@ -80,6 +80,7 @@
...
@@ -80,6 +80,7 @@
<string>
your_simulation_state
</string>
<string>
your_simulation_state
</string>
<string>
your_total_leaves_days_confirmed
</string>
<string>
your_total_leaves_days_confirmed
</string>
<string>
your_total_leaves_days_planned
</string>
<string>
your_total_leaves_days_planned
</string>
<string>
your_confirmed_leaves_days_left
</string>
</list>
</list>
</value>
</value>
</item>
</item>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_record/LeaveReportRecord_viewAsJio/your_confirmed_leaves_days_left.xml
0 → 100644
View file @
596083cc
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"StringField"
module=
"Products.Formulator.StandardFields"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
your_confirmed_leaves_days_left
</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>
<item>
<key>
<string>
required_not_found
</string>
</key>
<value>
<string>
Input is required but no input given.
</string>
</value>
</item>
<item>
<key>
<string>
too_long
</string>
</key>
<value>
<string>
Too much input was given.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
alternate_name
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
css_class
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
default
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
display_maxwidth
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
display_width
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
editable
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
enabled
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
external_validator
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
extra
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<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>
</item>
<item>
<key>
<string>
required
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
truncate
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
unicode
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
whitespace_preserve
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
alternate_name
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
css_class
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
default
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
display_maxwidth
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
display_width
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
editable
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
enabled
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
external_validator
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
extra
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<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>
</item>
<item>
<key>
<string>
required
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
truncate
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
unicode
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
whitespace_preserve
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
alternate_name
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
css_class
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
default
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
display_maxwidth
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
display_width
</string>
</key>
<value>
<int>
20
</int>
</value>
</item>
<item>
<key>
<string>
editable
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
<item>
<key>
<string>
enabled
</string>
</key>
<value>
<int>
1
</int>
</value>
</item>
<item>
<key>
<string>
external_validator
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
extra
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
hidden
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
<item>
<key>
<string>
input_type
</string>
</key>
<value>
<string>
text
</string>
</value>
</item>
<item>
<key>
<string>
max_length
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
required
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Confirmed Leaves Days Left
</string>
</value>
</item>
<item>
<key>
<string>
truncate
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
<item>
<key>
<string>
unicode
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
<item>
<key>
<string>
whitespace_preserve
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"TALESMethod"
module=
"Products.Formulator.TALESField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python: 25.0 + here.getPortalObject().portal_simulation.getAvailableInventory(portal_type="Leave Request Period",node_uid=here.getDestinationUid(),)
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
This diff is collapsed.
Click to expand it.
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