Mirror/odoo_account_ebics
2
0
Fork 0
mirror of https://github.com/brain-tec/account_ebics.git synced 2024-11-22 20:22:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40 from Noviat/14-fix-stack-trace

Browse Source 
[14.0]account_ebics - fix stack trace when using Odoo OE statement im…
This commit is contained in:
Luc De Meyer 2022-08-05 12:32:28 +02:00 committed by GitHub
commit b0b5ca9e57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
account_ebics/__manifest__.py
View File

@ -3,7 +3,7 @@
{ {
"name": "EBICS banking protocol", "name": "EBICS banking protocol",
"version": "14.0.1.0.3", "version": "14.0.1.0.4",
"license": "LGPL-3", "license": "LGPL-3",
"author": "Noviat", "author": "Noviat",
"website": "www.noviat.com", "website": "www.noviat.com",

21
account_ebics/models/ebics_file.py
View File

@ -168,10 +168,12 @@ class EbicsFile(models.Model):
return False return False
return True return True
def _process_result_action(self, res): def _process_result_action(self, res, parser="oca"):
notifications = [] notifications = []
st_line_ids = [] st_line_ids = []
statement_ids = [] statement_ids = []
sts_data = []
if parser == "oca":
if res.get("context"): if res.get("context"):
notifications = res["context"].get("notifications", []) notifications = res["context"].get("notifications", [])
st_line_ids = res["context"].get("statement_line_ids", []) st_line_ids = res["context"].get("statement_line_ids", [])
@ -204,8 +206,21 @@ class EbicsFile(models.Model):
(tuple(st_line_ids),), (tuple(st_line_ids),),
) )
sts_data = self.env.cr.dictfetchall() sts_data = self.env.cr.dictfetchall()
elif parser == "oe":
if res.get("res_id"):
st_ids = res["res_id"]
else: else:
sts_data = [] st_ids = res["domain"][2]
statements = self.env["account.bank.statement"].browse(st_ids)
for statement in statements:
sts_data.append(
{
"statement_id": statement.id,
"date": statement.date,
"name": statement.name,
"company_name": statement.company_id.name,
}
)
st_cnt = len(sts_data) st_cnt = len(sts_data)
if st_cnt: if st_cnt:
self.note_process += _("%s bank statements have been imported: ") % st_cnt self.note_process += _("%s bank statements have been imported: ") % st_cnt
@ -414,7 +429,7 @@ class EbicsFile(models.Model):
_("No financial journal found for Company Bank Account %s") _("No financial journal found for Company Bank Account %s")
% bank_account % bank_account
) )
return self._process_result_action(res) return self._process_result_action(res, parser="oe")
@staticmethod @staticmethod
def _unlink_camt053(self): def _unlink_camt053(self):