mirror of
https://github.com/brain-tec/account_ebics.git
synced 2024-11-23 12:42:04 +00:00
[HOTFIX] to process camt052 files
This commit is contained in:
parent
0717980660
commit
cc2f902584
@ -442,7 +442,7 @@ class EbicsFile(models.Model):
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
res = {"statement_ids": [], "notifications": []}
|
res = {"statement_ids": [], "notifications": []}
|
||||||
st_datas = self._split_camt(res)
|
st_datas = self._split_camt(res, file_format)
|
||||||
if author == "oca":
|
if author == "oca":
|
||||||
self._process_bank_statement_oca(res, st_datas)
|
self._process_bank_statement_oca(res, st_datas)
|
||||||
else:
|
else:
|
||||||
@ -529,7 +529,7 @@ class EbicsFile(models.Model):
|
|||||||
EBICS data file and its related bank statements.
|
EBICS data file and its related bank statements.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def _split_camt(self, res):
|
def _split_camt(self, res, file_format):
|
||||||
"""
|
"""
|
||||||
Split CAMT file received via EBICS per statement.
|
Split CAMT file received via EBICS per statement.
|
||||||
Statements without transactions are removed.
|
Statements without transactions are removed.
|
||||||
@ -541,7 +541,10 @@ class EbicsFile(models.Model):
|
|||||||
message = _("Invalid XML file.")
|
message = _("Invalid XML file.")
|
||||||
res["notifications"].append({"type": "error", "message": message})
|
res["notifications"].append({"type": "error", "message": message})
|
||||||
ns = {k or "ns": v for k, v in root.nsmap.items()}
|
ns = {k or "ns": v for k, v in root.nsmap.items()}
|
||||||
stmts = root[0].findall("ns:Stmt", ns)
|
tag_to_find = "ns:Stmt"
|
||||||
|
if file_format == 'camt052':
|
||||||
|
tag_to_find = "ns:Rpt"
|
||||||
|
stmts = root[0].findall(tag_to_find, ns)
|
||||||
for i, stmt in enumerate(stmts):
|
for i, stmt in enumerate(stmts):
|
||||||
acc_number = sanitize_account_number(
|
acc_number = sanitize_account_number(
|
||||||
stmt.xpath(
|
stmt.xpath(
|
||||||
@ -559,7 +562,7 @@ class EbicsFile(models.Model):
|
|||||||
|
|
||||||
root_new = deepcopy(root)
|
root_new = deepcopy(root)
|
||||||
entries = False
|
entries = False
|
||||||
for j, el in enumerate(root_new[0].findall("ns:Stmt", ns)):
|
for j, el in enumerate(root_new[0].findall(tag_to_find, ns)):
|
||||||
if j != i:
|
if j != i:
|
||||||
el.getparent().remove(el)
|
el.getparent().remove(el)
|
||||||
else:
|
else:
|
||||||
|
Loading…
Reference in New Issue
Block a user