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

Merge pull request #81 from Noviat/14-imp-no-transaction-handling

Browse Source 
14 imp no transaction handling
This commit is contained in:
Luc De Meyer 2023-04-02 11:33:19 +02:00 committed by GitHub
commit e7fc1d9b86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 29 additions and 18 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",
"version": "14.0.1.1.1",
"version": "14.0.1.1.2",
"license": "LGPL-3",
"author": "Noviat",
"website": "https://www.noviat.com",

28
account_ebics/models/ebics_file.py
View File

@ -65,7 +65,7 @@ class EbicsFile(models.Model):
readonly=True,
)
note = fields.Text(string="Notes")
note_process = fields.Text(string="Notes")
note_process = fields.Text(string="Process Notes")
company_ids = fields.Many2many(
comodel_name="res.company",
string="Companies",
@ -87,7 +87,7 @@ class EbicsFile(models.Model):
return super(EbicsFile, self).unlink()
def set_to_draft(self):
return self.write({"state": "draft"})
return self.write({"state": "draft", "note": False})
def set_to_done(self):
return self.write({"state": "done"})
@ -219,10 +219,11 @@ class EbicsFile(models.Model):
error_cnt += 1
elif notif["type"] == "warning":
warning_cnt += 1
parts = [notif[k] for k in notif if k in ("message", "details")]
parts = [
notif[k] for k in notif if k in ("message", "details") and notif[k]
]
self.note_process += "\n".join(parts)
self.note_process += "\n\n"
self.note_process += "\n"
if error_cnt:
self.note_process += (
_("Number of errors detected during import: %s: ") % error_cnt
@ -233,8 +234,9 @@ class EbicsFile(models.Model):
_("Number of watnings detected during import: %s: ") % warning_cnt
)
if st_cnt:
self.note_process += "\n\n"
self.note_process += _("%s bank statements have been imported: ") % st_cnt
if self.note_process:
self.note_process += "\n\n"
self.note_process += _("%s bank statement(s) have been imported: ") % st_cnt
self.note_process += "\n"
for st_data in sts_data:
self.note_process += ("\n%s, %s (%s)") % (
@ -293,6 +295,8 @@ class EbicsFile(models.Model):
"account.action_bank_statement_tree"
)
result_action["context"] = safe_eval(result_action["context"])
transactions = False
statement_ids = []
notifications = []
for i, wiz_vals in enumerate(wiz_vals_list, start=1):
@ -316,7 +320,10 @@ class EbicsFile(models.Model):
fn=statement_filename,
)
wiz.import_single_file(file_data, result)
if not result["statement_ids"]:
if result["statement_ids"]:
transactions = True
statement_ids.extend(result["statement_ids"])
elif not result.get("no_transactions"):
message = msg_hdr.format(_("Warning"))
message += _(
"You have already imported this file, or this file "
@ -328,8 +335,7 @@ class EbicsFile(models.Model):
"message": message,
}
]
else:
statement_ids.extend(result["statement_ids"])
transactions = True
notifications.extend(result["notifications"])
except UserError as e:
@ -353,6 +359,10 @@ class EbicsFile(models.Model):
}
]
if not transactions:
message = _("This file doesn't contain any transaction.")
notifications = [{"type": "warning", "message": message, "details": ""}]
self.note = message
result_action["context"]["notifications"] = notifications
result_action["domain"] = [("id", "in", statement_ids)]
return self._process_result_action(result_action)

2
account_ebics/models/ebics_userid.py
View File

@ -107,7 +107,7 @@ class EbicsUserID(models.Model):
"by means of the SWIFT 3SKey token.",
)
swift_3skey_certificate = fields.Binary(string="3SKey Certficate")
swift_3skey_certificate_fn = fields.Char(string="EBICS Public Bank Keys Filename")
swift_3skey_certificate_fn = fields.Char(string="EBICS certificate name")
# X.509 Distinguished Name attributes used to
# create self-signed X.509 certificates
ebics_key_x509 = fields.Boolean(

2
account_ebics/wizards/ebics_xfer.py
View File

@ -65,7 +65,7 @@ class EbicsXfer(models.TransientModel):
date_from = fields.Date()
date_to = fields.Date()
upload_data = fields.Binary(string="File to Upload")
upload_fname = fields.Char(string="Upload Filename", default="")
upload_fname = fields.Char(default="")
upload_fname_dummy = fields.Char(
related="upload_fname", string="Upload Filename", readonly=True
)

4
account_ebics_oca_statement_import/__manifest__.py
View File

@ -1,10 +1,10 @@
# Copyright 2020 Noviat.
# Copyright 2009-2023 Noviat.
# License LGPL-3 or later (http://www.gnu.org/licenses/lpgl).
{
"name": "account_ebics with OCA Bank Statement Imoort",
"summary": "Use OCA Bank Statement Import with account_ebics",
"version": "14.0.1.0.0",
"version": "14.0.1.0.1",
"author": "Noviat",
"category": "Hidden",
"license": "LGPL-3",

9
account_ebics_oca_statement_import/wizards/account_statement_import.py
View File

@ -1,4 +1,4 @@
# Copyright 2009-2020 Noviat.
# Copyright 2009-2023 Noviat.
# License LGPL-3 or later (http://www.gnu.org/licenses/lpgl).
import logging
@ -53,8 +53,9 @@ class AccountStatementImport(models.TransientModel):
break
if not transactions:
message = _("This file doesn't contain any transaction.")
st_line_ids = []
notifications = {"type": "warning", "message": message, "details": ""}
return st_line_ids, [notifications]
result["notifications"].append(
{"type": "warning", "message": message, "details": ""}
)
result["no_transactions"] = True
return super()._create_bank_statements(stmts_vals, result)