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

Merge branch '16-imp-file-format-on-ebics-upload' into '16.0'

Browse Source 
[IMP]EBICS File Format on Payment Mode

See merge request Noviat/Noviat_Generic/accounting-ebics!51
This commit is contained in:
Luc De Meyer 2024-05-14 22:00:33 +00:00
commit 001589b5bd
6 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
account_ebics/__manifest__.py
View File

@ -3,7 +3,7 @@
{
"name": "EBICS banking protocol",
"version": "16.0.1.10.0",
"version": "16.0.1.10.1",
"license": "LGPL-3",
"author": "Noviat",
"website": "https://www.noviat.com/",

25
account_ebics/wizards/ebics_xfer.py
View File

@ -141,21 +141,26 @@ class EbicsXfer(models.TransientModel):
avail_formats = self.ebics_config_id.ebics_file_format_ids.filtered(
lambda r: r.type == "down"
)
if avail_formats and len(avail_formats) == 1:
self.format_id = avail_formats
else:
self.format_id = False
avail_userids = avail_userids.filtered(
lambda r: r.transaction_rights in ["both", "down"]
)
else: # Upload Form
avail_formats = self.ebics_config_id.ebics_file_format_ids.filtered(
lambda r: r.type == "up"
)
if not self.env.context.get("active_model") == "account.payment.order":
avail_formats = self.ebics_config_id.ebics_file_format_ids.filtered(
lambda r: r.type == "up"
)
if avail_formats and len(avail_formats) == 1:
self.format_id = avail_formats
else:
self.format_id = False
avail_userids = avail_userids.filtered(
lambda r: r.transaction_rights in ["both", "up"]
)
if avail_formats and len(avail_formats) == 1:
self.format_id = avail_formats
else:
self.format_id = False
if avail_userids:
if len(avail_userids) == 1:
self.ebics_userid_id = avail_userids
@ -170,6 +175,8 @@ class EbicsXfer(models.TransientModel):
@api.onchange("upload_data")
def _onchange_upload_data(self):
if self.env.context.get("active_model") == "account.payment.order":
return
self.upload_fname_dummy = self.upload_fname
self.format_id = False
self._detect_upload_format()
@ -187,10 +194,6 @@ class EbicsXfer(models.TransientModel):
if len(upload_formats) == 1:
self.format_id = upload_formats
@api.onchange("format_id")
def _onchange_format_id(self):
self.order_type = self.format_id.order_type
def ebics_upload(self):
self.ensure_one()
ctx = self._context.copy()

2
account_ebics/wizards/ebics_xfer.xml
View File

@ -92,8 +92,8 @@
<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" />

2
account_ebics_payment_order/__manifest__.py
View File

@ -3,7 +3,7 @@
{
"name": "Upload Payment Order via EBICS",
"version": "16.0.1.1.0",
"version": "16.0.1.1.1",
"license": "LGPL-3",
"author": "Noviat",
"website": "https://www.noviat.com/",

4
account_ebics_payment_order/models/account_payment_order.py
View File

@ -10,7 +10,7 @@ class AccountPaymentOrder(models.Model):
def ebics_upload(self):
self.ensure_one()
ctx = self._context.copy()
ctx = self.env.context.copy()
ebics_format_id = self.payment_mode_id.ebics_format_id
if not ebics_format_id:
raise UserError(
@ -56,7 +56,6 @@ class AccountPaymentOrder(models.Model):
"for the selected bank."
)
)
ctx = self.env.context.copy()
if len(ebics_config) == 1:
ctx["default_ebics_config_id"] = ebics_config.id
ctx.update(
@ -70,7 +69,6 @@ class AccountPaymentOrder(models.Model):
ebics_xfer = self.env["ebics.xfer"].with_context(**ctx).create({})
ebics_xfer._onchange_ebics_config_id()
ebics_xfer._onchange_upload_data()
ebics_xfer._onchange_format_id()
view = self.env.ref("account_ebics.ebics_xfer_view_form_upload")
act = {
"name": _("EBICS Upload"),

18
account_ebics_payment_order/views/account_payment_mode.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>