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
138
Merge Requests
138
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
d90f7c8f
Commit
d90f7c8f
authored
Jan 08, 2018
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_payroll_l10n_fr: individual contribution for retirement's base is 0.
Only quantity should be set
parent
9a6fe459
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getSocialContributionDict.py
..._l10n_fr/PaySheetTransaction_getSocialContributionDict.py
+6
-5
No files found.
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getSocialContributionDict.py
View file @
d90f7c8f
...
...
@@ -106,17 +106,18 @@ def makeTaxableBaseComponentBlock(movement, category):
def
makeIndividualContributionBlock
(
movement
,
category
):
base
=
quantity
=
0.0
if
category
in
(
'0
18'
,
'0
63'
,
'064'
):
if
category
in
(
'063'
,
'064'
):
quantity
=
(
getattr
(
movement
,
'employer_total_price'
,
0
)
+
getattr
(
movement
,
'employee_total_price'
,
0
))
*
-
1
# If "reduction generale but CTP is 801P then it should be positive, as we have to give money back
if
category
==
'018'
and
'base_amount/payroll/l10n/fr/ctp/801P'
not
in
movement
.
getBaseContributionList
():
assert
quantity
<=
0.
,
"Quantity in %s should be negative"
%
movement
.
absolute_url
()
elif
category
==
'018'
:
assert
quantity
>=
0.
,
"Quantity in %s should be positive"
%
movement
.
absolute_url
()
base
=
movement
.
base
quantity
=
(
getattr
(
movement
,
'employer_total_price'
,
0
)
+
getattr
(
movement
,
'employee_total_price'
,
0
))
*
-
1
if
'base_amount/payroll/l10n/fr/ctp/801P'
not
in
movement
.
getBaseContributionList
():
assert
quantity
<=
0.
,
"Quantity in %s should be negative"
%
movement
.
absolute_url
()
else
:
assert
quantity
>=
0.
,
"Quantity in %s should be positive"
%
movement
.
absolute_url
()
elif
category
in
(
'059'
,):
quantity
=
(
getattr
(
movement
,
'employer_total_price'
,
0
)
+
getattr
(
movement
,
'employee_total_price'
,
0
))
*
-
1
base
=
0.
else
:
base
=
movement
.
base
return
{
...
...
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