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
143
Merge Requests
143
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
3b943572
Commit
3b943572
authored
Feb 17, 2024
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
calendar: python3 support
parent
bf5790b4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PersonModule_getLeaveRequestReportLineList.py
...p5_calendar/PersonModule_getLeaveRequestReportLineList.py
+1
-1
bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PersonModule_getLeaveRequestReportListboxColumnList.py
...ar/PersonModule_getLeaveRequestReportListboxColumnList.py
+1
-1
bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PersonModule_getLeaveRequestReportListboxUntranslatableColumnList.py
...e_getLeaveRequestReportListboxUntranslatableColumnList.py
+1
-1
No files found.
bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PersonModule_getLeaveRequestReportLineList.py
View file @
3b943572
...
@@ -39,7 +39,7 @@ for person in person_value_list:
...
@@ -39,7 +39,7 @@ for person in person_value_list:
portal_type
=
'Leave Request Period'
,
portal_type
=
'Leave Request Period'
,
group_by_resource
=
1
):
group_by_resource
=
1
):
resource
=
inventory
.
resource_relative_url
resource
=
inventory
.
resource_relative_url
or
''
if
inventory
.
resource_uid
in
presence_resource_uid_list
:
if
inventory
.
resource_uid
in
presence_resource_uid_list
:
raise
ValueError
(
"This report does not work when same resource are"
raise
ValueError
(
"This report does not work when same resource are"
...
...
bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PersonModule_getLeaveRequestReportListboxColumnList.py
View file @
3b943572
...
@@ -3,7 +3,7 @@ column_item_list = [ ('person_career_reference', 'Employee Number'),
...
@@ -3,7 +3,7 @@ column_item_list = [ ('person_career_reference', 'Employee Number'),
non_translatable_column_item_list
=
context
\
non_translatable_column_item_list
=
context
\
.
PersonModule_getLeaveRequestReportListboxUntranslatableColumnList
()
.
PersonModule_getLeaveRequestReportListboxUntranslatableColumnList
()
non_translatable_column_item_list
.
sort
(
lambda
a
,
b
:
cmp
(
a
[
1
],
b
[
1
])
)
non_translatable_column_item_list
.
sort
(
key
=
lambda
v
:
v
[
1
]
)
column_item_list
.
extend
(
non_translatable_column_item_list
)
column_item_list
.
extend
(
non_translatable_column_item_list
)
column_item_list
.
append
((
'total'
,
'Total'
))
column_item_list
.
append
((
'total'
,
'Total'
))
...
...
bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PersonModule_getLeaveRequestReportListboxUntranslatableColumnList.py
View file @
3b943572
...
@@ -15,6 +15,6 @@ for inventory in stool.getInventoryList(
...
@@ -15,6 +15,6 @@ for inventory in stool.getInventoryList(
resource_list
.
append
(
resource_list
.
append
(
(
inventory
.
resource_relative_url
,
(
inventory
.
resource_relative_url
,
portal
.
portal_categories
.
restrictedTraverse
(
portal
.
portal_categories
.
restrictedTraverse
(
inventory
.
resource_relative_url
).
getTitle
()))
inventory
.
resource_relative_url
).
getT
ranslatedT
itle
()))
return
resource_list
return
resource_list
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