Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions account_ebics/i18n/account_ebics.pot
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ msgstr ""
#. module: account_ebics
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_change_passphrase_view_form
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_download
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_mark_as_downloaded
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_upload
msgid "Cancel"
msgstr ""
Expand Down Expand Up @@ -311,6 +312,7 @@ msgstr ""

#. module: account_ebics
#: model:ir.model.fields,field_description:account_ebics.field_account_bank_statement__display_name
#: model:ir.model.fields,field_description:account_ebics.field_account_journal__display_name
#: model:ir.model.fields,field_description:account_ebics.field_ebics_admin_order__display_name
#: model:ir.model.fields,field_description:account_ebics.field_ebics_change_passphrase__display_name
#: model:ir.model.fields,field_description:account_ebics.field_ebics_config__display_name
Expand Down Expand Up @@ -602,6 +604,11 @@ msgstr ""
msgid "EBICS Manager"
msgstr ""

#. module: account_ebics
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_mark_as_downloaded
msgid "EBICS Mark as Downloaded"
msgstr ""

#. module: account_ebics
#. odoo-python
#: code:addons/account_ebics/wizards/ebics_xfer.py:0
Expand Down Expand Up @@ -789,6 +796,12 @@ msgstr ""
msgid "EBICS version mismatch."
msgstr ""

#. module: account_ebics
#: model:ir.model.fields,field_description:account_ebics.field_account_journal__ebics_config_id
#: model:ir.model.fields,field_description:account_ebics.field_account_journal__ebics_config_ids
msgid "Ebics Config"
msgstr ""

#. module: account_ebics
#: model:ir.model.fields,field_description:account_ebics.field_ebics_userid__ebics_keys_fn
msgid "Ebics Keys Fn"
Expand Down Expand Up @@ -947,6 +960,7 @@ msgstr ""

#. module: account_ebics
#: model:ir.model.fields,field_description:account_ebics.field_account_bank_statement__id
#: model:ir.model.fields,field_description:account_ebics.field_account_journal__id
#: model:ir.model.fields,field_description:account_ebics.field_ebics_admin_order__id
#: model:ir.model.fields,field_description:account_ebics.field_ebics_change_passphrase__id
#: model:ir.model.fields,field_description:account_ebics.field_ebics_config__id
Expand Down Expand Up @@ -1008,6 +1022,11 @@ msgstr ""
msgid "Invalid XML file."
msgstr ""

#. module: account_ebics
#: model:ir.model,name:account_ebics.model_account_journal
msgid "Journal"
msgstr ""

#. module: account_ebics
#: model:ir.model.fields,field_description:account_ebics.field_ebics_admin_order__write_uid
#: model:ir.model.fields,field_description:account_ebics.field_ebics_change_passphrase__write_uid
Expand Down Expand Up @@ -1035,6 +1054,17 @@ msgstr ""
msgid "Locality Name [L]"
msgstr ""

#. module: account_ebics
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_mark_as_downloaded
msgid "Mark as Downloaded"
msgstr ""

#. module: account_ebics
#: model:ir.actions.act_window,name:account_ebics.ebics_xfer_action_mark_as_downloaded
#: model:ir.ui.menu,name:account_ebics.ebics_xfer_menu_mark_as_downloaded
msgid "Mark files as Downloaded"
msgstr ""

#. module: account_ebics
#: model:ir.model.fields,help:account_ebics.field_ebics_file_format__btf_format
msgid ""
Expand Down Expand Up @@ -1288,6 +1318,7 @@ msgstr ""

#. module: account_ebics
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_download
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_mark_as_downloaded
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_upload
msgid "Select your bank :"
msgstr ""
Expand Down Expand Up @@ -1437,6 +1468,14 @@ msgstr ""
msgid "Test Mode"
msgstr ""

#. module: account_ebics
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_mark_as_downloaded
msgid ""
"The EBICS Files (Bank Statements) selected via this screen will not become available in Odoo as EBICS files but will be marked by your bank as downloaded.\n"
" <br/>\n"
" As a consequence, these Bank Statements will not be retrieved by the next 'EBICS Batch Import' scheduled action."
msgstr ""

#. module: account_ebics
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_config_view_form
msgid ""
Expand Down
42 changes: 42 additions & 0 deletions account_ebics/i18n/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ msgstr "Relevés"
#. module: account_ebics
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_change_passphrase_view_form
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_download
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_mark_as_downloaded
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_upload
msgid "Cancel"
msgstr "Annuler"
Expand Down Expand Up @@ -321,6 +322,7 @@ msgstr "Description"

#. module: account_ebics
#: model:ir.model.fields,field_description:account_ebics.field_account_bank_statement__display_name
#: model:ir.model.fields,field_description:account_ebics.field_account_journal__display_name
#: model:ir.model.fields,field_description:account_ebics.field_ebics_admin_order__display_name
#: model:ir.model.fields,field_description:account_ebics.field_ebics_change_passphrase__display_name
#: model:ir.model.fields,field_description:account_ebics.field_ebics_config__display_name
Expand Down Expand Up @@ -617,6 +619,11 @@ msgstr ""
msgid "EBICS Manager"
msgstr ""

#. module: account_ebics
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_mark_as_downloaded
msgid "EBICS Mark as Downloaded"
msgstr ""

#. module: account_ebics
#. odoo-python
#: code:addons/account_ebics/wizards/ebics_xfer.py:0
Expand Down Expand Up @@ -804,6 +811,12 @@ msgstr ""
msgid "EBICS version mismatch."
msgstr ""

#. module: account_ebics
#: model:ir.model.fields,field_description:account_ebics.field_account_journal__ebics_config_id
#: model:ir.model.fields,field_description:account_ebics.field_account_journal__ebics_config_ids
msgid "Ebics Config"
msgstr ""

#. module: account_ebics
#: model:ir.model.fields,field_description:account_ebics.field_ebics_userid__ebics_keys_fn
msgid "Ebics Keys Fn"
Expand Down Expand Up @@ -965,6 +978,7 @@ msgstr ""

#. module: account_ebics
#: model:ir.model.fields,field_description:account_ebics.field_account_bank_statement__id
#: model:ir.model.fields,field_description:account_ebics.field_account_journal__id
#: model:ir.model.fields,field_description:account_ebics.field_ebics_admin_order__id
#: model:ir.model.fields,field_description:account_ebics.field_ebics_change_passphrase__id
#: model:ir.model.fields,field_description:account_ebics.field_ebics_config__id
Expand Down Expand Up @@ -1026,6 +1040,11 @@ msgstr ""
msgid "Invalid XML file."
msgstr ""

#. module: account_ebics
#: model:ir.model,name:account_ebics.model_account_journal
msgid "Journal"
msgstr ""

#. module: account_ebics
#: model:ir.model.fields,field_description:account_ebics.field_ebics_admin_order__write_uid
#: model:ir.model.fields,field_description:account_ebics.field_ebics_change_passphrase__write_uid
Expand Down Expand Up @@ -1053,6 +1072,17 @@ msgstr "Dernière mise à jour le"
msgid "Locality Name [L]"
msgstr ""

#. module: account_ebics
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_mark_as_downloaded
msgid "Mark as Downloaded"
msgstr ""

#. module: account_ebics
#: model:ir.actions.act_window,name:account_ebics.ebics_xfer_action_mark_as_downloaded
#: model:ir.ui.menu,name:account_ebics.ebics_xfer_menu_mark_as_downloaded
msgid "Mark files as Downloaded"
msgstr ""

#. module: account_ebics
#: model:ir.model.fields,help:account_ebics.field_ebics_file_format__btf_format
msgid ""
Expand Down Expand Up @@ -1312,6 +1342,7 @@ msgstr ""

#. module: account_ebics
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_download
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_mark_as_downloaded
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_upload
msgid "Select your bank :"
msgstr ""
Expand Down Expand Up @@ -1461,6 +1492,17 @@ msgstr ""
msgid "Test Mode"
msgstr "Mode de test"

#. module: account_ebics
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_mark_as_downloaded
msgid ""
"The EBICS Files (Bank Statements) selected via this screen will not become "
"available in Odoo as EBICS files but will be marked by your bank as "
"downloaded.\n"
" <br/>\n"
" As a consequence, these Bank Statements will not be "
"retrieved by the next 'EBICS Batch Import' scheduled action."
msgstr ""

#. module: account_ebics
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_config_view_form
msgid ""
Expand Down
42 changes: 42 additions & 0 deletions account_ebics/i18n/nl.po
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ msgstr "Afschriften"
#. module: account_ebics
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_change_passphrase_view_form
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_download
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_mark_as_downloaded
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_upload
msgid "Cancel"
msgstr "Annuleer"
Expand Down Expand Up @@ -321,6 +322,7 @@ msgstr "Omschrijving"

#. module: account_ebics
#: model:ir.model.fields,field_description:account_ebics.field_account_bank_statement__display_name
#: model:ir.model.fields,field_description:account_ebics.field_account_journal__display_name
#: model:ir.model.fields,field_description:account_ebics.field_ebics_admin_order__display_name
#: model:ir.model.fields,field_description:account_ebics.field_ebics_change_passphrase__display_name
#: model:ir.model.fields,field_description:account_ebics.field_ebics_config__display_name
Expand Down Expand Up @@ -617,6 +619,11 @@ msgstr ""
msgid "EBICS Manager"
msgstr ""

#. module: account_ebics
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_mark_as_downloaded
msgid "EBICS Mark as Downloaded"
msgstr ""

#. module: account_ebics
#. odoo-python
#: code:addons/account_ebics/wizards/ebics_xfer.py:0
Expand Down Expand Up @@ -804,6 +811,12 @@ msgstr ""
msgid "EBICS version mismatch."
msgstr ""

#. module: account_ebics
#: model:ir.model.fields,field_description:account_ebics.field_account_journal__ebics_config_id
#: model:ir.model.fields,field_description:account_ebics.field_account_journal__ebics_config_ids
msgid "Ebics Config"
msgstr ""

#. module: account_ebics
#: model:ir.model.fields,field_description:account_ebics.field_ebics_userid__ebics_keys_fn
msgid "Ebics Keys Fn"
Expand Down Expand Up @@ -965,6 +978,7 @@ msgstr ""

#. module: account_ebics
#: model:ir.model.fields,field_description:account_ebics.field_account_bank_statement__id
#: model:ir.model.fields,field_description:account_ebics.field_account_journal__id
#: model:ir.model.fields,field_description:account_ebics.field_ebics_admin_order__id
#: model:ir.model.fields,field_description:account_ebics.field_ebics_change_passphrase__id
#: model:ir.model.fields,field_description:account_ebics.field_ebics_config__id
Expand Down Expand Up @@ -1026,6 +1040,11 @@ msgstr ""
msgid "Invalid XML file."
msgstr ""

#. module: account_ebics
#: model:ir.model,name:account_ebics.model_account_journal
msgid "Journal"
msgstr ""

#. module: account_ebics
#: model:ir.model.fields,field_description:account_ebics.field_ebics_admin_order__write_uid
#: model:ir.model.fields,field_description:account_ebics.field_ebics_change_passphrase__write_uid
Expand Down Expand Up @@ -1053,6 +1072,17 @@ msgstr "Laatst bijgewerkt op"
msgid "Locality Name [L]"
msgstr ""

#. module: account_ebics
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_mark_as_downloaded
msgid "Mark as Downloaded"
msgstr ""

#. module: account_ebics
#: model:ir.actions.act_window,name:account_ebics.ebics_xfer_action_mark_as_downloaded
#: model:ir.ui.menu,name:account_ebics.ebics_xfer_menu_mark_as_downloaded
msgid "Mark files as Downloaded"
msgstr ""

#. module: account_ebics
#: model:ir.model.fields,help:account_ebics.field_ebics_file_format__btf_format
msgid ""
Expand Down Expand Up @@ -1312,6 +1342,7 @@ msgstr ""

#. module: account_ebics
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_download
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_mark_as_downloaded
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_upload
msgid "Select your bank :"
msgstr ""
Expand Down Expand Up @@ -1461,6 +1492,17 @@ msgstr ""
msgid "Test Mode"
msgstr ""

#. module: account_ebics
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_xfer_view_form_mark_as_downloaded
msgid ""
"The EBICS Files (Bank Statements) selected via this screen will not become "
"available in Odoo as EBICS files but will be marked by your bank as "
"downloaded.\n"
" <br/>\n"
" As a consequence, these Bank Statements will not be "
"retrieved by the next 'EBICS Batch Import' scheduled action."
msgstr ""

#. module: account_ebics
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_config_view_form
msgid ""
Expand Down
1 change: 1 addition & 0 deletions account_ebics/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from . import fintech_ebics_register
from . import account_bank_statement
from . import account_journal
from . import ebics_config
from . import ebics_file
from . import ebics_file_format
Expand Down
26 changes: 26 additions & 0 deletions account_ebics/models/account_journal.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Copyright 2026 Noviat.
# License LGPL-3 or later (https://www.gnu.org/licenses/lgpl).

from odoo import api, fields, models


class AccountJournal(models.Model):
_inherit = "account.journal"

ebics_config_ids = fields.Many2many(
comodel_name="ebics.config",
relation="account_journal_ebics_config_rel",
readonly=True,
)
ebics_config_id = fields.Many2one(
comodel_name="ebics.config",
compute="_compute_ebics_config_id",
compute_sudo=True,
)

@api.depends("ebics_config_ids")
def _compute_ebics_config_id(self):
for rec in self:
rec.ebics_config_id = rec.ebics_config_ids.filtered(
lambda r: r.state == "confirm"
)[:1]
29 changes: 7 additions & 22 deletions account_ebics/models/ebics_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ class EbicsConfig(models.Model):
comodel_name="res.company",
relation="ebics_config_res_company_rel",
string="Companies",
readonly=True,
compute="_compute_company_ids",
store=True,
help="Companies sharing this EBICS contract.",
)

Expand Down Expand Up @@ -154,34 +155,18 @@ def _check_order_number(self):
)
)

@api.depends("journal_ids.company_id")
def _compute_company_ids(self):
for rec in self:
rec.company_ids = rec.journal_ids.mapped("company_id")

@api.ondelete(at_uninstall=False)
def _unlink_except_confirm(self):
if any(rec.state == "confirm" for rec in self):
raise UserError(
self.env._("You cannot remove active EBICS configurations.")
)

def write(self, vals):
"""
Due to the multi-company nature of the EBICS config we
need to adapt the company_ids in the write method.
"""
if "journal_ids" not in vals:
return super().write(vals)
for rec in self:
old_company_ids = rec.journal_ids.mapped("company_id").ids
super(EbicsConfig, rec).write(vals)
new_company_ids = rec.journal_ids.mapped("company_id").ids
updates = []
for cid in new_company_ids:
if cid in old_company_ids:
old_company_ids.remove(cid)
else:
updates += [(4, cid)]
updates += [(3, x) for x in old_company_ids]
super(EbicsConfig, rec).write({"company_ids": updates})
return True

def set_to_draft(self):
return self.write({"state": "draft"})

Expand Down
Loading
Loading