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
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
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Leo Le Bouter
erp5
Commits
3b695570
Commit
3b695570
authored
Jun 06, 2018
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_payroll: there now exist more than one type of payroll record
parent
094bcf08
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_getCareerRecord.py
...eItem/portal_skins/erp5_payroll/Person_getCareerRecord.py
+2
-2
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_getCareerRecord.xml
...Item/portal_skins/erp5_payroll/Person_getCareerRecord.xml
+2
-2
No files found.
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_get
PayrollEnrollment
Record.py
→
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_get
Career
Record.py
View file @
3b695570
...
@@ -26,8 +26,8 @@ else:
...
@@ -26,8 +26,8 @@ else:
# and Organisation is taken into account
# and Organisation is taken into account
career_step
=
career_step_list
[
0
]
career_step
=
career_step_list
[
0
]
record
=
career_step
.
getAggregateValue
()
record
=
career_step
.
getAggregateValue
(
portal_type
=
portal_type
)
if
record
is
None
:
if
record
is
None
:
raise
AttributeError
(
"No
Payroll Enrollment Record found for employee %s"
%
context
.
getRelativeUrl
(
))
raise
AttributeError
(
"No
%s found for employee %s"
%
(
portal_type
,
context
.
getRelativeUrl
()
))
return
record
return
record
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_get
PayrollEnrollment
Record.xml
→
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_get
Career
Record.xml
View file @
3b695570
...
@@ -50,11 +50,11 @@
...
@@ -50,11 +50,11 @@
</item>
</item>
<item>
<item>
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string>
organisation=None
</string>
</value>
<value>
<string>
portal_type,
organisation=None
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
Person_get
PayrollEnrollment
Record
</string>
</value>
<value>
<string>
Person_get
Career
Record
</string>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
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