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
140
Merge Requests
140
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
92bfec97
Commit
92bfec97
authored
Jun 06, 2018
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_payroll_l10n_fr: remove CVAE from DSN reports
parent
2fa0c313
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
16 deletions
+7
-16
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/DSNMonthlyReport_makeReport.py
...skins/erp5_payroll_l10n_fr/DSNMonthlyReport_makeReport.py
+0
-2
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/Organisation_getAnnualTaxDictList.py
...erp5_payroll_l10n_fr/Organisation_getAnnualTaxDictList.py
+7
-14
No files found.
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/DSNMonthlyReport_makeReport.py
View file @
92bfec97
...
...
@@ -204,8 +204,6 @@ elif len(paysheet_list):
if
organisation
==
establishment
:
tax_list
=
organisation
.
Organisation_getAnnualTaxDictList
(
context
)
for
tax
in
tax_list
:
if
tax
[
'tax_code'
]
==
'011'
:
dsn_file
.
append
(
getDSNBlockDict
(
block_id
=
'S21.G00.42'
,
target
=
establishment
))
dsn_file
.
append
(
getDSNBlockDict
(
block_id
=
'S21.G00.44'
,
target
=
establishment
,
**
tax
))
...
...
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/Organisation_getAnnualTaxDictList.py
View file @
92bfec97
...
...
@@ -16,24 +16,17 @@ tax_property_name_list = {
'continuous_short_term_professional_training_fee_liability'
:
(
'013'
,
'014'
),
}
if
dsn_report
.
getEffectiveDate
().
month
()
==
5
:
tax
=
'cvae_fee_liability'
result
=
{
'tax_code'
:
''
,
'amount'
:
0.
,
# TODO: get amount right
}
if
context
.
getProperty
(
tax
,
False
):
result
[
'tax_code'
]
=
tax_property_name_list
[
'cvae_fee_liability'
][
0
]
else
:
result
[
'tax_code'
]
=
tax_property_name_list
[
'cvae_fee_liability'
][
1
]
return
result
year_start_date
=
DateTime
(
dsn_report
.
getEffectiveDate
().
year
(),
1
,
1
)
year_stop_date
=
DateTime
(
dsn_report
.
getEffectiveDate
().
year
(),
12
,
31
)
for
tax
,
value_list
in
tax_property_name_list
.
items
():
is_subjected
=
context
.
getProperty
(
tax
,
False
)
# CVAE is now out of DSN's scope, so always declare as not subjected
# http://dsn-info.custhelp.com/app/answers/detail/a_id/1885
if
tax
==
'cvae_fee_liability'
:
is_subjected
=
False
else
:
is_subjected
=
context
.
getProperty
(
tax
,
False
)
amount
=
0.
if
is_subjected
:
amount
=
portal
.
portal_simulation
.
getInventory
(
...
...
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