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

Merge branch '18-imp-ebics' into '18.0'

Browse Source 
[IMP] account_ebics: add draft, done filters on ebics.file search view

See merge request Noviat/Noviat_Generic/accounting-ebics!75
This commit is contained in:
Luc De Meyer 2025-01-04 16:11:46 +00:00
commit 95c8c19949
14 changed files with 640 additions and 555 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).
{ {

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;
"""
)

7
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."
) )

17
account_ebics/views/ebics_config_views.xml
View File

@ -1,4 +1,4 @@
<?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">
@ -71,11 +71,20 @@
</group> </group>
</group> </group>
<notebook> <notebook>
<page string="EBICS Users" groups="account_ebics.group_ebics_manager"> <page
string="EBICS Users"
groups="account_ebics.group_ebics_manager"
>
<field name="ebics_userid_ids" readonly="state != 'draft'" /> <field name="ebics_userid_ids" readonly="state != 'draft'" />
</page> </page>
<page string="File Formats" groups="account_ebics.group_ebics_manager"> <page
<field name="ebics_file_format_ids" readonly="state != 'draft'" /> string="File Formats"
groups="account_ebics.group_ebics_manager"
>
<field
name="ebics_file_format_ids"
readonly="state != 'draft'"
/>
</page> </page>
</notebook> </notebook>
</form> </form>

2
account_ebics/views/ebics_file_format_views.xml
View File

@ -1,4 +1,4 @@
<?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">

62
account_ebics/views/ebics_file_views.xml
View File

@ -1,4 +1,4 @@
<?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">
@ -6,7 +6,6 @@
<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" />
@ -17,16 +16,32 @@
widget="selection" widget="selection"
groups="base.group_multi_company" groups="base.group_multi_company"
/> />
</group> <filter
<newline /> string="Draft"
name="draft"
domain="[('state', '=', 'draft')]"
/>
<filter
string="Done"
name="done"
domain="[('state', '=', 'confirm')]"
/>
<group expand="0" string="Group By"> <group expand="0" string="Group By">
<filter <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"
name="state"
context="{'group_by':'state'}"
/>
<filter
string="User"
name="user"
context="{'group_by':'user_id'}"
/>
</group> </group>
</search> </search>
</field> </field>
@ -62,9 +77,10 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="EBICS File" create="false"> <form string="EBICS File" create="false">
<header> <header>
<field name="download_process_method" invisible="1" />
<button <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"
@ -72,7 +88,7 @@
<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"
@ -80,28 +96,38 @@
/> />
<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
name="state"
widget="statusbar"
invisible="not download_process_method"
/>
</header> </header>
<group colspan="4" col="4"> <group name="main">
<field name="date" string="Download Date" /> <group name="main-full-screen" colspan="2" col="2">
<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="date_from" /> </group>
<field name="date_to" /> <group name="main-left">
<field name="date" string="Download Date" />
<field name="user_id" /> <field name="user_id" />
<field name="ebics_userid_id" /> <field name="ebics_userid_id" />
</group>
<group name="main-right">
<field name="date_from" />
<field name="date_to" />
<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>
</group>
<notebook> <notebook>
<page string="Additional Information"> <page string="Additional Information">
<field name="note" nolabel="1" /> <field name="note" nolabel="1" />
@ -121,7 +147,13 @@
<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
name="note_process"
colspan="4"
nolabel="1"
width="850"
height="400"
/>
<footer> <footer>
<button <button
name="action_open_bank_statements" name="action_open_bank_statements"

34
account_ebics/views/ebics_userid_views.xml
View File

@ -1,4 +1,4 @@
<?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">
@ -126,25 +126,42 @@
<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
name="dn"
invisible="not ebics_key_x509"
readonly="state != 'draft'"
>
<div colspan="2" col="1"> <div colspan="2" col="1">
<strong <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
name="ebics_key_x509_dn_cn"
readonly="state != 'draft'"
/>
<field name="ebics_key_x509_dn_o" readonly="state != 'draft'" /> <field name="ebics_key_x509_dn_o" readonly="state != 'draft'" />
<field name="ebics_key_x509_dn_l" readonly="state != 'draft'" /> <field name="ebics_key_x509_dn_l" readonly="state != 'draft'" />
<field name="ebics_key_x509_dn_c" readonly="state != 'draft'" /> <field name="ebics_key_x509_dn_c" readonly="state != 'draft'" />
</group> </group>
<group name="dn_r"> <group name="dn_r">
<field name="ebics_key_x509_dn_e" readonly="state != 'draft'" /> <field name="ebics_key_x509_dn_e" readonly="state != 'draft'" />
<field name="ebics_key_x509_dn_ou" readonly="state != 'draft'" /> <field
<field name="ebics_key_x509_dn_st" readonly="state != 'draft'" /> name="ebics_key_x509_dn_ou"
readonly="state != 'draft'"
/>
<field
name="ebics_key_x509_dn_st"
readonly="state != 'draft'"
/>
</group> </group>
</group> </group>
<group name="files"> <group name="files">
<group colspan="2" name="ebics_ini_letter" invisible="not ebics_ini_letter"> <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_fn" invisible="1" />
<field name="ebics_ini_letter" filename="ebics_ini_letter_fn" /> <field name="ebics_ini_letter" filename="ebics_ini_letter_fn" />
</group> </group>
@ -154,7 +171,10 @@
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
name="ebics_public_bank_keys"
filename="ebics_public_bank_keys_fn"
/>
</group> </group>
</group> </group>
</form> </form>

2
account_ebics/views/menu.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" ?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<menuitem <menuitem

3
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
@ -612,6 +612,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,

5
account_ebics/wizards/ebics_xfer.xml
View File

@ -94,7 +94,10 @@
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
name="test_mode"
invisible="order_type not in ('FUL', 'BTU')"
/>
</group> </group>
<footer> <footer>
<button <button

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()