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
2e8ef0bb
Commit
2e8ef0bb
authored
Jan 09, 2024
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_payroll_l10n_fr: display net social
parent
d233dc6b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_generatePayslipReportContent.zpt
...n_fr/PaySheetTransaction_generatePayslipReportContent.zpt
+2
-2
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getPayslipData.py
...rp5_payroll_l10n_fr/PaySheetTransaction_getPayslipData.py
+5
-0
bt5/erp5_payroll_l10n_fr_test/PathTemplateItem/image_module/pay_sheet_transaction_expected_image.png
...tem/image_module/pay_sheet_transaction_expected_image.png
+0
-0
bt5/erp5_payroll_l10n_fr_test/PathTemplateItem/image_module/pay_sheet_transaction_expected_image.xml
...tem/image_module/pay_sheet_transaction_expected_image.xml
+1
-1
No files found.
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_generatePayslipReportContent.zpt
View file @
2e8ef0bb
...
@@ -79,8 +79,8 @@
...
@@ -79,8 +79,8 @@
payslip_data['currency'])">800.000,00</td>
payslip_data['currency'])">800.000,00</td>
</tr>
</tr>
<tr>
<tr>
<td i18n:translate="" i18n:domain="erp5_ui">
dont évolution de la rémunération à la supression des cotisations salariales chômage et maladie
</td>
<td i18n:translate="" i18n:domain="erp5_ui">
Net Social
</td>
<td tal:content="python: quantity_renderer(payslip_data['
amount_of_remuneration_evolution
'])"></td>
<td tal:content="python: quantity_renderer(payslip_data['
net_social
'])"></td>
</tr>
</tr>
</tbody>
</tbody>
</table>
</table>
...
...
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getPayslipData.py
View file @
2e8ef0bb
...
@@ -3,6 +3,7 @@ from DateTime import DateTime
...
@@ -3,6 +3,7 @@ from DateTime import DateTime
line_dict_list
=
context
.
PaySheetTransaction_getLineListAsDict
()
line_dict_list
=
context
.
PaySheetTransaction_getLineListAsDict
()
non_subject_amount
=
'base_amount/payroll/report_section/l10n/fr/amount_non_subject_to_contribution'
non_subject_amount
=
'base_amount/payroll/report_section/l10n/fr/amount_non_subject_to_contribution'
gross_category
=
'base_amount/payroll/report/salary/gross'
gross_category
=
'base_amount/payroll/report/salary/gross'
net_social
=
'base_amount/payroll/report/salary/net_social'
contribution_relief
=
'base_amount/payroll/report_section/l10n/fr/contribution_relief'
contribution_relief
=
'base_amount/payroll/report_section/l10n/fr/contribution_relief'
income_tax
=
'base_amount/payroll/report_section/l10n/fr/income_tax'
income_tax
=
'base_amount/payroll/report_section/l10n/fr/income_tax'
csg_crds_taxable_to_income_tax
=
'base_amount/payroll/report_section/l10n/fr/csg_crds_taxable_to_income_tax'
csg_crds_taxable_to_income_tax
=
'base_amount/payroll/report_section/l10n/fr/csg_crds_taxable_to_income_tax'
...
@@ -191,6 +192,8 @@ if len(non_contribution_dict_list):
...
@@ -191,6 +192,8 @@ if len(non_contribution_dict_list):
gross_salary
=
context
.
PaySheetTransaction_getMovementTotalPriceFromCategory
(
base_contribution
=
"base_contribution/%s"
%
gross_category
)
gross_salary
=
context
.
PaySheetTransaction_getMovementTotalPriceFromCategory
(
base_contribution
=
"base_contribution/%s"
%
gross_category
)
net_social
=
context
.
PaySheetTransaction_getMovementTotalPriceFromCategory
(
base_contribution
=
"base_contribution/%s"
%
net_social
)
# Set contribution_share to 'True' so it will return all movement with 0 contribution share
# Set contribution_share to 'True' so it will return all movement with 0 contribution share
total_pay_by_employer
=
context
.
PaySheetTransaction_getMovementTotalPriceFromCategory
(
total_pay_by_employer
=
context
.
PaySheetTransaction_getMovementTotalPriceFromCategory
(
...
@@ -219,12 +222,14 @@ if DateTime('2018/01/01') <= start_date <= DateTime('2018/09/30'):
...
@@ -219,12 +222,14 @@ if DateTime('2018/01/01') <= start_date <= DateTime('2018/09/30'):
elif
start_date
>=
DateTime
(
'2018/10/01'
):
elif
start_date
>=
DateTime
(
'2018/10/01'
):
amount_of_remuneration_evolution
=
gross_salary
*
0.0315
-
csg_base
*
0.017
amount_of_remuneration_evolution
=
gross_salary
*
0.0315
-
csg_base
*
0.017
net_social
=
net_social
+
gross_salary
+
contribution_employee_total_price
return
{
return
{
"contribution_dict_list"
:
contribution_dict_list
,
"contribution_dict_list"
:
contribution_dict_list
,
"non_contribution_dict_list"
:
non_contribution_dict_list
,
"non_contribution_dict_list"
:
non_contribution_dict_list
,
"gross_salary"
:
gross_salary
,
"gross_salary"
:
gross_salary
,
"net_salary_before_income_tax"
:
net_salary_before_income_tax
,
"net_salary_before_income_tax"
:
net_salary_before_income_tax
,
"net_salary"
:
net_salary
,
"net_salary"
:
net_salary
,
"net_social"
:
net_social
,
"currency"
:
currency
,
"currency"
:
currency
,
"amount_of_remuneration_evolution"
:
amount_of_remuneration_evolution
,
"amount_of_remuneration_evolution"
:
amount_of_remuneration_evolution
,
"income_tax_dict"
:
income_tax_dict
,
"income_tax_dict"
:
income_tax_dict
,
...
...
bt5/erp5_payroll_l10n_fr_test/PathTemplateItem/image_module/pay_sheet_transaction_expected_image.png
View replaced file @
d233dc6b
View file @
2e8ef0bb
28.9 KB
|
W:
|
H:
28.4 KB
|
W:
|
H:
2-up
Swipe
Onion skin
bt5/erp5_payroll_l10n_fr_test/PathTemplateItem/image_module/pay_sheet_transaction_expected_image.xml
View file @
2e8ef0bb
...
@@ -79,7 +79,7 @@
...
@@ -79,7 +79,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
content_md5
</string>
</key>
<key>
<string>
content_md5
</string>
</key>
<value>
<string>
6b29beaea7d11b21ed4ce99010e0ab98
</string>
</value>
<value>
<string>
5a0a74392e9ce70ca65f6f821c2e2bd5
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
content_type
</string>
</key>
<key>
<string>
content_type
</string>
</key>
...
...
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