erp5_payroll_l10n_fr: remove CVAE from DSN reports

bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/DSNMonthlyReport_makeReport.py

@@ -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

@@ -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():
+  # 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(