Commit 92bfec97 authored by Nicolas Wavrant's avatar Nicolas Wavrant

erp5_payroll_l10n_fr: remove CVAE from DSN reports

parent 2fa0c313
...@@ -204,8 +204,6 @@ elif len(paysheet_list): ...@@ -204,8 +204,6 @@ elif len(paysheet_list):
if organisation == establishment: if organisation == establishment:
tax_list = organisation.Organisation_getAnnualTaxDictList(context) tax_list = organisation.Organisation_getAnnualTaxDictList(context)
for tax in tax_list: 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)) dsn_file.append(getDSNBlockDict(block_id='S21.G00.44', target=establishment, **tax))
......
...@@ -16,24 +16,17 @@ tax_property_name_list = { ...@@ -16,24 +16,17 @@ tax_property_name_list = {
'continuous_short_term_professional_training_fee_liability': ('013', '014'), '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_start_date = DateTime(dsn_report.getEffectiveDate().year(), 1, 1)
year_stop_date = DateTime(dsn_report.getEffectiveDate().year(), 12, 31) year_stop_date = DateTime(dsn_report.getEffectiveDate().year(), 12, 31)
for tax, value_list in tax_property_name_list.items(): for tax, value_list in tax_property_name_list.items():
# 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) is_subjected = context.getProperty(tax, False)
amount = 0. amount = 0.
if is_subjected: if is_subjected:
amount = portal.portal_simulation.getInventory( amount = portal.portal_simulation.getInventory(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment