From 8fe8573906f634defb036b0e99b89519e64ca79e Mon Sep 17 00:00:00 2001
From: Luc De Meyer <luc.demeyer@noviat.com>
Date: Mon, 26 Dec 2022 18:37:23 +0100
Subject: [PATCH] 11.0 account_ebics - add camt 052 and 054 support

---
 account_ebics/data/ebics_file_format.xml | 8 ++++++++
 account_ebics/models/ebics_file.py       | 7 ++++++-
 account_ebics/wizard/ebics_xfer.py       | 2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/account_ebics/data/ebics_file_format.xml b/account_ebics/data/ebics_file_format.xml
index 5c36d10..079a8f8 100644
--- a/account_ebics/data/ebics_file_format.xml
+++ b/account_ebics/data/ebics_file_format.xml
@@ -84,6 +84,14 @@
       <field name="suffix">xml</field>
     </record>
 
+    <record id="ebics_ff_camt_054_001_02_rdd" model="ebics.file.format">
+      <field name="name">camt.054.001.02.rdd</field>
+      <field name="type">down</field>
+      <field name="order_type">FDL</field>
+      <field name="description">Bank Statement in Format camt.054</field>
+      <field name="suffix">c54.xml</field>
+    </record>
+
     <!--
     File format tested with the following banks:
     - CIC (France)
diff --git a/account_ebics/models/ebics_file.py b/account_ebics/models/ebics_file.py
index 7960ee4..8f1e3b6 100644
--- a/account_ebics/models/ebics_file.py
+++ b/account_ebics/models/ebics_file.py
@@ -78,7 +78,8 @@ class EbicsFile(models.Model):
             if ff in ff_methods:
                 if ff_methods[ff].get('unlink'):
                     ff_methods[ff]['unlink'](ebics_file)
-            # remove bank statements
+                elif ff[:7] == 'camt.05' and ff_methods[ff[:8]].get('unlink'):
+                    ff_methods[ff[:8]]['unlink'](self)
             ebics_file.bank_statement_ids.unlink()
         return super(EbicsFile, self).unlink()
 
@@ -101,6 +102,10 @@ class EbicsFile(models.Model):
                 res = ff_methods[ff]['process'](self)
                 self.state = 'done'
                 return res
+            elif ff[:7] == 'camt.05' and ff_methods[ff[:8]].get('process'):
+                res = ff_methods[ff[:8]]['process'](self)
+                self.state = 'done'
+                return res
         else:
             return self._process_undefined_format()
 
diff --git a/account_ebics/wizard/ebics_xfer.py b/account_ebics/wizard/ebics_xfer.py
index 8cc3886..bd2bcb0 100644
--- a/account_ebics/wizard/ebics_xfer.py
+++ b/account_ebics/wizard/ebics_xfer.py
@@ -166,7 +166,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', 'C54']:
                     params.update({
                         'start': self.date_from or None,
                         'end': self.date_to or None,