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
1
Merge Requests
1
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
Cédric Le Ninivin
erp5
Commits
cd007e38
Commit
cd007e38
authored
Jun 06, 2018
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_payroll_l10n_fr: follow change for retrieving payroll records
parent
3b695570
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getSocialContributionDict.py
..._l10n_fr/PaySheetTransaction_getSocialContributionDict.py
+2
-2
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/Person_getSocialDeclarationDataDict.py
...p5_payroll_l10n_fr/Person_getSocialDeclarationDataDict.py
+1
-3
No files found.
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getSocialContributionDict.py
View file @
cd007e38
...
@@ -26,6 +26,8 @@ all_other_income_set = set(portal_categories.getCategoryValue('base_amount/payro
...
@@ -26,6 +26,8 @@ all_other_income_set = set(portal_categories.getCategoryValue('base_amount/payro
all_other_bonus_set
=
set
(
portal_categories
.
getCategoryValue
(
'base_amount/payroll/l10n/fr/other_bonus'
).
objectValues
(
portal_type
=
'Category'
))
all_other_bonus_set
=
set
(
portal_categories
.
getCategoryValue
(
'base_amount/payroll/l10n/fr/other_bonus'
).
objectValues
(
portal_type
=
'Category'
))
trainee_base_contribution
=
portal_categories
.
getCategoryValue
(
'base_amount/payroll/l10n/fr/base/gratification_stage'
)
trainee_base_contribution
=
portal_categories
.
getCategoryValue
(
'base_amount/payroll/l10n/fr/base/gratification_stage'
)
enrollment_record
=
context
.
getSourceSectionValue
().
Person_getCareerRecord
(
'DSN Enrollment Record'
)
def
formatDate
(
datetime
):
def
formatDate
(
datetime
):
return
"%02d%02d%04d"
%
(
datetime
.
day
(),
datetime
.
month
(),
datetime
.
year
())
return
"%02d%02d%04d"
%
(
datetime
.
day
(),
datetime
.
month
(),
datetime
.
year
())
...
@@ -90,7 +92,6 @@ def makeTaxableBaseComponentBlock(movement, category):
...
@@ -90,7 +92,6 @@ def makeTaxableBaseComponentBlock(movement, category):
if
isFullMonthPaysheet
(
context
):
if
isFullMonthPaysheet
(
context
):
base
=
minimum_salary
base
=
minimum_salary
else
:
else
:
enrollment_record
=
context
.
getSourceSectionValue
().
Person_getPayrollEnrollmentRecord
()
worked_time
=
float
(
enrollment_record
.
getWorkingUnitQuantity
())
worked_time
=
float
(
enrollment_record
.
getWorkingUnitQuantity
())
normal_working_time
=
float
(
enrollment_record
.
getStandardWorkingUnit
())
normal_working_time
=
float
(
enrollment_record
.
getStandardWorkingUnit
())
base
=
minimum_salary
*
(
worked_time
/
normal_working_time
)
base
=
minimum_salary
*
(
worked_time
/
normal_working_time
)
...
@@ -258,7 +259,6 @@ if len(result['ctp']):
...
@@ -258,7 +259,6 @@ if len(result['ctp']):
######################################################################
######################################################################
# Remuneration and Activity
# Remuneration and Activity
enrollment_record
=
context
.
getSourceSectionValue
().
Person_getPayrollEnrollmentRecord
()
is_trainee
=
(
True
if
enrollment_record
.
getContractType
()
==
'29'
else
False
)
is_trainee
=
(
True
if
enrollment_record
.
getContractType
()
==
'29'
else
False
)
is_corporate_executive
=
(
True
if
enrollment_record
.
getContractType
()
==
'80'
else
False
)
is_corporate_executive
=
(
True
if
enrollment_record
.
getContractType
()
==
'80'
else
False
)
career_start_date
=
enrollment_record
.
getCareerStartDate
()
career_start_date
=
enrollment_record
.
getCareerStartDate
()
...
...
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/Person_getSocialDeclarationDataDict.py
View file @
cd007e38
portal
=
context
.
getPortalObject
()
enrollment_record
=
context
.
Person_getCareerRecord
(
'DSN Enrollment Record'
)
enrollment_record
=
context
.
Person_getPayrollEnrollmentRecord
()
if
dsn_report
is
None
:
if
dsn_report
is
None
:
dsn_report
=
context
dsn_report
=
context
...
...
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