accounting_l10n_fr: Workaround encoding bugs in Test Compta Demat

This removes some characters causing 'Erreur Wide character in
subroutine entry' bugs in Test Compta Demat from the XML output

bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransactionModule_aggregateFrenchAccountingTransactionFile.py

+# coding: utf-8
 from cStringIO import StringIO
 import zipfile
 from Products.ERP5Type.Message import translateString
@@ -11,6 +12,16 @@ result_list = active_process.getResultList()
 fec_file = context.AccountingTransactionModule_viewComptabiliteAsFECXML(
       at_date=at_date,
       result_list=result_list)
+if test_compta_demat_compatibility:
+  fec_file = (fec_file
+    # https://github.com/DGFiP/Test-Compta-Demat/issues/37
+    .replace(u"’", u"'")
+    .replace(u"Œ", u"OE")
+    .replace(u"œ", u"oe")
+    .replace(u"Ÿ", u"Y")
+    # https://github.com/DGFiP/Test-Compta-Demat/issues/39
+    .replace(u"€", u"EUR")
+)
 
 zipbuffer = StringIO()
 zipfilename = at_date.strftime('FEC-%Y%m%d.zip')

bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransactionModule_aggregateFrenchAccountingTransactionFile.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>at_date, active_process, user_name</string> </value>
+            <value> <string>at_date, active_process, user_name, test_compta_demat_compatibility</string> </value>
         </item>
         <item>
             <key> <string>_proxy_roles</string> </key>

bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransactionModule_viewFrenchAccountingTransactionFile.py

@@ -29,7 +29,9 @@ context.activate().AccountingTransactionModule_viewFrenchAccountingTransactionFi
   tag=tag,
   aggregate_tag=aggregate_tag,
   date_column=date_column,
-  search_kw=search_kw)
+  search_kw=search_kw,
+  test_compta_demat_compatibility=True
+)
 
 return context.Base_redirect(form_id, keep_items=dict(
               portal_status_message=translateString("Report Started")))

bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransactionModule_viewFrenchAccountingTransactionFileActive.py

@@ -105,4 +105,6 @@ for journal_code, journal_lib, journal_search_kw in _groupedJournalTupleDict():
 context.activate(after_tag=(tag, aggregate_tag)).AccountingTransactionModule_aggregateFrenchAccountingTransactionFile(
   at_date,
   active_process.getRelativeUrl(),
-  user_name=user_name)
+  user_name=user_name,
+  test_compta_demat_compatibility=test_compta_demat_compatibility,
+)

bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransactionModule_viewFrenchAccountingTransactionFileActive.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>section_category, section_category_strict, from_date, at_date, group_by, simulation_state, ledger, user_name=None, tag=None, aggregate_tag=None, date_column=None, search_kw=None, **kw</string> </value>
+            <value> <string>section_category, section_category_strict, from_date, at_date, group_by, simulation_state, ledger, user_name=None, tag=None, aggregate_tag=None, date_column=None, search_kw=None, test_compta_demat_compatibility=False, **kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_accounting_l10n_fr/TestTemplateItem/portal_components/test.erp5.testAccounting_l10n_fr.py

@@ -109,6 +109,22 @@ class TestAccounting_l10n_fr(AccountingTestCase):
     self.assertFalse(xmlschema.validate(etree.fromstring('<invalide/>')))
     xmlschema.assertValid(tree)
 
+  def getFECFromMailMessage(self):
+    last_message = self.portal.MailHost._last_message
+    self.assertNotEqual((), last_message)
+    _, mto, message_text = last_message
+    self.assertEqual('"%s" <%s>' % (self.first_name, self.recipient_email_address), mto[0])
+    mail_message = email.message_from_string(message_text)
+    for part in mail_message.walk():
+      content_type = part.get_content_type()
+      file_name = part.get_filename()
+      if file_name == 'FEC-20141231.zip':
+        self.assertEqual('application/zip', content_type)
+        data = part.get_payload(decode=True)
+        zf = zipfile.ZipFile(StringIO(data))
+        return zf.open("FEC.xml").read()
+    self.fail("Attachment not found")
+
   def test_FEC(self):
     account_module = self.portal.account_module
     self._makeOne(
@@ -146,23 +162,7 @@ class TestAccounting_l10n_fr(AccountingTestCase):
         simulation_state=['delivered'])
     self.tic()
 
-    fec_xml = ''
-    last_message = self.portal.MailHost._last_message
-    self.assertNotEqual((), last_message)
-    _, mto, message_text = last_message
-    self.assertEqual('"%s" <%s>' % (self.first_name, self.recipient_email_address), mto[0])
-    mail_message = email.message_from_string(message_text)
-    for part in mail_message.walk():
-      content_type = part.get_content_type()
-      file_name = part.get_filename()
-      if file_name == 'FEC-20141231.zip':
-        self.assertEqual('application/zip', content_type)
-        data = part.get_payload(decode=True)
-        zf = zipfile.ZipFile(StringIO(data))
-        fec_xml = zf.open("FEC.xml").read()
-        break
-    else:
-      self.fail("Attachment not found")
+    fec_xml = self.getFECFromMailMessage()
 
     tree = etree.fromstring(fec_xml)
     self.validateFECXML(tree)
@@ -233,27 +233,8 @@ class TestAccounting_l10n_fr(AccountingTestCase):
         ledger=ledger_list)
     self.tic()
 
-    fec_xml = ''
-    last_message = self.portal.MailHost._last_message
-    self.assertNotEqual((), last_message)
-    _, mto, message_text = last_message
-    self.assertEqual('"%s" <%s>' % (self.first_name, self.recipient_email_address), mto[0])
-    mail_message = email.message_from_string(message_text)
-    for part in mail_message.walk():
-      content_type = part.get_content_type()
-      file_name = part.get_filename()
-      if file_name == 'FEC-20141231.zip':
-        self.assertEqual('application/zip', content_type)
-        data = part.get_payload(decode=True)
-        zf = zipfile.ZipFile(StringIO(data))
-        fec_xml = zf.open("FEC.xml").read()
-        break
-    else:
-      self.fail("Attachment not found")
-
-    tree = etree.fromstring(fec_xml)
+    tree = etree.fromstring(self.getFECFromMailMessage())
     self.validateFECXML(tree)
-
     return tree
 
   def test_FECWithOneLedger(self):
@@ -437,6 +418,42 @@ class TestAccounting_l10n_fr(AccountingTestCase):
     tree = etree.fromstring(invoice.AccountingTransaction_viewAsDestinationFECXML())
     self.assertEqual(tree.xpath('//ValidDate/text()'), ['2001-02-03'])
 
+  def test_EscapeTestComptaDematUnsupportedCharacters(self):
+    # Workaround bugs with Test Compta Demat
+    # https://github.com/DGFiP/Test-Compta-Demat/issues/37
+    # https://github.com/DGFiP/Test-Compta-Demat/issues/39
+
+    account_module = self.portal.account_module
+    self._makeOne(
+      portal_type='Purchase Invoice Transaction',
+      title='Des œufs, des Œufs, des Ÿ et des €',
+      simulation_state='delivered',
+      reference='1',
+      source_section_value=self.organisation_module.supplier,
+      stop_date=DateTime(2014, 2, 2),
+      lines=(
+        dict(
+          destination_value=account_module.payable, destination_debit=132.00),
+        dict(
+          destination_value=account_module.refundable_vat,
+          destination_credit=22.00),
+        dict(
+          destination_value=account_module.goods_purchase,
+          destination_credit=110.00)))
+    self.tic()
+    self.portal.accounting_module.AccountingTransactionModule_viewFrenchAccountingTransactionFile(
+      section_category='group/demo_group',
+      section_category_strict=False,
+      at_date=DateTime(2014, 12, 31),
+      simulation_state=['delivered'])
+    self.tic()
+
+    tree = etree.fromstring(self.getFECFromMailMessage())
+    self.validateFECXML(tree)
+    self.assertEqual(
+      tree.xpath('//EcritureLib/text()'),
+      [u'Des oeufs, des OEufs, des Y et des EUR'])
+
 
 def test_suite():
   suite = unittest.TestSuite()