Mirror/odoo_account_ebics
3
0
Fork 0
mirror of https://github.com/brain-tec/account_ebics.git synced 2025-11-04 15:10:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32 from Noviat/15.0

Browse Source 
Syncing from upstream Noviat/account_ebics (15.0)
This commit is contained in:
braintec
2024-05-13 09:44:36 +02:00
committed by GitHub
parent da4eeeef29 ea3a94ea8e
commit dd5602e018
9 changed files with 76 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
account_ebics/__manifest__.py
View File

@@ -1,9 +1,9 @@
# Copyright 2009-2023 Noviat.
# Copyright 2009-2024 Noviat.
# License LGPL-3 or later (http://www.gnu.org/licenses/lpgl).
{
"name": "EBICS banking protocol",
"version": "15.0.1.1.5",
"version": "15.0.1.2.0",
"license": "LGPL-3",
"author": "Noviat",
"website": "https://www.noviat.com/",

23
account_ebics/wizards/ebics_xfer.py
View File

@@ -1,13 +1,6 @@
# Copyright 2009-2023 Noviat.
# Copyright 2009-2024 Noviat.
# License LGPL-3 or later (http://www.gnu.org/licenses/lpgl).
"""
import logging
logging.basicConfig(
level=logging.DEBUG,
format='[%(asctime)s] %(levelname)s - %(name)s: %(message)s')
"""
import base64
import logging
import os
@@ -75,6 +68,9 @@ class EbicsXfer(models.TransientModel):
help="Select EBICS File Format to upload/download."
"\nLeave blank to download all available files.",
)
upload_format_ids = fields.Many2many(
comodel_name="ebics.file.format", compute="_compute_upload_format_ids"
)
allowed_format_ids = fields.Many2many(
related="ebics_config_id.ebics_file_format_ids",
string="Allowed EBICS File Formats",
@@ -105,6 +101,17 @@ class EbicsXfer(models.TransientModel):
else:
return cfg_mod
@api.depends("ebics_config_id")
def _compute_upload_format_ids(self):
for rec in self:
rec.upload_format_ids = False
if not self.env.context.get("ebics_download"):
rec.upload_format_ids = (
rec.ebics_config_id.ebics_file_format_ids.filtered(
lambda r: r.type == "up"
)
)
@api.onchange("ebics_config_id")
def _onchange_ebics_config_id(self):
ebics_userids = self.ebics_config_id.ebics_userid_ids

4
account_ebics/wizards/ebics_xfer.xml
View File

@@ -66,10 +66,12 @@
<field name="upload_data" filename="upload_fname" required="1" />
<field name="upload_fname" invisible="1" />
<field name="upload_fname_dummy" />
<field name="upload_format_ids" invisible="1" />
<field
name="format_id"
domain="[('id', 'in', upload_format_ids)]"
required="1"
domain="[('type', '=', 'up'), ('id', 'in', allowed_format_ids)]"
readonly="context.get('active_model') == 'account.payment.order'"
/>
<field name="order_type" />
<field

10
account_ebics_payment_order/README.rst
View File

@@ -16,13 +16,13 @@ This module depends upon the following modules (cf. apps.odoo.com):
- account_ebics
- account_payment_order
Configuration
=============
Set the EBICS File Format on your Payment Modes.
Usage
=====
Create your Payment Order and generate the bank file.
Upload the generated file via the 'EBICS Upload' button on the payment order.
Known issues / Roadmap
======================
* Add support for multiple EBICS connections.

5
account_ebics_payment_order/__manifest__.py
View File

@@ -1,9 +1,9 @@
# Copyright 2009-2022 Noviat.
# Copyright 2009-2024 Noviat.
# License LGPL-3 or later (http://www.gnu.org/licenses/lpgl).
{
"name": "Upload Payment Order via EBICS",
"version": "15.0.1.0.0",
"version": "15.0.1.1.0",
"license": "LGPL-3",
"author": "Noviat",
"website": "https://www.noviat.com/",
@@ -11,6 +11,7 @@
"depends": ["account_ebics", "account_payment_order"],
"data": [
"views/account_payment_order_views.xml",
"views/account_payment_mode_views.xml",
],
"installable": True,
"images": ["static/description/cover.png"],

1
account_ebics_payment_order/models/__init__.py
View File

@@ -1 +1,2 @@
from . import account_payment_mode
from . import account_payment_order

15
account_ebics_payment_order/models/account_payment_mode.py Normal file
View File

@@ -0,0 +1,15 @@
# Copyright 2009-2024 Noviat.
# License LGPL-3 or later (http://www.gnu.org/licenses/lpgl).
from odoo import fields, models
class AccountPaymentMode(models.Model):
_inherit = "account.payment.mode"
ebics_format_id = fields.Many2one(
comodel_name="ebics.file.format",
string="EBICS File Format",
domain="[('type', '=', 'up')]",
help="Select EBICS File Format to upload.",
)

16
account_ebics_payment_order/models/account_payment_order.py
View File

@@ -1,4 +1,4 @@
# Copyright 2009-2022 Noviat.
# Copyright 2009-2024 Noviat.
# License LGPL-3 or later (http://www.gnu.org/licenses/lpgl).
from odoo import _, models
@@ -10,6 +10,18 @@ class AccountPaymentOrder(models.Model):
def ebics_upload(self):
self.ensure_one()
ctx = self._context.copy()
ebics_format_id = self.payment_mode_id.ebics_format_id
if not ebics_format_id:
raise UserError(
_("Missing EBICS File Format setting on your Payment Mode.")
)
ctx.update(
{
"active_model": self._name,
"default_format_id": ebics_format_id.id,
}
)
attach = self.env["ir.attachment"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)]
)
@@ -52,7 +64,7 @@ class AccountPaymentOrder(models.Model):
"default_upload_data": attach.datas,
"default_upload_fname": attach.name,
"origin": origin,
"force_comany": self.company_id.id,
"force_company": self.company_id.id,
}
)
ebics_xfer = self.env["ebics.xfer"].with_context(**ctx).create({})

18
account_ebics_payment_order/views/account_payment_mode_views.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record id="account_payment_mode_form" model="ir.ui.view">
<field name="name">account.payment.mode.form</field>
<field name="model">account.payment.mode</field>
<field name="inherit_id" ref="account_payment_mode.account_payment_mode_form" />
<field name="arch" type="xml">
<field name="payment_type" position="after">
<field
name="ebics_format_id"
attrs="{'invisible': [('payment_order_ok', '=', False)]}"
/>
</field>
</field>
</record>
</odoo>