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
Léo-Paul Géneau
erp5
Commits
422d839b
Commit
422d839b
authored
Jun 06, 2018
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_payroll_l10n_fr: remove wrong condition on subrogation
parent
38f1e0e0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
11 deletions
+7
-11
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/DSNMonthlyReport_getLeavePeriodDict.py
...p5_payroll_l10n_fr/DSNMonthlyReport_getLeavePeriodDict.py
+7
-11
No files found.
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/DSNMonthlyReport_getLeavePeriodDict.py
View file @
422d839b
...
...
@@ -33,17 +33,13 @@ def getLeaveBlocAsDict(leave_period, leave_category):
bloc
[
'S21.G00.60.001'
]
=
leave_category
.
getCodification
()
bloc
[
'S21.G00.60.002'
]
=
formatDate
(
leave_period
.
getStartDate
())
bloc
[
'S21.G00.60.003'
]
=
formatDate
(
leave_period
.
getStopDate
())
# employee left during this period
if
from_date
<
leave_period
.
getStartDate
()
<
effective_date
:
bloc
[
'S21.G00.60.004'
]
=
'01'
# we do subrogation
first_subrogation_day
=
addToDate
(
leave_period
.
getStartDate
(),
day
=
3
)
bloc
[
'S21.G00.60.005'
]
=
formatDate
(
first_subrogation_day
)
# 3 months of subrogation, as defined in the collective agreement
bloc
[
'S21.G00.60.006'
]
=
formatDate
(
addToDate
(
first_subrogation_day
,
month
=
3
,
days
=-
1
))
bloc
[
'S21.G00.60.007'
]
=
bank_account
.
getIban
()
bloc
[
'S21.G00.60.008'
]
=
bank_account
.
getBicCode
()
else
:
bloc
[
'S21.G00.60.004'
]
=
'02'
# we don't do subrogation
bloc
[
'S21.G00.60.004'
]
=
'01'
# we do subrogation
first_subrogation_day
=
addToDate
(
leave_period
.
getStartDate
(),
day
=
3
)
bloc
[
'S21.G00.60.005'
]
=
formatDate
(
first_subrogation_day
)
# 3 months of subrogation, as defined in the collective agreement
bloc
[
'S21.G00.60.006'
]
=
formatDate
(
addToDate
(
first_subrogation_day
,
month
=
3
,
days
=-
1
))
bloc
[
'S21.G00.60.007'
]
=
bank_account
.
getIban
()
bloc
[
'S21.G00.60.008'
]
=
bank_account
.
getBicCode
()
# employee restarted work during this period
if
getattr
(
leave_period
,
'expiration_date'
,
None
):
bloc
[
'S21.G00.60.010'
]
=
formatDate
(
leave_period
.
getExpirationDate
())
...
...
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