From d06555b0b0b9a27c8b382f4e38f9c8fe68fe5722 Mon Sep 17 00:00:00 2001
From: Luc De Meyer <luc.demeyer@noviat.com>
Date: Wed, 11 Dec 2019 19:57:00 +0100
Subject: [PATCH 1/3] [12.0][ENH]camt.052 support

---
 account_ebics/__manifest__.py            |  2 +-
 account_ebics/data/ebics_file_format.xml | 14 +++++++++++++-
 account_ebics/wizard/ebics_xfer.py       | 12 +++++++++++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/account_ebics/__manifest__.py b/account_ebics/__manifest__.py
index 0b4f0ea..0ef6e7b 100644
--- a/account_ebics/__manifest__.py
+++ b/account_ebics/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'EBICS banking protocol',
-    'version': '12.0.1.0.0',
+    'version': '12.0.1.0.1',
     'license': 'LGPL-3',
     'author': 'Noviat',
     'category': 'Accounting & Finance',
diff --git a/account_ebics/data/ebics_file_format.xml b/account_ebics/data/ebics_file_format.xml
index bf4738b..a910b5f 100644
--- a/account_ebics/data/ebics_file_format.xml
+++ b/account_ebics/data/ebics_file_format.xml
@@ -14,6 +14,18 @@
       <field name="suffix">c53.xml</field>
     </record>
 
+    <!--
+    File format tested with the following banks:
+    - Kreissparkasse Göppingen (Germany)
+    -->
+    <record id="ebics_ff_camt_052_001_02_stm" model="ebics.file.format">
+      <field name="name">camt.052.001.02.stm</field>
+      <field name="type">down</field>
+      <field name="order_type">C52</field>
+      <field name="description">Bank Statement in Format camt.052</field>
+      <field name="suffix">c52.xml</field>
+    </record>
+
     <!--
     File format tested with the following banks:
     - GLS Gemeinschaftsbank (Germany)
@@ -41,7 +53,7 @@
       <field name="description">Sepa Direct Debit (B2B) Order in Format pain.008.001.02</field>
       <field name="suffix">xml</field>
     </record>
-    
+
     <!--
     File format tested with the following banks:
     - Credit Suisse (Switzerland)
diff --git a/account_ebics/wizard/ebics_xfer.py b/account_ebics/wizard/ebics_xfer.py
index 98502c3..d851f76 100644
--- a/account_ebics/wizard/ebics_xfer.py
+++ b/account_ebics/wizard/ebics_xfer.py
@@ -165,7 +165,7 @@ class EbicsXfer(models.TransientModel):
                 params = {}
                 if order_type == 'FDL':
                     params['filetype'] = df.name
-                if order_type in ['FDL', 'C53']:
+                if order_type in ['FDL', 'C52', 'C53']:
                     params.update({
                         'start':
                             self.date_from and self.date_from.isoformat()
@@ -399,6 +399,7 @@ class EbicsXfer(models.TransientModel):
         """
         res = {
             'camt.xxx.cfonb120.stm': self._handle_cfonb120,
+            'camt.052.001.02.stm': self._handle_camt052,
             'camt.053.001.02.stm': self._handle_camt053,
         }
         return res
@@ -535,6 +536,15 @@ class EbicsXfer(models.TransientModel):
     def _handle_cfonb240(self, data_in):
         return self._insert_line_terminator(data_in, 240)
 
+    def _handle_camt052(self, data_in):
+        """
+        Use this method if you need to fix camt files received
+        from your bank before passing them to the
+        Odoo Community CAMT parser.
+        Remark: Odoo Enterprise doesn't support camt.052.
+        """
+        return data_in
+
     def _handle_camt053(self, data_in):
         """
         Use this method if you need to fix camt files received

From 6b086ac4368c08ef2876a1f0fce54c9a959f1777 Mon Sep 17 00:00:00 2001
From: Luc De Meyer <luc.demeyer@noviat.com>
Date: Thu, 12 Dec 2019 09:52:40 +0100
Subject: [PATCH 2/3] fix

---
 account_ebics/models/ebics_file_format.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/account_ebics/models/ebics_file_format.py b/account_ebics/models/ebics_file_format.py
index b5eb4f4..907dbb1 100644
--- a/account_ebics/models/ebics_file_format.py
+++ b/account_ebics/models/ebics_file_format.py
@@ -48,7 +48,7 @@ class EbicsFileFormat(models.Model):
         return ['FUL', 'CCT', 'CDD', 'CDB', 'XE2', 'XE3']
 
     def _supported_download_order_types(self):
-        return ['FDL', 'C53']
+        return ['FDL', 'C52', 'C53']
 
     @api.model
     def _selection_name(self):
@@ -65,6 +65,7 @@ class EbicsFileFormat(models.Model):
         the doc folder of this module (EBICS_Annex2).
         """
         request_types = [
+            'camt.052.001.02.stm',
             'camt.053.001.02.stm',
             'pain.001.001.03.sct',
             'pain.008.001.02.sdd',

From 65cf8377367d02ca324db1b0f59ed440a1bdea17 Mon Sep 17 00:00:00 2001
From: Luc De Meyer <luc.demeyer@noviat.com>
Date: Wed, 18 Dec 2019 21:23:15 +0100
Subject: [PATCH 3/3] c52 parser method

---
 account_ebics/models/ebics_file.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/account_ebics/models/ebics_file.py b/account_ebics/models/ebics_file.py
index a2db783..8a86a20 100644
--- a/account_ebics/models/ebics_file.py
+++ b/account_ebics/models/ebics_file.py
@@ -128,6 +128,9 @@ class EbicsFile(models.Model):
             'camt.xxx.cfonb120.stm':
                 {'process': self._process_cfonb120,
                  'unlink': self._unlink_cfonb120},
+            'camt.052.001.02.stm':
+                {'process': self._process_camt052,
+                 'unlink': self._unlink_camt052},
             'camt.053.001.02.stm':
                 {'process': self._process_camt053,
                  'unlink': self._unlink_camt053},
@@ -205,6 +208,20 @@ class EbicsFile(models.Model):
         """
         pass
 
+    @staticmethod
+    def _process_camt052(self):
+        import_module = 'account_bank_statement_import_camt_oca'
+        self._check_import_module(import_module)
+        return self._process_camt053(self)
+
+    @staticmethod
+    def _unlink_camt052(self):
+        """
+        Placeholder for camt052 specific actions before removing the
+        EBICS data file and its related bank statements.
+        """
+        pass
+
     @staticmethod
     def _process_camt053(self):
         import_module = 'account_bank_statement_import_camt%'