Mirror/odoo_account_ebics
2
0
Fork 0
mirror of https://github.com/brain-tec/account_ebics.git synced 2025-01-22 22:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #54 from Noviat/18.0

Browse Source 
Syncing from upstream Noviat/account_ebics (18.0)
This commit is contained in:
braintec 2025-01-05 10:07:39 +01:00 committed by GitHub
commit c142e0e997
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
19 changed files with 640 additions and 562 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
account_ebics/__manifest__.py
View File

@ -1,4 +1,4 @@
# Copyright 2009-2024 Noviat. # Copyright 2009-2025 Noviat.
# License LGPL-3 or later (http://www.gnu.org/licenses/lgpl). # License LGPL-3 or later (http://www.gnu.org/licenses/lgpl).
{ {

4
account_ebics/i18n/account_ebics.pot
View File

@ -323,6 +323,7 @@ msgstr ""
#. module: account_ebics #. module: account_ebics
#: model:ir.model.fields.selection,name:account_ebics.selection__ebics_file__state__done #: model:ir.model.fields.selection,name:account_ebics.selection__ebics_file__state__done
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_search
msgid "Done" msgid "Done"
msgstr "" msgstr ""
@ -355,6 +356,7 @@ msgid "Download Only"
msgstr "" msgstr ""
#. module: account_ebics #. module: account_ebics
#: model:ir.model.fields,field_description:account_ebics.field_ebics_file__download_process_method
#: model:ir.model.fields,field_description:account_ebics.field_ebics_file_format__download_process_method #: model:ir.model.fields,field_description:account_ebics.field_ebics_file_format__download_process_method
msgid "Download Process Method" msgid "Download Process Method"
msgstr "" msgstr ""
@ -368,6 +370,7 @@ msgstr ""
#: model:ir.model.fields.selection,name:account_ebics.selection__ebics_config__state__draft #: model:ir.model.fields.selection,name:account_ebics.selection__ebics_config__state__draft
#: model:ir.model.fields.selection,name:account_ebics.selection__ebics_file__state__draft #: model:ir.model.fields.selection,name:account_ebics.selection__ebics_file__state__draft
#: model:ir.model.fields.selection,name:account_ebics.selection__ebics_userid__state__draft #: model:ir.model.fields.selection,name:account_ebics.selection__ebics_userid__state__draft
#: model_terms:ir.ui.view,arch_db:account_ebics.ebics_file_view_search
msgid "Draft" msgid "Draft"
msgstr "" msgstr ""
@ -819,6 +822,7 @@ msgid "Enable 3SKey support"
msgstr "" msgstr ""
#. module: account_ebics #. module: account_ebics
#: model:ir.model.fields,help:account_ebics.field_ebics_file__download_process_method
#: model:ir.model.fields,help:account_ebics.field_ebics_file_format__download_process_method #: model:ir.model.fields,help:account_ebics.field_ebics_file_format__download_process_method
msgid "" msgid ""
"Enable processing within Odoo of the downloaded file via the 'Process' " "Enable processing within Odoo of the downloaded file via the 'Process' "

15
account_ebics/migrations/17.0.1.2/post-migration.py Normal file
View File

@ -0,0 +1,15 @@
# Copyright 2009-2025 Noviat.
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
def migrate(cr, version):
cr.execute( # pylint: disable=E8103
"""
UPDATE ebics_file ef
SET state = 'done'
FROM ebics_file_format eff
WHERE ef.format_id = eff.id
AND eff.type = 'down'
AND eff.download_process_method IS NULL;
"""
)

8
account_ebics/models/ebics_file.py
View File

@ -1,4 +1,4 @@
# Copyright 2009-2024 Noviat. # Copyright 2009-2025 Noviat.
# License LGPL-3 or later (http://www.gnu.org/licenses/lgpl). # License LGPL-3 or later (http://www.gnu.org/licenses/lgpl).
import base64 import base64
@ -36,7 +36,10 @@ class EbicsFile(models.Model):
format_id = fields.Many2one( format_id = fields.Many2one(
comodel_name="ebics.file.format", string="EBICS File Formats", readonly=True comodel_name="ebics.file.format", string="EBICS File Formats", readonly=True
) )
type = fields.Selection(related="format_id.type", readonly=True) download_process_method = fields.Selection(
related="format_id.download_process_method"
)
type = fields.Selection(related="format_id.type")
date_from = fields.Date( date_from = fields.Date(
readonly=True, help="'Date From' as entered in the download wizard." readonly=True, help="'Date From' as entered in the download wizard."
) )
@ -306,7 +309,6 @@ class EbicsFile(models.Model):
return { return {
"name": self.env._("Import EBICS File"), "name": self.env._("Import EBICS File"),
"res_id": self.id, "res_id": self.id,
"view_type": "form",
"view_mode": "form", "view_mode": "form",
"res_model": self._name, "res_model": self._name,
"view_id": result_view.id, "view_id": result_view.id,

1
account_ebics/models/ebics_userid.py
View File

@ -587,7 +587,6 @@ class EbicsUserID(models.Model):
view = self.env.ref("%s.ebics_change_passphrase_view_form" % module) view = self.env.ref("%s.ebics_change_passphrase_view_form" % module)
return { return {
"name": self.env._("EBICS keys change passphrase"), "name": self.env._("EBICS keys change passphrase"),
"view_type": "form",
"view_mode": "form", "view_mode": "form",
"res_model": "ebics.change.passphrase", "res_model": "ebics.change.passphrase",
"view_id": view.id, "view_id": view.id,

54
account_ebics/security/ebics_security.xml
View File

@ -1,40 +1,40 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<record model="res.groups" id="group_ebics_manager"> <record model="res.groups" id="group_ebics_manager">
<field name="name">EBICS Manager</field> <field name="name">EBICS Manager</field>
<field name="category_id" ref="base.module_category_hidden" /> <field name="category_id" ref="base.module_category_hidden" />
</record>
<data noupdate="1">
<record id="ebics_config_comp_rule" model="ir.rule">
<field name="name">EBICS Configuration model company rule</field>
<field name="model_id" ref="model_ebics_config" />
<field eval="True" name="global" />
<field
name="domain_force"
>['|', ('company_ids', '=', False), ('company_ids', 'in', user.company_ids.ids)]</field>
</record> </record>
<record id="ebics_userid_comp_rule" model="ir.rule"> <data noupdate="1">
<field name="name">EBICS UserID model company rule</field>
<field name="model_id" ref="model_ebics_userid" /> <record id="ebics_config_comp_rule" model="ir.rule">
<field eval="True" name="global" /> <field name="name">EBICS Configuration model company rule</field>
<field <field name="model_id" ref="model_ebics_config" />
<field eval="True" name="global" />
<field
name="domain_force" name="domain_force"
>['|', ('company_ids', '=', False), ('company_ids', 'in', user.company_ids.ids)]</field> >['|', ('company_ids', '=', False), ('company_ids', 'in', user.company_ids.ids)]</field>
</record> </record>
<record id="ebics_file_comp_rule" model="ir.rule"> <record id="ebics_userid_comp_rule" model="ir.rule">
<field name="name">EBICS File model company rule</field> <field name="name">EBICS UserID model company rule</field>
<field name="model_id" ref="model_ebics_file" /> <field name="model_id" ref="model_ebics_userid" />
<field eval="True" name="global" /> <field eval="True" name="global" />
<field <field
name="domain_force" name="domain_force"
>['|', ('company_ids', '=', False), ('company_ids', 'in', user.company_ids.ids)]</field> >['|', ('company_ids', '=', False), ('company_ids', 'in', user.company_ids.ids)]</field>
</record> </record>
</data> <record id="ebics_file_comp_rule" model="ir.rule">
<field name="name">EBICS File model company rule</field>
<field name="model_id" ref="model_ebics_file" />
<field eval="True" name="global" />
<field
name="domain_force"
>['|', ('company_ids', '=', False), ('company_ids', 'in', user.company_ids.ids)]</field>
</record>
</data>
</odoo> </odoo>

123
account_ebics/views/ebics_config_views.xml
View File

@ -1,26 +1,26 @@
<?xml version="1.0" ?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<record id="ebics_config_view_list" model="ir.ui.view"> <record id="ebics_config_view_list" model="ir.ui.view">
<field name="name">ebics.config.list</field> <field name="name">ebics.config.list</field>
<field name="model">ebics.config</field> <field name="model">ebics.config</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<list decoration-muted="state == 'draft'"> <list decoration-muted="state == 'draft'">
<field name="name" /> <field name="name" />
<field name="ebics_host" /> <field name="ebics_host" />
<field name="state" /> <field name="state" />
<field name="active" /> <field name="active" />
</list> </list>
</field> </field>
</record> </record>
<record id="ebics_config_view_form" model="ir.ui.view"> <record id="ebics_config_view_form" model="ir.ui.view">
<field name="name">ebics.config.form</field> <field name="name">ebics.config.form</field>
<field name="model">ebics.config</field> <field name="model">ebics.config</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="EBICS Configuration"> <form string="EBICS Configuration">
<header> <header>
<button <button
name="set_to_draft" name="set_to_draft"
invisible="state != 'confirm'" invisible="state != 'confirm'"
string="Set to Draft" string="Set to Draft"
@ -28,7 +28,7 @@
groups="account_ebics.group_ebics_manager" groups="account_ebics.group_ebics_manager"
help="Set to Draft in order to change the EBICS configuration parameters." help="Set to Draft in order to change the EBICS configuration parameters."
/> />
<button <button
name="set_to_confirm" name="set_to_confirm"
invisible="state != 'draft'" invisible="state != 'draft'"
string="Confirm" string="Confirm"
@ -37,56 +37,65 @@
groups="account_ebics.group_ebics_manager" groups="account_ebics.group_ebics_manager"
help="The EBICS configuration must be confirmed before it can used for bank transactions." help="The EBICS configuration must be confirmed before it can used for bank transactions."
/> />
<field name="state" widget="statusbar" /> <field name="state" widget="statusbar" />
</header> </header>
<widget <widget
name="web_ribbon" name="web_ribbon"
text="Archived" text="Archived"
bg_color="bg-danger" bg_color="bg-danger"
invisible="active" invisible="active"
/> />
<group name="main"> <group name="main">
<group name="main-left"> <group name="main-left">
<field name="name" readonly="state != 'draft'" colspan="2" /> <field name="name" readonly="state != 'draft'" colspan="2" />
<field name="ebics_host" readonly="state != 'draft'" /> <field name="ebics_host" readonly="state != 'draft'" />
<field name="ebics_url" readonly="state != 'draft'" /> <field name="ebics_url" readonly="state != 'draft'" />
<field name="ebics_partner" readonly="state != 'draft'" /> <field name="ebics_partner" readonly="state != 'draft'" />
<field name="ebics_keys" readonly="state != 'draft'" /> <field name="ebics_keys" readonly="state != 'draft'" />
</group> </group>
<group name="main-right"> <group name="main-right">
<field <field
name="journal_ids" name="journal_ids"
readonly="state != 'draft'" readonly="state != 'draft'"
widget="many2many_tags" widget="many2many_tags"
options="{'no_create': True}" options="{'no_create': True}"
/> />
<field name="ebics_version" readonly="state != 'draft'" /> <field name="ebics_version" readonly="state != 'draft'" />
<field name="ebics_key_version" readonly="state != 'draft'" /> <field name="ebics_key_version" readonly="state != 'draft'" />
<field name="ebics_key_bitlength" readonly="state != 'draft'" /> <field name="ebics_key_bitlength" readonly="state != 'draft'" />
<field <field
name="order_number" name="order_number"
invisible="ebics_version != 'H003'" invisible="ebics_version != 'H003'"
readonly="state != 'draft'" readonly="state != 'draft'"
/> />
</group> </group>
</group> </group>
<notebook> <notebook>
<page string="EBICS Users" groups="account_ebics.group_ebics_manager"> <page
<field name="ebics_userid_ids" readonly="state != 'draft'" /> string="EBICS Users"
</page> groups="account_ebics.group_ebics_manager"
<page string="File Formats" groups="account_ebics.group_ebics_manager"> >
<field name="ebics_file_format_ids" readonly="state != 'draft'" /> <field name="ebics_userid_ids" readonly="state != 'draft'" />
</page> </page>
</notebook> <page
</form> string="File Formats"
</field> groups="account_ebics.group_ebics_manager"
</record> >
<field
name="ebics_file_format_ids"
readonly="state != 'draft'"
/>
</page>
</notebook>
</form>
</field>
</record>
<record id="ebics_config_action" model="ir.actions.act_window"> <record id="ebics_config_action" model="ir.actions.act_window">
<field name="name">EBICS Configuration</field> <field name="name">EBICS Configuration</field>
<field name="res_model">ebics.config</field> <field name="res_model">ebics.config</field>
<field name="view_mode">list,form</field> <field name="view_mode">list,form</field>
<field name="context">{'active_test': False}</field> <field name="context">{'active_test': False}</field>
</record> </record>
</odoo> </odoo>

104
account_ebics/views/ebics_file_format_views.xml
View File

@ -1,74 +1,74 @@
<?xml version="1.0" ?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<record id="ebics_file_format_view_list" model="ir.ui.view"> <record id="ebics_file_format_view_list" model="ir.ui.view">
<field name="name">ebics.file.format.list</field> <field name="name">ebics.file.format.list</field>
<field name="model">ebics.file.format</field> <field name="model">ebics.file.format</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<list> <list>
<field name="ebics_version" /> <field name="ebics_version" />
<field name="type" /> <field name="type" />
<field name="order_type" /> <field name="order_type" />
<field name="signature_class" /> <field name="signature_class" />
<field name="name" /> <field name="name" />
<field name="description" /> <field name="description" />
</list> </list>
</field> </field>
</record> </record>
<record id="ebics_file_format_view_form" model="ir.ui.view"> <record id="ebics_file_format_view_form" model="ir.ui.view">
<field name="name">ebics.file.format.form</field> <field name="name">ebics.file.format.form</field>
<field name="model">ebics.file.format</field> <field name="model">ebics.file.format</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="EBICS File Format"> <form string="EBICS File Format">
<group name="main"> <group name="main">
<group name="main-left"> <group name="main-left">
<field name="ebics_version" /> <field name="ebics_version" />
<field name="type" /> <field name="type" />
<field name="suffix" /> <field name="suffix" />
<field <field
name="download_process_method" name="download_process_method"
invisible="type == 'up'" invisible="type == 'up'"
force_save="1" force_save="1"
/> />
<field name="signature_class" /> <field name="signature_class" />
</group> </group>
<group name="main-right"> <group name="main-right">
<field name="order_type" /> <field name="order_type" />
<field <field
name="name" name="name"
required="ebics_version == '2'" required="ebics_version == '2'"
invisible="ebics_version == '3'" invisible="ebics_version == '3'"
/> />
<field <field
name="btf_service" name="btf_service"
required="ebics_version == '3'" required="ebics_version == '3'"
invisible="ebics_version == '2'" invisible="ebics_version == '2'"
/> />
<field <field
name="btf_message" name="btf_message"
required="ebics_version == '3'" required="ebics_version == '3'"
invisible="ebics_version == '2'" invisible="ebics_version == '2'"
/> />
<field name="btf_scope" invisible="ebics_version == '2'" /> <field name="btf_scope" invisible="ebics_version == '2'" />
<field name="btf_option" invisible="ebics_version == '2'" /> <field name="btf_option" invisible="ebics_version == '2'" />
<field name="btf_container" invisible="ebics_version == '2'" /> <field name="btf_container" invisible="ebics_version == '2'" />
<field name="btf_version" invisible="ebics_version == '2'" /> <field name="btf_version" invisible="ebics_version == '2'" />
<field name="btf_variant" invisible="ebics_version == '2'" /> <field name="btf_variant" invisible="ebics_version == '2'" />
<field name="btf_format" invisible="ebics_version == '2'" /> <field name="btf_format" invisible="ebics_version == '2'" />
</group> </group>
</group> </group>
<group name="description"> <group name="description">
<field name="description" /> <field name="description" />
</group> </group>
</form> </form>
</field> </field>
</record> </record>
<record id="ebics_file_format_action" model="ir.actions.act_window"> <record id="ebics_file_format_action" model="ir.actions.act_window">
<field name="name">EBICS File Formats</field> <field name="name">EBICS File Formats</field>
<field name="res_model">ebics.file.format</field> <field name="res_model">ebics.file.format</field>
<field name="view_mode">list,form</field> <field name="view_mode">list,form</field>
</record> </record>
</odoo> </odoo>

396
account_ebics/views/ebics_file_views.xml
View File

@ -1,253 +1,281 @@
<?xml version="1.0" ?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<record id="ebics_file_view_search" model="ir.ui.view"> <record id="ebics_file_view_search" model="ir.ui.view">
<field name="name">ebics.file.search</field> <field name="name">ebics.file.search</field>
<field name="model">ebics.file</field> <field name="model">ebics.file</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search EBICS Files"> <search string="Search EBICS Files">
<group col="10" colspan="4"> <field name="date_from" />
<field name="date_from" /> <field name="date_to" />
<field name="date_to" /> <field name="name" />
<field name="name" /> <field name="format_id" />
<field name="format_id" /> <field name="user_id" />
<field name="user_id" /> <field
<field name="company_ids"
name="company_ids" widget="selection"
widget="selection" groups="base.group_multi_company"
groups="base.group_multi_company" />
/> <filter
</group> string="Draft"
<newline /> name="draft"
<group expand="0" string="Group By"> domain="[('state', '=', 'draft')]"
<filter />
<filter string="Done" name="done" domain="[('state', '=', 'done')]" />
<group expand="0" string="Group By">
<filter
string="File Format" string="File Format"
name="file_format" name="file_format"
context="{'group_by':'format_id'}" context="{'group_by':'format_id'}"
/> />
<filter string="State" name="state" context="{'group_by':'state'}" /> <filter
<filter string="User" name="user" context="{'group_by':'user_id'}" /> string="State"
</group> name="state"
</search> context="{'group_by':'state'}"
</field> />
</record> <filter
string="User"
name="user"
context="{'group_by':'user_id'}"
/>
</group>
</search>
</field>
</record>
<!-- Download --> <!-- Download -->
<record id="ebics_file_view_list_download" model="ir.ui.view"> <record id="ebics_file_view_list_download" model="ir.ui.view">
<field name="name">ebics.file.list</field> <field name="name">ebics.file.list</field>
<field name="model">ebics.file</field> <field name="model">ebics.file</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<list decoration-muted="state=='draft'" create="false"> <list decoration-muted="state=='draft'" create="false">
<field name="date" string="Download Date" /> <field name="date" string="Download Date" />
<field name="name" /> <field name="name" />
<field name="date_from" /> <field name="date_from" />
<field name="date_to" /> <field name="date_to" />
<field name="user_id" /> <field name="user_id" />
<field name="state" /> <field name="state" />
<field name="format_id" /> <field name="format_id" />
<field <field
name="company_ids" name="company_ids"
widget="many2many_tags" widget="many2many_tags"
groups="base.group_multi_company" groups="base.group_multi_company"
/> />
</list> </list>
</field> </field>
</record> </record>
<record id="ebics_file_view_form_download" model="ir.ui.view"> <record id="ebics_file_view_form_download" model="ir.ui.view">
<field name="name">ebics.file.form</field> <field name="name">ebics.file.form</field>
<field name="model">ebics.file</field> <field name="model">ebics.file</field>
<field name="priority">1</field> <field name="priority">1</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="EBICS File" create="false"> <form string="EBICS File" create="false">
<header> <header>
<button <field name="download_process_method" invisible="1" />
<button
name="set_to_draft" name="set_to_draft"
invisible="state != 'done'" invisible="not download_process_method or state != 'done'"
string="Set to Draft" string="Set to Draft"
type="object" type="object"
groups="account.group_account_manager" groups="account.group_account_manager"
/> />
<button <button
name="process" name="process"
class="oe_highlight" class="oe_highlight"
invisible="state != 'draft'" invisible="not download_process_method or state != 'draft'"
string="Process" string="Process"
type="object" type="object"
groups="account.group_account_invoice" groups="account.group_account_invoice"
help="Process the EBICS File" help="Process the EBICS File"
/> />
<button <button
name="set_to_done" name="set_to_done"
invisible="state != 'draft'" invisible="not download_process_method or state != 'draft'"
string="Set to Done" string="Set to Done"
type="object" type="object"
groups="account.group_account_manager" groups="account.group_account_manager"
/> />
<field name="state" widget="statusbar" /> <field
</header> name="state"
<group colspan="4" col="4"> widget="statusbar"
<field name="date" string="Download Date" /> invisible="not download_process_method"
<field name="name" />
<field name="data" filename="name" />
<field name="format_id" />
<field name="date_from" />
<field name="date_to" />
<field name="user_id" />
<field name="ebics_userid_id" />
<field
name="company_ids"
widget="many2many_tags"
groups="base.group_multi_company"
/> />
</group> </header>
<notebook> <group name="main">
<page string="Additional Information"> <group name="main-full-screen" colspan="2" col="2">
<field name="note" nolabel="1" /> <field name="name" />
</page> <field name="data" filename="name" />
<page string="Bank Statements" invisible="not bank_statement_ids"> <field name="format_id" />
<field name="bank_statement_ids" nolabel="1" /> </group>
</page> <group name="main-left">
</notebook> <field name="date" string="Download Date" />
</form> <field name="user_id" />
</field> <field name="ebics_userid_id" />
</record> </group>
<group name="main-right">
<field name="date_from" />
<field name="date_to" />
<field
name="company_ids"
widget="many2many_tags"
groups="base.group_multi_company"
/>
</group>
</group>
<notebook>
<page string="Additional Information">
<field name="note" nolabel="1" />
</page>
<page string="Bank Statements" invisible="not bank_statement_ids">
<field name="bank_statement_ids" nolabel="1" />
</page>
</notebook>
</form>
</field>
</record>
<record id="ebics_file_view_form_result" model="ir.ui.view"> <record id="ebics_file_view_form_result" model="ir.ui.view">
<field name="name">ebics.file.process.result</field> <field name="name">ebics.file.process.result</field>
<field name="model">ebics.file</field> <field name="model">ebics.file</field>
<field name="priority">2</field> <field name="priority">2</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Process EBICS File"> <form string="Process EBICS File">
<separator colspan="4" string="Results :" /> <separator colspan="4" string="Results :" />
<field name="note_process" colspan="4" nolabel="1" width="850" height="400" /> <field
<footer> name="note_process"
<button colspan="4"
nolabel="1"
width="850"
height="400"
/>
<footer>
<button
name="action_open_bank_statements" name="action_open_bank_statements"
string="View Bank Statement(s)" string="View Bank Statement(s)"
type="object" type="object"
class="oe_highlight" class="oe_highlight"
invisible="not context.get('statement_ids')" invisible="not context.get('statement_ids')"
/> />
<button name="button_close" type="object" string="Close" /> <button name="button_close" type="object" string="Close" />
</footer> </footer>
</form> </form>
</field> </field>
</record> </record>
<record id="ebics_file_action_download" model="ir.actions.act_window"> <record id="ebics_file_action_download" model="ir.actions.act_window">
<field name="name">EBICS Download Files</field> <field name="name">EBICS Download Files</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">ebics.file</field> <field name="res_model">ebics.file</field>
<field name="view_mode">list,form</field> <field name="view_mode">list,form</field>
<field name="view_id" eval="False" /> <field name="view_id" eval="False" />
<field name="domain">[('type','=','down')]</field> <field name="domain">[('type', '=', 'down')]</field>
<field name="search_view_id" ref="ebics_file_view_search" /> <field name="search_view_id" ref="ebics_file_view_search" />
</record> </record>
<record id="ebics_file_action_download_list" model="ir.actions.act_window.view"> <record id="ebics_file_action_download_list" model="ir.actions.act_window.view">
<field eval="1" name="sequence" /> <field eval="1" name="sequence" />
<field name="view_mode">list</field> <field name="view_mode">list</field>
<field name="view_id" ref="ebics_file_view_list_download" /> <field name="view_id" ref="ebics_file_view_list_download" />
<field name="act_window_id" ref="ebics_file_action_download" /> <field name="act_window_id" ref="ebics_file_action_download" />
</record> </record>
<record id="ebics_file_action_download_form" model="ir.actions.act_window.view"> <record id="ebics_file_action_download_form" model="ir.actions.act_window.view">
<field eval="2" name="sequence" /> <field eval="2" name="sequence" />
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="view_id" ref="ebics_file_view_form_download" /> <field name="view_id" ref="ebics_file_view_form_download" />
<field name="act_window_id" ref="ebics_file_action_download" /> <field name="act_window_id" ref="ebics_file_action_download" />
</record> </record>
<!-- Upload --> <!-- Upload -->
<record id="ebics_file_view_list_upload" model="ir.ui.view"> <record id="ebics_file_view_list_upload" model="ir.ui.view">
<field name="name">ebics.file.list</field> <field name="name">ebics.file.list</field>
<field name="model">ebics.file</field> <field name="model">ebics.file</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<list decoration-muted="state=='draft'" create="false"> <list decoration-muted="state=='draft'" create="false">
<field name="date" string="Upload Date" /> <field name="date" string="Upload Date" />
<field name="name" /> <field name="name" />
<field name="user_id" /> <field name="user_id" />
<field name="state" /> <field name="state" />
<field name="format_id" /> <field name="format_id" />
<field <field
name="company_ids" name="company_ids"
widget="many2many_tags" widget="many2many_tags"
groups="base.group_multi_company" groups="base.group_multi_company"
/> />
</list> </list>
</field> </field>
</record> </record>
<record id="ebics_file_view_form_upload" model="ir.ui.view"> <record id="ebics_file_view_form_upload" model="ir.ui.view">
<field name="name">ebics.file.form</field> <field name="name">ebics.file.form</field>
<field name="model">ebics.file</field> <field name="model">ebics.file</field>
<field name="priority">1</field> <field name="priority">1</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="EBICS File" create="false"> <form string="EBICS File" create="false">
<header> <header>
<button <button
name="set_to_draft" name="set_to_draft"
invisible="state != 'done'" invisible="state != 'done'"
string="Set to Draft" string="Set to Draft"
type="object" type="object"
groups="account.group_account_manager" groups="account.group_account_manager"
/> />
<button <button
name="set_to_done" name="set_to_done"
invisible="state != 'draft'" invisible="state != 'draft'"
string="Set to Done" string="Set to Done"
type="object" type="object"
groups="account.group_account_manager" groups="account.group_account_manager"
/> />
<field name="state" widget="statusbar" /> <field name="state" widget="statusbar" />
</header> </header>
<group colspan="4" col="4"> <group colspan="4" col="4">
<field name="date" string="Upload Date" /> <field name="date" string="Upload Date" />
<field name="name" /> <field name="name" />
<field name="data" filename="name" /> <field name="data" filename="name" />
<field name="format_id" /> <field name="format_id" />
<field name="user_id" /> <field name="user_id" />
<field name="ebics_userid_id" /> <field name="ebics_userid_id" />
<field <field
name="company_ids" name="company_ids"
widget="many2many_tags" widget="many2many_tags"
groups="base.group_multi_company" groups="base.group_multi_company"
/> />
</group> </group>
<notebook> <notebook>
<page string="Additional Information"> <page string="Additional Information">
<field name="note" nolabel="1" /> <field name="note" nolabel="1" />
</page> </page>
</notebook> </notebook>
</form> </form>
</field> </field>
</record> </record>
<record id="ebics_file_action_upload" model="ir.actions.act_window"> <record id="ebics_file_action_upload" model="ir.actions.act_window">
<field name="name">EBICS Upload Files</field> <field name="name">EBICS Upload Files</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">ebics.file</field> <field name="res_model">ebics.file</field>
<field name="view_mode">list,form</field> <field name="view_mode">list,form</field>
<field name="view_id" eval="False" /> <field name="view_id" eval="False" />
<field name="domain">[('type','=','up')]</field> <field name="domain">[('type', '=', 'up')]</field>
<field name="search_view_id" ref="ebics_file_view_search" /> <field name="search_view_id" ref="ebics_file_view_search" />
</record> </record>
<record id="ebics_file_action_upload_list" model="ir.actions.act_window.view"> <record id="ebics_file_action_upload_list" model="ir.actions.act_window.view">
<field eval="1" name="sequence" /> <field eval="1" name="sequence" />
<field name="view_mode">list</field> <field name="view_mode">list</field>
<field name="view_id" ref="ebics_file_view_list_upload" /> <field name="view_id" ref="ebics_file_view_list_upload" />
<field name="act_window_id" ref="ebics_file_action_upload" /> <field name="act_window_id" ref="ebics_file_action_upload" />
</record> </record>
<record id="ebics_file_action_upload_form" model="ir.actions.act_window.view"> <record id="ebics_file_action_upload_form" model="ir.actions.act_window.view">
<field eval="2" name="sequence" /> <field eval="2" name="sequence" />
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="view_id" ref="ebics_file_view_form_upload" /> <field name="view_id" ref="ebics_file_view_form_upload" />
<field name="act_window_id" ref="ebics_file_action_upload" /> <field name="act_window_id" ref="ebics_file_action_upload" />
</record> </record>
</odoo> </odoo>

192
account_ebics/views/ebics_userid_views.xml
View File

@ -1,26 +1,26 @@
<?xml version="1.0" ?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<record id="ebics_userid_view_list" model="ir.ui.view"> <record id="ebics_userid_view_list" model="ir.ui.view">
<field name="name">ebics.userid.list</field> <field name="name">ebics.userid.list</field>
<field name="model">ebics.userid</field> <field name="model">ebics.userid</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<list decoration-muted="state != 'active_keys'"> <list decoration-muted="state != 'active_keys'">
<field name="name" /> <field name="name" />
<field name="signature_class" /> <field name="signature_class" />
<field name="state" /> <field name="state" />
<field name="active" /> <field name="active" />
</list> </list>
</field> </field>
</record> </record>
<record id="ebics_userid_view_form" model="ir.ui.view"> <record id="ebics_userid_view_form" model="ir.ui.view">
<field name="name">ebics.userid.form</field> <field name="name">ebics.userid.form</field>
<field name="model">ebics.userid</field> <field name="model">ebics.userid</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="EBICS UserID"> <form string="EBICS UserID">
<header> <header>
<button <button
name="ebics_init_1" name="ebics_init_1"
invisible="state != 'draft'" invisible="state != 'draft'"
string="EBICS Initialisation" string="EBICS Initialisation"
@ -28,7 +28,7 @@
class="oe_highlight" class="oe_highlight"
help="Initialise EBICS Bank Keys" help="Initialise EBICS Bank Keys"
/> />
<button <button
name="ebics_init_2" name="ebics_init_2"
invisible="state != 'init'" invisible="state != 'init'"
string="Account activated" string="Account activated"
@ -36,7 +36,7 @@
class="oe_highlight" class="oe_highlight"
help="EBICS Initialisation - Push this button when the account has been activated by the bank." help="EBICS Initialisation - Push this button when the account has been activated by the bank."
/> />
<button <button
name="ebics_init_3" name="ebics_init_3"
invisible="state != 'get_bank_keys'" invisible="state != 'get_bank_keys'"
string="Get Bank Keys" string="Get Bank Keys"
@ -44,7 +44,7 @@
class="oe_highlight" class="oe_highlight"
help="EBICS Initialisation - After the account has been activated the public bank keys must be downloaded and checked for consistency." help="EBICS Initialisation - After the account has been activated the public bank keys must be downloaded and checked for consistency."
/> />
<button <button
name="ebics_init_4" name="ebics_init_4"
invisible="state != 'to_verify'" invisible="state != 'to_verify'"
string="Bank Keys Verified" string="Bank Keys Verified"
@ -52,113 +52,133 @@
class="oe_highlight" class="oe_highlight"
help="EBICS Initialisation - Push this button when the public have been checked for consistency." help="EBICS Initialisation - Push this button when the public have been checked for consistency."
/> />
<button <button
name="change_passphrase" name="change_passphrase"
string="Change Passphrase" string="Change Passphrase"
type="object" type="object"
class="oe_highlight" class="oe_highlight"
invisible="not ebics_keys_found or state != 'active_keys'" invisible="not ebics_keys_found or state != 'active_keys'"
/> />
<button <button
name="set_to_draft" name="set_to_draft"
invisible="state != 'active_keys'" invisible="state != 'active_keys'"
string="Set to Draft" string="Set to Draft"
type="object" type="object"
help="Set to Draft in order to reinitialize your bank connection." help="Set to Draft in order to reinitialize your bank connection."
/> />
<button <button
name="set_to_get_bank_keys" name="set_to_get_bank_keys"
invisible="state != 'active_keys'" invisible="state != 'active_keys'"
string="Renew Bank Keys" string="Renew Bank Keys"
type="object" type="object"
help="Use this button to update the EBICS certificates of your bank." help="Use this button to update the EBICS certificates of your bank."
/> />
<button <button
name="set_to_active_keys" name="set_to_active_keys"
invisible="state != 'draft'" invisible="state != 'draft'"
string="Force Active Keys" string="Force Active Keys"
type="object" type="object"
help="Use this button to bypass the EBICS initialization (e.g. in case you have manually transferred active EBICS keys from another system." help="Use this button to bypass the EBICS initialization (e.g. in case you have manually transferred active EBICS keys from another system."
/> />
<field name="state" widget="statusbar" /> <field name="state" widget="statusbar" />
</header> </header>
<group name="main" readonly="state != 'draft'"> <group name="main" readonly="state != 'draft'">
<group name="main-left"> <group name="main-left">
<field name="name" readonly="state != 'draft'" /> <field name="name" readonly="state != 'draft'" />
<field <field
name="ebics_passphrase" name="ebics_passphrase"
password="True" password="True"
required="ebics_passphrase_required" required="ebics_passphrase_required"
invisible="ebics_passphrase_invisible" invisible="ebics_passphrase_invisible"
/> />
<field <field
name="ebics_passphrase_store" name="ebics_passphrase_store"
readonly="ebics_passphrase_store_readonly" readonly="ebics_passphrase_store_readonly"
/> />
<field <field
name="ebics_sig_passphrase" name="ebics_sig_passphrase"
password="True" password="True"
invisible="ebics_sig_passphrase_invisible" invisible="ebics_sig_passphrase_invisible"
/> />
<field name="transaction_rights" /> <field name="transaction_rights" />
<field name="active" /> <field name="active" />
</group> </group>
<group name="main-right"> <group name="main-right">
<field name="signature_class" readonly="state != 'draft'" /> <field name="signature_class" readonly="state != 'draft'" />
<field <field
name="user_ids" name="user_ids"
widget="many2many_tags" widget="many2many_tags"
options="{'no_create': True}" options="{'no_create': True}"
/> />
<!-- TODO: restore these fields after implementation of SWIFT SConnect <!-- TODO: restore these fields after implementation of SWIFT SConnect
<field <field
name="swift_3skey" name="swift_3skey"
invisible="signature_class == 'T'" invisible="signature_class == 'T'"
/> />
<field name="swift_3skey_certificate_fn" invisible="1" /> <field name="swift_3skey_certificate_fn" invisible="1" />
<field <field
name="swift_3skey_certificate" name="swift_3skey_certificate"
filename="swift_3skey_certificate_fn" filename="swift_3skey_certificate_fn"
invisible="not swift_3skey" invisible="not swift_3skey"
required="swift_3skey" required="swift_3skey"
/> />
--> -->
<field name="ebics_key_x509" readonly="state != 'draft'" /> <field name="ebics_key_x509" readonly="state != 'draft'" />
</group> </group>
</group> </group>
<group name="dn" invisible="not ebics_key_x509" readonly="state != 'draft'"> <group
<div colspan="2" col="1"> name="dn"
<strong invisible="not ebics_key_x509"
readonly="state != 'draft'"
>
<div colspan="2" col="1">
<strong
>Distinguished Name attributes used to create self-signed X.509 certificates:</strong> >Distinguished Name attributes used to create self-signed X.509 certificates:</strong>
</div> </div>
<group name="dn_l"> <group name="dn_l">
<field name="ebics_key_x509_dn_cn" readonly="state != 'draft'" /> <field
<field name="ebics_key_x509_dn_o" readonly="state != 'draft'" /> name="ebics_key_x509_dn_cn"
<field name="ebics_key_x509_dn_l" readonly="state != 'draft'" /> readonly="state != 'draft'"
<field name="ebics_key_x509_dn_c" readonly="state != 'draft'" /> />
</group> <field name="ebics_key_x509_dn_o" readonly="state != 'draft'" />
<group name="dn_r"> <field name="ebics_key_x509_dn_l" readonly="state != 'draft'" />
<field name="ebics_key_x509_dn_e" readonly="state != 'draft'" /> <field name="ebics_key_x509_dn_c" readonly="state != 'draft'" />
<field name="ebics_key_x509_dn_ou" readonly="state != 'draft'" /> </group>
<field name="ebics_key_x509_dn_st" readonly="state != 'draft'" /> <group name="dn_r">
</group> <field name="ebics_key_x509_dn_e" readonly="state != 'draft'" />
</group> <field
<group name="files"> name="ebics_key_x509_dn_ou"
<group colspan="2" name="ebics_ini_letter" invisible="not ebics_ini_letter"> readonly="state != 'draft'"
<field name="ebics_ini_letter_fn" invisible="1" /> />
<field name="ebics_ini_letter" filename="ebics_ini_letter_fn" /> <field
</group> name="ebics_key_x509_dn_st"
<group readonly="state != 'draft'"
/>
</group>
</group>
<group name="files">
<group
colspan="2"
name="ebics_ini_letter"
invisible="not ebics_ini_letter"
>
<field name="ebics_ini_letter_fn" invisible="1" />
<field name="ebics_ini_letter" filename="ebics_ini_letter_fn" />
</group>
<group
colspan="2" colspan="2"
name="ebics_public_bank_keys" name="ebics_public_bank_keys"
invisible="not ebics_public_bank_keys" invisible="not ebics_public_bank_keys"
> >
<field name="ebics_public_bank_keys_fn" invisible="1" /> <field name="ebics_public_bank_keys_fn" invisible="1" />
<field name="ebics_public_bank_keys" filename="ebics_public_bank_keys_fn" /> <field
</group> name="ebics_public_bank_keys"
</group> filename="ebics_public_bank_keys_fn"
</form> />
</field> </group>
</record> </group>
</form>
</field>
</record>
</odoo> </odoo>

22
account_ebics/views/menu.xml
View File

@ -1,14 +1,14 @@
<?xml version="1.0" ?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<menuitem <menuitem
id="ebics_processing_menu" id="ebics_processing_menu"
name="EBICS Processing" name="EBICS Processing"
parent="account.menu_finance" parent="account.menu_finance"
sequence="4" sequence="4"
/> />
<menuitem <menuitem
id="ebics_xfer_menu_download" id="ebics_xfer_menu_download"
name="EBICS Download" name="EBICS Download"
parent="ebics_processing_menu" parent="ebics_processing_menu"
@ -16,7 +16,7 @@
sequence="10" sequence="10"
/> />
<menuitem <menuitem
id="ebics_xfer_menu_upload" id="ebics_xfer_menu_upload"
name="EBICS Upload" name="EBICS Upload"
parent="ebics_processing_menu" parent="ebics_processing_menu"
@ -24,14 +24,14 @@
sequence="20" sequence="20"
/> />
<menuitem <menuitem
id="ebics_file_menu" id="ebics_file_menu"
name="EBICS Files" name="EBICS Files"
parent="ebics_processing_menu" parent="ebics_processing_menu"
sequence="30" sequence="30"
/> />
<menuitem <menuitem
id="ebics_file_menu_download" id="ebics_file_menu_download"
name="Download" name="Download"
parent="ebics_file_menu" parent="ebics_file_menu"
@ -39,7 +39,7 @@
sequence="10" sequence="10"
/> />
<menuitem <menuitem
id="ebics_file_menu_upload" id="ebics_file_menu_upload"
name="Upload" name="Upload"
parent="ebics_file_menu" parent="ebics_file_menu"
@ -47,7 +47,7 @@
sequence="20" sequence="20"
/> />
<menuitem <menuitem
id="ebics_menu" id="ebics_menu"
name="EBICS" name="EBICS"
parent='account.menu_finance_configuration' parent='account.menu_finance_configuration'
@ -55,7 +55,7 @@
sequence="100" sequence="100"
/> />
<menuitem <menuitem
id="ebics_config_menu" id="ebics_config_menu"
name="EBICS Configuration" name="EBICS Configuration"
parent="ebics_menu" parent="ebics_menu"
@ -64,7 +64,7 @@
sequence="10" sequence="10"
/> />
<menuitem <menuitem
id="ebics_file_format_menu" id="ebics_file_format_menu"
name="EBICS File Formats" name="EBICS File Formats"
parent="ebics_menu" parent="ebics_menu"
@ -73,7 +73,7 @@
sequence="20" sequence="20"
/> />
<menuitem <menuitem
id="ebics_admin_order_menu" id="ebics_admin_order_menu"
name="EBICS Administrative Orders" name="EBICS Administrative Orders"
parent="ebics_menu" parent="ebics_menu"

1
account_ebics/wizards/ebics_admin_order.py
View File

@ -42,7 +42,6 @@ class EbicsAdminOrder(models.TransientModel):
return { return {
"name": self.env._("EBICS Administrative Order result"), "name": self.env._("EBICS Administrative Order result"),
"res_id": self.id, "res_id": self.id,
"view_type": "form",
"view_mode": "form", "view_mode": "form",
"res_model": "ebics.admin.order", "res_model": "ebics.admin.order",
"view_id": result_view.id, "view_id": result_view.id,

98
account_ebics/wizards/ebics_admin_order.xml
View File

@ -1,61 +1,61 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<record id="ebics_admin_order_view_form" model="ir.ui.view"> <record id="ebics_admin_order_view_form" model="ir.ui.view">
<field name="name">EBICS Administrative Order</field> <field name="name">EBICS Administrative Order</field>
<field name="model">ebics.admin.order</field> <field name="model">ebics.admin.order</field>
<field name="inherit_id" ref="ebics_xfer_view_form_download" /> <field name="inherit_id" ref="ebics_xfer_view_form_download" />
<field name="priority">1</field> <field name="priority">1</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="date_from" position="attributes"> <field name="date_from" position="attributes">
<attribute name="invisible">1</attribute> <attribute name="invisible">1</attribute>
</field> </field>
<field name="date_to" position="attributes"> <field name="date_to" position="attributes">
<attribute name="invisible">1</attribute> <attribute name="invisible">1</attribute>
</field> </field>
<field name="format_id" position="attributes"> <field name="format_id" position="attributes">
<attribute name="invisible">1</attribute> <attribute name="invisible">1</attribute>
</field> </field>
<field name="order_type" position="attributes"> <field name="order_type" position="attributes">
<attribute name="invisible">1</attribute> <attribute name="invisible">1</attribute>
</field> </field>
<field name="order_type" position="after"> <field name="order_type" position="after">
<field name="admin_order_type" /> <field name="admin_order_type" />
</field> </field>
<button name="ebics_download" position="attributes"> <button name="ebics_download" position="attributes">
<attribute name="name">ebics_admin_order</attribute> <attribute name="name">ebics_admin_order</attribute>
<attribute name="string">Execute</attribute> <attribute name="string">Execute</attribute>
</button> </button>
</field> </field>
</record> </record>
<record id="ebics_admin_order_view_form_result" model="ir.ui.view"> <record id="ebics_admin_order_view_form_result" model="ir.ui.view">
<field name="name">EBICS Administrative Order result</field> <field name="name">EBICS Administrative Order result</field>
<field name="model">ebics.admin.order</field> <field name="model">ebics.admin.order</field>
<field name="priority">2</field> <field name="priority">2</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="EBICS Administrative Order result"> <form string="EBICS Administrative Order result">
<separator colspan="4" string="Results :" /> <separator colspan="4" string="Results :" />
<field name="note" colspan="4" nolabel="1" width="850" height="400" /> <field name="note" colspan="4" nolabel="1" width="850" height="400" />
<footer> <footer>
<button <button
string="Close" string="Close"
class="btn-secondary" class="btn-secondary"
special="cancel" special="cancel"
data-hotkey="z" data-hotkey="z"
/> />
</footer> </footer>
</form> </form>
</field> </field>
</record> </record>
<record id="ebics_admin_order_action" model="ir.actions.act_window"> <record id="ebics_admin_order_action" model="ir.actions.act_window">
<field name="name">EBICS Administrative Order</field> <field name="name">EBICS Administrative Order</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">ebics.admin.order</field> <field name="res_model">ebics.admin.order</field>
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="target">new</field> <field name="target">new</field>
<field name="view_id" ref="ebics_admin_order_view_form" /> <field name="view_id" ref="ebics_admin_order_view_form" />
</record> </record>
</odoo> </odoo>

1
account_ebics/wizards/ebics_change_passphrase.py
View File

@ -109,7 +109,6 @@ class EbicsChangePassphrase(models.TransientModel):
return { return {
"name": self.env._("EBICS Keys Change Passphrase"), "name": self.env._("EBICS Keys Change Passphrase"),
"res_id": self.id, "res_id": self.id,
"view_type": "form",
"view_mode": "form", "view_mode": "form",
"res_model": "ebics.change.passphrase", "res_model": "ebics.change.passphrase",
"view_id": result_view.id, "view_id": result_view.id,

5
account_ebics/wizards/ebics_xfer.py
View File

@ -1,4 +1,4 @@
# Copyright 2009-2024 Noviat. # Copyright 2009-2025 Noviat.
# License LGPL-3 or later (http://www.gnu.org/licenses/lgpl). # License LGPL-3 or later (http://www.gnu.org/licenses/lgpl).
import base64 import base64
@ -205,7 +205,6 @@ class EbicsXfer(models.TransientModel):
return { return {
"name": self.env._("EBICS file transfer result"), "name": self.env._("EBICS file transfer result"),
"res_id": self.id, "res_id": self.id,
"view_type": "form",
"view_mode": "form", "view_mode": "form",
"res_model": "ebics.xfer", "res_model": "ebics.xfer",
"view_id": result_view.id, "view_id": result_view.id,
@ -347,7 +346,6 @@ class EbicsXfer(models.TransientModel):
return { return {
"name": self.env._("EBICS file transfer result"), "name": self.env._("EBICS file transfer result"),
"res_id": self.id, "res_id": self.id,
"view_type": "form",
"view_mode": "form", "view_mode": "form",
"res_model": "ebics.xfer", "res_model": "ebics.xfer",
"view_id": result_view.id, "view_id": result_view.id,
@ -612,6 +610,7 @@ class EbicsXfer(models.TransientModel):
"date_from": self.date_from, "date_from": self.date_from,
"date_to": self.date_to, "date_to": self.date_to,
"format_id": file_format.id, "format_id": file_format.id,
"state": file_format.download_process_method and "draft" or "done",
"user_id": self._uid, "user_id": self._uid,
"ebics_userid_id": self.ebics_userid_id.id, "ebics_userid_id": self.ebics_userid_id.id,
"company_ids": self.ebics_config_id.company_ids.ids, "company_ids": self.ebics_config_id.company_ids.ids,

169
account_ebics/wizards/ebics_xfer.xml
View File

@ -1,130 +1,133 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<record id="ebics_xfer_view_form_download" model="ir.ui.view"> <record id="ebics_xfer_view_form_download" model="ir.ui.view">
<field name="name">EBICS File Download</field> <field name="name">EBICS File Download</field>
<field name="model">ebics.xfer</field> <field name="model">ebics.xfer</field>
<field name="priority">1</field> <field name="priority">1</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="EBICS File Download"> <form string="EBICS File Download">
<group> <group>
<separator string="Select your bank :" colspan="2" /> <separator string="Select your bank :" colspan="2" />
<field <field
name="ebics_config_id" name="ebics_config_id"
required="1" required="1"
options="{'no_create': True, 'no_open': True}" options="{'no_create': True, 'no_open': True}"
/> />
<field <field
name="ebics_userid_id" name="ebics_userid_id"
domain="[('ebics_config_id', '=', ebics_config_id), ('user_ids.id', '=', uid), ('transaction_rights', 'in', ['both', 'down'])]" domain="[('ebics_config_id', '=', ebics_config_id), ('user_ids.id', '=', uid), ('transaction_rights', 'in', ['both', 'down'])]"
required="1" required="1"
options="{'no_create': True, 'no_open': True}" options="{'no_create': True, 'no_open': True}"
/> />
<field <field
name="ebics_passphrase" name="ebics_passphrase"
password="True" password="True"
invisible="ebics_passphrase_store" invisible="ebics_passphrase_store"
required="not ebics_passphrase_store" required="not ebics_passphrase_store"
/> />
<field name="date_from" /> <field name="date_from" />
<field name="date_to" /> <field name="date_to" />
<field <field
name="format_id" name="format_id"
domain="[('type', '=', 'down'), ('id', 'in', allowed_format_ids)]" domain="[('type', '=', 'down'), ('id', 'in', allowed_format_ids)]"
/> />
<field name="order_type" /> <field name="order_type" />
</group> </group>
<footer> <footer>
<button <button
name="ebics_download" name="ebics_download"
string="Download Files" string="Download Files"
type="object" type="object"
class="btn-primary" class="btn-primary"
data-hotkey="q" data-hotkey="q"
/> />
<button <button
string="Cancel" string="Cancel"
class="btn-secondary" class="btn-secondary"
special="cancel" special="cancel"
data-hotkey="z" data-hotkey="z"
/> />
</footer> </footer>
</form> </form>
</field> </field>
</record> </record>
<record id="ebics_xfer_view_form_upload" model="ir.ui.view"> <record id="ebics_xfer_view_form_upload" model="ir.ui.view">
<field name="name">EBICS File Upload</field> <field name="name">EBICS File Upload</field>
<field name="model">ebics.xfer</field> <field name="model">ebics.xfer</field>
<field name="priority">1</field> <field name="priority">1</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="EBICS File Upload"> <form string="EBICS File Upload">
<group> <group>
<separator string="Select your bank :" colspan="2" /> <separator string="Select your bank :" colspan="2" />
<field <field
name="ebics_config_id" name="ebics_config_id"
required="1" required="1"
options="{'no_create': True, 'no_open': True}" options="{'no_create': True, 'no_open': True}"
/> />
<field <field
name="ebics_userid_id" name="ebics_userid_id"
domain="[('ebics_config_id', '=', ebics_config_id), ('user_ids.id', '=', uid), ('transaction_rights', 'in', ['both', 'up'])]" domain="[('ebics_config_id', '=', ebics_config_id), ('user_ids.id', '=', uid), ('transaction_rights', 'in', ['both', 'up'])]"
required="1" required="1"
options="{'no_create': True, 'no_open': True}" options="{'no_create': True, 'no_open': True}"
/> />
<field <field
name="ebics_passphrase" name="ebics_passphrase"
password="True" password="True"
invisible="ebics_passphrase_store" invisible="ebics_passphrase_store"
required="not ebics_passphrase_store" required="not ebics_passphrase_store"
/> />
<field <field
name="ebics_sig_passphrase" name="ebics_sig_passphrase"
password="True" password="True"
invisible="ebics_sig_passphrase_invisible" invisible="ebics_sig_passphrase_invisible"
/> />
<separator string="Select your file :" colspan="2" /> <separator string="Select your file :" colspan="2" />
<field name="upload_data" filename="upload_fname" required="1" /> <field name="upload_data" filename="upload_fname" required="1" />
<field name="upload_fname" invisible="1" /> <field name="upload_fname" invisible="1" />
<field name="upload_fname_dummy" string="Upload Filename" /> <field name="upload_fname_dummy" string="Upload Filename" />
<field <field
name="format_id" name="format_id"
required="1" required="1"
domain="[('type', '=', 'up'), ('id', 'in', allowed_format_ids)]" domain="[('type', '=', 'up'), ('id', 'in', allowed_format_ids)]"
readonly="context.get('active_model') == 'account.payment.order'" readonly="context.get('active_model') == 'account.payment.order'"
/> />
<field name="order_type" /> <field name="order_type" />
<field name="test_mode" invisible="order_type not in ('FUL', 'BTU')" /> <field
</group> name="test_mode"
<footer> invisible="order_type not in ('FUL', 'BTU')"
<button />
</group>
<footer>
<button
name="ebics_upload" name="ebics_upload"
string="Upload File" string="Upload File"
type="object" type="object"
class="btn-primary" class="btn-primary"
data-hotkey="q" data-hotkey="q"
/> />
<button <button
string="Cancel" string="Cancel"
class="btn-secondary" class="btn-secondary"
special="cancel" special="cancel"
data-hotkey="z" data-hotkey="z"
/> />
</footer> </footer>
</form> </form>
</field> </field>
</record> </record>
<record id="ebics_xfer_view_form_result" model="ir.ui.view"> <record id="ebics_xfer_view_form_result" model="ir.ui.view">
<field name="name">EBICS File Transfer</field> <field name="name">EBICS File Transfer</field>
<field name="model">ebics.xfer</field> <field name="model">ebics.xfer</field>
<field name="priority">2</field> <field name="priority">2</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="EBICS File Transfer"> <form string="EBICS File Transfer">
<separator colspan="4" string="Results :" /> <separator colspan="4" string="Results :" />
<field name="note" colspan="4" nolabel="1" width="850" height="400" /> <field name="note" colspan="4" nolabel="1" width="850" height="400" />
<footer> <footer>
<button <button
name="view_ebics_file" name="view_ebics_file"
type="object" type="object"
string="View EBICS File(s)" string="View EBICS File(s)"
@ -132,35 +135,35 @@
invisible="not context.get('ebics_file_ids')" invisible="not context.get('ebics_file_ids')"
data-hotkey="q" data-hotkey="q"
/> />
<button <button
string="Close" string="Close"
class="btn-secondary" class="btn-secondary"
special="cancel" special="cancel"
data-hotkey="z" data-hotkey="z"
/> />
</footer> </footer>
</form> </form>
</field> </field>
</record> </record>
<record id="ebics_xfer_action_download" model="ir.actions.act_window"> <record id="ebics_xfer_action_download" model="ir.actions.act_window">
<field name="name">EBICS File Transfer - Download</field> <field name="name">EBICS File Transfer - Download</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">ebics.xfer</field> <field name="res_model">ebics.xfer</field>
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="target">new</field> <field name="target">new</field>
<field name="context">{'ebics_download': 1}</field> <field name="context">{'ebics_download': 1}</field>
<field name="view_id" ref="ebics_xfer_view_form_download" /> <field name="view_id" ref="ebics_xfer_view_form_download" />
</record> </record>
<record id="ebics_xfer_action_upload" model="ir.actions.act_window"> <record id="ebics_xfer_action_upload" model="ir.actions.act_window">
<field name="name">EBICS File Transfer - Upload</field> <field name="name">EBICS File Transfer - Upload</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">ebics.xfer</field> <field name="res_model">ebics.xfer</field>
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="target">new</field> <field name="target">new</field>
<field name="context">{'ebics_upload': 1}</field> <field name="context">{'ebics_upload': 1}</field>
<field name="view_id" ref="ebics_xfer_view_form_upload" /> <field name="view_id" ref="ebics_xfer_view_form_upload" />
</record> </record>
</odoo> </odoo>

2
account_ebics_batch/__manifest__.py
View File

@ -1,4 +1,4 @@
# Copyright 2009-2024 Noviat. # Copyright 2009-2025 Noviat.
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
{ {

4
account_ebics_batch/models/ebics_batch_log.py
View File

@ -182,7 +182,9 @@ class EbicsBatchLog(models.Model):
return file_ids return file_ids
def _ebics_process(self, import_dict): def _ebics_process(self, import_dict):
to_process = self.file_ids.filtered(lambda r: r.state == "draft") to_process = self.file_ids.filtered(
lambda r: r.download_process_method and r.state == "draft"
)
for ebics_file in to_process: for ebics_file in to_process:
ebics_file.process() ebics_file.process()

1
account_ebics_batch_payment/models/account_batch_payment.py
View File

@ -46,7 +46,6 @@ class AccountBatchPayment(models.Model):
view = self.env.ref("account_ebics.ebics_xfer_view_form_upload") view = self.env.ref("account_ebics.ebics_xfer_view_form_upload")
act = { act = {
"name": self.env._("EBICS Upload"), "name": self.env._("EBICS Upload"),
"view_type": "form",
"view_mode": "form", "view_mode": "form",
"res_model": "ebics.xfer", "res_model": "ebics.xfer",
"view_id": view.id, "view_id": view.id,